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

[ghc-hetmet.git] / mk / suffix.mk

diff --git a/mk/suffix.mk b/mk/suffix.mk
index 12ad26c..af86e44 100644 (file)
--- a/mk/suffix.mk
+++ b/mk/suffix.mk
@@ -38,18 +38,18 @@ HC_SPLIT_POST  = touch $@
 HC_PRE__       = $(patsubst %,$(HC_SPLIT_PRE) ; ,$(filter -split-objs,$(HC_OPTS)))
 HC_POST__      = $(patsubst %,$(HC_SPLIT_POST) ; ,$(filter -split-objs,$(HC_OPTS)))
 
-SRC_HC_POST += $(HC_POST__)
-SRC_HC_PRE  += $(HC_PRE__)
+SRC_HC_POST_OPTS += $(HC_POST__)
+SRC_HC_PRE_OPTS  += $(HC_PRE__)
 
 %.$(way_)o : %.hs
-       $(SRC_HC_PRE)
+       $(HC_PRE_OPTS)
        $(HC) $(HC_OPTS) -c $< -o $@ -osuf $(subst .,,$(suffix $@))
-       $(SRC_HC_POST)
+       $(HC_POST_OPTS)
                         
 %.$(way_)o : %.lhs      
-       $(SRC_HC_PRE)
+       $(HC_PRE_OPTS)
        $(HC) $(HC_OPTS) -c $< -o $@ -osuf $(subst .,,$(suffix $@))
-       $(SRC_HC_POST)
+       $(HC_POST_OPTS)
                         
 %.$(way_)hc : %.lhs     
        $(RM) $@
@@ -60,9 +60,14 @@ SRC_HC_PRE  += $(HC_PRE__)
        $(HC) $(HC_OPTS) -C $< -o $@
                         
 %.$(way_)o : %.$(way_)hc 
-       $(SRC_HC_PRE)
+       $(HC_PRE_OPTS)
        $(HC) $(HC_OPTS) -c $< -o $@ -osuf $(subst .,,$(suffix $@))
-       $(SRC_HC_POST)
+       $(HC_POST_OPTS)
+
+%.$(way_)s : %.$(way_)hc 
+       $(HC_PRE_OPTS)
+       $(HC) $(HC_OPTS) -S $< -o $@ -osuf $(subst .,,$(suffix $@))
+       $(HC_POST_OPTS)
 
 %.$(way_)hc : %.lhc
        @$(RM) $@
@@ -98,7 +103,7 @@ SRC_HC_PRE  += $(HC_PRE__)
 .PRECIOUS: %.hs
 
 %.hs : %.ly
-       $(HAPPY) $(HAPPY_OPTS) -g $<
+       $(HAPPY) $(HAPPY_OPTS) $<
 
 #-----------------------------------------------------------------------------
 # Lx Suffix Rules
@@ -125,6 +130,10 @@ SRC_HC_PRE  += $(HC_PRE__)
        @$(RM) $@
        $(CC) $(CC_OPTS) -c $< -o $@
 
+%.$(way_)o : %.S
+       @$(RM) $@
+       $(CC) $(CC_OPTS) -c $< -o $@
+
 #%.$(way_)s : %.c
 #      @$(RM) $@
 #      $(CC) $(CC_OPTS) -S $< -o $@