X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc.mk;h=b6df093d335bd738ddd1d04d454a68511166d86b;hb=cf96c6c8f2ead02205e509975282e212a5eb9aee;hp=68a1f6f7a76c4f375210bea5718641f46bcf94b6;hpb=ff0223a9bca6653a0d5be29956dc4ed210768c2e;p=ghc-hetmet.git

diff --git a/ghc.mk b/ghc.mk
index 68a1f6f..b6df093 100644
--- a/ghc.mk
+++ b/ghc.mk
@@ -21,15 +21,12 @@
 #   * need to fix Cabal for new Windows layout, see
 #     Distribution/Simple/GHC.configureToolchain.
 #   * remove old Makefiles, add new stubs for building in subdirs
-#     * utils/hsc2hs/Makefile
-#     * utils/haddock/Makefile
 #     * docs/Makefile
 #     * docs/docbook-cheat-sheet/Makefile
 #     * docs/ext-core/Makefile
 #     * docs/man/Makefile
 #     * docs/storage-mgmt/Makefile
 #     * docs/vh/Makefile
-#     * driver/Makefile
 #     * rts/dotnet/Makefile
 #     * utils/Makefile
 #   * GhcProfiled
@@ -823,7 +820,8 @@ SRC_DIST_DIRS = mk rules docs distrib bindisttest libffi includes utils docs rts
 SRC_DIST_FILES += \
 	configure.ac config.guess config.sub configure \
 	aclocal.m4 README ANNOUNCE HACKING LICENSE Makefile install-sh \
-	ghc.spec.in ghc.spec extra-gcc-opts.in VERSION boot ghc.mk
+	ghc.spec.in ghc.spec extra-gcc-opts.in VERSION \
+	boot boot-pkgs packages ghc.mk
 
 SRC_DIST_TARBALL = $(SRC_DIST_NAME)-src.tar.bz2
 
@@ -907,22 +905,33 @@ clean_files :
 	"$(RM)" $(RM_OPTS) $(CLEAN_FILES)
 
 .PHONY: clean_libraries
+clean_libraries: $(patsubst %,clean_libraries/%_dist-install,$(PACKAGES) $(PACKAGES_STAGE2))
+clean_libraries: $(patsubst %,clean_libraries/%_dist-boot,$(BOOT_PKGS))
+
 clean_libraries:
 	"$(RM)" $(RM_OPTS) -r $(patsubst %, libraries/%/dist, $(PACKAGES) $(PACKAGES_STAGE2))
-	"$(RM)" $(RM_OPTS) -r $(patsubst %, libraries/%/dist-install, $(PACKAGES) $(PACKAGES_STAGE2))
-	"$(RM)" $(RM_OPTS) -r $(patsubst %, libraries/%/dist-boot, $(PACKAGES) $(PACKAGES_STAGE2))
 	"$(RM)" $(RM_OPTS) $(patsubst %, libraries/%/*.buildinfo, $(PACKAGES) $(PACKAGES_STAGE2))
 
+# We have to define a clean target for each library manually, because the
+# libraries/*/ghc.mk files are not included when we're cleaning.
+ifeq "$(CLEANING)" "YES"
+$(foreach lib,$(PACKAGES) $(PACKAGES_STAGE2),\
+  $(eval $(call clean-target,libraries/$(lib),dist-install,libraries/$(lib)/dist-install)))
+endif
+
 distclean : clean
 	"$(RM)" $(RM_OPTS) config.cache config.status config.log mk/config.h mk/stamp-h
 	"$(RM)" $(RM_OPTS) mk/config.mk mk/are-validating.mk mk/project.mk
+	"$(RM)" $(RM_OPTS) mk/config.mk.old mk/project.mk.old
 	"$(RM)" $(RM_OPTS) extra-gcc-opts docs/users_guide/ug-book.xml
-	"$(RM)" $(RM_OPTS) compiler/ghc.cabal ghc/ghc-bin.cabal
+	"$(RM)" $(RM_OPTS) compiler/ghc.cabal compiler/ghc.cabal.old
+	"$(RM)" $(RM_OPTS) ghc/ghc-bin.cabal
 	"$(RM)" $(RM_OPTS) libraries/base/include/HsBaseConfig.h
 	"$(RM)" $(RM_OPTS) libraries/directory/include/HsDirectoryConfig.h
 	"$(RM)" $(RM_OPTS) libraries/process/include/HsProcessConfig.h
 	"$(RM)" $(RM_OPTS) libraries/unix/include/HsUnixConfig.h
 	"$(RM)" $(RM_OPTS) libraries/old-time/include/HsTimeConfig.h
+
 	"$(RM)" $(RM_OPTS) $(patsubst %, libraries/%/config.log, $(PACKAGES) $(PACKAGES_STAGE2))
 	"$(RM)" $(RM_OPTS) $(patsubst %, libraries/%/config.status, $(PACKAGES) $(PACKAGES_STAGE2))
 	"$(RM)" $(RM_OPTS) $(patsubst %, libraries/%/include/Hs*Config.h, $(PACKAGES) $(PACKAGES_STAGE2))