FIX #1559, #1560. Rearrange the way we do ifBuildable...
[ghc-hetmet.git] / libraries / Makefile
index 0ef78d8..0c845c9 100644 (file)
@@ -22,7 +22,7 @@
 
 .PHONY: default_target
 
-default_target: build
+default_target: all
 
 # make doesn't give us an easy way to get the libraries built in
 # dependency order the first time, but not rebuild base (for example)
@@ -35,8 +35,8 @@ default_target: build
 TOP=..
 include $(TOP)/mk/boilerplate.mk
 
-SUBDIRS = base old-locale old-time directory process filepath pretty \
-          template-haskell readline Cabal random haskell98
+SUBDIRS = base old-locale old-time filepath directory process pretty \
+          hpc template-haskell readline Cabal random haskell98
 
 ifeq "$(GhcLibsWithUnix)" "YES"
 SUBDIRS += unix
@@ -117,7 +117,6 @@ subdirs:
 
 boot: $(BOOTSTRAP_STAMPS) ifBuildable/ifBuildable \
          $(foreach SUBDIR,$(SUBDIRS),$(SUBDIR)/setup/Setup) \
-         $(foreach SUBDIR,$(SUBDIRS),$(SUBDIR)/GNUmakefile) \
          installPackage/installPackage
 
 # We build the Setup program in a setup subdirectory to stop it trying
@@ -168,6 +167,8 @@ endif
 $(foreach SUBDIR,$(SUBDIRS),rebuild.library.$(SUBDIR)):\
 rebuild.library.%: clean.library.% make.library.%
 
+# 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))
 build: installPackage/installPackage
 
@@ -189,10 +190,21 @@ configure: $(foreach SUBDIR,$(SUBDIRS), \
 # the executable with the shell script on non-Windows. This should
 # probably be tidied up so that we can always pass the same libsubdir.
 ifeq "$(Windows)" "YES"
-libsubdir = $$pkgid
+DATA_REL_DIR = .
+datadir      = $$prefix
+libsubdir    = $$pkgid
 else
-libsubdir = $$compiler/lib/$$pkgid
+DATA_REL_DIR = share/ghc
+datadir      = $$prefix/share/ghc
+libsubdir    = $$compiler/lib/$$pkgid
 endif
+DOC_ROOT     = $(prefix)/$(DATA_REL_DIR)/doc/html/
+
+# We rely on all the CONFIGURE_ARGS being quoted with '...', and there
+# being no 's inside the values.
+FLAGGED_CONFIGURE_ARGS = $(subst $(space)',\
+                                 $(space)--configure-option=',\
+                                 $(space)$(CONFIGURE_ARGS))
 
 $(foreach SUBDIR,$(SUBDIRS), \
                  stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).$(SUBDIR)): \
@@ -201,16 +213,16 @@ stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).%: %/setup/Setup
        ( cd $* && setup/Setup configure \
                   $(CONFIGURE_OPTS) \
                   --prefix='$$topdir' \
-                  --datadir='$$prefix/share' \
+                  --datadir='$(datadir)' \
+                  --datasubdir='.' \
                   --libsubdir='$(libsubdir)' \
-                  --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-compiler=../../compiler/stage1/ghc-inplace$ \
+                  --with-hc-pkg=../../utils/ghc-pkg/ghc-pkg-inplace$ \
+                  --with-hsc2hs=../../utils/hsc2hs/hsc2hs-inplace \
                   --with-ld=$(LD) \
-                  --datasubdir=ghc \
                   --haddock-args="--use-contents=../index.html \
                                   --use-index=../doc-index.html" \
-                  $(addprefix --configure-option=,$(CONFIGURE_ARGS)) \
+                  $(FLAGGED_CONFIGURE_ARGS) \
                   --configure-option=--with-cc=$(CC) ) \
              && touch $@ || touch $*/unbuildable
 # We don't touch $@ if configure failed as we would prefer to try
@@ -223,22 +235,29 @@ $(foreach SUBDIR,$(SUBDIRS),make.library.$(SUBDIR)):\
 make.library.%: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \
                %/GNUmakefile \
                 %/setup/Setup ifBuildable/ifBuildable
-       ifBuildable/ifBuildable $* $(MAKE)
-       ifBuildable/ifBuildable $* setup/Setup register --inplace
+       if ifBuildable/ifBuildable $*; then \
+         cd $* && \
+         $(MAKE) $(MFLAGS) && \
+         setup/Setup register --inplace; \
+       fi
 
 # Build the library using 'setup build' (not the default)
 $(foreach SUBDIR,$(SUBDIRS),build.library.$(SUBDIR)):\
 build.library.%: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \
                  %/setup/Setup ifBuildable/ifBuildable
-       ifBuildable/ifBuildable $* setup/Setup build \
-                                       $(addprefix --ghc-option=,$(GhcLibHcOpts))
+       if ifBuildable/ifBuildable $*; then \
+         cd $* && \
+         setup/Setup build $(addprefix --ghc-option=,$(GhcLibHcOpts)); \
+       fi
 
 $(foreach SUBDIR,$(SUBDIRS),$(SUBDIR)/GNUmakefile):\
 %/GNUmakefile: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \
                  %/setup/Setup ifBuildable/ifBuildable
        $(RM) $*/GNUmakefile
        cp Makefile.local $*
-       ifBuildable/ifBuildable $* setup/Setup makefile -f GNUmakefile
+       if ifBuildable/ifBuildable $*; then \
+          cd $* && setup/Setup makefile -f GNUmakefile; \
+       fi
 
 .PHONY: doc
 
