X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fsuffix.mk;h=0849ba4e48945204cd33638bec8680fc3337b6d6;hb=46518c83e1d4a479eec18c7fa87d2df1d60ec07f;hp=6e212fff865d179c5360272a41928ffe8f8b0992;hpb=65d0aa7f89fb1aab35e3aa4980a249d9e60c1087;p=ghc-hetmet.git

diff --git a/mk/suffix.mk b/mk/suffix.mk
index 6e212ff..0849ba4 100644
--- a/mk/suffix.mk
+++ b/mk/suffix.mk
@@ -30,35 +30,24 @@ 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 $@))
 	$(HC_POST_OPTS)
-			 
+
 %.$(way_)o : %.lhs	 
 	$(HC_PRE_OPTS)
 	$(HC) $(HC_OPTS) -c $< -o $@ -osuf $(subst .,,$(suffix $@))
 	$(HC_POST_OPTS)
-			 
+
 %.$(way_)hc : %.lhs	 
 	$(RM) $@
 	$(HC) $(HC_OPTS) -C $< -o $@
-			 
+
 %.$(way_)hc : %.hs	 
 	$(RM) $@
 	$(HC) $(HC_OPTS) -C $< -o $@
-			 
+
 %.$(way_)o : %.$(way_)hc 
 	$(HC_PRE_OPTS)
 	$(HC) $(HC_OPTS) -c $< -o $@ -osuf $(subst .,,$(suffix $@))
@@ -153,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
 
@@ -176,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
@@ -209,29 +194,25 @@ SRC_HC_PRE_OPTS  += $(HC_PRE__)
 	@$(RM) $@
 	expand $< | $(SGMLVERB) > $@
 
-%.tex : %.sgml
-	@$(RM) $@
-	$(SGML2LATEX) $(SGML2LATEX_OPTS) -m --output=tex $<
-
 %.dvi : %.sgml
 	@$(RM) $@
-	$(SGML2LATEX) $(SGML2LATEX_OPTS) -m --output=dvi $<
+	$(SGML2DVI) $(SGML2DVI_OPTS) $<
 
 %.ps : %.sgml
 	@$(RM) $@
-	$(SGML2LATEX) $(SGML2LATEX_OPTS) -m --output=ps $<
+	$(SGML2PS) $(SGML2PS_OPTS) $<
 
 %.html : %.sgml
 	@$(RM) $@
 	$(SGML2HTML) $(SGML2HTML_OPTS) $<
 
-%.info : %.sgml
+%.ps : %.sgml
 	@$(RM) $@
-	$(SGML2INFO) $(SGML2INFO_OPTS) $<
+	$(SGML2PS) $(SGML2PS_OPTS) $<
 
-%.txt : %.sgml
+%.rtf : %.sgml
 	@$(RM) $@
-	$(SGML2TXT) $(SGML2TXT_OPTS) $<
+	$(SGML2RTF) $(SGML2RTF_OPTS) $<
 
 #-----------------------------------------------------------------------------
 # Literate suffix rules
@@ -250,3 +231,13 @@ SRC_HC_PRE_OPTS  += $(HC_PRE__)
 	@$(RM) $@
 	$(UNLIT) $(UNLIT_OPTS) $< $@
 	@chmod 444 $@
+
+#-----------------------------------------------------------------------------
+# Win32 resource files
+#
+# The default is to use the GNU resource compiler.
+#
+
+%.$(way_)o : %.$(way_)rc
+	@$(RM) $@
+	windres $< $@