X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fsuffix.mk;h=af86e44739909e11e0b1a147abc3a7fa0ef0d2c0;hb=33939049908879995854acac39c3c85e250d1f9a;hp=4b6d966c5231bdf65222dbb3e70d20c9b25d465f;hpb=ea9845c67bf947d7c878c7aaf687106c40c52989;p=ghc-hetmet.git

diff --git a/mk/suffix.mk b/mk/suffix.mk
index 4b6d966..af86e44 100644
--- a/mk/suffix.mk
+++ b/mk/suffix.mk
@@ -38,18 +38,18 @@ 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 += $(HC_POST__)
-SRC_HC_PRE  += $(HC_PRE__)
+SRC_HC_POST_OPTS += $(HC_POST__)
+SRC_HC_PRE_OPTS  += $(HC_PRE__)
 
 %.$(way_)o : %.hs
-	$(SRC_HC_PRE)
+	$(HC_PRE_OPTS)
 	$(HC) $(HC_OPTS) -c $< -o $@ -osuf $(subst .,,$(suffix $@))
-	$(SRC_HC_POST)
+	$(HC_POST_OPTS)
 			 
 %.$(way_)o : %.lhs	 
-	$(SRC_HC_PRE)
+	$(HC_PRE_OPTS)
 	$(HC) $(HC_OPTS) -c $< -o $@ -osuf $(subst .,,$(suffix $@))
-	$(SRC_HC_POST)
+	$(HC_POST_OPTS)
 			 
 %.$(way_)hc : %.lhs	 
 	$(RM) $@
@@ -60,9 +60,14 @@ SRC_HC_PRE  += $(HC_PRE__)
 	$(HC) $(HC_OPTS) -C $< -o $@
 			 
 %.$(way_)o : %.$(way_)hc 
-	$(SRC_HC_PRE)
+	$(HC_PRE_OPTS)
 	$(HC) $(HC_OPTS) -c $< -o $@ -osuf $(subst .,,$(suffix $@))
-	$(SRC_HC_POST)
+	$(HC_POST_OPTS)
+
+%.$(way_)s : %.$(way_)hc 
+	$(HC_PRE_OPTS)
+	$(HC) $(HC_OPTS) -S $< -o $@ -osuf $(subst .,,$(suffix $@))
+	$(HC_POST_OPTS)
 
 %.$(way_)hc : %.lhc
 	@$(RM) $@
@@ -98,7 +103,7 @@ SRC_HC_PRE  += $(HC_PRE__)
 .PRECIOUS: %.hs
 
 %.hs : %.ly
-	$(HAPPY) $(HAPPY_OPTS) -g $<
+	$(HAPPY) $(HAPPY_OPTS) $<
 
 #-----------------------------------------------------------------------------
 # Lx Suffix Rules
@@ -125,6 +130,10 @@ SRC_HC_PRE  += $(HC_PRE__)
 	@$(RM) $@
 	$(CC) $(CC_OPTS) -c $< -o $@
 
+%.$(way_)o : %.S
+	@$(RM) $@
+	$(CC) $(CC_OPTS) -c $< -o $@
+
 #%.$(way_)s : %.c
 #	@$(RM) $@
 #	$(CC) $(CC_OPTS) -S $< -o $@
@@ -188,11 +197,9 @@ SRC_HC_PRE  += $(HC_PRE__)
 #-----------------------------------------------------------------------------
 # SGML suffix rules
 #
-# make sure these don't conflict with the literate rules!
-
 %.sgml : %.vsgml
 	@$(RM) $@
-	expand $*.verb | $(SGMLVERB) > $@
+	expand $< | $(SGMLVERB) > $@
 
 %.tex : %.sgml
 	@$(RM) $@
@@ -202,10 +209,9 @@ SRC_HC_PRE  += $(HC_PRE__)
 	@$(RM) $@
 	$(SGML2LATEX) -m --output=dvi $<
 
