X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fsuffix.mk;h=8ec5acb5112d5264fa4fc5ab5816c257f01896b5;hb=ea138284b7343bb1810cfbd0284a608dc57f7d46;hp=5f67ad61866331d71914c2429f50b9638c6f6af0;hpb=50027272414438955dbc41696541cbd25da55883;p=ghc-hetmet.git

diff --git a/mk/suffix.mk b/mk/suffix.mk
index 5f67ad6..8ec5acb 100644
--- a/mk/suffix.mk
+++ b/mk/suffix.mk
@@ -37,12 +37,12 @@ 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	 
@@ -55,17 +55,17 @@ ifneq "$(BootingFromHc)" "YES"
 
 %.$(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
@@ -84,14 +84,14 @@ ifneq "$(BootingFromHc)" "YES"
 
 %.$(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
@@ -112,8 +112,11 @@ endif # BootingViaC
 #-----------------------------------------------------------------------------
 # hsc2hs Suffix Rules
 #
-%.hs.c %.hs.h %.hs : %.hsc
-	$(HSC2HS) $<
+ifneq "$(BootingFromHc)" "YES"
+%_hsc.c %_hsc.h %.hs : %.hsc
+	$(HSC2HS) $(HSC2HS_OPTS) $<
+	@touch $(patsubst %.hsc,%_hsc.c,$<)
+endif
 
 #-----------------------------------------------------------------------------
 # Lx Suffix Rules
@@ -237,6 +240,10 @@ endif # BootingViaC
 	@$(RM) $@
 	$(SGML2RTF) $(SGML2RTF_OPTS) $<
 
+%.pdf : %.sgml
+	@$(RM) $@
+	$(SGML2PDF) $(SGML2PDF_OPTS) $<
+
 #-----------------------------------------------------------------------------
 # Literate suffix rules
 
@@ -264,3 +271,10 @@ endif # BootingViaC
 %.$(way_)o : %.$(way_)rc
 	@$(RM) $@
 	windres $< $@
+
+#-----------------------------------------------------------------------------
+# Preprocessor suffix rule
+
+% : %.pp
+	rm -f $@
+	$(CPP) -I$(GHC_INCLUDE_DIR) -x c $< | $(SED) -e '/^#/d' > $@