[project @ 2002-10-17 14:49:52 by simonmar]

[ghc-hetmet.git] / ghc / compiler / Makefile

diff --git a/ghc/compiler/Makefile b/ghc/compiler/Makefile
index 531ec2a..305399a 100644 (file)
--- a/ghc/compiler/Makefile
+++ b/ghc/compiler/Makefile
@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
-# $Id: Makefile,v 1.221 2002/09/06 14:35:43 simonmar Exp $
+# $Id: Makefile,v 1.224 2002/10/09 15:03:48 simonpj Exp $
 
 TOP = ..
 
@@ -106,6 +106,9 @@ ALL_DIRS = \
 # Make sure we include Config.hs even if it doesn't exist yet...
 ALL_SRCS += $(CONFIG_HS)
 
+# HsGeneric.hs is not used just now
+EXCLUDED_SRCS += hsSyn/HsGeneric.hs
+
 ifeq ($(GhcWithNativeCodeGen),YES)
 ALL_DIRS += nativeGen
 else
@@ -132,15 +135,17 @@ compiling_with_4xx = $(shell if (test $(GhcCanonVersion) -lt 500); then echo YES
 endif
 
 # Only include GHCi if we're bootstrapping with at least version 411
-ifeq "$(GhcWithInterpreter)" "YES"
-ifeq "$(bootstrapped)" "YES"
-SRC_HC_OPTS += -DGHCI -package readline
+ifeq "$(GhcWithInterpreter) $(bootstrapped)" "YES YES"
+# Yes, include the interepreter, readline, and Template Haskell extensions
+SRC_HC_OPTS += -DGHCI -package haskell-src
 ifneq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
-SRC_HC_OPTS += -package unix
+SRC_HC_OPTS += -package unix -package readline 
 endif
 ALL_DIRS += ghci
-endif
-endif
+else
+# No interpreter, so exclude Template Haskell modules
+EXCLUDED_SRCS += deSugar/DsMeta.hs typecheck/TcSplice.lhs hsSyn/Convert.lhs
+endif 
 
 # There are some C files to include in HS_PROG, so add these to HS_OBJS
 HS_OBJS         += $(C_OBJS)
@@ -170,7 +175,7 @@ space:= $(empty) $(empty)
 SRC_HC_OPTS += \
   -cpp -fglasgow-exts -Rghc-timing \
   -I. -IcodeGen -InativeGen -Iparser \
-  -i$(subst $(space),:,$(ALL_DIRS)) 
+  $(patsubst %, -i%, $(ALL_DIRS))
 
 # Omitted:     -I$(GHC_INCLUDE_DIR)
 # We should have -I$(GHC_INCLUDE_DIR) in SRC_HC_OPTS,