X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=libraries%2FMakefile;h=c1a3d2f928e42542cc1a306850748548a7928910;hb=c46a09eb4696fbd89fc7c8c1c2043d6da572326b;hp=9890f797aa9d96dc25756575175b2c6c25fe76a1;hpb=5a1a0eb0db6d43276080798ed970b397947006cf;p=ghc-hetmet.git

diff --git a/libraries/Makefile b/libraries/Makefile
index 9890f79..c1a3d2f 100644
--- a/libraries/Makefile
+++ b/libraries/Makefile
@@ -8,7 +8,7 @@
 # To rebuild a particular library <package>:
 #
 #   make clean.library.<package>
-#   make build.library.<package>
+#   make make.library.<package>
 #
 # 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.
@@ -152,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.
@@ -210,19 +219,30 @@ 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
+#       HACK: invoke make via $(SHELL), otherwise on Windows it apparently
+#       gets argv[0] set to "make" (with quotes), which causes a problem
+#       when make re-invokes itself after creating .depend.  Ugh.
+	ifBuildable/ifBuildable $* $(SHELL) -c $(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
 
@@ -251,6 +271,7 @@ clean.library.%:
 	$(RM) -f stamp/configure.library.*.$* $*/unbuildable
 	-cd $* && setup/Setup clean
 	$(RM) -rf $*/setup
+	$(RM) $*/GNUmakefile $*/Makefile.local
 endif
 
 # -----------------------------------------------------------------------------
@@ -260,7 +281,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)