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

diff --git a/mk/suffix.mk b/mk/suffix.mk
index 52c2d21..3f85bd2 100644
--- a/mk/suffix.mk
+++ b/mk/suffix.mk
@@ -34,20 +34,20 @@ endif
 	$(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 $@))
@@ -110,11 +110,16 @@ endif
 # Green-card Suffix Rules
 #
 
+.PRECIOUS: %.gc
+
 %.hs : %.gc
-	$(GREENCARD) $(GREENCARD_OPTS) $< -o $@
+	$(GREENCARD) $(GC_OPTS) $< -o $@
 
 %.lhs : %.gc
-	$(GREENCARD) $(GREENCARD_OPTS) $< -o $@
+	$(GREENCARD) $(GC_OPTS) $< -o $@
+
+%.gc : %.pgc
+	$(CPP) $(GC_CPP_OPTS) $< | perl -pe 's#\\n#\n#g' > $@
 
 #-----------------------------------------------------------------------------
 # C-related suffix rules
@@ -190,10 +195,6 @@ endif
 #-----------------------------------------------------------------------------
 # SGML suffix rules
 #
-%.sgml : %.vsgml
-	@$(RM) $@
-	expand $< | $(SGMLVERB) > $@
-
 %.dvi : %.sgml
 	@$(RM) $@
 	$(SGML2DVI) $(SGML2DVI_OPTS) $<
@@ -206,9 +207,12 @@ endif
 	@$(RM) $@
 	$(SGML2HTML) $(SGML2HTML_OPTS) $<
 
-%.ps : %.sgml
+%.html : %.tex
 	@$(RM) $@
-	$(SGML2PS) $(SGML2PS_OPTS) $<
+	$(HEVEA) $(HEVEA_OPTS) $(patsubst %.tex,%.hva,$<) $<
+	$(HEVEA) $(HEVEA_OPTS) $(patsubst %.tex,%.hva,$<) $<
+	$(HACHA) $(HACHA_OPTS) $(patsubst %.tex,%.html,$<)
+# Run HeVeA twice to resolve labels
 
 %.rtf : %.sgml
 	@$(RM) $@
@@ -238,6 +242,6 @@ endif
 # The default is to use the GNU resource compiler.
 #
 
-%.o : %.rc
+%.$(way_)o : %.$(way_)rc
 	@$(RM) $@
 	windres $< $@