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

diff --git a/mk/suffix.mk b/mk/suffix.mk
index 6d2c180..55637e3 100644
--- a/mk/suffix.mk
+++ b/mk/suffix.mk
@@ -26,7 +26,7 @@
 # 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
@@ -48,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 $@
@@ -92,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.; \
@@ -118,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
@@ -131,8 +147,6 @@ endif # BootingFromHc
 #-----------------------------------------------------------------------------
 # Happy Suffix Rules
 #
-.SECONDARY: %.hs
-
 %.hs : %.ly
 	$(HAPPY) $(HAPPY_OPTS) $<
 
@@ -151,23 +165,14 @@ endif # BootingFromHc
 #
 ifneq "$(BootingFromHc)" "YES"
 %_hsc.c %_hsc.h %.hs : %.hsc
-	$(HSC2HS) $(HSC2HS_OPTS) $<
+	$(HSC2HS_INPLACE) $(HSC2HS_OPTS) $<
 	@touch $(patsubst %.hsc,%_hsc.c,$<)
 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) $<
 
@@ -245,27 +250,58 @@ endif
 
 %.html : %.xml
 	$(XSLTPROC) --output $@ \
-	            --stringparam html.stylesheet fptools.css \
-	            $(XSLTPROC_OPTS) $(DIR_DOCBOOK_XSL)/html/docbook.xsl $<
-	cp $(FPTOOLS_CSS) .
+		    --stringparam html.stylesheet $(FPTOOLS_CSS) \
+		    $(XSLTPROC_LABEL_OPTS) $(XSLTPROC_OPTS) \
+		    $(DIR_DOCBOOK_XSL)/html/docbook.xsl $<
+	cp $(FPTOOLS_CSS_ABS) .
 
-%-html/index.html : %.xml
+%/index.html : %.xml
 	$(RM) -rf $(dir $@)
 	$(XSLTPROC) --stringparam base.dir $(dir $@) \
-	            --stringparam use.id.as.filename 1 \
-	            --stringparam html.stylesheet fptools.css \
-	            $(XSLTPROC_OPTS) $(DIR_DOCBOOK_XSL)/html/chunk.xsl $<
-	cp $(FPTOOLS_CSS) $(dir $@)
+		    --stringparam use.id.as.filename 1 \
+		    --stringparam html.stylesheet $(FPTOOLS_CSS) \
+		    $(XSLTPROC_LABEL_OPTS) $(XSLTPROC_OPTS) \
+		    $(DIR_DOCBOOK_XSL)/html/chunk.xsl $<
+	cp $(FPTOOLS_CSS_ABS) $(dir $@)
 
+# Note: Numeric labeling seems to be uncommon for HTML Help
 %-htmlhelp/index.html : %.xml
 	$(RM) -rf $(dir $@)
 	$(XSLTPROC) --stringparam base.dir $(dir $@) \
-	            --stringparam manifest.in.base.dir 1 \
-	            $(XSLTPROC_OPTS) $(DIR_DOCBOOK_XSL)/htmlhelp/htmlhelp.xsl $<
+		    --stringparam manifest.in.base.dir 1 \
+		    --stringparam htmlhelp.chm "..\\"$(basename $<).chm \
+		    $(XSLTPROC_OPTS) \
+		    $(DIR_DOCBOOK_XSL)/htmlhelp/htmlhelp.xsl $<
+
+%-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 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 $<) && 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 $@ \
-	            $(XSLTPROC_OPTS) $(DIR_DOCBOOK_XSL)/fo/docbook.xsl $<
+		    --stringparam draft.mode no \
+		    $(XSLTPROC_LABEL_OPTS) $(XSLTPROC_OPTS) \
+		    $(DIR_DOCBOOK_XSL)/fo/docbook.xsl $<
 
 ifeq "$(FOP)" ""
 ifneq "$(PDFXMLTEX)" ""
@@ -317,41 +353,6 @@ endif
 	fig2dev -L latex $< $@
 
 #-----------------------------------------------------------------------------
-# SGML suffix rules
-#
-%.dvi : %.sgml
-	@$(RM) $@
-	$(SGML2DVI) $(SGML2DVI_OPTS) $<
-
-%.ps : %.sgml
-	@$(RM) $@
-	$(SGML2PS) $(SGML2PS_OPTS) $<
-
-%.html : %.sgml
-	@$(RM) $@
-#	$(PERL) $(COLLATEINDEX) -N -o index.sgml
-#	$(JADE) -t sgml -V html-index -d $(SGMLSTYLESHEET) -c $(DOCBOOK_CATALOG) $<
-#	$(PERL) $(COLLATEINDEX) -N -o index.sgml
-	$(SGML2HTML) $(SGML2HTML_OPTS) $<
-# touch the .html file so that it is seen to be built
-	@touch $@
-
-%.html : %.tex
-	@$(RM) $@
-	$(HEVEA) $(HEVEA_OPTS) $(patsubst %.tex,%.hva,$<) $<
-	$(HEVEA) $(HEVEA_OPTS) $(patsubst %.tex,%.hva,$<) $<
-	$(HACHA) $(HACHA_OPTS) $(patsubst %.tex,%.html,$<)
-# Run HeVeA twice to resolve labels
-
-%.rtf : %.sgml
-	@$(RM) $@
-	$(SGML2RTF) $(SGML2RTF_OPTS) $<
-
-%.pdf : %.sgml
-	@$(RM) $@
-	$(SGML2PDF) $(SGML2PDF_OPTS) $<
-
-#-----------------------------------------------------------------------------
 # Literate suffix rules
 
 %.prl : %.lprl
@@ -387,4 +388,5 @@ endif
 
 % : %.pp
 	@$(RM) $@
-	$(CPP) $(RAWCPP_FLAGS) -P $(CPP_OPTS) -x c $< > $@
+	$(CPP) $(RAWCPP_FLAGS) -P $(CPP_OPTS) -x c $< | \
+	grep -v '^#pragma GCC' > $@