X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=mk%2Fsuffix.mk;h=762636aea14cb2e1463f7198d77ed830492f6306;hp=0c8fb7c8a7681664b8e1f74d21f48cb0004cb0d2;hb=74e1368d4688ee16f6decdf2cd3ebe27506b26ba;hpb=612f60d1a83443d2400301092ea8385843408835

diff --git a/mk/suffix.mk b/mk/suffix.mk
index 0c8fb7c..762636a 100644
--- a/mk/suffix.mk
+++ b/mk/suffix.mk
@@ -25,19 +25,19 @@
 #-----------------------------------------------------------------------------
 # Haskell Suffix Rules
 
-# Turn off all the Haskell suffix rules if we're booting from .hc
-# files.  The file bootstrap.mk contains alternative suffix rules in
-# this case.
-ifneq "$(BootingFromHc)" "YES"
-
 # 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
 odir_ =
 endif
 
+# Turn off all the Haskell suffix rules if we're booting from .hc
+# files.  The file bootstrap.mk contains alternative suffix rules in
+# this case.
+ifneq "$(BootingFromHc)" "YES"
+
 $(odir_)%.$(way_)o : %.hs
 	$(HC_PRE_OPTS)
 	$(HC) $(HC_OPTS) -c $< -o $@  -ohi $(basename $@).$(way_)hi
@@ -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 $@
@@ -56,12 +65,12 @@ $(odir_)%.$(way_)hc : %.hs
 	$(RM) $@
 	$(HC) $(HC_OPTS) -C $< -o $@
 
-$(odir_)%.$(way_)o : %.$(way_)hc 
+$(odir_)%.$(way_)o : %.$(way_)hc
 	$(HC_PRE_OPTS)
 	$(HC) $(HC_OPTS) -c $< -o $@
 	$(HC_POST_OPTS)
 
-$(odir_)%.$(way_)o : %.hc 
+$(odir_)%.$(way_)o : %.hc
 	$(HC_PRE_OPTS)
 	$(HC) $(HC_OPTS) -c $< -o $@
 	$(HC_POST_OPTS)
@@ -74,7 +83,7 @@ $(odir_)%.$(way_)s : %.$(way_)hc
 $(odir_)%.$(way_)hc : %.lhc
 	@$(RM) $@
 	$(UNLIT) $< $@
-	@chmod 444 $@
+	$(GENERATED_FILE) $@
 
 
 # Here's an interesting rule!
@@ -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.; \
@@ -99,13 +115,38 @@ $(odir_)%.$(way_)hi : %.$(way_)hc
 	else exit 0 ; \
 	fi
 
-endif # BootingViaC
+else # BootingFromHc
+
+# -----------------------------------------------------------------------------
+# suffix rules for building a .o from a .hc file in bootstrap mode.
+
+ifeq "$(BootingFromUnregisterisedHc)" "YES"
+
+# without mangling
+
+$(odir_)%.o : %.hc
+	$(CC) -x c $< -o $@ -c -O $(HC_BOOT_CC_OPTS) -I.  `echo $(patsubst -monly-%-regs, -DSTOLEN_X86_REGS=%, $(filter -monly-%-regs, $($*_HC_OPTS))) | sed 's/^$$/-DSTOLEN_X86_REGS=4/'`
+
+else
+
+# with mangling
+
+$(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 : $(odir_)%.raw_s
+	$(MANGLER) $< $@ $(patsubst -monly-%-regs, %, $(filter -monly-%-regs, $($*_HC_OPTS)))
+
+$(odir_)%.o : $(odir_)%.s
+	$(CC) -c -o $@ $<
+
+endif # not BootingFromUnregisterisedHc
+
+endif # BootingFromHc
 
 #-----------------------------------------------------------------------------
 # Happy Suffix Rules
 #
-.SECONDARY: %.hs
-
 %.hs : %.ly
 	$(HAPPY) $(HAPPY_OPTS) $<
 
@@ -113,27 +154,25 @@ endif # BootingViaC
 	$(HAPPY) $(HAPPY_OPTS) $<
 
 #-----------------------------------------------------------------------------
+# Alex Suffix Rules
+#
+
+%.hs : %.x
+	$(ALEX) $(ALEX_OPTS) $<
+
+#-----------------------------------------------------------------------------
 # hsc2hs Suffix Rules
 #
 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) $<
 
@@ -146,7 +185,8 @@ endif
 #-----------------------------------------------------------------------------
 # C-related suffix rules
 
-ifeq "$(UseGhcForCc)" "YES"
+# UseGhcForCc is only relevant when not booting from HC files.
+ifeq "$(UseGhcForCc) $(BootingFromHc)" "YES NO"
 
 $(odir_)%.$(way_)o : %.c
 	@$(RM) $@
