[project @ 2000-02-01 14:02:02 by sewardj]

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

diff --git a/ghc/compiler/Makefile b/ghc/compiler/Makefile
index ebd63f8..12085ee 100644 (file)
--- a/ghc/compiler/Makefile
+++ b/ghc/compiler/Makefile
@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
-# $Id: Makefile,v 1.60 1999/06/01 16:40:41 simonmar Exp $
+# $Id: Makefile,v 1.69 2000/01/25 10:15:55 simonmar Exp $
 
 TOP = ..
 include $(TOP)/mk/boilerplate.mk
@@ -8,13 +8,6 @@ include $(TOP)/mk/boilerplate.mk
 # Building hsc different ways (default is just `normal' sequential)
 WAYS=$(GhcCompilerWays)
 
-#-----------------------------------------------------------------------------
-#              Set SUBDIRS
-
-ifeq ($(IncludeTestDirsInBuild),YES)
-  SUBDIRS = tests
-endif
-
 # -----------------------------------------------------------------------------
 #              Set HS_PROG, LIBRARY
 
@@ -87,10 +80,7 @@ SRC_MKDEPENDC_OPTS += -D__GLASGOW_HASKELL__=$(ProjectVersionInt)
 
 # stuff you get for free in a source distribution
 # 
-# SRC_DIST_FILES += rename/ParseIface.hs \
-#  parser/U_tree.c parser/tree.h parser/tree.c \
-#  parser/hsparser.tab.c parser/hsparser.tab.h \
-#  parser/hslexer.c
+# SRC_DIST_FILES += rename/ParseIface.hs rename/Parser.hs
 
 # -----------------------------------------------------------------------------
 #              Haskell compilations
@@ -102,7 +92,7 @@ SRC_MKDEPENDC_OPTS += -D__GLASGOW_HASKELL__=$(ProjectVersionInt)
 ifneq "$(GhcWithHscBuiltViaC)" "YES"
 HC=$(WithGhcHc)
 else
-HC=$(GHC_DRIVER_DIR)/ghc
+HC=$(GHC_INPLACE)
 endif
 
 # magic from GNU make manual to convert a list of values
@@ -149,11 +139,10 @@ usageSP/UsageSPInf_HC_OPTS        = -Onot
 prelude/PrimOp_HC_OPTS                 = -H12m -K3m
 parser/Lex_HC_OPTS             = -K2m -H16m -fvia-C
 
-# -dcore-lint is *temporary* to work around ghc space leak.
-rename/ParseIface_HC_OPTS      += -Onot -H45m -dcore-lint -fno-warn-incomplete-patterns -dcore-lint
+rename/ParseIface_HC_OPTS      += -Onot -H45m -K2m -fno-warn-incomplete-patterns
 rename/ParseIface_HAPPY_OPTS    += -g
 
-parser/Parser_HC_OPTS          += -Onot -H45m -dcore-lint -fno-warn-incomplete-patterns -dcore-lint
+parser/Parser_HC_OPTS          += -Onot -H80m -optCrts-M80m -K2m -fno-warn-incomplete-patterns
 parser/Parser_HAPPY_OPTS       += -g
 
 ifeq "$(TARGETPLATFORM)" "hppa1.1-hp-hpux9"
@@ -232,11 +221,11 @@ SRC_C_OPTS     += -O -I. -IcodeGen
 
 parser/hschooks.o : parser/hschooks.c
        @$(RM) $@
-       $(HC) -c -o $@ -I$(GHC_INCLUDE_DIR) $(HC_OPTS) parser/hschooks.c
+       $(HC) -c -o $@ $(HC_OPTS) parser/hschooks.c
 
 
 # Interface-file parser uses Happy
-SRC_HAPPY_OPTS += +RTS -K2m -H10m -RTS
+SRC_HAPPY_OPTS += +RTS -K2m -H16m -RTS
 
 rename/ParseIface.hs : rename/ParseIface.y
        @$(RM) rename/ParseIface.hs rename/ParseIface.hinfo
@@ -286,7 +275,8 @@ endif
 CLEAN_FILES += $(wildcard */*.$(way_)o */*.$(way_)hi)
 
 # Extra tidy, remove the .hc files (if you've got them).
-MAINTAINER_CLEAN_FILES += $(wildcard */*.hc)
+MAINTAINER_CLEAN_FILES += $(wildcard */*.hc) \
+       parser/Parser.hs rename/ParseIface.hs
 
 
 #-----------------------------------------------------------------------------