X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=libraries%2FMakefile;h=20a7678023d8d937454d5de9803c5831ac0cdc98;hp=01400b0e813de02a42561e1b8d02ac9a24af68d2;hb=e026f28591898c710f5d41a7400c85931430cea5;hpb=69c3d6ccf567c2862bcb59bd14c764fe29b37fca

diff --git a/libraries/Makefile b/libraries/Makefile
index 01400b0..20a7678 100644
--- a/libraries/Makefile
+++ b/libraries/Makefile
@@ -17,7 +17,7 @@
 # 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
@@ -135,6 +135,10 @@ cabal-bin: cabal-bin.hs
 
 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
@@ -204,8 +208,7 @@ dph/%:
 
 $(foreach SUBDIR,$(SUBDIRS), \
 		  stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).$(SUBDIR)): \
-stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).%: cabal-bin \
-                                                          bootstrapping.conf
+stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).%: cabal-bin
 	-$(RM) -f stamp/configure.library.*.$* $*/unbuildable
 	$(MKDIRHIER) `dirname $@`
 	( cd $* && $(CABAL) configure $(ALL_CONFIGURE_FLAGS) ) \
@@ -222,7 +225,7 @@ stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).%: cabal-bin \
 # every time.
 $(foreach SUBDIR,$(SUBDIRS),make.library.$(SUBDIR)):\
 make.library.%: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \
-                cabal-bin ifBuildable/ifBuildable bootstrapping.conf
+                cabal-bin ifBuildable/ifBuildable
 	if $(IFBUILDABLE) $*; then \
 	  cd $* && \
 	  cmp -s $(MAKEFILE_LOCAL) Makefile.local || cp $(MAKEFILE_LOCAL) .; \
@@ -238,7 +241,7 @@ 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).% \
-                 cabal-bin ifBuildable/ifBuildable bootstrapping.conf
+                 cabal-bin ifBuildable/ifBuildable
 	if $(IFBUILDABLE) $*; then \
 	  cd $* && \
 	  $(CABAL) build $(BUILD_FLAGS); \
@@ -263,7 +266,7 @@ CABAL_HADDOCK_FLAGS += --with-haddock=$(FPTOOLS_TOP_ABS)/utils/haddock/install-i
 
 $(foreach SUBDIR,$(DOC_SUBDIRS),doc.library.$(SUBDIR)):\
 doc.library.%: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \
-               cabal-bin ifBuildable/ifBuildable bootstrapping.conf
+               cabal-bin ifBuildable/ifBuildable
 	if $(IFBUILDABLE) $*; then \
 	  cd $* && $(CABAL) haddock --html-location='../$$pkg' \
 	                            $(CABAL_HADDOCK_FLAGS); \
@@ -277,8 +280,9 @@ ifneq "$(HSCOLOUR)" ""
 	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
 
 clean: $(foreach SUBDIR,$(SUBDIRS),clean.library.$(SUBDIR))
@@ -297,7 +301,7 @@ ifneq "$(wildcard dph)" ""
 	$(MAKE) -C dph clean
 endif
 
-distclean:
+maintainer-clean distclean:
 	$(RM) $(foreach lib, $(SUBDIRS), $(lib)/.depend $(lib)/.depend.bak)
 
 $(foreach SUBDIR,$(SUBDIRS),clean.library.$(SUBDIR)): \
@@ -317,6 +321,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)
@@ -361,7 +366,7 @@ endif
 	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 index.html doc-index*.html; do echo $(WHERE_AM_I)/$$FILE >> $(BIN_DIST_LIST); done
+	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),binary-dist.library.$(SUBDIR)): \