X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=libraries%2FMakefile;h=1fef7e3893ed6067876649d7093318a5211f39f3;hb=dce65c102b136ee9eb57fadf4cc3fd7a8931d074;hp=b04c83b755c5d25f52c48ac00f32694b7e627f9f;hpb=79b5a2cb4b9ed5fe41a05fa2ec98bd1f83971daf;p=ghc-hetmet.git diff --git a/libraries/Makefile b/libraries/Makefile index b04c83b..1fef7e3 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,11 +18,17 @@ # # 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. @@ -72,6 +78,7 @@ ifeq "$(GhcLibsWithObjectIO)" "YES" SUBDIRS += $(wildcard ObjectIO) endif SUBDIRS += $(wildcard parallel) +SUBDIRS += $(wildcard ndp) endif # ----------------------------------------------------------------------------- @@ -79,12 +86,6 @@ endif empty= space=$(empty) $(empty) -ifeq "$(Windows)" "YES" -dot_bat=.bat -else -dot_bat= -endif - # ----------------------------------------------------------------------------- ifneq "$(DOING_BIN_DIST)" "YES" @@ -157,26 +158,49 @@ $(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. +# We explicitly set datadir to "$prefix/share" as, while that is the +# default on Linux, on Windows it defaults to +# "C:\\Program Files\\Common Files" + +# We also set libsubdir differently on Windows and non-Windows, as on +# non-Windows the path we deduce is highre up than the path passed to +# 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 +else +libsubdir = $$compiler/lib/$$pkgid +endif + +# 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)): \ stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).%: %/setup/Setup @@ -184,15 +208,16 @@ stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).%: %/setup/Setup ( cd $* && setup/Setup configure \ $(CONFIGURE_OPTS) \ --prefix='$$topdir' \ - --libsubdir='$$compiler/lib/$$pkgid' \ - --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) \ + --datadir='$$prefix/share' \ + --libsubdir='$(libsubdir)' \ + --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 @@ -200,19 +225,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 @@ -241,6 +274,7 @@ clean.library.%: $(RM) -f stamp/configure.library.*.$* $*/unbuildable -cd $* && setup/Setup clean $(RM) -rf $*/setup + $(RM) $*/GNUmakefile $*/Makefile.local endif # ----------------------------------------------------------------------------- @@ -250,7 +284,7 @@ endif ROOT=$(prefix)/share/ghc/doc/html/ install: $(foreach SUBDIR,$(SUBDIRS),install.library.$(SUBDIR)) -ifneq "$(NO_HADDOCK_DOCS)" "YES" +ifeq "$(HADDOCK_DOCS)" "YES" $(INSTALL_DIR) $(ROOT) $(INSTALL_DATA) index.html doc-index.html $(ROOT) $(INSTALL_SCRIPT) gen_contents_index $(ROOT) @@ -290,7 +324,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)/$* || :