X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Futils%2FMakefile;h=34ff7a44ba5e5e69cee5385b31e7b71399944f85;hb=0f8bc60689203fa9b7ce4a01b72e6022b3d1877d;hp=78554154dfc55eca9645597c2aefe27b76bcb62c;hpb=e79bf06e21221a04c4b05a1805ea511ba73796ce;p=ghc-hetmet.git

diff --git a/ghc/utils/Makefile b/ghc/utils/Makefile
index 7855415..34ff7a4 100644
--- a/ghc/utils/Makefile
+++ b/ghc/utils/Makefile
@@ -1,26 +1,24 @@
 TOP=..
 include $(TOP)/mk/boilerplate.mk
 
-#
-# No ways stuff in here (and further below), please
-#
-override WAYS=
-export WAYS=
-
 ifneq "$(BIN_DIST_NAME)" ""
 # We're doing a binary-dist, descend into a subset of the dirs.
-SUBDIRS = hp2ps hscpp hstags mkdependHS stat2resid unlit
+SUBDIRS = hp2ps stat2resid unlit
+else
+ifeq "$(BootingFromHc)" "YES"
+SUBDIRS = hp2ps parallel stat2resid prof unlit
 else
-SUBDIRS = hp2ps		\
-	  hscpp		\
-	  hstags	\
-	  mkdependHS	\
-	  parallel	\
-	  stat2resid	\
-	  ugen		\
-	  unlit
+SUBDIRS = hasktags ghc-pkg hp2ps hsc2hs parallel stat2resid prof unlit genprimopcode
+endif
 endif
 
+ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
+SUBDIRS += touchy
+endif
+
+# hstags died when the new parser was introduced.
+#	  hstags	\
+
 # "heap-view" is not in the list because (a) it requires
 #  a Haskell compiler (which you may not have yet), and (b) you are
 #  unlikely to want it desperately.  It is easy to build once you have