X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=utils%2FMakefile;h=e679dfac7bfc0c27c9edba81bf9cac982d7009ed;hp=b4a7ba1c0fac0359d0026277fb987163f73d619a;hb=04a42d01c41923baf66eacabf6ffb22dfe367108;hpb=93e677f64e39c2398c630d2ddff00b1bff0bf401

diff --git a/utils/Makefile b/utils/Makefile
index b4a7ba1..e679dfa 100644
--- a/utils/Makefile
+++ b/utils/Makefile
@@ -1,27 +1,25 @@
 TOP=..
 include $(TOP)/mk/boilerplate.mk
 
-ifneq "$(BIN_DIST_NAME)" ""
+ifeq "$(DOING_BIN_DIST)" "YES"
 # We're doing a binary-dist, descend into a subset of the dirs.
-SUBDIRS = hp2ps unlit
+SUBDIRS = mkdirhier ghc-pkg hasktags hp2ps hsc2hs parallel prof unlit runghc hpc pwd
 else
 ifeq "$(BootingFromHc)" "YES"
 SUBDIRS = mkdependC mkdirhier runstdtest genapply genprimopcode ghc-pkg unlit
 else
 SUBDIRS = mkdependC mkdirhier runstdtest ghc-pkg hasktags hp2ps hsc2hs \
-	  parallel prof unlit genprimopcode genapply runghc
+	  parallel prof unlit genprimopcode genapply runghc hpc
 endif
-endif
-
-ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
-SUBDIRS += touchy
-endif
-
 ifneq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
 # lndir doesn't build on Windows
 SUBDIRS += lndir
 endif
+endif
 
+ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
+SUBDIRS += touchy
+endif
 
 # Utils that we don't build by default:
 #	nofib-analyse
@@ -42,4 +40,16 @@ endif
 #  unlikely to want it desperately.  It is easy to build once you have
 #  a Haskell compiler and if you want it.
 
+binary-dist:
+	$(INSTALL_DIR)           $(BIN_DIST_DIR)/utils
+	$(INSTALL_DATA) Makefile $(BIN_DIST_DIR)/utils/
+	set -e; for d in $(SUBDIRS); do $(MAKE) -C $$d binary-dist; done
+
 include $(TOP)/mk/target.mk
+
+# genprimopcode is needed to boot in ghc/compiler...
+ifneq "$(BootingFromHc)" "YES"
+boot ::
+	$(MAKE) -C genprimopcode
+endif
+