Fix a bug in (the new function) SimplUtils.abstractFloats

[ghc-hetmet.git] / libraries / Makefile

diff --git a/libraries/Makefile b/libraries/Makefile
index c405f4f..41311b3 100644 (file)
--- 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
@@ -110,8 +122,7 @@ ifBuildable/ifBuildable: ifBuildable.hs stamp/$(BOOTSTRAPPING_CABAL)
        -$(RM) -rf ifBuildable
        mkdir ifBuildable
        $(CP) ifBuildable.hs ifBuildable/
-       cd ifBuildable && $(GHC) -Wall --make -i../$(BOOTSTRAPPING_CABAL) \
-                                ifBuildable -o ifBuildable
+       cd ifBuildable && $(GHC) -Wall --make ifBuildable -o ifBuildable
 
 stamp/$(BOOTSTRAPPING_CABAL):
        $(RM) -rf $(BOOTSTRAPPING_CABAL)
@@ -140,25 +151,31 @@ configure: $(foreach SUBDIR,$(SUBDIRS), \
 $(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.*.$*
-       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" \
-                            --configure-option=--with-cc=$(CC)
-       touch $@
+       -$(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 $@ || 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
-       cd $* && ../ifBuildable/ifBuildable setup/Setup build \
+                 %/setup/Setup ifBuildable/ifBuildable
+       ifBuildable/ifBuildable $* setup/Setup build \
                                        $(addprefix --ghc-option=,$(GhcLibHcOpts))
-       cd $* && ../ifBuildable/ifBuildable setup/Setup register --inplace
+       ifBuildable/ifBuildable $* setup/Setup register --inplace
 
 .PHONY: doc
 
@@ -169,8 +186,8 @@ doc: $(foreach SUBDIR,$(SUBDIRS),doc.library.$(SUBDIR))
 
 $(foreach SUBDIR,$(SUBDIRS),doc.library.$(SUBDIR)):\
 doc.library.%: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \
-               %/setup/Setup
-       cd $* && setup/Setup haddock
+               %/setup/Setup ifBuildable/ifBuildable
+       ifBuildable/ifBuildable $* setup/Setup haddock
 
 .PHONY: install install-docs install.library.%
 
@@ -194,9 +211,9 @@ 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.*.$*
-       cd $* && ../ifBuildable/ifBuildable setup/Setup configure \
+       ifBuildable/ifBuildable $* setup/Setup configure \
                                            $(CONFIGURE_OPTS) \
                                            --prefix=$(prefix) \
                                            --with-compiler=$(bindir)/ghc \
@@ -205,8 +222,9 @@ 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
-       cd $* && ../ifBuildable/ifBuildable setup/Setup install
+install.library.%: stamp/configure.library.install.% \
+                   %/setup/Setup ifBuildable/ifBuildable
+       ifBuildable/ifBuildable $* setup/Setup install
 
 .PHONY: distclean clean clean.library.%
 
@@ -220,7 +238,7 @@ clean: $(foreach SUBDIR,$(SUBDIRS),clean.library.$(SUBDIR))
 
 $(foreach SUBDIR,$(SUBDIRS),clean.library.$(SUBDIR)): \
 clean.library.%:
-       $(RM) -f stamp/configure.library.*.$*
+       $(RM) -f stamp/configure.library.*.$* $*/unbuildable
        -cd $* && setup/Setup clean
        $(RM) -rf $*/setup