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

diff --git a/mk/suffix.mk b/mk/suffix.mk
index 12ad26c..0268f5f 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,19 @@ 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_)o : %.hc 
+	$(HC_PRE_OPTS)
+	$(HC) $(HC_OPTS) -c $< -o $@ -osuf $(subst .,,$(suffix $@))
+	$(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 +108,7 @@ SRC_HC_PRE  += $(HC_PRE__)
 .PRECIOUS: %.hs
 
 %.hs : %.ly
-	$(HAPPY) $(HAPPY_OPTS) -g $<
+	$(HAPPY) $(HAPPY_OPTS) $<
 
 #-----------------------------------------------------------------------------
 # Lx Suffix Rules
@@ -112,7 +122,10 @@ SRC_HC_PRE  += $(HC_PRE__)
 #
 
 %.hs : %.gc
-	$(GREENCARD) $(GREENCARD_OPTS) $<
+	$(GREENCARD) $(GREENCARD_OPTS) $< -o $@
+
+%.lhs : %.gc
+	$(GREENCARD) $(GREENCARD_OPTS) $< -o $@
 
 #-----------------------------------------------------------------------------
 # C-related suffix rules
@@ -125,6 +138,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 $@