X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=libraries%2FMakefile;h=0fbd4739ffc87bed816931b978be3ca32070aafe;hb=e026f28591898c710f5d41a7400c85931430cea5;hp=c405f4f53d76e280e1cffdbd30c82b498cc1028a;hpb=384dc99e5a541a9196df146026abcbeb7679c711;p=ghc-hetmet.git

diff --git a/libraries/Makefile b/libraries/Makefile
index c405f4f..20a7678 100644
--- a/libraries/Makefile
+++ b/libraries/Makefile
@@ -1,25 +1,52 @@
 
+# To do a fresh build:
+#
+#   make clean
+#   make boot
+#   make
+#
+# To rebuild a particular library <package>:
+#
+#   make clean.library.<package>
+#   make make.library.<package>
+#
+# or the following is equivalent:
+#
+#   make remake.library.<package>
+#
+# To add a new library to the tree, do
+#
+#   darcs get http://darcs.haskell.org/packages/foo
+#   [ -f foo/configure.ac ] && ( cd foo && autoreconf )
+#   make make.library.foo
+
 .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)
+# when we want to rebuild another library later.
+# So for now we just don't do anything in parallel in here.
+.NOTPARALLEL:
 
-ifeq "$(IN_BIN_DIST)" "1"
-include ../Makefile-vars
-else
 # Ideally we'd just include something to give us variables
 # for paths and arguments to tools etc, and those set in mk/build.mk.
-TOP=.
+TOP=..
 include $(TOP)/mk/boilerplate.mk
-endif
+include $(TOP)/mk/cabal-flags.mk
 
-SUBDIRS = base filepath haskell98 template-haskell readline Cabal
+# Any libraries listed here should also be in ../packages
 
+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 += 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.
@@ -34,23 +61,17 @@ SUBDIRS += $(wildcard network)
 SUBDIRS += $(wildcard QuickCheck)
 SUBDIRS += $(wildcard HUnit)
 SUBDIRS += $(wildcard mtl)
-SUBDIRS += $(wildcard fgl)
-SUBDIRS += $(wildcard X11)
 SUBDIRS += $(wildcard time)
-ifeq "$(Windows)" "NO"
-# HGL is not working on Win32, so omit it for now.  Better not to ship it
-# at all than to ship a broken version.
-SUBDIRS += $(wildcard HGL)
-endif
-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)
+SUBDIRS += $(wildcard parallel)
+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
 endif
 endif
 
@@ -59,12 +80,16 @@ endif
 empty=
 space=$(empty) $(empty)
 
-ifeq "$(Windows)" "YES"
-dot_bat=.bat
-else
-dot_bat=
+# -----------------------------------------------------------------------------
+
+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 =
 CONFIGURE_STAMP_EXTRAS :=
 
@@ -73,117 +98,234 @@ CONFIGURE_OPTS += --enable-library-profiling
 CONFIGURE_STAMP_EXTRAS := $(CONFIGURE_STAMP_EXTRAS)-profiling
 endif
 
+ifeq "$(BuildSharedLibs)" "YES"
+CONFIGURE_OPTS += --enable-shared
+CONFIGURE_STAMP_EXTRAS := $(CONFIGURE_STAMP_EXTRAS)-shared
+endif
+
 ifeq "$(SplitObjs)" "YES"
 CONFIGURE_OPTS += --enable-split-objs
 CONFIGURE_STAMP_EXTRAS := $(CONFIGURE_STAMP_EXTRAS)-splitting
 endif
 
-BOOTSTRAPPING_CABAL = bootstrapping.cabal
-
 .PHONY: subdirs
 
 subdirs:
 	@echo $(SUBDIRS)
 
-.PHONY: boot
+HERE_ABS=$(FPTOOLS_TOP_ABS)/libraries
 
-boot: ifBuildable/ifBuildable \
-	  $(foreach SUBDIR,$(SUBDIRS),$(SUBDIR)/setup/Setup)
-	# XXX Hideous hacks:
-	$(GENPRIMOP) --make-haskell-source < ../compiler/prelude/primops.txt > base/GHC/Prim.hs
-	$(GENPRIMOP) --make-haskell-wrappers < ../compiler/prelude/primops.txt > base/GHC/PrimopWrappers.hs
+CABAL_GHC_FLAGS = -Wall
+ifeq "$(ghc_ge_605)" "NO"
+CABAL_GHC_FLAGS += -cpp
+endif
 
-# 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.
+# Euch, hideous hack:
+CABAL_VERSION = $(shell grep "^Version:" Cabal/Cabal.cabal | sed -e "s/^Version: //" -e 's/\./,/g')
 
-# We ought to be depending on %/Setup.*hs, but make makes that difficult.
+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
 
-$(foreach SUBDIR,$(SUBDIRS),$(SUBDIR)/setup/Setup): \
-%/setup/Setup: stamp/$(BOOTSTRAPPING_CABAL)
-	-$(RM) -rf $*/setup
-	mkdir $*/setup
-	$(CP) $*/Setup.*hs $*/setup
-	cd $*/setup && $(GHC) -Wall --make -i../../$(BOOTSTRAPPING_CABAL) Setup.*hs -o Setup
+.PHONY: boot
 
