X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=mk%2Fsuffix.mk;h=55637e3bcab1f03b98a984e21f5b3d879489ffb3;hp=b53280ac05498e1bdc011ff9f8010f48d2a03ea6;hb=fd1375dd261725eb00969a3017b924369c09835c;hpb=5ece0e434ef1df867feb1c0799a3861c67ee845f

diff --git a/mk/suffix.mk b/mk/suffix.mk
index b53280a..55637e3 100644
--- a/mk/suffix.mk
+++ b/mk/suffix.mk
@@ -22,15 +22,11 @@
 
 .DELETE_ON_ERROR:
 
-# This line prevents GNU make from deleting any intermediate targets:
-
-.SECONDARY:
-
 #-----------------------------------------------------------------------------
 # Haskell Suffix Rules
 
 # The $(odir) support is for building GHC, where we need to build three
-# different versions from the same sources.  See ghc/compiler/Makefile.
+# different versions from the same sources.  See compiler/Makefile.
 ifneq "$(odir)" ""
 odir_ = $(odir)/
 else
@@ -52,6 +48,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 $@
@@ -96,6 +101,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.; \
@@ -122,10 +134,10 @@ else
 $(odir_)%.raw_s : %.hc
 	$(CC) -x c $< -o $@ -S -O $(HC_BOOT_CC_OPTS) -I.  `echo $(patsubst -monly-%-regs, -DSTOLEN_X86_REGS=%, $(filter -monly-%-regs, $($*_HC_OPTS))) | sed 's/^$$/-DSTOLEN_X86_REGS=4/'`
 
-$(odir_)%.s : %.raw_s
-	$(GHC_MANGLER) $< $@ $(patsubst -monly-%-regs, %, $(filter -monly-%-regs, $($*_HC_OPTS)))
+$(odir_)%.s : $(odir_)%.raw_s
+	$(MANGLER) $< $@ $(patsubst -monly-%-regs, %, $(filter -monly-%-regs, $($*_HC_OPTS)))
 
-$(odir_)%.o : %.s
+$(odir_)%.o : $(odir_)%.s
 	$(CC) -c -o $@ $<
 
 endif # not BootingFromUnregisterisedHc
@@ -153,7 +165,7 @@ endif # BootingFromHc
 #
 ifneq "$(BootingFromHc)" "YES"
 %_hsc.c %_hsc.h %.hs : %.hsc
-	$(HSC2HS) $(HSC2HS_OPTS) $<
+	$(HSC2HS_INPLACE) $(HSC2HS_OPTS) $<
 	@touch $(patsubst %.hsc,%_hsc.c,$<)
 endif
 
@@ -261,9 +273,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 +294,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 $<