@@ -250,7 +269,9 @@ doc: $(foreach SUBDIR,$(SUBDIRS),doc.library.$(SUBDIR))
 $(foreach SUBDIR,$(SUBDIRS),doc.library.$(SUBDIR)):\
 doc.library.%: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \
                %/setup/Setup ifBuildable/ifBuildable
-       ifBuildable/ifBuildable $* setup/Setup haddock
+       if ifBuildable/ifBuildable $*; then \
+         cd $* && setup/Setup haddock; \
+       fi
 
 .PHONY: distclean clean clean.library.%
 
@@ -260,6 +281,7 @@ clean: $(foreach SUBDIR,$(SUBDIRS),clean.library.$(SUBDIR))
        $(RM) -f stamp/bootstrapping.*
        $(RM) -rf bootstrapping.*
        $(RM) -rf ifBuildable
+       $(RM) -rf installPackage
        $(RM) -f libraries.txt index.html doc-index.html
 
 $(foreach SUBDIR,$(SUBDIRS),clean.library.$(SUBDIR)): \
@@ -267,23 +289,22 @@ clean.library.%:
        $(RM) -f stamp/configure.library.*.$* $*/unbuildable
        -cd $* && setup/Setup clean
        $(RM) -rf $*/setup
+       $(RM) $*/GNUmakefile $*/Makefile.local
 endif
 
 # -----------------------------------------------------------------------------
 
 .PHONY: install install-docs install.library.%
 
-ROOT=$(prefix)/share/ghc/doc/html/
-
 install: $(foreach SUBDIR,$(SUBDIRS),install.library.$(SUBDIR))
 ifeq "$(HADDOCK_DOCS)" "YES"
-       $(INSTALL_DIR)                                            $(ROOT)
-       $(INSTALL_DATA)   index.html doc-index.html               $(ROOT)
-       $(INSTALL_SCRIPT) gen_contents_index                      $(ROOT)
+       $(INSTALL_DIR)                              $(DOC_ROOT)
+       $(INSTALL_DATA)   index.html doc-index.html $(DOC_ROOT)
+       $(INSTALL_SCRIPT) gen_contents_index        $(DOC_ROOT)
        # Hacks:
-       $(INSTALL_DATA)   $(prefix)/share/ghc/doc/html/base/*.css $(ROOT)
-       $(INSTALL_DATA)   $(prefix)/share/ghc/doc/html/base/*.js  $(ROOT)
-       $(INSTALL_DATA)   $(prefix)/share/ghc/doc/html/base/*.gif $(ROOT)
+       $(INSTALL_DATA)   $(DOC_ROOT)/base/*.css    $(DOC_ROOT)
+       $(INSTALL_DATA)   $(DOC_ROOT)/base/*.js     $(DOC_ROOT)
+       $(INSTALL_DATA)   $(DOC_ROOT)/base/*.gif    $(DOC_ROOT)
 endif
 
 # Cabal doesn't let us ask to install docs only, so do nothing here
@@ -295,7 +316,10 @@ install-docs:
 # Thus if you install without building then it will just break.
 $(foreach SUBDIR,$(SUBDIRS),install.library.$(SUBDIR)): \
 install.library.%: installPackage/installPackage ifBuildable/ifBuildable
-       ifBuildable/ifBuildable $* ../installPackage/installPackage $(prefix) $(bindir)/ghc-pkg
+       if ifBuildable/ifBuildable $*; then \
+         cd $* && \
+         ../installPackage/installPackage $(prefix) $(bindir)/ghc-pkg; \
+       fi
 
 .PHONY: binary-dist binary-dist.library.%
 
@@ -315,13 +339,15 @@ binary-dist: $(foreach SUBDIR,$(SUBDIRS),binary-dist.library.$(SUBDIR))
 $(foreach SUBDIR,$(SUBDIRS),binary-dist.library.$(SUBDIR)): \
 binary-dist.library.%:
        $(MKDIRHIER) $(BIN_DIST_LIBDIR)/$*
-       ifBuildable/ifBuildable $* cp    $*.cabal      $(BIN_DIST_LIBDIR)/$*
-       ifBuildable/ifBuildable $* cp -a dist          $(BIN_DIST_LIBDIR)/$*
-       # Euch
-       ifBuildable/ifBuildable $* cp -aL include      $(BIN_DIST_LIBDIR)/$* || :
-       ifBuildable/ifBuildable $* $(FIND) $(BIN_DIST_LIBDIR)/$*/dist \
-            \( -name "*_split" -o -name "autogen" \) | xargs rm -rf
-       ifBuildable/ifBuildable $* $(FIND) $(BIN_DIST_LIBDIR)/$*/dist \
+       if ifBuildable/ifBuildable $*; then \
+         cd $* && \
+         cp    $*.cabal      $(BIN_DIST_LIBDIR)/$* && \
+         cp -a dist          $(BIN_DIST_LIBDIR)/$* && \
+       # Euch \
+         (cp -aL include      $(BIN_DIST_LIBDIR)/$* || :) && \
+         $(FIND) $(BIN_DIST_LIBDIR)/$*/dist \
+            \( -name "*_split" -o -name "autogen" \) | xargs rm -rf && \
+         $(FIND) $(BIN_DIST_LIBDIR)/$*/dist \
             \( \( -name "*.o" -o -name "*.p_o" \) -a ! -name "HS*" \) \
-            -exec rm {} \;
-
+            -exec rm {} \; ; \
+       fi