-ifBuildable/ifBuildable: ifBuildable.hs stamp/$(BOOTSTRAPPING_CABAL)
+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/
-	cd ifBuildable && $(GHC) -Wall --make -i../$(BOOTSTRAPPING_CABAL) \
-	                         ifBuildable -o ifBuildable
-
-stamp/$(BOOTSTRAPPING_CABAL):
-	$(RM) -rf $(BOOTSTRAPPING_CABAL)
-	$(CP) -R Cabal $(BOOTSTRAPPING_CABAL)
-	$(FIND) $(BOOTSTRAPPING_CABAL) \( -name "*.o" -o -name "*.hi" \) -exec $(RM) -f {} \;
-	touch $@
+ifeq "$(stage)" "2"
+	cd ifBuildable && ../$(HC) -Wall --make ifBuildable -o ifBuildable
+else
+	cd ifBuildable && $(GHC) -Wall --make ifBuildable -o ifBuildable
+endif
 
 .PHONY: all build configure
 
 all: build
 
-ifneq "$(NO_HADDOCK_DOCS)" "YES"
-all: doc
-endif
+.PHONY: rebuild.library.%
+.PHONY: remake.library.%
+
+$(foreach SUBDIR,$(SUBDIRS),rebuild.library.$(SUBDIR)):\
+rebuild.library.%: clean.library.% build.library.%
+
+$(foreach SUBDIR,$(SUBDIRS),remake.library.$(SUBDIR)):\
+remake.library.%: clean.library.% make.library.%
 
-build: $(foreach SUBDIR,$(SUBDIRS),build.library.$(SUBDIR))
+# 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))
 
 configure: $(foreach SUBDIR,$(SUBDIRS), \
              stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).$(SUBDIR))
 
 .PHONY: build.library.%
+.PHONY: make.library.%
 
 # We should depend on %/%.cabal here (and in other rules), but make
 # makes that difficult.
 
+ALL_CONFIGURE_FLAGS = \
+               $(INSTALL_DIRS_CONFIGURE_FLAGS) \
+               $(USE_STAGE1_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
+
+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
-	-$(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 $@
-
+stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).%: cabal-bin
+	-$(RM) -f stamp/configure.library.*.$* $*/unbuildable
+	$(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.
+# This is particularly important for bootlibs, where failure means the
+# build dies!
+
+# Build the library using 'make'
+# We re-run 'setup makefile' each time, just in case any preprocessing
+# needs to be done.  However, we're careful not to overwrite GNUmakefile
+# if it hasn't changed, so that dependency-generation isn't forced
+# every time.
+$(foreach SUBDIR,$(SUBDIRS),make.library.$(SUBDIR)):\
+make.library.%: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \
+                cabal-bin ifBuildable/ifBuildable
+	if $(IFBUILDABLE) $*; then \
+	  cd $* && \
+	  cmp -s $(MAKEFILE_LOCAL) Makefile.local || cp $(MAKEFILE_LOCAL) .; \
+	  mv GNUmakefile GNUmakefile.tmp; \
+	  $(CABAL) makefile -f GNUmakefile; \
+	  cmp -s GNUmakefile GNUmakefile.tmp && mv GNUmakefile.tmp GNUmakefile; \
+	  $(MAKE) $(MFLAGS) && \
+	  $(CABAL) register --inplace; \
+	fi
+
+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
-	cd $* && ../ifBuildable/ifBuildable setup/Setup build \
-	                                $(addprefix --ghc-option=,$(GhcLibHcOpts))
-	cd $* && ../ifBuildable/ifBuildable setup/Setup register --inplace
+                 cabal-bin ifBuildable/ifBuildable
+	if $(IFBUILDABLE) $*; then \
+	  cd $* && \
+	  $(CABAL) build $(BUILD_FLAGS); \
+	  $(CABAL) register --inplace; \
+	fi
+
+.PHONY: doc html
+
+html: doc
 
-.PHONY: doc
+# No docs for compat libraries for now.
+DOC_SUBDIRS = $(filter-out %-compat, $(SUBDIRS))
 
-DOC_SUBDIRS = $(filter-out haskell98,$(SUBDIRS))
+doc: $(foreach SUBDIR,$(DOC_SUBDIRS),doc.library.$(SUBDIR))
+	sh gen_contents_index --inplace
 
-doc: $(foreach SUBDIR,$(SUBDIRS),doc.library.$(SUBDIR))
-	sh gen_contents_index
+# Making hyperlinked source only works if we have hscolour
+ifneq "$(HSCOLOUR)" ""
+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
-	cd $* && setup/Setup haddock
+               cabal-bin ifBuildable/ifBuildable
+	if $(IFBUILDABLE) $*; then \
+	  cd $* && $(CABAL) haddock --html-location='../$$pkg' \
+	                            $(CABAL_HADDOCK_FLAGS); \
+	fi
+ifneq "$(HSCOLOUR)" ""
+# 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: install install-docs install.library.%
+.PHONY: maintainer-clean distclean clean clean.library.%
+
+maintainer-clean: clean
+distclean: clean
 
-INSTALL_DIR=$(prefix)/share/ghc/doc/html/
+clean: $(foreach SUBDIR,$(SUBDIRS),clean.library.$(SUBDIR))
+	-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) -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)): \
+clean.library.%:
+	$(RM) -f stamp/configure.library.*.$* $*/unbuildable
+	-cd $* && $(CABAL) clean
+	$(RM) -f $*/Setup $*/Setup.exe $*/Setup.hi $*/Setup.o
+	$(RM) $*/GNUmakefile $*/Makefile.local
+endif
+
+# -----------------------------------------------------------------------------
+
+.PHONY: install install-docs install.library.%
 
 install: $(foreach SUBDIR,$(SUBDIRS),install.library.$(SUBDIR))
