Fix SPARC build, missing #include
[ghc-hetmet.git] / libraries / Makefile
index 51cb7aa..c32c1f6 100644 (file)
 #
 # or the following is equivalent:
 #
-#   make rebuild.library.<package>
+#   make remake.library.<package>
 #
 # To add a new library to the tree, do
 #
 #   darcs get http://darcs.haskell.org/packages/foo
-#   [ -e foo/configure.ac ] && ( cd foo && autoreconf )
+#   [ -f foo/configure.ac ] && ( cd foo && autoreconf )
 #   make make.library.foo
 
-.PHONY: default_target show
+.PHONY: default_target
 
 default_target: all
 
-show:
-       @echo '$(VALUE)="$($(VALUE))"'
-
 # 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)
 # when we want to rebuild another library later.
@@ -37,16 +34,39 @@ show:
 # for paths and arguments to tools etc, and those set in mk/build.mk.
 TOP=..
 include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/cabal-flags.mk
+
+ifeq "$(stage)" ""
+stage := 1
+endif
+
+DO_STAGE_1_LIBS := NO
+DO_STAGE_2_LIBS := NO
+ifeq "$(stage)" "1"
+DO_STAGE_1_LIBS := YES
+endif
+ifeq "$(stage)" "2"
+DO_STAGE_2_LIBS := YES
+endif
+ifneq "$(filter install clean maintainer-clean distclean binary-dist,$(MAKECMDGOALS))" ""
+DO_STAGE_1_LIBS := YES
+DO_STAGE_2_LIBS := YES
+endif
 
-SUBDIRS  = base array packedstring containers bytestring
-SUBDIRS += old-locale old-time filepath directory
+# Any libraries listed here should also be in ../packages
+
+SUBDIRS :=
+
+ifeq "$(DO_STAGE_1_LIBS)" "YES"
+SUBDIRS += ghc-prim $(INTEGER_LIBRARY) base syb base3-compat array packedstring
+SUBDIRS += containers bytestring old-locale old-time filepath 
 ifeq "$(GhcLibsWithUnix)" "YES"
 SUBDIRS += unix
 endif
 ifeq "$(Windows)" "YES"
 SUBDIRS += $(wildcard Win32)
 endif
-SUBDIRS += process pretty hpc template-haskell readline Cabal random haskell98
+SUBDIRS += directory process pretty hpc template-haskell editline Cabal random haskell98
 
 # Set GhcBootLibs=YES from the command line to work with just the libraries
 # needed to bootstrap GHC.
@@ -61,20 +81,32 @@ SUBDIRS += $(wildcard network)
 SUBDIRS += $(wildcard QuickCheck)
 SUBDIRS += $(wildcard HUnit)
 SUBDIRS += $(wildcard mtl)
-SUBDIRS += $(wildcard fgl)
 SUBDIRS += $(wildcard time)
-SUBDIRS += $(wildcard OpenGL)
-SUBDIRS += $(wildcard GLUT)
-SUBDIRS += $(wildcard OpenAL)
-SUBDIRS += $(wildcard ALUT)
 SUBDIRS += $(wildcard stm)
 SUBDIRS += $(wildcard xhtml)
-SUBDIRS += $(wildcard cgi)
-ifeq "$(GhcLibsWithObjectIO)" "YES"
-SUBDIRS += $(wildcard ObjectIO)
-endif
 SUBDIRS += $(wildcard parallel)
-SUBDIRS += $(wildcard ndp)
+endif
+endif
+
+DPH_SUBDIRS :=
+ifneq "$(GhcBootLibs)" "YES"
+ifneq "$(wildcard dph)" ""
+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
 
 # -----------------------------------------------------------------------------
@@ -84,35 +116,12 @@ space=$(empty) $(empty)
 
 # -----------------------------------------------------------------------------
 
