X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fsuffix.mk;h=52c2d21e36f00368380c69802cd8e41da636050c;hb=22f40af747bb2d6b26b8755e539560db1c5814d1;hp=47b1a38b90c3ee4e815192ba514b7515b4050ffa;hpb=6086e2b7d9188e5da5296df9faf12f252c7888d9;p=ghc-hetmet.git

diff --git a/mk/suffix.mk b/mk/suffix.mk
index 47b1a38..52c2d21 100644
--- a/mk/suffix.mk
+++ b/mk/suffix.mk
@@ -30,17 +30,6 @@ endif
 #-----------------------------------------------------------------------------
 # Haskell Suffix Rules
 
-HC_SPLIT_PRE= \
- $(RM) $@ ; if [ ! -d $(basename $@) ]; then mkdir $(basename $@); else \
- find $(basename $@) -name '*.$(way_)o' -print | xargs $(RM) __rm_food ; fi
-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_OPTS += $(HC_POST__)
-SRC_HC_PRE_OPTS  += $(HC_PRE__)
-
 %.$(way_)o : %.hs
 	$(HC_PRE_OPTS)
 	$(HC) $(HC_OPTS) -c $< -o $@ -osuf $(subst .,,$(suffix $@))
@@ -64,6 +53,11 @@ 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 $@))
@@ -103,7 +97,7 @@ SRC_HC_PRE_OPTS  += $(HC_PRE__)
 .PRECIOUS: %.hs
 
 %.hs : %.ly
-	$(HAPPY) $(HAPPY_OPTS) -g $<
+	$(HAPPY) $(HAPPY_OPTS) $<
 
 #-----------------------------------------------------------------------------
 # Lx Suffix Rules
@@ -117,7 +111,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
@@ -145,6 +142,10 @@ SRC_HC_PRE_OPTS  += $(HC_PRE__)
 	@$(RM) $@
 	$(FLEX) -t $(FLEX_OPTS) $< > $@ || ( $(RM) $@ && exit 1 )
 
+# stubs are automatically generated and compiled by GHC
+%_stub.$(way_)o: %.o
+	@:
+
 #-----------------------------------------------------------------------------
 # Yacc stuff
 
@@ -168,18 +169,10 @@ SRC_HC_PRE_OPTS  += $(HC_PRE__)
 #
 # ToDo: make these more robust
 #
-%.dvi : %.tex
-	@$(RM) $@
-	$(LTX) $<
-
 %.ps : %.dvi
 	@$(RM) $@
 	dvips $< -o $@
 
-%.tex : %.verb
-	@$(RM) $*.tex
-	expand $*.verb | $(VERBATIM) > $*.tex
-
 %.tex : %.tib
 	@$(RM) $*.tex $*.verb-t.tex
 	$(TIB) $*.tib
@@ -201,29 +194,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
+%.ps : %.sgml
 	@$(RM) $@
-	$(SGML2INFO) $<
+	$(SGML2PS) $(SGML2PS_OPTS) $<
 
-%.txt : %.sgml
+%.rtf : %.sgml
 	@$(RM) $@
-	$(SGML2TXT) $<
+	$(SGML2RTF) $(SGML2RTF_OPTS) $<
 
 #-----------------------------------------------------------------------------
 # Literate suffix rules
@@ -235,10 +224,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 $< $@