[project @ 2002-10-29 11:57:41 by chak]

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

diff --git a/ghc/compiler/Makefile b/ghc/compiler/Makefile
index 5104714..305399a 100644 (file)
--- a/ghc/compiler/Makefile
+++ b/ghc/compiler/Makefile
@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
-# $Id: Makefile,v 1.217 2002/05/11 10:02:21 panne Exp $
+# $Id: Makefile,v 1.224 2002/10/09 15:03:48 simonpj Exp $
 
 TOP = ..
 
@@ -11,6 +11,10 @@ endif
 
 include $(TOP)/mk/boilerplate.mk
 
+USER_SRCS = $(filter-out $(DERIVED_SRCS),$(SRCS))
+count :
+       ./count_lines $(USER_SRCS)
+
 #-----------------------------------------------------------------------------
 # Building ghc different ways (default is just `normal' sequential)
 WAYS=$(GhcCompilerWays)
@@ -25,7 +29,7 @@ WAYS=$(GhcCompilerWays)
 # equivalent of `env' if it doesn't exist locally).
 #
 ifneq "$(way)" "dll"
-ifneq "$(HOSTPLATFORM)" "i386-unknown-mingw32"
+ifneq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
 HS_PROG=ghc$(_way)-$(ProjectVersion)
 else
 HS_PROG=ghc$(_way)
@@ -102,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
@@ -125,22 +132,20 @@ compiling_with_4xx=NO
 else
 bootstrapped = $(shell if (test $(GhcCanonVersion) -ge $(ProjectVersionInt) -a $(GhcPatchLevel) -ge $(ProjectPatchLevel)); then echo YES; else echo NO; fi)
 compiling_with_4xx = $(shell if (test $(GhcCanonVersion) -lt 500); then echo YES; else echo NO; fi)
-ghc_502_at_least = $(shell if (test $(GhcCanonVersion) -ge 502); then echo YES; else echo NO; fi)
 endif
 
 # Only include GHCi if we're bootstrapping with at least version 411
-ifeq "$(GhcWithInterpreter)" "YES"
-ifeq "$(bootstrapped)" "YES"
-SRC_HC_OPTS += -DGHCI
-ALL_DIRS += ghci
-endif
-endif
-
-# Enable code that assumes a MSDOSish subshell. See mk/config.mk.in
-# for explanatory comment as to what this does.
-ifeq "$(HOSTPLATFORM)" "i386-unknown-mingw32"
-ghc_501_at_least = $(shell if (test $(GhcVanonVersion) -ge 5010); then echo YES; else echo NO; fi)
+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 -package readline 
 endif
+ALL_DIRS += ghci
+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, 
@@ -187,11 +192,15 @@ SRC_HC_OPTS += \
 # which needs it).
 SRC_MKDEPENDHS_OPTS += -I$(GHC_INCLUDE_DIR)
 
+# When bootstrapped, we don't make use of *any* packages
+# (except possibly readline if GHCi is enabled, see above)
+ifneq "$(bootstrapped)" "YES"
 ifneq "$(mingw32_HOST_OS)" "1"
 SRC_HC_OPTS += -package concurrent -package posix -package util
 else
 SRC_HC_OPTS += -package concurrent -package util
 endif
+endif
 
 SRC_CC_OPTS += -Iparser -I. -I$(TOP)/includes -O
 SRC_HC_OPTS += -recomp $(GhcHcOpts)
@@ -235,14 +244,6 @@ ifeq "$(bootstrapped)" "YES"
 utils/Binary_HC_OPTS           = -funbox-strict-fields
 endif
 
-# flags for PrimPacked:
-#
-# -monly-2-regs 
-#      because it contains 'ccall strlen' and 'ccall memcmp', which gets 
-#      inlined by gcc, causing a lack of registers.
-#
-utils/PrimPacked_HC_OPTS       = -fvia-C
-
 # ByteCodeItbls uses primops that the NCG doesn't support yet.
 ghci/ByteCodeItbls_HC_OPTS     = -fvia-C
 ghci/ByteCodeLink_HC_OPTS      = -fvia-C -monly-3-regs
@@ -371,10 +372,16 @@ endif
 # ----------------------------------------------------------------------------
 # profiling.
 
-rename/Rename_HC_OPTS += -auto-all
-rename/RnEnv_HC_OPTS += -auto-all
-rename/RnHiFiles_HC_OPTS += -auto-all
-rename/RnSource_HC_OPTS += -auto-all
+# rename/Rename_HC_OPTS += -auto-all
+# rename/RnEnv_HC_OPTS += -auto-all
+# rename/RnHiFiles_HC_OPTS += -auto-all
+# rename/RnIfaces_HC_OPTS += -auto-all
+# rename/RnSource_HC_OPTS += -auto-all
+# rename/RnBinds_HC_OPTS += -auto-all
+# rename/RnExpr_HC_OPTS += -auto-all
+# rename/RnHsSyn_HC_OPTS += -auto-all
+# rename/RnNames_HC_OPTS += -auto-all
+# rename/RnTypes_HC_OPTS += -auto-all
 
 #-----------------------------------------------------------------------------
 #              clean