X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc.mk;h=1c86407b6198792fb011aaf91abdee1131df0130;hb=6826a75eee4b12835fc33bdf492b6079e3c6f5b7;hp=119e1be68fec61ce3737ca90bd5992b64914212d;hpb=f3aea765441184e9a1235dccd8ebc02d2eb4dc5a;p=ghc-hetmet.git

diff --git a/ghc.mk b/ghc.mk
index 119e1be..1c86407 100644
--- a/ghc.mk
+++ b/ghc.mk
@@ -165,8 +165,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 +316,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 +525,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
@@ -733,8 +744,13 @@ binary-dist:
 	$(RM) -f $(BIN_DIST_TAR)
 # h means "follow symlinks", e.g. if aclocal.m4 is a symlink to a source
 # tree then we want to include the real file, not a symlink to it
-	$(TAR) hcf $(BIN_DIST_TAR) -T $(BIN_DIST_LIST)
-	bzip2 < $(BIN_DIST_TAR) > $(BIN_DIST_TAR_BZ2)
+	$(TAR) hcf - -T $(BIN_DIST_LIST) | bzip2 -c >$(BIN_DIST_TAR_BZ2)
+
+nTimes = set -e; for i in `seq 1 $(1)`; do echo Try "$$i: $(2)"; if $(2); then break; fi; done
+
+.PHONY: publish-binary-dist
+publish-binary-dist:
+	$(call nTimes,10,$(PublishCp) $(BIN_DIST_TAR_BZ2) $(PublishLocation)/dist)
 
 # -----------------------------------------------------------------------------
 # Source distributions
@@ -832,14 +848,8 @@ sdist-manifest : $(SRC_DIST_TARBALL)
 # over SSH.
 ifneq "$(PublishLocation)" ""
 publish-sdist :
-	@for i in 0 1 2 3 4 5 6 7 8 9; do \
-		echo "Try $$i: $(PublishCp) $(SRC_DIST_EXTRALIBS_TARBALL) $(PublishLocation)/dist"; \
-		if $(PublishCp) $(SRC_DIST_EXTRALIBS_TARBALL) $(PublishLocation)/dist; then break; fi; \
-	done
-	@for i in 0 1 2 3 4 5 6 7 8 9; do \
-		echo "Try $$i: $(PublishCp) $(SRC_DIST_TARBALL) $(PublishLocation)/dist"; \
-		if $(PublishCp) $(SRC_DIST_TARBALL) $(PublishLocation)/dist; then break; fi; \
-	done
+	$(call nTimes,10,$(PublishCp) $(SRC_DIST_EXTRALIBS_TARBALL) $(PublishLocation)/dist)
+	$(call nTimes,10,$(PublishCp) $(SRC_DIST_TARBALL) $(PublishLocation)/dist)
 endif
 
 # -----------------------------------------------------------------------------