X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc.mk;h=690850d652f6c14b2a833c3c35cba6451cb7dabf;hb=f986a83107850e6031a0635d49fe99d8a3e9085e;hp=96b3c963ed18350a2323cec98226d22d50b7d9cd;hpb=c7217d65dcefdbdc0660f25af6b4fb354c80e239;p=ghc-hetmet.git

diff --git a/ghc.mk b/ghc.mk
index 96b3c96..690850d 100644
--- a/ghc.mk
+++ b/ghc.mk
@@ -26,10 +26,13 @@
 #
 # Once the new build system is in HEAD, and before 6.12:
 #
+#   * separate the logic of whether to do something from the test for
+#     existence of the tool to do it. For example, rather than checking
+#     if $DIR_DOCBOOK_XSL or $XSLTPROC is "", we should have a variable
+#     for controlling the building of the docs.
 #   * remove old Makefiles, add new stubs for building in subdirs
 #     * utils/hsc2hs/Makefile
 #     * utils/haddock/Makefile
-#     * mk/oldconfig.mk.in
 #     * docs/Makefile
 #     * docs/docbook-cheat-sheet/Makefile
 #     * docs/ext-core/Makefile
@@ -165,8 +168,6 @@ $(eval $(call clean-target,inplace,,inplace))
 # When we're just doing 'make clean' or 'make show', then we don't need
 # to build dependencies.
 
-NO_INCLUDE_DEPS = NO
-NO_INCLUDE_PKGDATA = NO
 ifneq "$(findstring clean,$(MAKECMDGOALS))" ""
 NO_INCLUDE_DEPS = YES
 NO_INCLUDE_PKGDATA = YES
@@ -318,6 +319,16 @@ endif
 
 PACKAGES += haskeline
 
+ifneq "$(wildcard libraries/dph)" ""
+PACKAGES += \
+	dph/dph-base \
+	dph/dph-prim-interface \
+	dph/dph-prim-seq \
+	dph/dph-prim-par \
+	dph/dph-seq \
+	dph/dph-par
+endif
+
 BOOT_PKGS = Cabal hpc extensible-exceptions
 
 # The actual .a and .so/.dll files: needed for dependencies.
@@ -517,6 +528,9 @@ $(foreach lib,$(PACKAGES),$(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
@@ -701,13 +715,13 @@ install_packages: libffi/package.conf.install rts/package.conf.install
 
 $(eval $(call bindist,.,\
     LICENSE \
-    configure config.sub config.guess \
+    configure config.sub config.guess install-sh \
     extra-gcc-opts.in \
     Makefile \
     mk/config.mk.in \
     $(INPLACE_BIN)/mkdirhier \
     $(INPLACE_BIN)/ghc-cabal \
-    utils/pwd/pwd \
+    utils/ghc-pwd/ghc-pwd \
 	$(BINDIST_WRAPPERS) \
 	$(BINDIST_LIBS) \
 	$(BINDIST_HI) \
@@ -727,7 +741,7 @@ $(eval $(call bindist,.,\
 binary-dist:
 	$(RM) -rf $(BIN_DIST_NAME)
 	mkdir $(BIN_DIST_NAME)
-	set -e; for i in LICENSE compiler ghc rts libraries utils gmp docs libffi includes driver mk rules Makefile aclocal.m4 config.sub config.guess extra-gcc-opts.in ghc.mk inplace; do ln -s ../$$i $(BIN_DIST_NAME)/; done
+	set -e; for i in LICENSE compiler ghc rts libraries utils gmp docs libffi includes driver mk rules Makefile aclocal.m4 config.sub config.guess install-sh extra-gcc-opts.in ghc.mk inplace; do ln -s ../$$i $(BIN_DIST_NAME)/; done
 	ln -s ../distrib/configure-bin.ac $(BIN_DIST_NAME)/configure.ac
 	cd $(BIN_DIST_NAME) && autoreconf
 	$(RM) -f $(BIN_DIST_TAR)
@@ -841,11 +855,20 @@ publish-sdist :
 	$(call nTimes,10,$(PublishCp) $(SRC_DIST_TARBALL) $(PublishLocation)/dist)
 endif
 
+ifeq "$(GhcUnregisterised)" "YES"
+SRC_CC_OPTS += -DNO_REGS -DUSE_MINIINTERPRETER
+endif
+
 # -----------------------------------------------------------------------------
 # Cleaning
 
 .PHONY: clean
 
+CLEAN_FILES += utils/ghc-pwd/ghc-pwd
+CLEAN_FILES += utils/ghc-pwd/ghc-pwd.exe
+CLEAN_FILES += utils/ghc-pwd/ghc-pwd.hi
+CLEAN_FILES += utils/ghc-pwd/ghc-pwd.o
+
 clean : clean_files
 .PHONY: clean_files
 clean_files :