-ifneq "$(NO_HADDOCK_DOCS)" "YES"
-	$(INSTALL_DATA)   index.html doc-index.html 			  $(INSTALL_DIR)
-	$(INSTALL_SCRIPT) gen_contents_index 					  $(INSTALL_DIR)
+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)   $(prefix)/share/ghc/doc/html/base/*.css $(INSTALL_DIR)
-	$(INSTALL_DATA)   $(prefix)/share/ghc/doc/html/base/*.js  $(INSTALL_DIR)
-	$(INSTALL_DATA)   $(prefix)/share/ghc/doc/html/base/*.gif $(INSTALL_DIR)
+	$(INSTALL_DATA)   base/dist/doc/html/*/*.css $(DESTDIR)$(html_installed_root)
+	$(INSTALL_DATA)   base/dist/doc/html/*/*.js $(DESTDIR)$(html_installed_root)
+	$(INSTALL_DATA)   base/dist/doc/html/*/*.gif $(DESTDIR)$(html_installed_root)
 endif
 
 # Cabal doesn't let us ask to install docs only, so do nothing here
@@ -193,34 +335,49 @@ install-docs:
 # Ideally this would depend on a stamp/build.library.%, but if it does
 # 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
-	-$(RM) -f stamp/configure.library.*.$*
-	cd $* && ../ifBuildable/ifBuildable setup/Setup configure \
-	                                    $(CONFIGURE_OPTS) \
-	                                    --prefix=$(prefix) \
-	                                    --with-compiler=$(bindir)/ghc \
-	                                    --datasubdir=ghc
-	touch $@
-
-# We need to reconfigure as we now need to register with the normal ghc-pkg
+
+# prefix and (on Windows) htmldir use $topdir when configuring, so we
+# need to tell installPackage the real path to use when installing.
+
+# We also need to pass all the other directories in, as they can be
+# overridden when installing a bindist.
+
 $(foreach SUBDIR,$(SUBDIRS),install.library.$(SUBDIR)): \
-install.library.%: stamp/configure.library.install.% %/setup/Setup
-	cd $* && ../ifBuildable/ifBuildable setup/Setup install
+install.library.%: ifBuildable/ifBuildable
+	if $(IFBUILDABLE) $*; then \
+	  cd $* && \
+	  $(INSTALL_PACKAGE) install '$(GHC_PKG_INSTALL_PROG)' '$(DESTDIR)$(datadir)/package.conf' '$(DESTDIR)' '$(prefix)' '$(iprefix)' '$(ibindir)' '$(ilibdir)' '$(ilibexecdir)' '$(idynlibdir)' '$(idatadir)' '$(idocdir)' '$(ihtmldir)' '$(ihaddockdir)' ; \
+	fi
 
-.PHONY: distclean clean clean.library.%
+.PHONY: binary-dist binary-dist.library.%
 
-distclean: clean
+BIN_DIST_LIBDIR=$(BIN_DIST_DIR)/libraries
 
-clean: $(foreach SUBDIR,$(SUBDIRS),clean.library.$(SUBDIR))
-	$(RM) -f stamp/$(BOOTSTRAPPING_CABAL)
-	$(RM) -rf $(BOOTSTRAPPING_CABAL)
-	$(RM) -rf ifBuildable
-	$(RM) -f libraries.txt index.html doc-index.html
+binary-dist: $(foreach SUBDIR,$(SUBDIRS),binary-dist.library.$(SUBDIR))
+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"
+	for FILE in gen_contents_index prologue index.html doc-index*.html; do echo $(WHERE_AM_I)/$$FILE >> $(BIN_DIST_LIST); done
+endif
 
-$(foreach SUBDIR,$(SUBDIRS),clean.library.$(SUBDIR)): \
-clean.library.%:
-	$(RM) -f stamp/configure.library.*.$*
-	-cd $* && setup/Setup clean
-	$(RM) -rf $*/setup
+$(foreach SUBDIR,$(SUBDIRS),binary-dist.library.$(SUBDIR)): \
+binary-dist.library.%:
+	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
+# The root recurses into us when these targets are made
+.PHONY: html-no-chunks chm HxS fo dvi ps pdf
+html-no-chunks chm HxS fo dvi ps pdf:
+	@: