merge up to ghc HEAD 16-Apr-2011

[ghc-hetmet.git] / ghc.mk

diff --git a/ghc.mk b/ghc.mk
index 738b5ca..76120ba 100644 (file)
--- a/ghc.mk
+++ b/ghc.mk
@@ -227,6 +227,7 @@ include rules/package-config.mk
 # -----------------------------------------------------------------------------
 # Building dependencies
 
+include rules/dependencies.mk
 include rules/build-dependencies.mk
 include rules/include-dependencies.mk
 
@@ -544,7 +545,6 @@ BUILD_DIRS += \
 
 ifneq "$(GhcUnregisterised)" "YES"
 BUILD_DIRS += \
-   $(GHC_MANGLER_DIR) \
    $(GHC_SPLIT_DIR)
 endif
 
@@ -920,7 +920,6 @@ $(eval $(call bindist,.,\
     $(includes_H_PLATFORM) \
     $(includes_H_FILES) \
     includes/ghcconfig.h \
-    includes/rts/Config.h \
     $(INSTALL_HEADERS) \
     $(INSTALL_LIBEXECS) \
     $(INSTALL_LIBEXEC_SCRIPTS) \
@@ -1219,7 +1218,7 @@ compiler/hetmet/Makefile:
        git submodule update --init compiler/hetmet
        cd compiler/hetmet/; git checkout master
 compiler/hetmet/build/CoqPass.hs: compiler/hetmet/Makefile $(wildcard compiler/hetmet/src/*.v) $(wildcard compiler/hetmet/src/*.hs)
-       cd compiler/hetmet; make
+       cd compiler/hetmet; make build/CoqPass.hs
 compiler/stage1/build/CoqPass.hs: compiler/hetmet/build/CoqPass.hs
        cp compiler/hetmet/build/CoqPass.hs $@
 compiler/stage2/build/CoqPass.hs: compiler/hetmet/build/CoqPass.hs