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

diff --git a/mk/suffix.mk b/mk/suffix.mk
index 67657c1..3f85bd2 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 $@))
@@ -121,11 +110,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 +147,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 +195,6 @@ SRC_HC_PRE_OPTS  += $(HC_PRE__)
 #-----------------------------------------------------------------------------
 # SGML suffix rules
 #
-%.sgml : %.vsgml
-	@$(RM) $@
-	expand $< | $(SGMLVERB) > $@
-
 %.dvi : %.sgml
 	@$(RM) $@
 	$(SGML2DVI) $(SGML2DVI_OPTS) $<
@@ -213,9 +207,12 @@ SRC_HC_PRE_OPTS  += $(HC_PRE__)
 	@$(RM) $@
 	$(SGML2HTML) $(SGML2HTML_OPTS) $<
 
-%.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) $@
@@ -245,6 +242,6 @@ SRC_HC_PRE_OPTS  += $(HC_PRE__)
 # The default is to use the GNU resource compiler.
 #
 
-%.o : %.rc
+%.$(way_)o : %.$(way_)rc
 	@$(RM) $@
 	windres $< $@