X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=libraries%2FMakefile;h=5311d55a31524b4ea8d98965e0aa30a93272b1c6;hb=02856ea491a11076e293af3ec8c1d35740bcb551;hp=417e37d636970af321a985ab8e3dfc36d8647327;hpb=d0d51c8b13ea9168ee22fbb7d89b1694f317277c;p=ghc-hetmet.git

diff --git a/libraries/Makefile b/libraries/Makefile
index 417e37d..5311d55 100644
--- a/libraries/Makefile
+++ b/libraries/Makefile
@@ -9,6 +9,10 @@
 #
 #   make clean.library.<package>
 #   make build.library.<package>
+#
+# or the following is equivalent:
+#
+#   make rebuild.library.<package>
 
 .PHONY: default_target
 
@@ -23,7 +27,8 @@ TOP=.
 include $(TOP)/mk/boilerplate.mk
 endif
 
-SUBDIRS = base filepath haskell98 pretty template-haskell readline Cabal
+SUBDIRS = base old-locale old-time directory process filepath pretty \
+          template-haskell readline Cabal random haskell98
 
 ifeq "$(GhcLibsWithUnix)" "YES"
 SUBDIRS += unix
@@ -64,6 +69,7 @@ SUBDIRS += $(wildcard arrows)
 ifeq "$(GhcLibsWithObjectIO)" "YES"
 SUBDIRS += $(wildcard ObjectIO)
 endif
+SUBDIRS += $(wildcard parallel)
 endif
 
 # -----------------------------------------------------------------------------
@@ -90,7 +96,10 @@ CONFIGURE_OPTS += --enable-split-objs
 CONFIGURE_STAMP_EXTRAS := $(CONFIGURE_STAMP_EXTRAS)-splitting
 endif
 
-BOOTSTRAPPING_STAMPS = $(addprefix stamp/bootstrapping.,Cabal filepath pretty)
+BOOTSTRAP_LIBS = Cabal filepath
+BOOTSTRAP_STAMPS = $(addprefix stamp/bootstrapping.,$(BOOTSTRAP_LIBS))
+BOOTSTRAP_INC_1_UP = $(addprefix -i../bootstrapping.,$(BOOTSTRAP_LIBS))
+BOOTSTRAP_INC_2_UP = $(addprefix -i../../bootstrapping.,$(BOOTSTRAP_LIBS))
 
 .PHONY: subdirs
 
@@ -99,7 +108,7 @@ subdirs:
 
 .PHONY: boot
 
-boot: $(BOOTSTRAPPING_STAMPS) ifBuildable/ifBuildable \
+boot: $(BOOTSTRAP_STAMPS) ifBuildable/ifBuildable \
 	  $(foreach SUBDIR,$(SUBDIRS),$(SUBDIR)/setup/Setup) \
 	  installPackage/installPackage
 
@@ -110,24 +119,20 @@ boot: $(BOOTSTRAPPING_STAMPS) ifBuildable/ifBuildable \
 # We ought to be depending on %/Setup.*hs, but make makes that difficult.
 
 $(foreach SUBDIR,$(SUBDIRS),$(SUBDIR)/setup/Setup): \
-%/setup/Setup: $(BOOTSTRAPPING_STAMPS)
+%/setup/Setup: $(BOOTSTRAP_STAMPS)
 	-$(RM) -rf $*/setup
 	mkdir $*/setup
 	$(CP) $*/Setup.*hs $*/setup
-	cd $*/setup && $(GHC) -i../../bootstrapping.Cabal \
-	                      -i../../bootstrapping.filepath \
-	                      -i../../bootstrapping.pretty \
-	                      -Wall -cpp --make Setup.*hs -o Setup
+	cd $*/setup && $(GHC) -Wall -cpp --make Setup.*hs -o Setup \
+	                      $(BOOTSTRAP_INC_2_UP)
 
-installPackage/installPackage: installPackage.hs $(BOOTSTRAPPING_STAMPS)
+installPackage/installPackage: installPackage.hs $(BOOTSTRAP_STAMPS)
 	-$(RM) -rf installPackage
 	mkdir installPackage
 	$(CP) installPackage.hs installPackage/
 	cd installPackage && $(GHC) -Wall -cpp \
 	                            --make installPackage -o installPackage \
-	                      -i../bootstrapping.Cabal \
-	                      -i../bootstrapping.filepath \
-	                      -i../bootstrapping.pretty
+	                            $(BOOTSTRAP_INC_1_UP)
 
 ifBuildable/ifBuildable: ifBuildable.hs
 	-$(RM) -rf ifBuildable
@@ -135,7 +140,7 @@ ifBuildable/ifBuildable: ifBuildable.hs
 	$(CP) ifBuildable.hs ifBuildable/
 	cd ifBuildable && $(GHC) -Wall --make ifBuildable -o ifBuildable
 
-$(BOOTSTRAPPING_STAMPS): stamp/bootstrapping.%:
+$(BOOTSTRAP_STAMPS): stamp/bootstrapping.%:
 	$(RM) -rf bootstrapping.$*
 	$(CP) -R $* bootstrapping.$*
 	$(FIND) bootstrapping.$* \( -name "*.o" -o -name "*.hi" \) \
@@ -150,6 +155,11 @@ ifneq "$(NO_HADDOCK_DOCS)" "YES"
 all: doc
 endif
 
+.PHONY: rebuild.library.%
+
+$(foreach SUBDIR,$(SUBDIRS),rebuild.library.$(SUBDIR)):\
+rebuild.library.%: clean.library.% build.library.%
+
 build: $(foreach SUBDIR,$(SUBDIRS),build.library.$(SUBDIR))
 build: installPackage/installPackage
 
@@ -190,6 +200,13 @@ build.library.%: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \
 	                                $(addprefix --ghc-option=,$(GhcLibHcOpts))
 	ifBuildable/ifBuildable $* setup/Setup register --inplace
 
+$(foreach SUBDIR,$(SUBDIRS),$(SUBDIR)/CabalMakefile):\
+%/CabalMakefile: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \
+                 %/setup/Setup ifBuildable/ifBuildable
+	$(RM) $*/CabalMakefile
+	ifBuildable/ifBuildable $* setup/Setup makefile -f CabalMakefile \
+	                             $(addprefix --ghc-option=,$(GhcLibHcOpts))
+
 .PHONY: doc
 
 DOC_SUBDIRS = $(filter-out haskell98,$(SUBDIRS))