-# Not yet: we already have a %.ps : %.dvi rule, this one would conflict.
-#%,ps : %.sgml
-#	@$(RM) $@
-#	$(SGML2LATEX) -m --output=ps $<
+%,ps : %.sgml
+	@$(RM) $@
+	$(SGML2LATEX) -m --output=ps $<
 
 %.html : %.sgml
 	@$(RM) $@
@@ -222,197 +228,17 @@ SRC_HC_PRE  += $(HC_PRE__)
 #-----------------------------------------------------------------------------
 # Literate suffix rules
 
-# ToDo: somehow macroize this lot. (if only!)
-
-%.itxi : %.lit
-	@$(RM) $@
-	$(LIT2TEXI) -c $(LIT2TEXI_OPTS) -o $@ $<
-	@chmod 444 $@
-
-%.txt : %.lit
-	@$(RM) $@
-	$(LIT2TEXT) $(LIT2TEXT_OPTS) -o $@ $<
-	@chmod 444 $@
-
-%.ihtml : %.lit
-	@$(RM) $@
-	$(LIT2HTML) -c $(LIT2HTML_OPTS) -o $@ $<
-	@chmod 444 $@
-
-%.itex : %.lit
-	@$(RM) $@
-	$(LIT2LATEX) -c $(LIT2LATEX_OPTS) -o $@ $<
-	@chmod 444 $@
-
-#
-# Produce stand-alone TEX documents
-#
-%.tex : %.itex
-	@$(RM) $@
-	$(LIT2LATEX) -S $(LIT2LATEX_OPTS) -o $@ $<
-	@chmod 444 $@
-
-%.tex : %.lhs
-	@$(RM) $@
-	$(LIT2LATEX) -S $(LIT2LATEX_OPTS) -o $@ $<
-	@chmod 444 $@
-
-%.texi : %.lhs
-	@$(RM) $@
-	$(LIT2TEXI) -S $(LIT2TEXI_OPTS) -o $@ $<
-	@chmod 444 $@
-
-%.html : %.lhs
-	@$(RM) $@ 
-	$(LIT2TEXI) $(LIT2TEXI_OPTS) -o $(patsubst %.html,%.texi,$@) $<
-	$(TEXI2HTML) $(TEXI2HTML_OPTS) $(patsubst %.lhs,%.texi,$<) 
-	@touch $@
-
-%.info:: %.texi
-	@$(RM) $@
-	$(MAKEINFO) $(MAKEINFO_OPTS) $< && $(POSTMAKEINFO) $@
-
-%.hs : %.lhs
-	@$(RM) $@
-	$(LIT2PGM) $(LIT2PGM_OPTS) -o $@ $<
-	@chmod 444 $@
-
-%.itxi : %.lhs
-	@$(RM) $@
-	$(LIT2TEXI) -c $(LIT2TEXI_OPTS) -o $@ $<
-	@chmod 444 $@
-
-%.ihtml : %.lhs
-	@$(RM) $@
-	$(LIT2HTML) -c $(LIT2HTML_OPTS) -o $@ $<
-	@chmod 444 $@
-
-%.itex : %.lhs
-	@$(RM) $@
-	$(LIT2LATEX) -c $(LIT2LATEX_OPTS) -o $@ $<
-	@chmod 444 $@
-
-%.tex : %.lhs
-	$(LIT2LATEX) -S -c $(LIT2LATEX_OPTS) -o $@ $<
-	$(HC) $(HC_OPTS) -c $< -o $@
-
-
-%.itxi : %.lhc
-	@$(RM) $@
-	$(LIT2TEXI) -c $(LIT2TEXI_OPTS) -o $@ $<
-	@chmod 444 $@
-
-%.ihtml : %.lhc
-	@$(RM) $@
-	$(LIT2HTML) -c $(LIT2HTML_OPTS) -o $@ $<
-	@chmod 444 $@
-
-%.itex : %.lhc
-	@$(RM) $@
-	$(LIT2LATEX) -c $(LIT2LATEX_OPTS) -o $@ $<
-	@chmod 444 $@
-
-#
-# Temporary, until either unlit is lifted out of ghc/
-# or literate is properly set up locally -- SOF
-#
 %.prl : %.lprl
 	@$(RM) $@
 	$(UNLIT) $(UNLIT_OPTS) $< $@
 	@chmod 444 $@
 
