X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fsuffix.mk;h=60308b31dee878606dd7814ec9dba2a844409c4d;hb=e940363a7b70bc3373ebebeff5fe5075b5b141ec;hp=1efd5b469f0d6f828f060a294ec211449b7dcad0;hpb=52b327b9d76ca9b234d6ab05f18cd9c91d2c6607;p=ghc-hetmet.git

diff --git a/mk/suffix.mk b/mk/suffix.mk
index 1efd5b4..60308b3 100644
--- a/mk/suffix.mk
+++ b/mk/suffix.mk
@@ -30,48 +30,42 @@ 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__)
+# 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	 
 	$(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 $@))
+	$(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
@@ -90,18 +84,20 @@ SRC_HC_PRE_OPTS  += $(HC_PRE__)
 
 %.$(way_)hi : %.$(way_)o
 	@if [ ! -f $@ ] ; then \
-	    echo Panic! $< exists, but $@ does not. \
+	    echo Panic! $< exists, but $@ does not.; \
 	    exit 1; \
 	else exit 0 ; \
 	fi							
 
 %.$(way_)hi : %.$(way_)hc
 	@if [ ! -f $@ ] ; then \
-	    echo Panic! $< exists, but $@ does not. \
+	    echo Panic! $< exists, but $@ does not.; \
 	    exit 1; \
 	else exit 0 ; \
 	fi
 
+endif # BootingViaC
+
 #-----------------------------------------------------------------------------
 # Happy Suffix Rules
 #
@@ -110,6 +106,18 @@ SRC_HC_PRE_OPTS  += $(HC_PRE__)
 %.hs : %.ly
 	$(HAPPY) $(HAPPY_OPTS) $<
 
+%.hs : %.y
+	$(HAPPY) $(HAPPY_OPTS) $<
+
+#-----------------------------------------------------------------------------
+# hsc2hs Suffix Rules
+#
+ifneq "$(BootingFromHc)" "YES"
+%_hsc.c %_hsc.h %.hs : %.hsc
+	$(HSC2HS) $(HSC2HS_OPTS) $<
+	@touch $(patsubst %.hsc,%_hsc.c,$<)
+endif
+
 #-----------------------------------------------------------------------------
 # Lx Suffix Rules
 #
@@ -121,11 +129,16 @@ SRC_HC_PRE_OPTS  += $(HC_PRE__)
 # 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
@@ -153,6 +166,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
 
@@ -197,10 +214,6 @@ SRC_HC_PRE_OPTS  += $(HC_PRE__)
 #-----------------------------------------------------------------------------
 # SGML suffix rules
 #
-%.sgml : %.vsgml
-	@$(RM) $@
-	expand $< | $(SGMLVERB) > $@
-
 %.dvi : %.sgml
 	@$(RM) $@
 	$(SGML2DVI) $(SGML2DVI_OPTS) $<
@@ -211,16 +224,28 @@ SRC_HC_PRE_OPTS  += $(HC_PRE__)
 
 %.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) $<
+# touch the .html file so that it is seen to be built
+	@touch $@
 
-%.info : %.sgml
+%.html : %.tex
 	@$(RM) $@
-	$(SGML2INFO) $(SGML2INFO_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) $@
 	$(SGML2RTF) $(SGML2RTF_OPTS) $<
 
+%.pdf : %.sgml
+	@$(RM) $@
+	$(SGML2PDF) $(SGML2PDF_OPTS) $<
+
 #-----------------------------------------------------------------------------
 # Literate suffix rules
 
@@ -245,6 +270,13 @@ SRC_HC_PRE_OPTS  += $(HC_PRE__)
 # The default is to use the GNU resource compiler.
 #
 
-%.o : %.rc
+%.$(way_)o : %.$(way_)rc
 	@$(RM) $@
 	windres $< $@
+
+#-----------------------------------------------------------------------------
+# Preprocessor suffix rule
+
+% : %.pp
+	rm -f $@
+	$(CPP) $(CPP_OPTS) -x c $< | $(SED) -e '/^#/d' > $@