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

diff --git a/libraries/Makefile b/libraries/Makefile
index 01400b0..43220f6 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
@@ -204,8 +204,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 +221,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 +237,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 +262,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 +276,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 +297,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)): \