Fix SPARC build, missing #include

[ghc-hetmet.git] / libraries / Makefile

diff --git a/libraries/Makefile b/libraries/Makefile
index 8ccba2c..c32c1f6 100644 (file)
--- a/libraries/Makefile
+++ b/libraries/Makefile
@@ -88,17 +88,25 @@ SUBDIRS += $(wildcard parallel)
 endif
 endif
 
-ifeq "$(DO_STAGE_2_LIBS)" "YES"
+DPH_SUBDIRS :=
 ifneq "$(GhcBootLibs)" "YES"
 ifneq "$(wildcard dph)" ""
-SUBDIRS += dph/dph-base
-SUBDIRS += dph/dph-prim-interface
-SUBDIRS += dph/dph-prim-seq
-SUBDIRS += dph/dph-prim-par
-SUBDIRS += dph/dph-seq
-SUBDIRS += dph/dph-par
+DPH_SUBDIRS += dph/dph-base
+DPH_SUBDIRS += dph/dph-prim-interface
+DPH_SUBDIRS += dph/dph-prim-seq
+DPH_SUBDIRS += dph/dph-prim-par
+DPH_SUBDIRS += dph/dph-seq
+DPH_SUBDIRS += dph/dph-par
 endif
 endif
+
+# We have a separate variable for cleaning as this happens in stage=1 and
+# we want to clean the dph subdirectories, too.
+ifeq "$(DO_STAGE_2_LIBS)" "YES"
+SUBDIRS       += $(DPH_SUBDIRS)
+CLEAN_SUBDIRS  = $(SUBDIRS)
+else
+CLEAN_SUBDIRS  = $(SUBDIRS) $(DPH_SUBDIRS)
 endif
 
 # -----------------------------------------------------------------------------
@@ -196,6 +204,22 @@ rebuild.library.%: clean.library.% build.library.%
 $(foreach SUBDIR,$(SUBDIRS),remake.library.$(SUBDIR)):\
 remake.library.%: clean.library.% make.library.%
 
+# The meta package dph is a special case
+ifeq "$(stage)" "1"
+remake.library.dph:
+       @echo "*** Package dph needs to be made in stage=2"
+endif
+ifeq "$(stage)" "2"
+# NB. we're depending on make chasing dependencies from left to right here.
+# This bit goes wrong with 'make -j'.
+remake.library.dph: remake.library.dph/dph-base \
+               remake.library.dph/dph-prim-interface \
+               remake.library.dph/dph-prim-seq \
+               remake.library.dph/dph-prim-par \
+               remake.library.dph/dph-seq \
+               remake.library.dph/dph-par
+endif
+
 # 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))
@@ -256,6 +280,11 @@ make.library.%: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \
          $(CABAL) register --inplace; \
        fi
 
+# Special case for meta package dph: we can only remake it as we don't have
+# any dependency info between the sub-packages
+make.library.dph:
+       @echo "*** Please use the target 'remake.library.dph' instead"
+
 MAKEFILE_LOCAL = $(FPTOOLS_TOP_ABS)/libraries/Makefile.local
 
 # Build the library using 'setup build' (not the default)
@@ -305,7 +334,11 @@ endif
 maintainer-clean: clean
 distclean: clean
 
+ifeq "$(DPH_SUBDIRS)" ""
 clean: $(foreach SUBDIR,$(SUBDIRS),clean.library.$(SUBDIR))
+else
+clean: $(foreach SUBDIR,$(SUBDIRS),clean.library.$(SUBDIR)) clean.library.dph
+endif
        -cd extensible-exceptions && $(CABAL) clean --distpref=dist-bootstrapping
        -cd filepath              && $(CABAL) clean --distpref=dist-bootstrapping
        -cd Cabal                 && $(CABAL) clean --distpref=dist-bootstrapping
@@ -318,14 +351,11 @@ clean: $(foreach SUBDIR,$(SUBDIRS),clean.library.$(SUBDIR))
        $(RM) -f libraries.txt index.html doc-index.html doc-index*.html
        $(RM) -f haddock* *.gif
        $(RM) -rf stamp/*
-ifneq "$(wildcard dph)" ""
-       $(MAKE) -C dph clean
-endif
 
 maintainer-clean distclean:
        $(RM) $(foreach lib, $(SUBDIRS), $(lib)/.depend $(lib)/.depend.bak)
 
-$(foreach SUBDIR,$(SUBDIRS),clean.library.$(SUBDIR)): \
+$(foreach SUBDIR,$(CLEAN_SUBDIRS),clean.library.$(SUBDIR)): \
 clean.library.%:
        $(RM) -f stamp/configure.library.*.$* $*/unbuildable
        -cd $* && $(CABAL) clean
@@ -333,6 +363,13 @@ clean.library.%:
        $(RM) $*/GNUmakefile $*/Makefile.local
 endif
 
+# Extra target to clean all the sub-packages of dph
+clean.library.dph: clean.library.dph/dph-prim-par \
+               clean.library.dph/dph-prim-seq \
+               clean.library.dph/dph-prim-interface \
+               clean.library.dph/dph-base
+       $(MAKE) -C dph clean
+
 # -----------------------------------------------------------------------------
 
 .PHONY: install install-docs install.library.%