X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=utils%2FMakefile;h=73685d85dd392e5afb82578274e0e6de9427fe56;hb=a9afdc24b1b2bbe63d71e8e2890770edfa8a6a8d;hp=4ecbd72b0ca8e96b5b43569e5c482b48891ed00a;hpb=eed437cdefb952e6c70e58012b23d436e74710af;p=ghc-hetmet.git

diff --git a/utils/Makefile b/utils/Makefile
index 4ecbd72..73685d8 100644
--- a/utils/Makefile
+++ b/utils/Makefile
@@ -3,24 +3,26 @@ include $(TOP)/mk/boilerplate.mk
 
 ifeq "$(DOING_BIN_DIST)" "YES"
 # We're doing a binary-dist, descend into a subset of the dirs.
-SUBDIRS = mkdirhier hasktags hp2ps parallel unlit runghc hpc pwd
+SUBDIRS = mkdirhier hp2ps parallel unlit
 else
 ifeq "$(BootingFromHc)" "YES"
 SUBDIRS = mkdependC mkdirhier runstdtest genapply genprimopcode unlit
 else
-SUBDIRS = mkdependC mkdirhier runstdtest hasktags hp2ps \
-	  installPackage parallel unlit genprimopcode genapply runghc hpc pwd
-endif
-ifneq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
-# lndir doesn't build on Windows
-SUBDIRS += lndir
+SUBDIRS = mkdependC mkdirhier runstdtest hp2ps \
+	  parallel unlit genprimopcode genapply
 endif
+#ifneq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
+## lndir doesn't build on Windows
+#SUBDIRS += lndir
+#endif
 endif
 
 ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
 SUBDIRS += touchy
 endif
 
+# XXX pwd and lndir building disabled for now
+
 # Utils that we don't build by default:
 #	nofib-analyse
 
@@ -53,13 +55,16 @@ boot ::
 	$(MAKE) -C genprimopcode
 endif
 
-WITH_BOOTSTRAPPING_COMPILER = ghc-pkg hsc2hs
+WITH_BOOTSTRAPPING_COMPILER = installPackage ghc-pkg hsc2hs hpc
 
-WITH_STAGE1 = ghc-pkg
+WITH_STAGE1 = installPackage ghc-pkg hasktags runghc hpc
 ifneq "$(NO_INSTALL_HSC2HS)" "YES"
 WITH_STAGE1 += hsc2hs
 endif
 
+# sort removes duplicates - we don't actually care about the order
+WITH_EITHER = $(sort $(WITH_BOOTSTRAPPING_COMPILER) $(WITH_STAGE1))
+
 with-bootstrapping-compiler: \
     $(foreach P,$(WITH_BOOTSTRAPPING_COMPILER),with-bootstrapping-compiler.$P)