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

diff --git a/libraries/Makefile b/libraries/Makefile
index 624427f..56c1b7b 100644
--- a/libraries/Makefile
+++ b/libraries/Makefile
@@ -36,9 +36,16 @@ TOP=..
 include $(TOP)/mk/boilerplate.mk
 include $(TOP)/mk/cabal-flags.mk
 
+ifeq "$(stage)" ""
+stage := 1
+endif
+
 # Any libraries listed here should also be in ../packages
 
-SUBDIRS  = ghc-prim $(INTEGER_LIBRARY) base syb base3-compat array packedstring
+SUBDIRS :=
+
+ifeq "$(stage)" "1"
+SUBDIRS += ghc-prim $(INTEGER_LIBRARY) base syb base3-compat array packedstring
 SUBDIRS += containers bytestring old-locale old-time filepath 
 ifeq "$(GhcLibsWithUnix)" "YES"
 SUBDIRS += unix
@@ -65,6 +72,11 @@ SUBDIRS += $(wildcard time)
 SUBDIRS += $(wildcard stm)
 SUBDIRS += $(wildcard xhtml)
 SUBDIRS += $(wildcard parallel)
+endif
+endif
+
+ifeq "$(stage)" "2"
+ifneq "$(GhcBootLibs)" "YES"
 ifneq "$(wildcard dph)" ""
 SUBDIRS += dph/dph-base
 SUBDIRS += dph/dph-prim-interface
@@ -74,6 +86,7 @@ SUBDIRS += dph/dph-seq
 SUBDIRS += dph/dph-par
 endif
 endif
+endif
 
 # -----------------------------------------------------------------------------
 
@@ -108,6 +121,10 @@ 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:
@@ -116,9 +133,6 @@ subdirs:
 HERE_ABS=$(FPTOOLS_TOP_ABS)/libraries
 
 CABAL_GHC_FLAGS = -Wall
-ifeq "$(ghc_ge_605)" "NO"
-CABAL_GHC_FLAGS += -cpp
-endif
 
 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
 
@@ -188,7 +202,7 @@ 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" \
@@ -256,7 +270,7 @@ doc: $(foreach SUBDIR,$(DOC_SUBDIRS),doc.library.$(SUBDIR))
 	sh gen_contents_index --inplace
 
 # Making hyperlinked source only works if we have hscolour
-ifneq "$(HSCOLOUR)" ""
+ifeq "$(HSCOLOUR_SRCS)" "YES"
 CABAL_HADDOCK_FLAGS += --hyperlink-source
 endif
 CABAL_HADDOCK_FLAGS += --with-haddock=$(FPTOOLS_TOP_ABS)/utils/haddock/install-inplace/bin/haddock