X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=libraries%2FMakefile;h=6ca6284b0361e1609fac51008cfcc56ec5cb3786;hb=714c5ba52f8ec62f6f78219358bef59219e2125c;hp=56c1b7b3869d8957b973387ba7a8ffc2bd1ac2ba;hpb=8275817fa739644d332aea3871802905d45bfa63;p=ghc-hetmet.git

diff --git a/libraries/Makefile b/libraries/Makefile
index 56c1b7b..6ca6284 100644
--- a/libraries/Makefile
+++ b/libraries/Makefile
@@ -40,11 +40,24 @@ 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 :=
 
-ifeq "$(stage)" "1"
+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"
@@ -75,7 +88,7 @@ SUBDIRS += $(wildcard parallel)
 endif
 endif
 
-ifeq "$(stage)" "2"
+ifeq "$(DO_STAGE_2_LIBS)" "YES"
 ifneq "$(GhcBootLibs)" "YES"
 ifneq "$(wildcard dph)" ""
 SUBDIRS += dph/dph-base
@@ -121,10 +134,6 @@ CONFIGURE_OPTS += --enable-split-objs
 CONFIGURE_STAMP_EXTRAS := $(CONFIGURE_STAMP_EXTRAS)-splitting
 endif
 
-ifeq "$(HSCOLOUR_SRCS)" "YES"
-CONFIGURE_OPTS += --with-hscolour="$(HSCOLOUR)"
-endif
-
 .PHONY: subdirs
 
 subdirs:
@@ -187,6 +196,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))
@@ -247,6 +272,11 @@ 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)
@@ -296,7 +326,11 @@ endif
 maintainer-clean: clean
 distclean: clean
 
+ifeq "$(wildcard dph)" ""
 clean: $(foreach SUBDIR,$(SUBDIRS),clean.library.$(SUBDIR))
+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
@@ -309,9 +343,6 @@ 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
 
 maintainer-clean distclean:
 	$(RM) $(foreach lib, $(SUBDIRS), $(lib)/.depend $(lib)/.depend.bak)
@@ -324,6 +355,19 @@ clean.library.%:
 	$(RM) $*/GNUmakefile $*/Makefile.local
 endif
 
+# Extra target to clean all the sub-packages of dph
+ifeq "$(stage)" "1"
+clean.library.dph:
+	@echo "*** Package dph needs to be made in stage=2"
+endif
+ifeq "$(stage)" "2"
+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
+endif
+
 # -----------------------------------------------------------------------------
 
 .PHONY: install install-docs install.library.%