X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=libraries%2FMakefile;h=c32c1f61526e6ceca8997bb7018ffce77cc90abb;hp=d759d8bb0458492531f468e703e8b790d6104ca1;hb=74e1368d4688ee16f6decdf2cd3ebe27506b26ba;hpb=979761bcf53bdb03e95e82e0463676ba80cdc0ce diff --git a/libraries/Makefile b/libraries/Makefile index d759d8b..c32c1f6 100644 --- a/libraries/Makefile +++ b/libraries/Makefile @@ -17,16 +17,13 @@ # To add a new library to the tree, do # # darcs get http://darcs.haskell.org/packages/foo -# [ -e foo/configure.ac ] && ( cd foo && autoreconf ) +# [ -f foo/configure.ac ] && ( cd foo && autoreconf ) # make make.library.foo -.PHONY: default_target show +.PHONY: default_target default_target: all -show: - @echo '$(VALUE)="$($(VALUE))"' - # make doesn't give us an easy way to get the libraries built in # dependency order the first time, but not rebuild base (for example) # when we want to rebuild another library later. @@ -39,17 +36,37 @@ TOP=.. include $(TOP)/mk/boilerplate.mk include $(TOP)/mk/cabal-flags.mk +ifeq "$(stage)" "" +stage := 1 +endif + +DO_STAGE_1_LIBS := NO +DO_STAGE_2_LIBS := NO +ifeq "$(stage)" "1" +DO_STAGE_1_LIBS := YES +endif +ifeq "$(stage)" "2" +DO_STAGE_2_LIBS := YES +endif +ifneq "$(filter install clean maintainer-clean distclean binary-dist,$(MAKECMDGOALS))" "" +DO_STAGE_1_LIBS := YES +DO_STAGE_2_LIBS := YES +endif + # Any libraries listed here should also be in ../packages -SUBDIRS = ghc-prim $(INTEGER_LIBRARY) base array packedstring -SUBDIRS += containers bytestring old-locale old-time filepath directory +SUBDIRS := + +ifeq "$(DO_STAGE_1_LIBS)" "YES" +SUBDIRS += ghc-prim $(INTEGER_LIBRARY) base syb base3-compat array packedstring +SUBDIRS += containers bytestring old-locale old-time filepath ifeq "$(GhcLibsWithUnix)" "YES" SUBDIRS += unix endif ifeq "$(Windows)" "YES" SUBDIRS += $(wildcard Win32) endif -SUBDIRS += process pretty hpc template-haskell editline Cabal random haskell98 +SUBDIRS += directory process pretty hpc template-haskell editline Cabal random haskell98 # Set GhcBootLibs=YES from the command line to work with just the libraries # needed to bootstrap GHC. @@ -68,14 +85,28 @@ SUBDIRS += $(wildcard time) SUBDIRS += $(wildcard stm) SUBDIRS += $(wildcard xhtml) SUBDIRS += $(wildcard parallel) +endif +endif + +DPH_SUBDIRS := +ifneq "$(GhcBootLibs)" "YES" ifneq "$(wildcard dph)" "" -SUBDIRS += dph/dph-base -SUBDIRS += dph/dph-prim-interface -SUBDIRS += dph/dph-prim-seq -SUBDIRS += dph/dph-prim-par -SUBDIRS += dph/dph-seq -SUBDIRS += dph/dph-par +DPH_SUBDIRS += dph/dph-base +DPH_SUBDIRS += dph/dph-prim-interface +DPH_SUBDIRS += dph/dph-prim-seq +DPH_SUBDIRS += dph/dph-prim-par +DPH_SUBDIRS += dph/dph-seq +DPH_SUBDIRS += dph/dph-par +endif endif + +# We have a separate variable for cleaning as this happens in stage=1 and +# we want to clean the dph subdirectories, too. +ifeq "$(DO_STAGE_2_LIBS)" "YES" +SUBDIRS += $(DPH_SUBDIRS) +CLEAN_SUBDIRS = $(SUBDIRS) +else +CLEAN_SUBDIRS = $(SUBDIRS) $(DPH_SUBDIRS) endif # ----------------------------------------------------------------------------- @@ -89,37 +120,6 @@ ifeq "$(ghc_ge_609)" "YES" GhcLibHcOpts += -fno-warn-deprecated-flags endif -ifeq "$(RelocatableBuild)" "YES" -# On Windows we want to make moveable bindists, but we need to tell -# ghc-pkg where the haddock docs are. Therefore we completely ignore -# 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 -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) -idynlibdir = $(dynlibdir) -idatadir = $(datadir) -idocdir = $(docdir)/libraries/$$pkg -ihaddockdir = $(htmldir)/libraries/$$pkg -ihtmldir = $(htmldir)/libraries/$$pkg -html_installed_root = $(htmldir)/libraries -endif - IFBUILDABLE=ifBuildable/ifBuildable $(FPTOOLS_TOP_ABS)/packages ifneq "$(DOING_BIN_DIST)" "YES" @@ -150,12 +150,6 @@ subdirs: HERE_ABS=$(FPTOOLS_TOP_ABS)/libraries CABAL_GHC_FLAGS = -Wall -ifeq "$(ghc_ge_605)" "NO" -CABAL_GHC_FLAGS += -cpp -endif - -# Euch, hideous hack: -CABAL_VERSION = $(shell grep "^Version:" Cabal/Cabal.cabal | sed -e "s/^Version: //" -e 's/\./,/g') BOOTSTRAPPING_FLAGS = $(CABAL_GHC_FLAGS) -DCABAL_VERSION=$(CABAL_VERSION) -odir $(HERE_ABS)/bootstrapping -hidir $(HERE_ABS)/bootstrapping -i$(HERE_ABS)/Cabal -i$(HERE_ABS)/filepath -i$(HERE_ABS)/hpc @@ -164,11 +158,15 @@ BOOTSTRAPPING_FLAGS = $(CABAL_GHC_FLAGS) -DCABAL_VERSION=$(CABAL_VERSION) -odir boot: ifBuildable/ifBuildable cabal-bin bootstrapping.conf cabal-bin: cabal-bin.hs - mkdir bootstrapping + -mkdir bootstrapping $(GHC) $(BOOTSTRAPPING_FLAGS) --make cabal-bin -o cabal-bin bootstrapping.conf: cabal-bin echo "[]" > $@.tmp + -cd extensible-exceptions && $(CABAL) clean --distpref=dist-bootstrapping + cd extensible-exceptions && $(CABAL) configure --distpref=dist-bootstrapping --with-compiler=$(GHC) --with-hc-pkg=$(GHC_PKG) --package-db=$(HERE_ABS)/$@.tmp + cd extensible-exceptions && $(CABAL) build --distpref=dist-bootstrapping + cd extensible-exceptions && $(CABAL) install --distpref=dist-bootstrapping --inplace -cd filepath && $(CABAL) clean --distpref=dist-bootstrapping cd filepath && $(CABAL) configure --distpref=dist-bootstrapping --with-compiler=$(GHC) --with-hc-pkg=$(GHC_PKG) --package-db=$(HERE_ABS)/$@.tmp cd filepath && $(CABAL) build --distpref=dist-bootstrapping @@ -197,10 +195,6 @@ endif all: build -ifeq "$(HADDOCK_DOCS)" "YES" -all: doc -endif - .PHONY: rebuild.library.% .PHONY: remake.library.% @@ -210,6 +204,22 @@ rebuild.library.%: clean.library.% build.library.% $(foreach SUBDIR,$(SUBDIRS),remake.library.$(SUBDIR)):\ remake.library.%: clean.library.% make.library.% +# The meta package dph is a special case +ifeq "$(stage)" "1" +remake.library.dph: + @echo "*** Package dph needs to be made in stage=2" +endif +ifeq "$(stage)" "2" +# NB. we're depending on make chasing dependencies from left to right here. +# This bit goes wrong with 'make -j'. +remake.library.dph: remake.library.dph/dph-base \ + remake.library.dph/dph-prim-interface \ + remake.library.dph/dph-prim-seq \ + remake.library.dph/dph-prim-par \ + remake.library.dph/dph-seq \ + remake.library.dph/dph-par +endif + # NB. we're depending on make chasing dependencies from left to right here. # This bit goes wrong with 'make -j'. build: $(foreach SUBDIR,$(SUBDIRS),make.library.$(SUBDIR)) @@ -225,27 +235,24 @@ configure: $(foreach SUBDIR,$(SUBDIRS), \ ALL_CONFIGURE_FLAGS = \ $(INSTALL_DIRS_CONFIGURE_FLAGS) \ - $(USE_STAGE1_CONFIGURE_FLAGS) \ + $(USE_STAGE$(stage)_CONFIGURE_FLAGS) \ $(COMMON_CONFIGURE_FLAGS) \ --haddock-options="--use-contents=../index.html \ --use-index=../doc-index.html" \ $(CONFIGURE_OPTS) stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).dph/dph-par: \ - create_dph-par + dph/dph-par stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).dph/dph-seq: \ - create_dph-seq + dph/dph-seq -.PHONY: dph-create_par create_dph-seq - -create_dph-par create_dph-seq: create_%: +dph/%: $(MAKE) -C dph $* $(foreach SUBDIR,$(SUBDIRS), \ stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).$(SUBDIR)): \ -stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).%: cabal-bin \ - bootstrapping.conf +stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).%: cabal-bin -$(RM) -f stamp/configure.library.*.$* $*/unbuildable $(MKDIRHIER) `dirname $@` ( cd $* && $(CABAL) configure $(ALL_CONFIGURE_FLAGS) ) \ @@ -262,7 +269,7 @@ stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).%: cabal-bin \ # every time. $(foreach SUBDIR,$(SUBDIRS),make.library.$(SUBDIR)):\ make.library.%: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \ - cabal-bin ifBuildable/ifBuildable bootstrapping.conf + cabal-bin ifBuildable/ifBuildable if $(IFBUILDABLE) $*; then \ cd $* && \ cmp -s $(MAKEFILE_LOCAL) Makefile.local || cp $(MAKEFILE_LOCAL) .; \ @@ -273,12 +280,17 @@ make.library.%: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \ $(CABAL) register --inplace; \ fi +# Special case for meta package dph: we can only remake it as we don't have +# any dependency info between the sub-packages +make.library.dph: + @echo "*** Please use the target 'remake.library.dph' instead" + MAKEFILE_LOCAL = $(FPTOOLS_TOP_ABS)/libraries/Makefile.local # Build the library using 'setup build' (not the default) $(foreach SUBDIR,$(SUBDIRS),build.library.$(SUBDIR)):\ build.library.%: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \ - cabal-bin ifBuildable/ifBuildable bootstrapping.conf + cabal-bin ifBuildable/ifBuildable if $(IFBUILDABLE) $*; then \ cd $* && \ $(CABAL) build $(BUILD_FLAGS); \ @@ -289,17 +301,21 @@ build.library.%: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \ html: doc -doc: $(foreach SUBDIR,$(SUBDIRS),doc.library.$(SUBDIR)) +# No docs for compat libraries for now. +DOC_SUBDIRS = $(filter-out %-compat, $(SUBDIRS)) + +doc: $(foreach SUBDIR,$(DOC_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 +ifeq "$(HSCOLOUR_SRCS)" "YES" +CABAL_HADDOCK_FLAGS += --hyperlink-source endif +CABAL_HADDOCK_FLAGS += --with-haddock=$(FPTOOLS_TOP_ABS)/utils/haddock/install-inplace/bin/haddock -$(foreach SUBDIR,$(SUBDIRS),doc.library.$(SUBDIR)):\ +$(foreach SUBDIR,$(DOC_SUBDIRS),doc.library.$(SUBDIR)):\ doc.library.%: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \ - cabal-bin ifBuildable/ifBuildable bootstrapping.conf + cabal-bin ifBuildable/ifBuildable if $(IFBUILDABLE) $*; then \ cd $* && $(CABAL) haddock --html-location='../$$pkg' \ $(CABAL_HADDOCK_FLAGS); \ @@ -313,14 +329,20 @@ ifneq "$(HSCOLOUR)" "" if $(IFBUILDABLE) $* && [ -d $*/dist/doc/html/*/src/ ]; then cp hscolour.css $*/dist/doc/html/*/src/; fi endif -.PHONY: distclean clean clean.library.% +.PHONY: maintainer-clean distclean clean clean.library.% +maintainer-clean: clean distclean: clean +ifeq "$(DPH_SUBDIRS)" "" clean: $(foreach SUBDIR,$(SUBDIRS),clean.library.$(SUBDIR)) - -cd filepath && $(CABAL) clean --distpref=dist-bootstrapping - -cd Cabal && $(CABAL) clean --distpref=dist-bootstrapping - -cd hpc && $(CABAL) clean --distpref=dist-bootstrapping +else +clean: $(foreach SUBDIR,$(SUBDIRS),clean.library.$(SUBDIR)) clean.library.dph +endif + -cd extensible-exceptions && $(CABAL) clean --distpref=dist-bootstrapping + -cd filepath && $(CABAL) clean --distpref=dist-bootstrapping + -cd Cabal && $(CABAL) clean --distpref=dist-bootstrapping + -cd hpc && $(CABAL) clean --distpref=dist-bootstrapping $(RM) -rf bootstrapping $(RM) -f bootstrapping.conf bootstrapping.conf.old $(RM) -f bootstrapping.conf.tmp bootstrapping.conf.tmp.old @@ -329,14 +351,11 @@ clean: $(foreach SUBDIR,$(SUBDIRS),clean.library.$(SUBDIR)) $(RM) -f libraries.txt index.html doc-index.html doc-index*.html $(RM) -f haddock* *.gif $(RM) -rf stamp/* -ifneq "$(wildcard dph)" "" - $(MAKE) -C dph clean -endif -distclean: +maintainer-clean distclean: $(RM) $(foreach lib, $(SUBDIRS), $(lib)/.depend $(lib)/.depend.bak) -$(foreach SUBDIR,$(SUBDIRS),clean.library.$(SUBDIR)): \ +$(foreach SUBDIR,$(CLEAN_SUBDIRS),clean.library.$(SUBDIR)): \ clean.library.%: $(RM) -f stamp/configure.library.*.$* $*/unbuildable -cd $* && $(CABAL) clean @@ -344,6 +363,13 @@ clean.library.%: $(RM) $*/GNUmakefile $*/Makefile.local endif +# Extra target to clean all the sub-packages of dph +clean.library.dph: clean.library.dph/dph-prim-par \ + clean.library.dph/dph-prim-seq \ + clean.library.dph/dph-prim-interface \ + clean.library.dph/dph-base + $(MAKE) -C dph clean + # ----------------------------------------------------------------------------- .PHONY: install install-docs install.library.% @@ -353,6 +379,7 @@ ifeq "$(HADDOCK_DOCS)" "YES" $(INSTALL_DIR) $(DESTDIR)$(html_installed_root) $(INSTALL_DATA) index.html doc-index*.html $(DESTDIR)$(html_installed_root) $(INSTALL_SCRIPT) gen_contents_index $(DESTDIR)$(html_installed_root) + $(INSTALL_DATA) prologue.txt $(DESTDIR)$(html_installed_root) # Hacks: $(INSTALL_DATA) base/dist/doc/html/*/*.css $(DESTDIR)$(html_installed_root) $(INSTALL_DATA) base/dist/doc/html/*/*.js $(DESTDIR)$(html_installed_root) @@ -377,23 +404,27 @@ $(foreach SUBDIR,$(SUBDIRS),install.library.$(SUBDIR)): \ install.library.%: ifBuildable/ifBuildable if $(IFBUILDABLE) $*; then \ cd $* && \ - $(INSTALL_PACKAGE) install '$(DESTDIR)$(bindir)/ghc-pkg' '$(DESTDIR)$(datadir)/package.conf' '$(DESTDIR)' '$(prefix)' '$(iprefix)' '$(ibindir)' '$(ilibdir)' '$(ilibexecdir)' '$(idynlibdir)' '$(idatadir)' '$(idocdir)' '$(ihtmldir)' '$(ihaddockdir)' ; \ + $(INSTALL_PACKAGE) install '$(GHC_PKG_INSTALL_PROG)' '$(DESTDIR)$(datadir)/package.conf' '$(DESTDIR)' '$(prefix)' '$(iprefix)' '$(ibindir)' '$(ilibdir)' '$(ilibexecdir)' '$(idynlibdir)' '$(idatadir)' '$(idocdir)' '$(ihtmldir)' '$(ihaddockdir)' ; \ fi .PHONY: binary-dist binary-dist.library.% BIN_DIST_LIBDIR=$(BIN_DIST_DIR)/libraries -BINDIST_EXTRAS += ifBuildable/ifBuildable binary-dist: $(foreach SUBDIR,$(SUBDIRS),binary-dist.library.$(SUBDIR)) +ifeq "$(WHERE_AM_I)" "" + echo "I don't know where I am" >&2 + exit 1 +endif echo $(WHERE_AM_I)/Makefile >> $(BIN_DIST_LIST) # XXX This needs to be changed: This ifBuildable is built with the # bootstrapping compiler, so isn't OS X friendly. It should be made into # a Cabal package if we keep it. However, once we drop extralibs we can # probably remove it anyway. echo $(WHERE_AM_I)/ifBuildable/ifBuildable >> $(BIN_DIST_LIST) + for FILE in dph/dph-prim-interface/interface/*.h dph/dph/LICENSE; do if [ -f $$FILE ]; then echo $(WHERE_AM_I)/$$FILE >> $(BIN_DIST_LIST); fi; done ifeq "$(HADDOCK_DOCS)" "YES" - for FILE in gen_contents_index index.html doc-index*.html; do echo $(WHERE_AM_I)/$$FILE >> $(BIN_DIST_LIST); done + for FILE in gen_contents_index prologue.txt index.html doc-index*.html; do echo $(WHERE_AM_I)/$$FILE >> $(BIN_DIST_LIST); done endif $(foreach SUBDIR,$(SUBDIRS),binary-dist.library.$(SUBDIR)): \