X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fsuffix.mk;h=f45682ffb98d626f3ee8e3c5482fec3bacb21769;hb=d19f868a2fbfb583e57d9c47b97c0cdb3a95ae57;hp=5ac15fbcd29b41ece104809f8e7eb78507e7e67d;hpb=aa9c98eccad321f97953330e7d4931a68ed0550e;p=ghc-hetmet.git

diff --git a/mk/suffix.mk b/mk/suffix.mk
index 5ac15fb..f45682f 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) $<
 
@@ -159,8 +177,6 @@ endif
 # Green-card Suffix Rules
 #
 
-.PRECIOUS: %.gc
-
 %.hs %_stub_ffi.c %_stub_ffi.h : %.gc
 	$(GREENCARD) $(GC_OPTS) $<
 
@@ -261,9 +277,17 @@ endif
 		    $(XSLTPROC_OPTS) \
 		    $(DIR_DOCBOOK_XSL)/htmlhelp/htmlhelp.xsl $<
 
-# TODO: Detect hhc via autoconf
+%-htmlhelp2/collection.HxC : %.xml
+	$(RM) -rf $(dir $@)
+	$(XSLTPROC) --stringparam base.dir $(dir $@) \
+		    --stringparam use.id.as.filename 1 \
+		    --stringparam manifest.in.base.dir 1 \
+		    $(XSLTPROC_OPTS) \
+		    $(DIR_DOCBOOK_XSL)/htmlhelp2/htmlhelp2.xsl $<
+
+# TODO: Detect hhc & Hxcomp via autoconf
 #
-# Two obstables here:
+# 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.
@@ -274,8 +298,12 @@ endif
 %.chm : %-htmlhelp/index.html
 	( cd $(dir $<) && if hhc htmlhelp.hhp ; then false ; else true ; fi ) || true
 
+%.HxS : %-htmlhelp2/collection.HxC
+	( cd $(dir $<) && if Hxcomp -p collection.HxC -o ../$@ ; then false ; else true ; fi )
+
 %.fo : %.xml
 	$(XSLTPROC) --output $@ \
+		    --stringparam draft.mode no \
 		    $(XSLTPROC_LABEL_OPTS) $(XSLTPROC_OPTS) \
 		    $(DIR_DOCBOOK_XSL)/fo/docbook.xsl $<