X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fsuffix.mk;h=ad238ed9135a6a363d87bbc814dc54cd570c6ee9;hb=2b811329caa54eee7c1b159384e1e1aa3a5e9feb;hp=fa76355f0668ba9c6094b16f81d03f78eb619de4;hpb=be0242d094f9b3091b15f200ac9d978576b7b681;p=ghc-hetmet.git

diff --git a/mk/suffix.mk b/mk/suffix.mk
index fa76355..ad238ed 100644
--- a/mk/suffix.mk
+++ b/mk/suffix.mk
@@ -22,6 +22,10 @@
 
 .DELETE_ON_ERROR:
 
+# This line prevents GNU make from deleting any intermediate targets:
+
+.SECONDARY:
+
 #-----------------------------------------------------------------------------
 # Haskell Suffix Rules
 
@@ -48,6 +52,15 @@ $(odir_)%.$(way_)o : %.lhs
 	$(HC) $(HC_OPTS) -c $< -o $@  -ohi $(basename $@).$(way_)hi
 	$(HC_POST_OPTS)
 
+# Now the rules for hs-boot files. 
+# Note that they do *not* do teh HS_PRE_OPTS / HS_POST_OPTS stuff,
+# (which concerns splitting) because they don't generate .o files
+$(odir_)%.$(way_)o-boot : %.hs-boot
+	$(HC) $(HC_OPTS) -c $< -o $@  -ohi $(basename $@).$(way_)hi-boot
+
+$(odir_)%.$(way_)o-boot : %.lhs-boot
+	$(HC) $(HC_OPTS) -c $< -o $@  -ohi $(basename $@).$(way_)hi-boot
+
 $(odir_)%.$(way_)hc : %.lhs	 
 	$(RM) $@
 	$(HC) $(HC_OPTS) -C $< -o $@
@@ -92,6 +105,13 @@ $(odir_)%.$(way_)hc : %.lhc
 	else exit 0 ; \
 	fi							
 
+%.$(way_)hi-boot : %.$(way_)o-boot
+	@if [ ! -f $@ ] ; then \
+	    echo Panic! $< exists, but $@ does not.; \
+	    exit 1; \
+	else exit 0 ; \
+	fi							
+
 $(odir_)%.$(way_)hi : %.$(way_)hc
 	@if [ ! -f $@ ] ; then \
 	    echo Panic! $< exists, but $@ does not.; \
@@ -131,8 +151,6 @@ endif # BootingFromHc
 #-----------------------------------------------------------------------------
 # Happy Suffix Rules
 #
-.SECONDARY: %.hs
-
 %.hs : %.ly
 	$(HAPPY) $(HAPPY_OPTS) $<
 
@@ -156,18 +174,9 @@ ifneq "$(BootingFromHc)" "YES"
 endif
 
 #-----------------------------------------------------------------------------
-# Lx Suffix Rules
-#
-
-%.hs : %.lx
-	$(LX) $(LX_OPTS) $<
-
-#-----------------------------------------------------------------------------
 # Green-card Suffix Rules
 #
 
-.PRECIOUS: %.gc
-
 %.hs %_stub_ffi.c %_stub_ffi.h : %.gc
 	$(GREENCARD) $(GC_OPTS) $<
 
@@ -269,11 +278,21 @@ endif
 		    $(DIR_DOCBOOK_XSL)/htmlhelp/htmlhelp.xsl $<
 
 # TODO: Detect hhc via autoconf
+#
+# Two obstacles here:
+#
+# * The reason for the strange "if" below is that hhc returns 0 on error and 1
+#   on success, the opposite of what shells and make expect.
+#
+# * There seems to be some trouble with DocBook indices, but the *.chm looks OK,
+#   anyway, therefore we pacify make by "|| true". Ugly...
+#
 %.chm : %-htmlhelp/index.html
-	( cd $(dir $<) && hhc htmlhelp.hhp )
+	( cd $(dir $<) && if hhc htmlhelp.hhp ; then false ; else true ; fi ) || true
 
 %.fo : %.xml
 	$(XSLTPROC) --output $@ \
+		    --stringparam draft.mode no \
 		    $(XSLTPROC_LABEL_OPTS) $(XSLTPROC_OPTS) \
 		    $(DIR_DOCBOOK_XSL)/fo/docbook.xsl $<
 
@@ -362,4 +381,5 @@ endif
 
 % : %.pp
 	@$(RM) $@
-	$(CPP) $(RAWCPP_FLAGS) -P $(CPP_OPTS) -x c $< > $@
+	$(CPP) $(RAWCPP_FLAGS) -P $(CPP_OPTS) -x c $< | \
+	grep -v '^#pragma GCC' > $@