X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fsuffix.mk;h=96a04033f2df532abf23cb85f41f4d71bb21c65a;hb=57c3ca2603ef0f2358d8d246bff1dd47ef97e843;hp=51b8fff3ed3935a8c7b2dde30f7e7fe46a03d8c1;hpb=c89ede7058c7c1d594e9071332780934a41a05ff;p=ghc-hetmet.git

diff --git a/mk/suffix.mk b/mk/suffix.mk
index 51b8fff..96a0403 100644
--- a/mk/suffix.mk
+++ b/mk/suffix.mk
@@ -30,14 +30,19 @@ endif
 #-----------------------------------------------------------------------------
 # Haskell Suffix Rules
 
+# Turn off all the Haskell suffix rules if we're booting from .hc
+# files.  The file bootstrap.mk contains alternative suffix rules in
+# this case.
+ifneq "$(BootingFromHc)" "YES"
+
 %.$(way_)o : %.hs
 	$(HC_PRE_OPTS)
-	$(HC) $(HC_OPTS) -c $< -o $@ -osuf $(subst .,,$(suffix $@))
+	$(HC) $(HC_OPTS) -c $< -o $@
 	$(HC_POST_OPTS)
 
 %.$(way_)o : %.lhs	 
 	$(HC_PRE_OPTS)
-	$(HC) $(HC_OPTS) -c $< -o $@ -osuf $(subst .,,$(suffix $@))
+	$(HC) $(HC_OPTS) -c $< -o $@
 	$(HC_POST_OPTS)
 
 %.$(way_)hc : %.lhs	 
@@ -50,17 +55,17 @@ endif
 
 %.$(way_)o : %.$(way_)hc 
 	$(HC_PRE_OPTS)
-	$(HC) $(HC_OPTS) -c $< -o $@ -osuf $(subst .,,$(suffix $@))
+	$(HC) $(HC_OPTS) -c $< -o $@
 	$(HC_POST_OPTS)
 
 %.$(way_)o : %.hc 
 	$(HC_PRE_OPTS)
-	$(HC) $(HC_OPTS) -c $< -o $@ -osuf $(subst .,,$(suffix $@))
+	$(HC) $(HC_OPTS) -c $< -o $@
 	$(HC_POST_OPTS)
 
 %.$(way_)s : %.$(way_)hc 
 	$(HC_PRE_OPTS)
-	$(HC) $(HC_OPTS) -S $< -o $@ -osuf $(subst .,,$(suffix $@))
+	$(HC) $(HC_OPTS) -S $< -o $@
 	$(HC_POST_OPTS)
 
 %.$(way_)hc : %.lhc
@@ -91,6 +96,8 @@ endif
 	else exit 0 ; \
 	fi
 
+endif # BootingViaC
+
 #-----------------------------------------------------------------------------
 # Happy Suffix Rules
 #
@@ -99,6 +106,17 @@ endif
 %.hs : %.ly
 	$(HAPPY) $(HAPPY_OPTS) $<
 
+%.hs : %.y
+	$(HAPPY) $(HAPPY_OPTS) $<
+
+#-----------------------------------------------------------------------------
+# hsc2hs Suffix Rules
+#
+ifneq "$(BootingFromHc)" "YES"
+%_hsc.c %_hsc.h %.hs : %.hsc
+	$(HSC2HS) $<
+endif
+
 #-----------------------------------------------------------------------------
 # Lx Suffix Rules
 #
@@ -113,10 +131,10 @@ endif
 .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' > $@
@@ -205,18 +223,26 @@ endif
 
 %.html : %.sgml
 	@$(RM) $@
+#	$(PERL) $(COLLATEINDEX) -N -o index.sgml
+#	$(JADE) -t sgml -V html-index -d $(SGMLSTYLESHEET) -c $(DOCBOOK_CATALOG) $<
+#	$(PERL) $(COLLATEINDEX) -N -o index.sgml
 	$(SGML2HTML) $(SGML2HTML_OPTS) $<
 
 %.html : %.tex
 	@$(RM) $@
-	$(LATEX2HTML) $(LATEX2HTML_OPTS) $(patsubst %.tex,%.hva,$<) $<
-	$(LATEX2HTML) $(LATEX2HTML_OPTS) $(patsubst %.tex,%.hva,$<) $<
-# Make twice to resolve xrefs
+	$(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) $@
 	$(SGML2RTF) $(SGML2RTF_OPTS) $<
 
+%.pdf : %.sgml
+	@$(RM) $@
+	$(SGML2PDF) $(SGML2PDF_OPTS) $<
+
 #-----------------------------------------------------------------------------
 # Literate suffix rules