@@ -199,31 +239,104 @@ endif
 	$(FLEX) -t $(FLEX_OPTS) $< > $@
 
 #-----------------------------------------------------------------------------
-# Yacc stuff
-
-%.tab.c %.tab.h : %.y
-	@$(RM) $*.tab.h $*.tab.c y.tab.c y.tab.h y.output
-	$(YACC) $(YACC_OPTS) $<
-	$(MV) y.tab.c $*.tab.c
-	@chmod 444 $*.tab.c
-	$(MV) y.tab.h $*.tab.h
-	@chmod 444 $*.tab.h
-
-
-#-----------------------------------------------------------------------------
 # Runtest rules for calling $(HC) on a single-file Haskell program
 
 %.runtest : %.hs
 	$(TIME) $(RUNTEST) $(HC) $(RUNTEST_OPTS) $<
 
 #-----------------------------------------------------------------------------
+# DocBook XML suffix rules
+#
+
+%.html : %.xml
+	$(XSLTPROC) --output $@ \
+		    --stringparam html.stylesheet $(FPTOOLS_CSS) \
+		    $(XSLTPROC_LABEL_OPTS) $(XSLTPROC_OPTS) \
+		    $(DIR_DOCBOOK_XSL)/html/docbook.xsl $<
+	cp $(FPTOOLS_CSS_ABS) .
+
+%/index.html : %.xml
+	$(RM) -rf $(dir $@)
+	$(XSLTPROC) --stringparam base.dir $(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 \
+		    --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 $@ \
+		    --stringparam draft.mode no \
+		    $(XSLTPROC_LABEL_OPTS) $(XSLTPROC_OPTS) \
+		    $(DIR_DOCBOOK_XSL)/fo/docbook.xsl $<
+
+ifeq "$(FOP)" ""
+ifneq "$(PDFXMLTEX)" ""
+%.pdf : %.fo
+	$(PDFXMLTEX) $<
+	if grep "LaTeX Warning: Label(s) may have changed.Rerun to get cross-references right." $(basename $@).log > /dev/null ; then \
+	  $(PDFXMLTEX) $< ; \
+	  $(PDFXMLTEX) $< ; \
+	fi
+endif
+else
+%.ps : %.fo
+	$(FOP) $(FOP_OPTS) -fo $< -ps $@
+
+%.pdf : %.fo
+	$(FOP) $(FOP_OPTS) -fo $< -pdf $@
+endif
+
+ifneq "$(XMLTEX)" ""
+%.dvi : %.fo
+	$(XMLTEX) $<
+	if grep "LaTeX Warning: Label(s) may have changed.Rerun to get cross-references right." $(basename $@).log > /dev/null ; then \
+	  $(XMLTEX) $< ; \
+	  $(XMLTEX) $< ; \
+	fi
+endif
+
+#-----------------------------------------------------------------------------
 # Doc processing suffix rules
 #
 # ToDo: make these more robust
 #
 %.ps : %.dvi
 	@$(RM) $@
-	dvips $< -o $@
+	$(DVIPS) $< -o $@
 
 %.tex : %.tib
 	@$(RM) $*.tex $*.verb-t.tex
@@ -240,57 +353,22 @@ 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
 	@$(RM) $@
 	$(UNLIT) $(UNLIT_OPTS) $< $@
-	@chmod 444 $@
+	$(GENERATED_FILE) $@
 
 %.c : %.lc
 	@$(RM) $@
 	$(UNLIT) $(UNLIT_OPTS) $< $@
-	@chmod 444 $@
+	$(GENERATED_FILE) $@
 
 %.h : %.lh
 	@$(RM) $@
 	$(UNLIT) $(UNLIT_OPTS) $< $@
-	@chmod 444 $@
+	$(GENERATED_FILE) $@
 
 #-----------------------------------------------------------------------------
 # Win32 resource files
@@ -300,11 +378,15 @@ endif
 
 %.$(way_)o : %.$(way_)rc
 	@$(RM) $@
-	windres $< $@
+	windres --preprocessor="$(CPP) -xc -DRC_INVOKED" $< $@
 
 #-----------------------------------------------------------------------------
 # Preprocessor suffix rule
 
+# Note use of -P option to prevent #line pragmas being left in the CPP
+# output.
+
 % : %.pp
 	@$(RM) $@
-	$(CPP) $(RAWCPP_FLAGS) $(CPP_OPTS) -x c $< | $(SED) -e '/^#/d' > $@
+	$(CPP) $(RAWCPP_FLAGS) -P $(CPP_OPTS) -x c $< | \
+	grep -v '^#pragma GCC' > $@