-ifeq "$(RelocatableBuild)" "YES"
-# On Windows we want to make moveable bindists, but we need to tell
-# ghc-pkg where the haddock docs are. Therefore we completely ignore
-# where the user tells us to put the haddock documentation and put it
-# somewhere whose relative location we know. When installing we need
-# to give Cabal a real path, though.
-iprefix             = $$topdir
-ibindir             = $$topdir
-ilibdir             = $$topdir
-ilibexecdir         = $$topdir
-idatadir            = $$topdir
-idocdir             = $$topdir/doc/libraries/$$pkg
-iinterfacedir       = $$topdir/doc/libraries/$$pkg
-ihtmldir            = $$httptopdir/doc/libraries/$$pkg
-html_installed_root = $(prefix)/doc/libraries
-else
-# On non-Windows we can just give absolute paths all the time, and
-# thus obey the htmldir that we are given.
-iprefix             = $(prefix)
-ibindir             = $(bindir)
-ilibdir             = $(libdir)
-ilibexecdir         = $(libexecdir)
-idatadir            = $(datadir)
-idocdir             = $(docdir)/libraries/$$pkg
-iinterfacedir       = $(htmldir)/libraries/$$pkg
-ihtmldir            = $(htmldir)/libraries/$$pkg
-html_installed_root = $(htmldir)/libraries
+ifeq "$(ghc_ge_609)" "YES"
+GhcLibHcOpts += -fno-warn-deprecated-flags
 endif
 
+IFBUILDABLE=ifBuildable/ifBuildable $(FPTOOLS_TOP_ABS)/packages
+
 ifneq "$(DOING_BIN_DIST)" "YES"
 
 CONFIGURE_OPTS =
@@ -123,7 +132,7 @@ CONFIGURE_OPTS += --enable-library-profiling
 CONFIGURE_STAMP_EXTRAS := $(CONFIGURE_STAMP_EXTRAS)-profiling
 endif
 
-ifneq "$(findstring $(space)dyn$(space), $(space)$(GhcLibWays)$(space))" ""
+ifeq "$(BuildSharedLibs)" "YES"
 CONFIGURE_OPTS += --enable-shared
 CONFIGURE_STAMP_EXTRAS := $(CONFIGURE_STAMP_EXTRAS)-shared
 endif
@@ -133,91 +142,87 @@ CONFIGURE_OPTS += --enable-split-objs
 CONFIGURE_STAMP_EXTRAS := $(CONFIGURE_STAMP_EXTRAS)-splitting
 endif
 
-ifneq "$(HSCOLOUR)" ""
-CONFIGURE_OPTS += --with-hscolour=$(HSCOLOUR)
-endif
-
-BOOTSTRAP_LIBS = Cabal filepath
-BOOTSTRAP_STAMPS = $(addprefix stamp/bootstrapping.,$(BOOTSTRAP_LIBS))
-BOOTSTRAP_INC_1_UP = -DCABAL_VERSION=1,3 $(addprefix -i../bootstrapping.,$(BOOTSTRAP_LIBS))
-BOOTSTRAP_INC_2_UP = -DCABAL_VERSION=1,3 $(addprefix -i../../bootstrapping.,$(BOOTSTRAP_LIBS))
-
 .PHONY: subdirs
 
 subdirs:
        @echo $(SUBDIRS)
 
+HERE_ABS=$(FPTOOLS_TOP_ABS)/libraries
+
+CABAL_GHC_FLAGS = -Wall
+
+BOOTSTRAPPING_FLAGS = $(CABAL_GHC_FLAGS) -DCABAL_VERSION=$(CABAL_VERSION) -odir $(HERE_ABS)/bootstrapping -hidir $(HERE_ABS)/bootstrapping -i$(HERE_ABS)/Cabal -i$(HERE_ABS)/filepath -i$(HERE_ABS)/hpc
+
 .PHONY: boot
 
