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

diff --git a/mk/suffix.mk b/mk/suffix.mk
index c4c2f7a..c919c7a 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 $@
@@ -192,29 +209,25 @@ SRC_HC_PRE_OPTS  += $(HC_PRE__)
 	@$(RM) $@
 	expand $< | $(SGMLVERB) > $@
 
-%.tex : %.sgml
-	@$(RM) $@
-	$(SGML2LATEX) -m --output=tex $<
-
 %.dvi : %.sgml
 	@$(RM) $@
-	$(SGML2LATEX) -m --output=dvi $<
+	$(SGML2DVI) $(SGML2DVI_OPTS) $<
 
-%,ps : %.sgml
+%.ps : %.sgml
 	@$(RM) $@
-	$(SGML2LATEX) -m --output=ps $<
+	$(SGML2PS) $(SGML2PS_OPTS) $<
 
 %.html : %.sgml
 	@$(RM) $@
-	$(SGML2HTML) $<
+	$(SGML2HTML) $(SGML2HTML_OPTS) $<
 
 %.info : %.sgml
 	@$(RM) $@
-	$(SGML2INFO) $<
+	$(SGML2INFO) $(SGML2INFO_OPTS) $<
 
-%.txt : %.sgml
+%.rtf : %.sgml
 	@$(RM) $@
-	$(SGML2TXT) $<
+	$(SGML2RTF) $(SGML2RTF_OPTS) $<
 
 #-----------------------------------------------------------------------------
 # Literate suffix rules
@@ -226,10 +239,20 @@ SRC_HC_PRE_OPTS  += $(HC_PRE__)
 
 %.c : %.lc
 	@$(RM) $@
-	$(UNLIT) $< $@
+	$(UNLIT) $(UNLIT_OPTS) $< $@
 	@chmod 444 $@
 
 %.h : %.lh
 	@$(RM) $@
-	$(UNLIT) $< $@
+	$(UNLIT) $(UNLIT_OPTS) $< $@
 	@chmod 444 $@
+
+#-----------------------------------------------------------------------------
+# Win32 resource files
+#
+# The default is to use the GNU resource compiler.
+#
+
+%.o : %.rc
+	@$(RM) $@
+	windres $< $@