[project @ 1998-04-16 10:03:50 by sof]

happy setup: move -g from suffix rule into Makefiles

diff --git a/ghc/compiler/Makefile b/ghc/compiler/Makefile
index 5674098..0bb394c 100644 (file)
--- a/ghc/compiler/Makefile
+++ b/ghc/compiler/Makefile
@@ -1,5 +1,5 @@
 # -----------------------------------------------------------------------------
-# $Id: Makefile,v 1.37 1998/03/08 22:44:44 simonpj Exp $
+# $Id: Makefile,v 1.38 1998/04/16 10:04:12 sof Exp $
 
 TOP = ..
 include $(TOP)/mk/boilerplate.mk
@@ -165,6 +165,7 @@ reader/Lex_HC_OPTS          = -K2m -H16m -fvia-C -DPROJECTVERSION=$(GhcProjectVersionInt
 reader/ReadPrefix_HC_OPTS      = -fvia-C '-\#include"hspincl.h"' -H10m
 
 rename/ParseIface_HC_OPTS      += -Onot -H30m -fno-warn-incomplete-patterns
+rename/ParseIface_HAPPY_OPTS    += -g
 
 ifeq "$(TARGETPLATFORM)" "hppa1.1-hp-hpux9"
 rename/RnMonad_HC_OPTS                 = -fvia-C -O2 -O2-for-C

diff --git a/mk/suffix.mk b/mk/suffix.mk
index 47b1a38..af86e44 100644 (file)
--- a/mk/suffix.mk
+++ b/mk/suffix.mk
@@ -103,7 +103,7 @@ SRC_HC_PRE_OPTS  += $(HC_PRE__)
 .PRECIOUS: %.hs
 
 %.hs : %.ly
-       $(HAPPY) $(HAPPY_OPTS) -g $<
+       $(HAPPY) $(HAPPY_OPTS) $<
 
 #-----------------------------------------------------------------------------
 # Lx Suffix Rules