X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=libraries%2FMakefile;h=60418f147361746930bfd5b6febf3fb664585886;hp=ea574e11064720ca356b06dafc9602de80ce4237;hb=235edf36cc202bb21c00d0e5e05ebf076fb0542e;hpb=f32eaf3f5bfe40f79ecaf75ec770be48ef49b7e6 diff --git a/libraries/Makefile b/libraries/Makefile index ea574e1..60418f1 100644 --- a/libraries/Makefile +++ b/libraries/Makefile @@ -94,10 +94,11 @@ iprefix = $$topdir ibindir = $$topdir ilibdir = $$topdir ilibexecdir = $$topdir +idynlibdir = $$topdir idatadir = $$topdir -idocdir = $$topdir/doc/libraries/$$pkgid -iinterfacedir = $$topdir/doc/libraries/$$pkgid -ihtmldir = $$httptopdir/doc/libraries/$$pkgid +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 @@ -106,10 +107,11 @@ iprefix = $(prefix) ibindir = $(bindir) ilibdir = $(libdir) ilibexecdir = $(libexecdir) +idynlibdir = $(dynlibdir) idatadir = $(datadir) -idocdir = $(docdir)/libraries/$$pkgid -iinterfacedir = $(htmldir)/libraries/$$pkgid -ihtmldir = $(htmldir)/libraries/$$pkgid +idocdir = $(docdir)/libraries/$$pkg +ihaddockdir = $(htmldir)/libraries/$$pkg +ihtmldir = $(htmldir)/libraries/$$pkg html_installed_root = $(htmldir)/libraries endif @@ -133,6 +135,10 @@ 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 = -DCABAL_VERSION=1,3 $(addprefix -i../bootstrapping.,$(BOOTSTRAP_LIBS)) @@ -167,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.$* @@ -233,7 +252,7 @@ stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).%: %/setup/Setup --libexecdir=/NONEXISTANT \ --datadir=/NONEXISTANT \ --docdir=/NONEXISTANT \ - --interfacedir=/NONEXISTANT \ + --haddockdir=/NONEXISTANT \ --htmldir=/NONEXISTANT \ --with-compiler=../../compiler/stage1/ghc-inplace \ --with-hc-pkg=../../utils/ghc-pkg/ghc-pkg-inplace \ @@ -250,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) @@ -269,15 +295,6 @@ 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 html: doc @@ -285,12 +302,21 @@ html: doc doc: $(foreach SUBDIR,$(SUBDIRS),doc.library.$(SUBDIR)) 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.% @@ -348,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)' '$(iinterfacedir)' ; \ + ../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.% @@ -367,10 +393,6 @@ ifeq "$(HADDOCK_DOCS)" "YES" cp doc-index*.html $(BIN_DIST_LIBDIR) endif cp -pR stamp $(BIN_DIST_LIBDIR) - # This gets used in the compiler directory to see if GHC should - # depend on the readline package or not - $(MKDIRHIER) $(BIN_DIST_LIBDIR)/readline - cp readline/config.mk $(BIN_DIST_LIBDIR)/readline $(foreach SUBDIR,$(SUBDIRS),binary-dist.library.$(SUBDIR)): \ binary-dist.library.%: @@ -381,6 +403,7 @@ binary-dist.library.%: 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 && \