X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2FMakefile;h=ee14beb43d83ed72e5773b0f614dd7ac4d45a5f2;hb=25a96d106f30518aadfbcb0da4f44e849778773e;hp=d247d623310b36c36b723578ed3427609eb57938;hpb=438596897ebbe25a07e1c82085cfbc5bdb00f09e;p=ghc-hetmet.git

diff --git a/ghc/Makefile b/ghc/Makefile
index d247d62..ee14beb 100644
--- a/ghc/Makefile
+++ b/ghc/Makefile
@@ -1,5 +1,5 @@
 #-----------------------------------------------------------------------------
-# $Id: Makefile,v 1.8 1998/12/02 13:17:13 simonm Exp $
+# $Id: Makefile,v 1.22 2003/03/31 12:23:41 simonmar Exp $
 #
 
 TOP=.
@@ -14,21 +14,36 @@ include $(TOP)/mk/boilerplate.mk
 #
 
 #
-# Order is important! driver/ has to come before includes/ which
-# again has to come before the rest.
+# Order is important! It's e.g. necessary to descend into include/
+# 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 = utils driver includes rts docs compiler lib
+ifeq "$(BootingFromHc)" "YES"
+SUBDIRS = includes rts docs compiler utils driver
 else
-SUBDIRS = utils driver includes rts docs lib compiler
+ifneq "$(ILXized)" "YES"
+SUBDIRS = includes utils driver docs compiler rts
+else
+# No RTS for ILX
+SUBDIRS = includes utils driver docs compiler
+endif
+endif
+
+ifeq ($(IncludeTestDirsInBuild),YES)
+SUBDIRS += tests
 endif
 
-# Easier to copy
-ifeq "$(BIN_DIST)" "1"
-SUBDIRS := $(filter-out docs,$(SUBDIRS))
+SRC_DIST_FILES += configure
+
+DIST_CLEAN_FILES += ghc.spec config.status
+
+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