X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=utils%2FMakefile;h=82eec81756cb63d17266d0578d7c98d99209e12e;hb=09d76f81a7b77139901a73f9f241d26a5bdd3796;hp=972716feb85b425f1ef8f2238cf768aac2726c39;hpb=c9f955eeac2e055c5f9d4d56ee8248ed687f9917;p=ghc-hetmet.git

diff --git a/utils/Makefile b/utils/Makefile
index 972716f..82eec81 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 ghc-pkg hasktags hp2ps parallel unlit runghc hpc pwd
+SUBDIRS = mkdirhier hp2ps parallel unlit
 else
 ifeq "$(BootingFromHc)" "YES"
-SUBDIRS = mkdependC mkdirhier runstdtest genapply genprimopcode ghc-pkg unlit
+SUBDIRS = mkdependC mkdirhier runstdtest genapply genprimopcode unlit
 else
-SUBDIRS = mkdependC mkdirhier runstdtest ghc-pkg 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,14 +55,38 @@ boot ::
 	$(MAKE) -C genprimopcode
 endif
 
-with-bootstrapping-compiler:
-	$(MAKE) -C hsc2hs with-bootstrapping-compiler
+WITH_BOOTSTRAPPING_COMPILER = installPackage ghc-pkg hsc2hs hpc
 
+WITH_STAGE1 = installPackage ghc-pkg hasktags runghc hpc
 ifneq "$(NO_INSTALL_HSC2HS)" "YES"
-with-stage-1:
-	$(MAKE) -C hsc2hs with-stage-1
-
-install ::
-	$(MAKE) -C hsc2hs install
+WITH_STAGE1 += hsc2hs
 endif
 
+# sort removes duplicates - we don't actually care about the order
+WITH_EITHER = $(sort $(WITH_BOOTSTRAPPING_COMPILER) $(WITH_STAGE1))
+
+clean:: $(foreach P,$(WITH_EITHER),clean.$P)
+
+with-bootstrapping-compiler: \
+    $(foreach P,$(WITH_BOOTSTRAPPING_COMPILER),with-bootstrapping-compiler.$P)
+
+with-stage-1: $(foreach P,$(WITH_STAGE1),with-stage-1.$P)
+
+install:: $(foreach P,$(WITH_STAGE1),install.$P)
+
+$(foreach P,$(WITH_EITHER),clean.$P): \
+clean.%:
+	$(MAKE) -C $* clean
+
+$(foreach P,$(WITH_BOOTSTRAPPING_COMPILER),with-bootstrapping-compiler.$P): \
+with-bootstrapping-compiler.%:
+	$(MAKE) -C $* with-bootstrapping-compiler
+
+$(foreach P,$(WITH_STAGE1),with-stage-1.$P): \
+with-stage-1.%:
+	$(MAKE) -C $* with-stage-1
+
+$(foreach P,$(WITH_STAGE1),install.$P): \
+install.%:
+	$(MAKE) -C $* install
+