-boot: $(BOOTSTRAP_STAMPS) ifBuildable/ifBuildable \
-         $(foreach SUBDIR,$(SUBDIRS),$(SUBDIR)/setup/Setup) \
-         installPackage/installPackage
-
-# We build the Setup program in a setup subdirectory to stop it trying
-# to use bits of base and Cabal when we build those packages.
-# This also makes it slightly easier to clean.
-
-# We ought to be depending on %/Setup.*hs, but make makes that difficult.
-
-$(foreach SUBDIR,$(SUBDIRS),$(SUBDIR)/setup/Setup): \
-%/setup/Setup: $(BOOTSTRAP_STAMPS)
-       -$(RM) -rf $*/setup
-       mkdir $*/setup
-       $(CP) $*/Setup.*hs $*/setup
-       cd $*/setup && $(GHC) -Wall -cpp --make Setup.*hs -o Setup \
-                             $(BOOTSTRAP_INC_2_UP)
-
-installPackage/installPackage: installPackage.hs $(BOOTSTRAP_STAMPS)
-       -$(RM) -rf installPackage
-       mkdir installPackage
-       $(CP) installPackage.hs installPackage/
-ifeq "$(UseStage1)" "YES"
-       cd installPackage && ../$(HC) -Wall -cpp \
-                                   --make installPackage -o installPackage \
-                                   $(BOOTSTRAP_INC_1_UP)
-else
-       cd installPackage && $(GHC) -Wall -cpp \
-                                   --make installPackage -o installPackage \
-                                   $(BOOTSTRAP_INC_1_UP)
-endif
-# TODO: The conditional is yucky, but we need to be able to build with stage1
-#       for bindists and as installPackages/ has no Makefile, it seems hard
-#      to make this nicer.
+boot: ifBuildable/ifBuildable cabal-bin bootstrapping.conf
+
+cabal-bin: cabal-bin.hs
+       -mkdir bootstrapping
+       $(GHC) $(BOOTSTRAPPING_FLAGS) --make cabal-bin -o cabal-bin
+
+bootstrapping.conf: cabal-bin
+       echo "[]" > $@.tmp
+       -cd extensible-exceptions && $(CABAL) clean     --distpref=dist-bootstrapping
+       cd extensible-exceptions && $(CABAL) configure --distpref=dist-bootstrapping --with-compiler=$(GHC) --with-hc-pkg=$(GHC_PKG) --package-db=$(HERE_ABS)/$@.tmp
+       cd extensible-exceptions && $(CABAL) build     --distpref=dist-bootstrapping
+       cd extensible-exceptions && $(CABAL) install   --distpref=dist-bootstrapping --inplace
+       -cd filepath && $(CABAL) clean     --distpref=dist-bootstrapping
+       cd filepath && $(CABAL) configure --distpref=dist-bootstrapping --with-compiler=$(GHC) --with-hc-pkg=$(GHC_PKG) --package-db=$(HERE_ABS)/$@.tmp
+       cd filepath && $(CABAL) build     --distpref=dist-bootstrapping
+       cd filepath && $(CABAL) install   --distpref=dist-bootstrapping --inplace
+       -cd Cabal    && $(CABAL) clean     --distpref=dist-bootstrapping
+       cd Cabal    && $(CABAL) configure --distpref=dist-bootstrapping --with-compiler=$(GHC) --with-hc-pkg=$(GHC_PKG) --package-db=$(HERE_ABS)/$@.tmp
+       cd Cabal    && $(CABAL) build     --distpref=dist-bootstrapping
+       cd Cabal    && $(CABAL) install   --distpref=dist-bootstrapping --inplace
+       -cd hpc    && $(CABAL) clean     --distpref=dist-bootstrapping
+       cd hpc    && $(CABAL) configure --distpref=dist-bootstrapping --with-compiler=$(GHC) --with-hc-pkg=$(GHC_PKG) --package-db=$(HERE_ABS)/$@.tmp
+       cd hpc    && $(CABAL) build     --distpref=dist-bootstrapping
+       cd hpc    && $(CABAL) install   --distpref=dist-bootstrapping --inplace
+       mv $@.tmp $@
 
 ifBuildable/ifBuildable: ifBuildable.hs
        -$(RM) -rf ifBuildable
        mkdir ifBuildable
        $(CP) ifBuildable.hs ifBuildable/
-ifeq "$(UseStage1)" "YES"
+ifeq "$(stage)" "2"
        cd ifBuildable && ../$(HC) -Wall --make ifBuildable -o ifBuildable
 else
        cd ifBuildable && $(GHC) -Wall --make ifBuildable -o ifBuildable
 endif
 
-$(BOOTSTRAP_STAMPS): stamp/bootstrapping.%:
-       $(RM) -rf bootstrapping.$*
-       $(CP) -R $* bootstrapping.$*
-       $(FIND) bootstrapping.$* \( -name "*.o" -o -name "*.hi" \) \
-                                -exec $(RM) -f {} \;
-       touch $@
-
 .PHONY: all build configure
 
 all: build
 
-ifeq "$(HADDOCK_DOCS)" "YES"
-all: doc
-endif
-
 .PHONY: rebuild.library.%
+.PHONY: remake.library.%
 
 $(foreach SUBDIR,$(SUBDIRS),rebuild.library.$(SUBDIR)):\
-rebuild.library.%: clean.library.% make.library.%
+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))
-build: installPackage/installPackage
 
 configure: $(foreach SUBDIR,$(SUBDIRS), \
              stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).$(SUBDIR))
