X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=libraries%2FMakefile;h=928871a658719782e5f6657f7fa0488bb8395c94;hb=6a104dcf597f27887f0f1ac82dba7051ed2fe0c3;hp=0f257dab1c0a9778723dbcd7ccf5513c013ad37b;hpb=703b1252f70b660e9ae2d33f236c1868d3dca0a9;p=ghc-hetmet.git

diff --git a/libraries/Makefile b/libraries/Makefile
index 0f257da..928871a 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
@@ -108,6 +108,10 @@ CONFIGURE_OPTS += --enable-split-objs
 CONFIGURE_STAMP_EXTRAS := $(CONFIGURE_STAMP_EXTRAS)-splitting
 endif
 
+ifeq "$(HSCOLOUR_SRCS)" "YES"
+CONFIGURE_OPTS += --with-hscolour="$(HSCOLOUR)"
+endif
+
 .PHONY: subdirs
 
 subdirs:
@@ -116,12 +120,6 @@ subdirs:
 HERE_ABS=$(FPTOOLS_TOP_ABS)/libraries
 
 CABAL_GHC_FLAGS = -Wall
-ifeq "$(ghc_ge_605)" "NO"
-CABAL_GHC_FLAGS += -cpp
-endif
-
-# Euch, hideous hack:
-CABAL_VERSION = $(shell grep "^Version:" Cabal/Cabal.cabal | sed -e "s/^Version: //" -e 's/\./,/g')
 
 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
 
@@ -135,6 +133,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
@@ -255,7 +257,7 @@ doc: $(foreach SUBDIR,$(DOC_SUBDIRS),doc.library.$(SUBDIR))
 	sh gen_contents_index --inplace
 
 # Making hyperlinked source only works if we have hscolour
-ifneq "$(HSCOLOUR)" ""
+ifeq "$(HSCOLOUR_SRCS)" "YES"
 CABAL_HADDOCK_FLAGS += --hyperlink-source
 endif
 CABAL_HADDOCK_FLAGS += --with-haddock=$(FPTOOLS_TOP_ABS)/utils/haddock/install-inplace/bin/haddock
@@ -276,14 +278,16 @@ 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))
-	-cd filepath && $(CABAL) clean --distpref=dist-bootstrapping
-	-cd Cabal    && $(CABAL) clean --distpref=dist-bootstrapping
-	-cd hpc      && $(CABAL) clean --distpref=dist-bootstrapping
+	-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
@@ -296,7 +300,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)): \
@@ -316,6 +320,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)
@@ -360,7 +365,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.txt index.html doc-index*.html; do echo $(WHERE_AM_I)/$$FILE >> $(BIN_DIST_LIST); done
 endif
 
 $(foreach SUBDIR,$(SUBDIRS),binary-dist.library.$(SUBDIR)): \