X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2FMakefile;h=3524757263ecc488f1f891edcaf9483e103f5c68;hb=845db8182942e006a9164e41e9839adb39f24268;hp=e88bc3c2c8512f67bf04754984066dc315e91260;hpb=29d3022cebcb5b3eae5a27fb6947ca473c6673e2;p=ghc-hetmet.git

diff --git a/ghc/Makefile b/ghc/Makefile
index e88bc3c..3524757 100644
--- a/ghc/Makefile
+++ b/ghc/Makefile
@@ -1,5 +1,5 @@
 #-----------------------------------------------------------------------------
-# $Id: Makefile,v 1.19 2001/10/24 10:07:57 rrt Exp $
+# $Id: Makefile,v 1.25 2004/02/20 21:21:27 panne Exp $
 #
 
 TOP=.
@@ -18,31 +18,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 lib compiler driver
+SUBDIRS = includes rts docs compiler utils driver
 else
 ifneq "$(ILXized)" "YES"
-SUBDIRS = includes utils driver docs compiler rts lib
+SUBDIRS = includes utils driver docs compiler rts
 else
 # No RTS for ILX
-SUBDIRS = includes utils driver docs compiler lib
+SUBDIRS = includes 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