X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2FMakefile;h=8c83dcd479b71d1f7620ded092c63de56cef689b;hb=0d52a0a134871d317b5f8b53a952c882ce5ae5b6;hp=767ddc84cd7c7ddab6f4fdc43290d39227e29cc3;hpb=dbdd86ba6cd527756becd70941544f4d599e8141;p=ghc-hetmet.git

diff --git a/ghc/Makefile b/ghc/Makefile
index 767ddc8..8c83dcd 100644
--- a/ghc/Makefile
+++ b/ghc/Makefile
@@ -1,5 +1,5 @@
 #-----------------------------------------------------------------------------
-# $Id: Makefile,v 1.12 2000/11/03 17:08:36 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,17 +19,17 @@ 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 "$(GhcWithHscBuiltViaC)" "NO"
-SUBDIRS = includes utils driver rts docs compiler lib
+ifeq "$(BootingFromHc)" "YES"
+SUBDIRS = includes rts docs compiler lib utils driver
 else
-SUBDIRS = includes utils driver rts docs lib compiler
+ifneq "$(ILXized)" "YES"
+SUBDIRS = includes lib utils driver docs compiler rts
+else
+# No RTS for ILX
+SUBDIRS = includes lib utils driver docs compiler
 endif
-
-# Easier to copy
-ifeq "$(BIN_DIST)" "1"
-SUBDIRS := $(filter-out docs,$(SUBDIRS))
 endif
 
 ifeq ($(IncludeTestDirsInBuild),YES)
@@ -37,7 +38,16 @@ endif
 
 SRC_DIST_FILES += configure
 
-DIST_CLEAN_FILES += ghc.spec
-MAINTAINER_CLEAN_FILES += configure 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
+# INSTALL_DATAS rather than INSTALL_DOCS is used so these files go
+# in the top-level directory of the distribution
+INSTALL_DATAS += ANNOUNCE LICENSE README VERSION
+endif
 
 include $(TOP)/mk/target.mk