From: simonmar <unknown>
Date: Wed, 24 Nov 1999 10:03:32 +0000 (+0000)
Subject: [project @ 1999-11-24 10:03:32 by simonmar]
X-Git-Tag: Approximately_9120_patches~5501
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=4a17dad0758d24f3b391b1805a068b6ffe1c6434;p=ghc-hetmet.git

[project @ 1999-11-24 10:03:32 by simonmar]
- remove -dcore-lint
- add Happy-generated files to MAINTAINER_CLEAN
- replace $(GHC_DRIVER_DIR)/ghc with $(GHC)
---

diff --git a/ghc/compiler/Makefile b/ghc/compiler/Makefile
index e94c91d..31e88f8 100644
--- a/ghc/compiler/Makefile
+++ b/ghc/compiler/Makefile
@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
-# $Id: Makefile,v 1.65 1999/09/17 09:11:20 simonpj Exp $
+# $Id: Makefile,v 1.66 1999/11/24 10:03:32 simonmar Exp $
 
 TOP = ..
 include $(TOP)/mk/boilerplate.mk
@@ -102,7 +102,7 @@ SRC_MKDEPENDC_OPTS += -D__GLASGOW_HASKELL__=$(ProjectVersionInt)
 ifneq "$(GhcWithHscBuiltViaC)" "YES"
 HC=$(WithGhcHc)
 else
-HC=$(GHC_DRIVER_DIR)/ghc
+HC=$(GHC)
 endif
 
 # magic from GNU make manual to convert a list of values
@@ -149,11 +149,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 -K2m -dcore-lint -fno-warn-incomplete-patterns
+rename/ParseIface_HC_OPTS 	+= -Onot -H45m -K2m -fno-warn-incomplete-patterns
 rename/ParseIface_HAPPY_OPTS    += -g
 
-parser/Parser_HC_OPTS 		+= -Onot -H45m -K2m -dcore-lint -fno-warn-incomplete-patterns
+parser/Parser_HC_OPTS 		+= -Onot -H64m -K2m -fno-warn-incomplete-patterns
 parser/Parser_HAPPY_OPTS    	+= -g
 
 ifeq "$(TARGETPLATFORM)" "hppa1.1-hp-hpux9"
@@ -286,7 +285,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
 
 
 #-----------------------------------------------------------------------------