X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2FMakefile;h=8c83dcd479b71d1f7620ded092c63de56cef689b;hb=6d36af4aff6e12afa50dae2fad3993c385f8081d;hp=5d130692ffc13e1a70332f7f45157b4332cd6163;hpb=2cc5b907318f97e19b28b2ad8ed9ff8c1f401dcc;p=ghc-hetmet.git

diff --git a/ghc/Makefile b/ghc/Makefile
index 5d13069..8c83dcd 100644
--- a/ghc/Makefile
+++ b/ghc/Makefile
@@ -1,5 +1,5 @@
 #-----------------------------------------------------------------------------
-# $Id: Makefile,v 1.20 2002/02/12 15:17:13 simonmar Exp $
+# $Id: Makefile,v 1.26 2004/11/11 09:36:55 simonmar Exp $
 #
 
 TOP=.
@@ -8,6 +8,7 @@ include $(TOP)/mk/boilerplate.mk
 #
 # subdir dependencies:
 #	everything needs utils
+#	utils needs lib
 #	includes/ needs driver (to easily c.pile mkNativeGen.c)
 #	make depend except in {utils,driver} needs includes	
 #	RTS and compiler need includes
@@ -18,31 +19,29 @@ include $(TOP)/mk/boilerplate.mk
 # before the rest to have a config.h, etc.
 #
 # If we're booting from .hc files, swap the order
-# we descend into compiler/ and lib/.
+# we descend into subdirs - to boot utils must be before driver.
 #
 ifeq "$(BootingFromHc)" "YES"
-SUBDIRS = includes utils rts docs compiler driver
+SUBDIRS = includes rts docs compiler lib utils driver
 else
 ifneq "$(ILXized)" "YES"
-SUBDIRS = includes utils driver docs compiler rts
+SUBDIRS = includes lib utils driver docs compiler rts
 else
 # No RTS for ILX
-SUBDIRS = includes utils driver docs compiler
+SUBDIRS = includes lib utils driver docs compiler
 endif
 endif
 
-# Easier to copy
-ifeq "$(BIN_DIST)" "1"
-SUBDIRS := $(filter-out docs,$(SUBDIRS))
-endif
-
 ifeq ($(IncludeTestDirsInBuild),YES)
 SUBDIRS += tests
 endif
 
 SRC_DIST_FILES += configure
 
-DIST_CLEAN_FILES += ghc.spec config.status
+DIST_CLEAN_FILES += config.cache config.status ghc.spec
+
+extraclean::
+	$(RM) -rf autom4te.cache
 
 ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
 # These files need to be in the InstallShield