X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=libraries%2FMakefile;h=b3f98081573351ced6950a6b2442706a6cdfc76d;hb=c6eadadbefe2ec5709e9d31893f79c4ff78754b4;hp=04404d281c2a04416b60cf3302cae07bb85920e7;hpb=1abb3c63204c465f90326b945a9b173021198911;p=ghc-hetmet.git diff --git a/libraries/Makefile b/libraries/Makefile index 04404d2..b3f9808 100644 --- a/libraries/Makefile +++ b/libraries/Makefile @@ -8,7 +8,7 @@ # To rebuild a particular library : # # make clean.library. -# make build.library. +# make make.library. # # or the following is equivalent: # @@ -18,19 +18,25 @@ # # darcs get http://darcs.haskell.org/packages/foo # [ -e foo/configure.ac ] && ( cd foo && autoreconf ) -# make build.library.foo +# make make.library.foo .PHONY: default_target -default_target: build +default_target: all + +# 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. +# So for now we just don't do anything in parallel in here. +.NOTPARALLEL: # Ideally we'd just include something to give us variables # for paths and arguments to tools etc, and those set in mk/build.mk. TOP=.. include $(TOP)/mk/boilerplate.mk -SUBDIRS = base old-locale old-time directory process filepath pretty \ - template-haskell readline Cabal random haskell98 +SUBDIRS = base old-locale old-time filepath directory process pretty \ + hpc template-haskell readline Cabal random haskell98 ifeq "$(GhcLibsWithUnix)" "YES" SUBDIRS += unix @@ -72,6 +78,7 @@ ifeq "$(GhcLibsWithObjectIO)" "YES" SUBDIRS += $(wildcard ObjectIO) endif SUBDIRS += $(wildcard parallel) +SUBDIRS += $(wildcard ndp) endif # ----------------------------------------------------------------------------- @@ -151,22 +158,25 @@ $(BOOTSTRAP_STAMPS): stamp/bootstrapping.%: all: build -ifneq "$(NO_HADDOCK_DOCS)" "YES" +ifeq "$(HADDOCK_DOCS)" "YES" all: doc endif .PHONY: rebuild.library.% $(foreach SUBDIR,$(SUBDIRS),rebuild.library.$(SUBDIR)):\ -rebuild.library.%: clean.library.% build.library.% +rebuild.library.%: clean.library.% make.library.% -build: $(foreach SUBDIR,$(SUBDIRS),build.library.$(SUBDIR)) +# 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)) build: installPackage/installPackage configure: $(foreach SUBDIR,$(SUBDIRS), \ stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).$(SUBDIR)) .PHONY: build.library.% +.PHONY: make.library.% # We should depend on %/%.cabal here (and in other rules), but make # makes that difficult. @@ -180,10 +190,21 @@ configure: $(foreach SUBDIR,$(SUBDIRS), \ # the executable with the shell script on non-Windows. This should # probably be tidied up so that we can always pass the same libsubdir. ifeq "$(Windows)" "YES" -libsubdir = $$pkgid +DATA_REL_DIR = . +datadir = $$prefix +libsubdir = $$pkgid else -libsubdir = $$compiler/lib/$$pkgid +DATA_REL_DIR = share/ghc +datadir = $$prefix/share/ghc +libsubdir = $$compiler/lib/$$pkgid endif +DOC_ROOT = $(prefix)/$(DATA_REL_DIR)/doc/html/ + +# We rely on all the CONFIGURE_ARGS being quoted with '...', and there +# being no 's inside the values. +FLAGGED_CONFIGURE_ARGS = $(subst $(space)',\ + $(space)--configure-option=',\ + $(space)$(CONFIGURE_ARGS)) $(foreach SUBDIR,$(SUBDIRS), \ stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).$(SUBDIR)): \ @@ -192,16 +213,16 @@ stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).%: %/setup/Setup ( cd $* && setup/Setup configure \ $(CONFIGURE_OPTS) \ --prefix='$$topdir' \ - --datadir='$$prefix/share' \ + --datadir='$(datadir)' \ + --datasubdir='.' \ --libsubdir='$(libsubdir)' \ - --with-compiler=../../compiler/ghc-inplace$(dot_bat) \ - --with-hc-pkg=../../utils/ghc-pkg/ghc-pkg-inplace$(dot_bat) \ - --with-hsc2hs=../../utils/hsc2hs/hsc2hs-inplace$(dot_bat) \ + --with-compiler=../../compiler/stage1/ghc-inplace$ \ + --with-hc-pkg=../../utils/ghc-pkg/ghc-pkg-inplace$ \ + --with-hsc2hs=../../utils/hsc2hs/hsc2hs-inplace \ --with-ld=$(LD) \ - --datasubdir=ghc \ --haddock-args="--use-contents=../index.html \ --use-index=../doc-index.html" \ - $(addprefix --configure-option=,$(CONFIGURE_ARGS)) \ + $(FLAGGED_CONFIGURE_ARGS) \ --configure-option=--with-cc=$(CC) ) \ && touch $@ || touch $*/unbuildable # We don't touch $@ if configure failed as we would prefer to try @@ -209,19 +230,27 @@ stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).%: %/setup/Setup # This is particularly important for corelibs, where failure means the # build dies! +# Build the library using 'make' +$(foreach SUBDIR,$(SUBDIRS),make.library.$(SUBDIR)):\ +make.library.%: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \ + %/GNUmakefile \ + %/setup/Setup ifBuildable/ifBuildable + ifBuildable/ifBuildable $* $(MAKE) + ifBuildable/ifBuildable $* setup/Setup register --inplace + +# Build the library using 'setup build' (not the default) $(foreach SUBDIR,$(SUBDIRS),build.library.$(SUBDIR)):\ build.library.%: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \ %/setup/Setup ifBuildable/ifBuildable ifBuildable/ifBuildable $* setup/Setup build \ $(addprefix --ghc-option=,$(GhcLibHcOpts)) - ifBuildable/ifBuildable $* setup/Setup register --inplace -$(foreach SUBDIR,$(SUBDIRS),$(SUBDIR)/CabalMakefile):\ -%/CabalMakefile: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \ +$(foreach SUBDIR,$(SUBDIRS),$(SUBDIR)/GNUmakefile):\ +%/GNUmakefile: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \ %/setup/Setup ifBuildable/ifBuildable - $(RM) $*/CabalMakefile - ifBuildable/ifBuildable $* setup/Setup makefile -f CabalMakefile \ - $(addprefix --ghc-option=,$(GhcLibHcOpts)) + $(RM) $*/GNUmakefile + cp Makefile.local $* + ifBuildable/ifBuildable $* setup/Setup makefile -f GNUmakefile .PHONY: doc @@ -243,6 +272,7 @@ clean: $(foreach SUBDIR,$(SUBDIRS),clean.library.$(SUBDIR)) $(RM) -f stamp/bootstrapping.* $(RM) -rf bootstrapping.* $(RM) -rf ifBuildable + $(RM) -rf installPackage $(RM) -f libraries.txt index.html doc-index.html $(foreach SUBDIR,$(SUBDIRS),clean.library.$(SUBDIR)): \ @@ -250,23 +280,22 @@ clean.library.%: $(RM) -f stamp/configure.library.*.$* $*/unbuildable -cd $* && setup/Setup clean $(RM) -rf $*/setup + $(RM) $*/GNUmakefile $*/Makefile.local endif # ----------------------------------------------------------------------------- .PHONY: install install-docs install.library.% -ROOT=$(prefix)/share/ghc/doc/html/ - install: $(foreach SUBDIR,$(SUBDIRS),install.library.$(SUBDIR)) -ifneq "$(NO_HADDOCK_DOCS)" "YES" - $(INSTALL_DIR) $(ROOT) - $(INSTALL_DATA) index.html doc-index.html $(ROOT) - $(INSTALL_SCRIPT) gen_contents_index $(ROOT) +ifeq "$(HADDOCK_DOCS)" "YES" + $(INSTALL_DIR) $(DOC_ROOT) + $(INSTALL_DATA) index.html doc-index.html $(DOC_ROOT) + $(INSTALL_SCRIPT) gen_contents_index $(DOC_ROOT) # Hacks: - $(INSTALL_DATA) $(prefix)/share/ghc/doc/html/base/*.css $(ROOT) - $(INSTALL_DATA) $(prefix)/share/ghc/doc/html/base/*.js $(ROOT) - $(INSTALL_DATA) $(prefix)/share/ghc/doc/html/base/*.gif $(ROOT) + $(INSTALL_DATA) $(DOC_ROOT)/base/*.css $(DOC_ROOT) + $(INSTALL_DATA) $(DOC_ROOT)/base/*.js $(DOC_ROOT) + $(INSTALL_DATA) $(DOC_ROOT)/base/*.gif $(DOC_ROOT) endif # Cabal doesn't let us ask to install docs only, so do nothing here @@ -299,7 +328,6 @@ $(foreach SUBDIR,$(SUBDIRS),binary-dist.library.$(SUBDIR)): \ binary-dist.library.%: $(MKDIRHIER) $(BIN_DIST_LIBDIR)/$* ifBuildable/ifBuildable $* cp $*.cabal $(BIN_DIST_LIBDIR)/$* - ifBuildable/ifBuildable $* cp .setup-config $(BIN_DIST_LIBDIR)/$* ifBuildable/ifBuildable $* cp -a dist $(BIN_DIST_LIBDIR)/$* # Euch ifBuildable/ifBuildable $* cp -aL include $(BIN_DIST_LIBDIR)/$* || :