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

diff --git a/mk/suffix.mk b/mk/suffix.mk
index c4c2f7a..0268f5f 100644
--- a/mk/suffix.mk
+++ b/mk/suffix.mk
@@ -64,6 +64,16 @@ SRC_HC_PRE_OPTS  += $(HC_PRE__)
 	$(HC) $(HC_OPTS) -c $< -o $@ -osuf $(subst .,,$(suffix $@))
 	$(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) $@
 	$(UNLIT) $< $@
@@ -98,7 +108,7 @@ SRC_HC_PRE_OPTS  += $(HC_PRE__)
 .PRECIOUS: %.hs
 
 %.hs : %.ly
-	$(HAPPY) $(HAPPY_OPTS) -g $<
+	$(HAPPY) $(HAPPY_OPTS) $<
 
 #-----------------------------------------------------------------------------
 # Lx Suffix Rules
@@ -112,7 +122,10 @@ SRC_HC_PRE_OPTS  += $(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_OPTS  += $(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 $@