X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fsuffix.mk;h=af86e44739909e11e0b1a147abc3a7fa0ef0d2c0;hb=33939049908879995854acac39c3c85e250d1f9a;hp=12ad26c37f05e65dca1f12224c0037ac8b1fd20e;hpb=4586d01428cad472b2fbf050cd7cc00cd5d8b0a1;p=ghc-hetmet.git

diff --git a/mk/suffix.mk b/mk/suffix.mk
index 12ad26c..af86e44 100644
--- 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 $@