X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=libraries%2FMakefile;h=41311b35ef448618c5de2e6ee6f2119f1f253283;hb=a93c4f67ea57f7143e5f540c522121d1e67da498;hp=1f7c474834a66f14d19c36c42a7b81b65921215e;hpb=6c796d2375238942c0b903e028181ea92727abc4;p=ghc-hetmet.git

diff --git a/libraries/Makefile b/libraries/Makefile
index 1f7c474..41311b3 100644
--- a/libraries/Makefile
+++ b/libraries/Makefile
@@ -1,4 +1,15 @@
 
+# To do a fresh build:
+#
+#   make clean
+#   make boot
+#   make
+#
+# To rebuild a particular library <package>:
+#
+#   make clean.library.<package>
+#   make build.library.<package>
+
 .PHONY: default_target
 
 default_target: build
@@ -49,6 +60,7 @@ SUBDIRS += $(wildcard ALUT)
 SUBDIRS += $(wildcard stm)
 SUBDIRS += $(wildcard xhtml)
 SUBDIRS += $(wildcard cgi)
+SUBDIRS += $(wildcard arrows)
 ifeq "$(GhcLibsWithObjectIO)" "YES"
 SUBDIRS += $(wildcard ObjectIO)
 endif
@@ -140,23 +152,27 @@ $(foreach SUBDIR,$(SUBDIRS), \
 		  stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).$(SUBDIR)): \
 stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).%: %/setup/Setup
 	-$(RM) -f stamp/configure.library.*.$* $*/unbuildable
-	cd $* && setup/Setup configure \
-	                     $(CONFIGURE_OPTS) \
-	                     --prefix=$(prefix) \
-	                     --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) \
-	                     --with-ld=$(LD) \
-	                     --datasubdir=ghc \
-	                     --haddock-args="--use-contents=../index.html --use-index=../doc-index.html" \
-	                     $(addprefix --configure-option=,$(CONFIGURE_ARGS)) \
-	                     --configure-option=--with-cc=$(CC) \
-	      || touch unbuildable
-	touch $@
+	( cd $* && setup/Setup configure \
+	           $(CONFIGURE_OPTS) \
+	           --prefix=$(prefix) \
+	           --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) \
+	           --with-ld=$(LD) \
+	           --datasubdir=ghc \
+	           --haddock-args="--use-contents=../index.html \
+	                           --use-index=../doc-index.html" \
+	           $(addprefix --configure-option=,$(CONFIGURE_ARGS)) \
+	           --configure-option=--with-cc=$(CC) ) \
+	      && touch $@ || touch $*/unbuildable
+# We don't touch $@ if configure failed as we would prefer to try
+# configuring it next time round, rather than assuming it'll still fail.
+# This is particularly important for corelibs, where failure means the
+# build dies!
 
 $(foreach SUBDIR,$(SUBDIRS),build.library.$(SUBDIR)):\
 build.library.%: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \
-                 %/setup/Setup
+                 %/setup/Setup ifBuildable/ifBuildable
 	ifBuildable/ifBuildable $* setup/Setup build \
 	                                $(addprefix --ghc-option=,$(GhcLibHcOpts))
 	ifBuildable/ifBuildable $* setup/Setup register --inplace
@@ -170,7 +186,7 @@ doc: $(foreach SUBDIR,$(SUBDIRS),doc.library.$(SUBDIR))
 
 $(foreach SUBDIR,$(SUBDIRS),doc.library.$(SUBDIR)):\
 doc.library.%: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \
-               %/setup/Setup
+               %/setup/Setup ifBuildable/ifBuildable
 	ifBuildable/ifBuildable $* setup/Setup haddock
 
 .PHONY: install install-docs install.library.%
@@ -195,7 +211,7 @@ install-docs:
 # then we can't change the libraries and then just rerun make.
 # Thus if you install without building then it will just break.
 $(foreach SUBDIR,$(SUBDIRS),stamp/configure.library.install.$(SUBDIR)): \
-stamp/configure.library.install.%: %/setup/Setup
+stamp/configure.library.install.%: %/setup/Setup ifBuildable/ifBuildable
 	-$(RM) -f stamp/configure.library.*.$*
 	ifBuildable/ifBuildable $* setup/Setup configure \
 	                                    $(CONFIGURE_OPTS) \
@@ -206,7 +222,8 @@ stamp/configure.library.install.%: %/setup/Setup
 
 # We need to reconfigure as we now need to register with the normal ghc-pkg
 $(foreach SUBDIR,$(SUBDIRS),install.library.$(SUBDIR)): \
-install.library.%: stamp/configure.library.install.% %/setup/Setup
+install.library.%: stamp/configure.library.install.% \
+                   %/setup/Setup ifBuildable/ifBuildable
 	ifBuildable/ifBuildable $* setup/Setup install
 
 .PHONY: distclean clean clean.library.%