X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=libraries%2FMakefile;h=60418f147361746930bfd5b6febf3fb664585886;hp=0e93ba0c00f1fe34a6eabf78b41cead749fd540c;hb=235edf36cc202bb21c00d0e5e05ebf076fb0542e;hpb=0a148fd7108528d6cb1596b5017888c1b558220d diff --git a/libraries/Makefile b/libraries/Makefile index 0e93ba0..60418f1 100644 --- a/libraries/Makefile +++ b/libraries/Makefile @@ -62,13 +62,7 @@ SUBDIRS += $(wildcard QuickCheck) SUBDIRS += $(wildcard HUnit) SUBDIRS += $(wildcard mtl) SUBDIRS += $(wildcard fgl) -SUBDIRS += $(wildcard X11) SUBDIRS += $(wildcard time) -ifeq "$(Windows)" "NO" -# HGL is not working on Win32, so omit it for now. Better not to ship it -# at all than to ship a broken version. -SUBDIRS += $(wildcard HGL) -endif SUBDIRS += $(wildcard OpenGL) SUBDIRS += $(wildcard GLUT) SUBDIRS += $(wildcard OpenAL) @@ -76,7 +70,6 @@ SUBDIRS += $(wildcard ALUT) SUBDIRS += $(wildcard stm) SUBDIRS += $(wildcard xhtml) SUBDIRS += $(wildcard cgi) -SUBDIRS += $(wildcard arrows) ifeq "$(GhcLibsWithObjectIO)" "YES" SUBDIRS += $(wildcard ObjectIO) endif @@ -97,25 +90,29 @@ ifeq "$(RelocatableBuild)" "YES" # where the user tells us to put the haddock documentation and put it # somewhere whose relative location we know. When installing we need # to give Cabal a real path, though. -iprefix = $$topdir -ibindir = $$topdir -ilibdir = $$topdir -ilibexecdir = $$topdir -idatadir = $$topdir -idocdir = $$topdir/doc/libraries/$$pkgid -ihtmldir = $$topdir/doc/libraries/$$pkgid +iprefix = $$topdir +ibindir = $$topdir +ilibdir = $$topdir +ilibexecdir = $$topdir +idynlibdir = $$topdir +idatadir = $$topdir +idocdir = $$topdir/doc/libraries/$$pkg +ihaddockdir = $$topdir/doc/libraries/$$pkg +ihtmldir = $$httptopdir/doc/libraries/$$pkg html_installed_root = $(prefix)/doc/libraries else # On non-Windows we can just give absolute paths all the time, and # thus obey the htmldir that we are given. -iprefix = $(prefix) -ibindir = $(bindir) -ilibdir = $(libdir) -ilibexecdir = $(libexecdir) -idatadir = $(datadir) -idocdir = $(docdir)/libraries/$$pkgid -ihtmldir = $(htmldir)/libraries/$$pkgid -html_installed_root = $(ihtmldir) +iprefix = $(prefix) +ibindir = $(bindir) +ilibdir = $(libdir) +ilibexecdir = $(libexecdir) +idynlibdir = $(dynlibdir) +idatadir = $(datadir) +idocdir = $(docdir)/libraries/$$pkg +ihaddockdir = $(htmldir)/libraries/$$pkg +ihtmldir = $(htmldir)/libraries/$$pkg +html_installed_root = $(htmldir)/libraries endif ifneq "$(DOING_BIN_DIST)" "YES" @@ -138,10 +135,14 @@ CONFIGURE_OPTS += --enable-split-objs CONFIGURE_STAMP_EXTRAS := $(CONFIGURE_STAMP_EXTRAS)-splitting endif +ifneq "$(HSCOLOUR)" "" +CONFIGURE_OPTS += --with-hscolour=$(HSCOLOUR) +endif + BOOTSTRAP_LIBS = Cabal filepath BOOTSTRAP_STAMPS = $(addprefix stamp/bootstrapping.,$(BOOTSTRAP_LIBS)) -BOOTSTRAP_INC_1_UP = $(addprefix -i../bootstrapping.,$(BOOTSTRAP_LIBS)) -BOOTSTRAP_INC_2_UP = $(addprefix -i../../bootstrapping.,$(BOOTSTRAP_LIBS)) +BOOTSTRAP_INC_1_UP = -DCABAL_VERSION=1,3 $(addprefix -i../bootstrapping.,$(BOOTSTRAP_LIBS)) +BOOTSTRAP_INC_2_UP = -DCABAL_VERSION=1,3 $(addprefix -i../../bootstrapping.,$(BOOTSTRAP_LIBS)) .PHONY: subdirs @@ -172,15 +173,28 @@ installPackage/installPackage: installPackage.hs $(BOOTSTRAP_STAMPS) -$(RM) -rf installPackage mkdir installPackage $(CP) installPackage.hs installPackage/ +ifeq "$(UseStage1)" "YES" + cd installPackage && ../$(HC) -Wall -cpp \ + --make installPackage -o installPackage \ + $(BOOTSTRAP_INC_1_UP) +else cd installPackage && $(GHC) -Wall -cpp \ --make installPackage -o installPackage \ $(BOOTSTRAP_INC_1_UP) +endif +# TODO: The conditional is yucky, but we need to be able to build with stage1 +# for bindists and as installPackages/ has no Makefile, it seems hard +# to make this nicer. ifBuildable/ifBuildable: ifBuildable.hs -$(RM) -rf ifBuildable mkdir ifBuildable $(CP) ifBuildable.hs ifBuildable/ +ifeq "$(UseStage1)" "YES" + cd ifBuildable && ../$(HC) -Wall --make ifBuildable -o ifBuildable +else cd ifBuildable && $(GHC) -Wall --make ifBuildable -o ifBuildable +endif $(BOOTSTRAP_STAMPS): stamp/bootstrapping.%: $(RM) -rf bootstrapping.$* @@ -238,6 +252,7 @@ stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).%: %/setup/Setup --libexecdir=/NONEXISTANT \ --datadir=/NONEXISTANT \ --docdir=/NONEXISTANT \ + --haddockdir=/NONEXISTANT \ --htmldir=/NONEXISTANT \ --with-compiler=../../compiler/stage1/ghc-inplace \ --with-hc-pkg=../../utils/ghc-pkg/ghc-pkg-inplace \ @@ -254,14 +269,21 @@ stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).%: %/setup/Setup # build dies! # Build the library using 'make' +# We re-run 'setup makefile' each time, just in case any preprocessing +# needs to be done. However, we're careful not to overwrite GNUmakefile +# if it hasn't changed, so that dependency-generation isn't forced +# every time. $(foreach SUBDIR,$(SUBDIRS),make.library.$(SUBDIR)):\ make.library.%: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \ - %/GNUmakefile \ - %/setup/Setup ifBuildable/ifBuildable + %/setup/Setup ifBuildable/ifBuildable installPackage/installPackage if ifBuildable/ifBuildable $*; then \ cd $* && \ + cmp -s ../Makefile.local Makefile.local || cp ../Makefile.local .; \ + mv GNUmakefile GNUmakefile.tmp; \ + setup/Setup makefile -f GNUmakefile; \ + cmp -s GNUmakefile GNUmakefile.tmp && mv GNUmakefile.tmp GNUmakefile; \ $(MAKE) $(MFLAGS) && \ - setup/Setup register --inplace; \ + ../installPackage/installPackage register --inplace; \ fi # Build the library using 'setup build' (not the default) @@ -273,26 +295,28 @@ build.library.%: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \ setup/Setup build $(addprefix --ghc-option=,$(GhcLibHcOpts)); \ fi -$(foreach SUBDIR,$(SUBDIRS),$(SUBDIR)/GNUmakefile):\ -%/GNUmakefile: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \ - %/setup/Setup ifBuildable/ifBuildable - $(RM) $*/GNUmakefile - cp Makefile.local $* - if ifBuildable/ifBuildable $*; then \ - cd $* && setup/Setup makefile -f GNUmakefile; \ - fi +.PHONY: doc html -.PHONY: doc +html: doc doc: $(foreach SUBDIR,$(SUBDIRS),doc.library.$(SUBDIR)) - sh gen_contents_index + sh gen_contents_index --inplace + +# Making hyperlinked source only works if we have hscolour +ifneq "$(HSCOLOUR)" "" +CABAL_HADDOCK_FLAGS=--hyperlink-source +endif $(foreach SUBDIR,$(SUBDIRS),doc.library.$(SUBDIR)):\ doc.library.%: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \ %/setup/Setup ifBuildable/ifBuildable if ifBuildable/ifBuildable $*; then \ - cd $* && setup/Setup haddock --html-location='../$$pkgid'; \ + cd $* && setup/Setup haddock --html-location='../$$pkg' \ + $(CABAL_HADDOCK_FLAGS); \ fi +ifneq "$(HSCOLOUR)" "" + if ifBuildable/ifBuildable $*; then cp hscolour.css $*/dist/doc/html/$*/src/; fi +endif .PHONY: distclean clean clean.library.% @@ -304,6 +328,7 @@ clean: $(foreach SUBDIR,$(SUBDIRS),clean.library.$(SUBDIR)) $(RM) -rf ifBuildable $(RM) -rf installPackage $(RM) -f libraries.txt index.html doc-index.html doc-index*.html + $(RM) -f haddock* *.gif distclean: $(RM) $(foreach lib, $(SUBDIRS), $(lib)/.depend $(lib)/.depend.bak) @@ -326,9 +351,9 @@ ifeq "$(HADDOCK_DOCS)" "YES" $(INSTALL_DATA) index.html doc-index*.html $(DESTDIR)$(html_installed_root) $(INSTALL_SCRIPT) gen_contents_index $(DESTDIR)$(html_installed_root) # Hacks: - $(INSTALL_DATA) $(DESTDIR)$(html_installed_root)/base*/*.css $(DESTDIR)$(html_installed_root) - $(INSTALL_DATA) $(DESTDIR)$(html_installed_root)/base*/*.js $(DESTDIR)$(html_installed_root) - $(INSTALL_DATA) $(DESTDIR)$(html_installed_root)/base*/*.gif $(DESTDIR)$(html_installed_root) + $(INSTALL_DATA) base/dist/doc/html/*/*.css $(DESTDIR)$(html_installed_root) + $(INSTALL_DATA) base/dist/doc/html/*/*.js $(DESTDIR)$(html_installed_root) + $(INSTALL_DATA) base/dist/doc/html/*/*.gif $(DESTDIR)$(html_installed_root) endif # Cabal doesn't let us ask to install docs only, so do nothing here @@ -349,7 +374,7 @@ $(foreach SUBDIR,$(SUBDIRS),install.library.$(SUBDIR)): \ install.library.%: installPackage/installPackage ifBuildable/ifBuildable if ifBuildable/ifBuildable $*; then \ cd $* && \ - ../installPackage/installPackage '$(GHC_PKG_PROG)' '$(DESTDIR)$(libdir)/package.conf' '$(DESTDIR)' '$(prefix)' '$(iprefix)' '$(ibindir)' '$(ilibdir)' '$(ilibexecdir)' '$(idatadir)' '$(idocdir)' '$(ihtmldir)' ; \ + ../installPackage/installPackage install '$(GHC_PKG_PROG)' '$(DESTDIR)$(libdir)/package.conf' '$(DESTDIR)' '$(prefix)' '$(iprefix)' '$(ibindir)' '$(ilibdir)' '$(ilibexecdir)' '$(idynlibdir)' '$(idatadir)' '$(idocdir)' '$(ihtmldir)' '$(ihaddockdir)' ; \ fi .PHONY: binary-dist binary-dist.library.% @@ -377,6 +402,8 @@ binary-dist.library.%: cp $*.cabal $(BIN_DIST_LIBDIR)/$* && \ cp LICENSE $(BIN_DIST_LIBDIR)/$* && \ cp -R dist $(BIN_DIST_LIBDIR)/$* && \ + $(FIND) . -name "*.buildinfo" -exec cp {} $(BIN_DIST_LIBDIR)/$* \; && \ + $(FIND) . -name unbuildable -exec cp {} $(BIN_DIST_LIBDIR)/$* \; && \ (cp -RL include $(BIN_DIST_LIBDIR)/$* || true) && \ $(FIND) $(BIN_DIST_LIBDIR)/$*/dist \ \( -name "*_split" -o -name "autogen" \) | xargs rm -rf && \ @@ -384,3 +411,10 @@ binary-dist.library.%: \( \( -name "*.o" -o -name "*.p_o" \) -a ! -name "HS*" \) \ -exec rm {} \; ; \ fi + +# Ignore some doc targets that we don't support +# The root recurses into us when these targets are made +.PHONY: html-no-chunks chm HxS fo dvi ps pdf +html-no-chunks chm HxS fo dvi ps pdf: + @: +