X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc.mk;h=f25163588ef58d15194f9a82b8c42b7ea0f122cf;hb=e86d72733e4eeda752a1b0b2874dd58090eae197;hp=4d2a29a0841790c0f8bbe6bf9e68ac07ec144aa6;hpb=7afa90fe13588f1cc0d2dd2e1ae16ef77496490c;p=ghc-hetmet.git

diff --git a/ghc.mk b/ghc.mk
index 4d2a29a..f251635 100644
--- a/ghc.mk
+++ b/ghc.mk
@@ -320,7 +320,6 @@ endif
 
 PACKAGES += haskeline
 
-ifneq "$(wildcard libraries/dph)" ""
 PACKAGES_STAGE2 += \
 	dph/dph-base \
 	dph/dph-prim-interface \
@@ -328,7 +327,6 @@ PACKAGES_STAGE2 += \
 	dph/dph-prim-par \
 	dph/dph-seq \
 	dph/dph-par
-endif
 
 BOOT_PKGS = Cabal hpc extensible-exceptions
 
@@ -488,10 +486,10 @@ BUILD_DIRS += \
    utils/haddock/doc \
    $(patsubst %, libraries/%, $(PACKAGES)) \
    $(patsubst %, libraries/%, $(PACKAGES_STAGE2)) \
+   libraries/dph \
    compiler \
    $(GHC_HSC2HS_DIR) \
    $(GHC_PKG_DIR) \
-   utils/hasktags \
    utils/hpc \
    utils/runghc \
    ghc
@@ -522,7 +520,6 @@ ifneq "$(findstring $(phase),0 1 2 3)" ""
 utils/haddock_dist_DISABLE = YES
 utils/runghc_dist_DISABLE = YES
 utils/hpc_dist_DISABLE = YES
-utils/hasktags_dist_DISABLE = YES
 utils/hsc2hs_dist-install_DISABLE = YES
 utils/ghc-pkg_dist-install_DISABLE = YES
 compiler_stage2_DISABLE = YES
@@ -533,9 +530,6 @@ $(foreach lib,$(PACKAGES) $(PACKAGES_STAGE2),$(eval \
   libraries/$(lib)_dist-install_DISABLE = YES))
 endif
 
-ifneq "$(wildcard libraries/dph)" ""
-include libraries/dph/ghc.mk
-endif
 include $(patsubst %, %/ghc.mk, $(BUILD_DIRS))
 
 # We need -fno-warn-deprecated-flags to avoid failure with -Werror
@@ -893,7 +887,11 @@ maintainer-clean : distclean
 	$(RM) configure mk/config.h.in
 	$(RM) -r autom4te.cache libraries/*/autom4te.cache
 	$(RM) ghc.spec
-	$(RM) libraries/*/GNUmakefile libraries/*/ghc.mk libraries/*/configure 
+	$(RM) $(patsubst %, libraries/%/GNUmakefile, \
+	        $(PACKAGES) $(PACKAGES_STAGE2))
+	$(RM) $(patsubst %, libraries/%/ghc.mk, $(PACKAGES) $(PACKAGES_STAGE2))
+	$(RM) $(patsubst %, libraries/%/configure, \
+	        $(PACKAGES) $(PACKAGES_STAGE2))
 	$(RM) libraries/base/include/HsBaseConfig.h.in
 	$(RM) libraries/directory/include/HsDirectoryConfig.h.in
 	$(RM) libraries/process/include/HsProcessConfig.h.in