From 24cc04d1f060d9efe02dd22631cf1848280cfb6d Mon Sep 17 00:00:00 2001
From: rrt <unknown>
Date: Wed, 20 Dec 2000 15:00:01 +0000
Subject: [PATCH] [project @ 2000-12-20 15:00:01 by rrt] Fixed GreenCard rules
 and flags (from GreenCard source).

---
 mk/opts.mk   |    6 +++---
 mk/suffix.mk |    4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/mk/opts.mk b/mk/opts.mk
index 5214983..33ff9d7 100644
--- a/mk/opts.mk
+++ b/mk/opts.mk
@@ -5,7 +5,7 @@
 #	This file defines Make variables for the
 #	option flags for each utility program
 #
-# 	$Id: opts.mk,v 1.17 2000/11/27 12:04:00 rrt Exp $
+# 	$Id: opts.mk,v 1.18 2000/12/20 15:00:01 rrt Exp $
 #
 #################################################################################
 
@@ -61,7 +61,7 @@ WAY$(_way)_LINT_OPTS	+= WAY$(_way)_CPP_OPTS
 SRC_BLD_DLL_OPTS += -mno-cygwin --target=i386-mingw32
 
 # Flags for CPP when running GreenCard on .pgc files
-GC_CPP_OPTS += -D__GLASGOW_HASKELL__
+GC_CPP_OPTS += -P -E -x c -traditional -D__GLASGOW_HASKELL__
 
 
 #################################################################################
@@ -88,7 +88,7 @@ CTAGS_OPTS         = $(SRC_CTAGS_OPTS) $(WAY$(_way)_CTAGS_OPTS) $(EXTRA_CTAGS_OP
 CC_OPTS            = $(SRC_CC_OPTS) $(WAY$(_way)_CC_OPTS) $($*_CC_OPTS) $(EXTRA_CC_OPTS)
 FLEX_OPTS          = $(SRC_FLEX_OPTS) $(WAY$(_way)_FLEX_OPTS) $(EXTRA_FLEX_OPTS)
 HAPPY_OPTS         = $(SRC_HAPPY_OPTS) $(WAY$(_way)_HAPPY_OPTS) $($*_HAPPY_OPTS) $(EXTRA_HAPPY_OPTS)
-GREENCARD_OPTS     = $(SRC_GREENCARD_OPTS) $(WAY$(_way)_GREENCARD_OPTS) $($*_GREENCARD_OPTS) $(EXTRA_GREENCARD_OPTS)
+GC_OPTS            = $(SRC_GC_OPTS) $(WAY$(_way)_GC_OPTS) $($*_GC_OPTS) $(EXTRA_GC_OPTS)
 HSTAGS_OPTS        = $(SRC_HSTAGS_OPTS) $(WAY$(_way)_HSTAGS_OPTS) $(EXTRA_HSTAGS_OPTS)
 INSTALL_OPTS       = $(SRC_INSTALL_OPTS) $(WAY$(_way)_INSTALL_OPTS) $(EXTRA_INSTALL_OPTS)
 INSTALL_BIN_OPTS   = $(INSTALL_OPTS) $(SRC_INSTALL_BIN_OPTS)
diff --git a/mk/suffix.mk b/mk/suffix.mk
index 9c427d1..3f85bd2 100644
--- a/mk/suffix.mk
+++ b/mk/suffix.mk
@@ -113,10 +113,10 @@ endif
 .PRECIOUS: %.gc
 
 %.hs : %.gc
-	$(GREENCARD) $(GREENCARD_OPTS) $< -o $@
+	$(GREENCARD) $(GC_OPTS) $< -o $@
 
 %.lhs : %.gc
-	$(GREENCARD) $(GREENCARD_OPTS) $< -o $@
+	$(GREENCARD) $(GC_OPTS) $< -o $@
 
 %.gc : %.pgc
 	$(CPP) $(GC_CPP_OPTS) $< | perl -pe 's#\\n#\n#g' > $@
-- 
1.7.10.4