-%.itxi : %.lprl
-	@$(RM) $@
-	$(LIT2TEXI) -c $(LIT2TEXI_OPTS) -o $@ $<
-	@chmod 444 $@
-
-%.ihtml : %.lprl
-	@$(RM) $@
-	$(LIT2HTML) -c $(LIT2HTML_OPTS) -o $@ $<
-	@chmod 444 $@
-
-%.itex : %.lprl
-	@$(RM) $@
-	$(LIT2LATEX) -c $(LIT2LATEX_OPTS) -o $@ $<
-	@chmod 444 $@
-
-%.sh : %.lsh
-	@$(RM) $@
-	$(LIT2PGM) $(LIT2PGM_OPTS) -o $@ $<
-	@chmod 444 $@
-
-%.itxi : %.lsh
-	@$(RM) $@
-	$(LIT2TEXI) -c $(LIT2TEXI_OPTS) -o $@ $<
-	@chmod 444 $@
-
-%.ihtml : %.lsh
-	@$(RM) $@
-	$(LIT2HTML) -c $(LIT2HTML_OPTS) -o $@ $<
-	@chmod 444 $@
-
-%.itex : %.lsh
-	@$(RM) $@
-	$(LIT2LATEX) -c $(LIT2LATEX_OPTS) -o $@ $<
-	@chmod 444 $@
-
 %.c : %.lc
 	@$(RM) $@
 	$(UNLIT) $< $@
 	@chmod 444 $@
 
-%.itxi : %.lc
-	@$(RM) $@
-	$(LIT2TEXI) -c $(LIT2TEXI_OPTS) -o $@ $<
-	@chmod 444 $@
-
-%.ihtml : %.lc
-	@$(RM) $@
-	$(LIT2HTML) -c $(LIT2HTML_OPTS) -o $@ $<
-	@chmod 444 $@
-
-%.itex : %.lc
-	@$(RM) $@
-	$(LIT2LATEX) -c $(LIT2LATEX_OPTS) -o $@ $<
-	@chmod 444 $@
-
 %.h : %.lh
 	@$(RM) $@
 	$(UNLIT) $< $@
 	@chmod 444 $@
-
-%.itxi : %.lh
-	@$(RM) $@
-	$(LIT2TEXI) -c $(LIT2TEXI_OPTS) -o $@ $<
-	@chmod 444 $@
-
-%.ihtml : %.lh
-	@$(RM) $@
-	$(LIT2HTML) -c $(LIT2HTML_OPTS) -o $@ $<
-	@chmod 444 $@
-
-%.itex : %.lh
-	@$(RM) $@
-	$(LIT2LATEX) -c $(LIT2LATEX_OPTS) -o $@ $<
-	@chmod 444 $@
-
-%.flex : %.lflex
-	@$(RM) $@
-	$(LIT2PGM) $(LIT2PGM_OPTS) -o $@ $<
-	@chmod 444 $@
-
-%.itxi : %.lflex
-	@$(RM) $@
-	$(LIT2TEXI) -c $(LIT2TEXI_OPTS) -o $@ $<
-	@chmod 444 $@
-
-%.ihtml : %.lflex
-	@$(RM) $@
-	$(LIT2HTML) -c $(LIT2HTML_OPTS) -o $@ $<
-	@chmod 444 $@
-
-%.itex : %.lflex
-	@$(RM) $@
-	$(LIT2LATEX) -c $(LIT2LATEX_OPTS) -o $@ $<
-	@chmod 444 $@
-