X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2FMakefile;h=afdb50a0ca07a1b3f82d79d6397d67084b5db863;hb=31751ccacc24ebe5d15a0af84b10dc612d455440;hp=4d71792ff608b2ce53a5b60d697c206708152481;hpb=8c178b26e4ecfab8d830f77807f64461d3b09703;p=ghc-hetmet.git

diff --git a/ghc/Makefile b/ghc/Makefile
index 4d71792..afdb50a 100644
--- a/ghc/Makefile
+++ b/ghc/Makefile
@@ -1,5 +1,5 @@
 #-----------------------------------------------------------------------------
-# $Id: Makefile,v 1.21 2002/07/02 14:15:22 simonmar Exp $
+# $Id: Makefile,v 1.30 2005/03/02 14:35:05 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,16 +19,16 @@ 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
 
@@ -37,7 +38,15 @@ endif
 
 SRC_DIST_FILES += configure
 
-DIST_CLEAN_FILES += ghc.spec config.status
+# Clean everything created by configure:
+DIST_CLEAN_FILES += VERSION config.cache config.status ghc.spec \
+	docs/users_guide/ug-book.xml
+
+# don't clean version.mk: it's needed when cleaning stuff later on
+LATE_DIST_CLEAN_FILES += mk/config.mk 
+
+extraclean::
+	$(RM) -rf autom4te.cache
 
 ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
 # These files need to be in the InstallShield