@@ -228,38 +233,29 @@ configure: $(foreach SUBDIR,$(SUBDIRS), \
 # We should depend on %/%.cabal here (and in other rules), but make
 # makes that difficult.
 
-# We put non-existant paths in when configuring, as we require that
-# builds don't depend on these paths when making bindists.
+ALL_CONFIGURE_FLAGS = \
+               $(INSTALL_DIRS_CONFIGURE_FLAGS) \
+               $(USE_STAGE$(stage)_CONFIGURE_FLAGS) \
+               $(COMMON_CONFIGURE_FLAGS) \
+                  --haddock-options="--use-contents=../index.html \
+                                     --use-index=../doc-index.html" \
+                  $(CONFIGURE_OPTS)
+
+stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).dph/dph-par: \
+    dph/dph-par
 
-# 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))
+stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).dph/dph-seq: \
+    dph/dph-seq
+
+dph/%:
+       $(MAKE) -C dph $*
 
 $(foreach SUBDIR,$(SUBDIRS), \
                  stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).$(SUBDIR)): \
-stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).%: %/setup/Setup
+stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).%: cabal-bin
        -$(RM) -f stamp/configure.library.*.$* $*/unbuildable
-       ( cd $* && setup/Setup configure \
-                  $(CONFIGURE_OPTS) \
-                  --prefix=/NONEXISTANT \
-                  --bindir=/NONEXISTANT \
-                  --libdir=/NONEXISTANT \
-                  --libsubdir='$$pkgid' \
-                  --libexecdir=/NONEXISTANT \
-                  --datadir=/NONEXISTANT \
-                  --docdir=/NONEXISTANT \
-                          --interfacedir=/NONEXISTANT \
-                  --htmldir=/NONEXISTANT \
-                  --with-compiler=../../compiler/stage1/ghc-inplace \
-                  --with-hc-pkg=../../utils/ghc-pkg/ghc-pkg-inplace \
-                  --with-hsc2hs=../../utils/hsc2hs/hsc2hs-inplace \
-                  --with-ld=$(LD) \
-                  --haddock-options="--use-contents=../index.html \
-                                  --use-index=../doc-index.html" \
-                  $(FLAGGED_CONFIGURE_ARGS) \
-                  --configure-option=--with-cc=$(CC) ) \
+       $(MKDIRHIER) `dirname $@`
+       ( cd $* && $(CABAL) configure $(ALL_CONFIGURE_FLAGS) ) \
              && 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.
@@ -273,72 +269,107 @@ stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).%: %/setup/Setup
 # every time.
 $(foreach SUBDIR,$(SUBDIRS),make.library.$(SUBDIR)):\
 make.library.%: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \
-                %/setup/Setup ifBuildable/ifBuildable
-       if ifBuildable/ifBuildable $*; then \
+                cabal-bin ifBuildable/ifBuildable
+       if $(IFBUILDABLE) $*; then \
          cd $* && \
-         cmp -s ../Makefile.local Makefile.local || cp ../Makefile.local .; \
+         cmp -s $(MAKEFILE_LOCAL) Makefile.local || cp $(MAKEFILE_LOCAL) .; \
          mv GNUmakefile GNUmakefile.tmp; \
-         setup/Setup makefile -f GNUmakefile; \
+         $(CABAL) makefile -f GNUmakefile; \
          cmp -s GNUmakefile GNUmakefile.tmp && mv GNUmakefile.tmp GNUmakefile; \
          $(MAKE) $(MFLAGS) && \
-         ../installPackage/installPackage register --inplace; \
+         $(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)
 $(foreach SUBDIR,$(SUBDIRS),build.library.$(SUBDIR)):\
 build.library.%: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \
-                 %/setup/Setup ifBuildable/ifBuildable
-       if ifBuildable/ifBuildable $*; then \
+                 cabal-bin ifBuildable/ifBuildable
+       if $(IFBUILDABLE) $*; then \
          cd $* && \
-         setup/Setup build $(addprefix --ghc-option=,$(GhcLibHcOpts)); \
+         $(CABAL) build $(BUILD_FLAGS); \
+         $(CABAL) register --inplace; \
        fi
 
 .PHONY: doc html
 
 html: doc
 
-doc: $(foreach SUBDIR,$(SUBDIRS),doc.library.$(SUBDIR))
+# No docs for compat libraries for now.
+DOC_SUBDIRS = $(filter-out %-compat, $(SUBDIRS))
+
+doc: $(foreach SUBDIR,$(DOC_SUBDIRS),doc.library.$(SUBDIR))
        sh gen_contents_index --inplace
 
 # Making hyperlinked source only works if we have hscolour
