[project @ 2005-04-15 18:13:34 by sof]

[ghc-hetmet.git] / mk / suffix.mk

diff --git a/mk/suffix.mk b/mk/suffix.mk
index d8b298c..ad238ed 100644 (file)
--- a/mk/suffix.mk
+++ b/mk/suffix.mk
@@ -47,20 +47,19 @@ $(odir_)%.$(way_)o : %.hs
        $(HC) $(HC_OPTS) -c $< -o $@  -ohi $(basename $@).$(way_)hi
        $(HC_POST_OPTS)
 
-$(odir_)%.$(way_)o-boot : %.hs-boot
-       $(HC_PRE_OPTS)
-       $(HC) $(HC_OPTS) -c $< -o $@  -ohi $(basename $@).$(way_)hi-boot
-       $(HC_POST_OPTS)
-
 $(odir_)%.$(way_)o : %.lhs      
        $(HC_PRE_OPTS)
        $(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_PRE_OPTS)
        $(HC) $(HC_OPTS) -c $< -o $@  -ohi $(basename $@).$(way_)hi-boot
-       $(HC_POST_OPTS)
 
 $(odir_)%.$(way_)hc : %.lhs     
        $(RM) $@
@@ -280,7 +279,7 @@ endif
 
 # TODO: Detect hhc 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.
@@ -293,6 +292,7 @@ endif
 
 %.fo : %.xml
        $(XSLTPROC) --output $@ \
+                   --stringparam draft.mode no \
                    $(XSLTPROC_LABEL_OPTS) $(XSLTPROC_OPTS) \
                    $(DIR_DOCBOOK_XSL)/fo/docbook.xsl $<