-ifneq "$(HSCOLOUR)" ""
-CABAL_HADDOCK_FLAGS=--hyperlink-source
+ifeq "$(HSCOLOUR_SRCS)" "YES"
+CABAL_HADDOCK_FLAGS += --hyperlink-source
 endif
+CABAL_HADDOCK_FLAGS += --with-haddock=$(FPTOOLS_TOP_ABS)/utils/haddock/install-inplace/bin/haddock
 
-$(foreach SUBDIR,$(SUBDIRS),doc.library.$(SUBDIR)):\
+$(foreach SUBDIR,$(DOC_SUBDIRS),doc.library.$(SUBDIR)):\
 doc.library.%: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \
-               %/setup/Setup ifBuildable/ifBuildable
-       if ifBuildable/ifBuildable $*; then \
-         cd $* && setup/Setup haddock --html-location='../$$pkg' \
-                                      $(CABAL_HADDOCK_FLAGS); \
+               cabal-bin ifBuildable/ifBuildable
+       if $(IFBUILDABLE) $*; then \
+         cd $* && $(CABAL) haddock --html-location='../$$pkg' \
+                                   $(CABAL_HADDOCK_FLAGS); \
        fi
 ifneq "$(HSCOLOUR)" ""
-       if ifBuildable/ifBuildable $*; then cp hscolour.css $*/dist/doc/html/$*/src/; fi
+# We use */src rather than $*/src due to the $(INTEGER_LIBRARY)/integer
+# mismatch
+# XXX We also need to check that the directory exists, as e.g. dph disables
+# haddock, so the directory doesn't get made. We should remove this once
+# we can always haddock everything.
+       if $(IFBUILDABLE) $* && [ -d $*/dist/doc/html/*/src/ ]; then cp hscolour.css $*/dist/doc/html/*/src/; fi
 endif
 
-.PHONY: distclean clean clean.library.%
+.PHONY: maintainer-clean distclean clean clean.library.%
 
+maintainer-clean: clean
 distclean: clean
 
+ifeq "$(DPH_SUBDIRS)" ""
 clean: $(foreach SUBDIR,$(SUBDIRS),clean.library.$(SUBDIR))
-       $(RM) -f stamp/bootstrapping.*
-       $(RM) -rf bootstrapping.*
+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
+       -cd hpc                   && $(CABAL) clean --distpref=dist-bootstrapping
+       $(RM) -rf bootstrapping
+       $(RM) -f bootstrapping.conf     bootstrapping.conf.old
+       $(RM) -f bootstrapping.conf.tmp bootstrapping.conf.tmp.old
+       $(RM) -f cabal-bin cabal-bin.exe
        $(RM) -rf ifBuildable
-       $(RM) -rf installPackage
        $(RM) -f libraries.txt index.html doc-index.html doc-index*.html
        $(RM) -f haddock* *.gif
+       $(RM) -rf stamp/*
 
-distclean:
+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 $* && setup/Setup clean
-       $(RM) -rf $*/setup
+       -cd $* && $(CABAL) clean
+       $(RM) -f $*/Setup $*/Setup.exe $*/Setup.hi $*/Setup.o
        $(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.%
@@ -348,6 +379,7 @@ ifeq "$(HADDOCK_DOCS)" "YES"
        $(INSTALL_DIR)                                                     $(DESTDIR)$(html_installed_root)
        $(INSTALL_DATA)   index.html doc-index*.html                       $(DESTDIR)$(html_installed_root)
        $(INSTALL_SCRIPT) gen_contents_index                               $(DESTDIR)$(html_installed_root)
+       $(INSTALL_DATA)   prologue.txt                                     $(DESTDIR)$(html_installed_root)
        # Hacks:
        $(INSTALL_DATA)   base/dist/doc/html/*/*.css $(DESTDIR)$(html_installed_root)
        $(INSTALL_DATA)   base/dist/doc/html/*/*.js $(DESTDIR)$(html_installed_root)
@@ -369,10 +401,10 @@ install-docs:
 # overridden when installing a bindist.
 
 $(foreach SUBDIR,$(SUBDIRS),install.library.$(SUBDIR)): \
-install.library.%: installPackage/installPackage ifBuildable/ifBuildable
-       if ifBuildable/ifBuildable $*; then \
+install.library.%: ifBuildable/ifBuildable
+       if $(IFBUILDABLE) $*; then \
          cd $* && \
-         ../installPackage/installPackage install '$(GHC_PKG_PROG)' '$(DESTDIR)$(libdir)/package.conf' '$(DESTDIR)' '$(prefix)' '$(iprefix)' '$(ibindir)' '$(ilibdir)' '$(ilibexecdir)' '$(idatadir)' '$(idocdir)' '$(ihtmldir)' '$(iinterfacedir)' ; \
+         $(INSTALL_PACKAGE) install '$(GHC_PKG_INSTALL_PROG)' '$(DESTDIR)$(datadir)/package.conf' '$(DESTDIR)' '$(prefix)' '$(iprefix)' '$(ibindir)' '$(ilibdir)' '$(ilibexecdir)' '$(idynlibdir)' '$(idatadir)' '$(idocdir)' '$(ihtmldir)' '$(ihaddockdir)' ; \
        fi
 
 .PHONY: binary-dist binary-dist.library.%
@@ -380,34 +412,25 @@ install.library.%: installPackage/installPackage ifBuildable/ifBuildable
 BIN_DIST_LIBDIR=$(BIN_DIST_DIR)/libraries
 
 binary-dist: $(foreach SUBDIR,$(SUBDIRS),binary-dist.library.$(SUBDIR))
-       mkdir                               $(BIN_DIST_LIBDIR)/installPackage
-       cp        installPackage/installPackage $(BIN_DIST_LIBDIR)/installPackage
-       mkdir                               $(BIN_DIST_LIBDIR)/ifBuildable
-       cp        ifBuildable/ifBuildable       $(BIN_DIST_LIBDIR)/ifBuildable
-       cp    Makefile                      $(BIN_DIST_LIBDIR)
+ifeq "$(WHERE_AM_I)" ""
+       echo "I don't know where I am" >&2
+       exit 1
+endif
+       echo $(WHERE_AM_I)/Makefile >> $(BIN_DIST_LIST)
+# XXX This needs to be changed: This ifBuildable is built with the
+# bootstrapping compiler, so isn't OS X friendly. It should be made into
+# a Cabal package if we keep it. However, once we drop extralibs we can
+# probably remove it anyway.
+       echo $(WHERE_AM_I)/ifBuildable/ifBuildable >> $(BIN_DIST_LIST)
+       for FILE in dph/dph-prim-interface/interface/*.h dph/dph/LICENSE; do if [ -f $$FILE ]; then echo $(WHERE_AM_I)/$$FILE >> $(BIN_DIST_LIST); fi; done
 ifeq "$(HADDOCK_DOCS)" "YES"
-       cp    gen_contents_index            $(BIN_DIST_LIBDIR)
-       cp    index.html                    $(BIN_DIST_LIBDIR)
-       cp    doc-index*.html               $(BIN_DIST_LIBDIR)
+       for FILE in gen_contents_index prologue.txt index.html doc-index*.html; do echo $(WHERE_AM_I)/$$FILE >> $(BIN_DIST_LIST); done
 endif
-       cp -pR stamp                         $(BIN_DIST_LIBDIR)
 
 $(foreach SUBDIR,$(SUBDIRS),binary-dist.library.$(SUBDIR)): \
 binary-dist.library.%:
-       if ifBuildable/ifBuildable $*; then \
-         $(MKDIRHIER) $(BIN_DIST_LIBDIR)/$*; \
-         cd $* && \
-         cp    $*.cabal      $(BIN_DIST_LIBDIR)/$* && \
-         cp    LICENSE       $(BIN_DIST_LIBDIR)/$* && \
-         cp -R dist          $(BIN_DIST_LIBDIR)/$* && \
-         $(FIND) . -name "*.buildinfo" -exec cp {} $(BIN_DIST_LIBDIR)/$* \; && \
-         $(FIND) . -name unbuildable -exec cp {} $(BIN_DIST_LIBDIR)/$* \; && \
-         (cp -RL include      $(BIN_DIST_LIBDIR)/$* || true) && \
-         $(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 {} \; ; \
+       if $(IFBUILDABLE) $*; then \
+         $(MAKE) -C $* -f Makefile.local binary-dist BINDIST_EXTRAS="$*.cabal LICENSE $*.buildinfo unbuildable" WHERE_AM_I=$(WHERE_AM_I)/$*; \
        fi
 
 # Ignore some doc targets that we don't support