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

diff --git a/mk/suffix.mk b/mk/suffix.mk
index 8b69b15..55637e3 100644
--- a/mk/suffix.mk
+++ b/mk/suffix.mk
@@ -16,51 +16,71 @@
 
 .SUFFIXES:
 
-# However, if $(way) is set then we have to define $(way_) and $(_way)
-# from it in the obvious fashion.
-# This must be done here (or earlier), but not in target.mk with the other
-# way management, because the pattern rules in this file take a snapshot of
-# the value of $(way_) and $(_way), and it's no good setting them later!
-
-ifneq "$(way)" ""
-  way_ := $(way)_
-  _way := _$(way)
-endif
+# This declaration tells GNU make to delete the target if it has
+# changed and the command which created it exited with a non-zero exit
+# code.
+
+.DELETE_ON_ERROR:
 
 #-----------------------------------------------------------------------------
 # Haskell Suffix Rules
 
-HASKELL_SPLIT_PRE= \
- $(RM) $@ ; if [ ! -d $(basename $@) ]; then mkdir $(basename $@); else \
- find $(basename $@) -name '*.$(way_)o' -print | xargs $(RM) __rm_food ; fi
-HASKELL_SPLIT_POST= touch $@
-HASKELL_PRE_COMPILE=$(patsubst %,$(HASKELL_SPLIT_PRE),$(filter -split-objs,$(HC_OPTS)))
-HASKELL_POST_COMPILE=$(patsubst %,$(HASKELL_SPLIT_POST),$(filter -split-objs,$(HC_OPTS)))
-
-%.$(way_)o : %.hs
-	$(HASKELL_PRE_COMPILE)
-	$(HC) $(HC_OPTS) -c $< -o $@ -osuf $(subst .,,$(suffix $@))
-	$(HASKELL_POST_COMPILE)
-			 
-%.$(way_)o : %.lhs	 
-	$(HASKELL_PRE_COMPILE)
-	$(HC) $(HC_OPTS) -c $< -o $@ -osuf $(subst .,,$(suffix $@))
-	$(HASKELL_POST_COMPILE)
-			 
-%.$(way_)hc : %.lhs	 
+# The $(odir) support is for building GHC, where we need to build three
+# 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
+	$(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) $(HC_OPTS) -c $< -o $@  -ohi $(basename $@).$(way_)hi-boot
+
+$(odir_)%.$(way_)hc : %.lhs	 
 	$(RM) $@
 	$(HC) $(HC_OPTS) -C $< -o $@
-			 
-%.$(way_)hc : %.hs	 
+
+$(odir_)%.$(way_)hc : %.hs	 
 	$(RM) $@
 	$(HC) $(HC_OPTS) -C $< -o $@
-			 
-%.$(way_)o : %.$(way_)hc 
-	$(HASKELL_PRE_COMPILE)
-	$(HC) $(HC_OPTS) -c $< -o $@ -osuf $(subst .,,$(suffix $@))
-	$(HASKELL_POST_COMPILE)
 
-%.$(way_)hc : %.lhc
+$(odir_)%.$(way_)o : %.$(way_)hc
+	$(HC_PRE_OPTS)
+	$(HC) $(HC_OPTS) -c $< -o $@
+	$(HC_POST_OPTS)
+
+$(odir_)%.$(way_)o : %.hc
+	$(HC_PRE_OPTS)
+	$(HC) $(HC_OPTS) -c $< -o $@
+	$(HC_POST_OPTS)
+
+$(odir_)%.$(way_)s : %.$(way_)hc 
+	$(HC_PRE_OPTS)
+	$(HC) $(HC_OPTS) -S $< -o $@
+	$(HC_POST_OPTS)
+
+$(odir_)%.$(way_)hc : %.lhc
 	@$(RM) $@
 	$(UNLIT) $< $@
 	@chmod 444 $@
@@ -76,330 +96,297 @@ HASKELL_POST_COMPILE=$(patsubst %,$(HASKELL_SPLIT_POST),$(filter -split-objs,$(H
 
 %.$(way_)hi : %.$(way_)o
 	@if [ ! -f $@ ] ; then \
-	    echo Panic! $< exists, but $@ does not. \
+	    echo Panic! $< exists, but $@ does not.; \
+	    exit 1; \
+	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							
 
-%.$(way_)hi : %.$(way_)hc
+$(odir_)%.$(way_)hi : %.$(way_)hc
 	@if [ ! -f $@ ] ; then \
-	    echo Panic! $< exists, but $@ does not. \
+	    echo Panic! $< exists, but $@ does not.; \
 	    exit 1; \
 	else exit 0 ; \
 	fi
 
-#-----------------------------------------------------------------------------
-# Happy Suffix Rules
-#
-.PRECIOUS: %.hs
+else # BootingFromHc
 
-%.hs : %.ly
-	$(HAPPY) $(HAPPY_OPTS) -g $<
+# -----------------------------------------------------------------------------
+# suffix rules for building a .o from a .hc file in bootstrap mode.
 
-#-----------------------------------------------------------------------------
-# Lx Suffix Rules
-#
+ifeq "$(BootingFromUnregisterisedHc)" "YES"
 
-%.hs : %.lx
-	$(LX) $(LX_OPTS) $<
+# without mangling
 
-#-----------------------------------------------------------------------------
-# Green-card Suffix Rules
-#
+$(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/'`
 
-%.hs : %.gc
-	$(GREENCARD) $(GREENCARD_OPTS) $<
+else
 
-#-----------------------------------------------------------------------------
-# C-related suffix rules
+# with mangling
 
-%.$(way_)o : %.$(way_)s
-	@$(RM) $@
-	$(AS) $(AS_OPTS) -o $@ $< || ( $(RM) $@ && exit 1 )
+$(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/'`
 
-%.$(way_)o : %.c
-	@$(RM) $@
-	$(CC) $(CC_OPTS) -c $< -o $@
+$(odir_)%.s : $(odir_)%.raw_s
+	$(MANGLER) $< $@ $(patsubst -monly-%-regs, %, $(filter -monly-%-regs, $($*_HC_OPTS)))
 
-#%.$(way_)s : %.c
-#	@$(RM) $@
-#	$(CC) $(CC_OPTS) -S $< -o $@
+$(odir_)%.o : $(odir_)%.s
+	$(CC) -c -o $@ $<
 
-%.c : %.flex
-	@$(RM) $@
-	$(FLEX) -t $(FLEX_OPTS) $< > $@ || ( $(RM) $@ && exit 1 )
-%.c : %.lex
-	@$(RM) $@
-	$(FLEX) -t $(FLEX_OPTS) $< > $@ || ( $(RM) $@ && exit 1 )
+endif # not BootingFromUnregisterisedHc
 
-#-----------------------------------------------------------------------------
-# Yacc stuff
+endif # BootingFromHc
 
-%.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
+#-----------------------------------------------------------------------------
+# Happy Suffix Rules
+#
+%.hs : %.ly
+	$(HAPPY) $(HAPPY_OPTS) $<
 
+%.hs : %.y
+	$(HAPPY) $(HAPPY_OPTS) $<
 
 #-----------------------------------------------------------------------------
-# Runtest rules for calling $(HC) on a single-file Haskell program
+# Alex Suffix Rules
+#
 
-%.runtest : %.hs
-	$(TIME) $(RUNTEST) $(HC) $(RUNTEST_OPTS) $<
+%.hs : %.x
+	$(ALEX) $(ALEX_OPTS) $<
 
 #-----------------------------------------------------------------------------
-# Doc processing suffix rules
+# hsc2hs Suffix Rules
 #
-# ToDo: make these more robust
-#
-%.dvi : %.tex
-	@$(RM) $@
-	$(LTX) $<
-
-%.ps : %.dvi
-	@$(RM) $@
-	dvips $< -o $@
+ifneq "$(BootingFromHc)" "YES"
+%_hsc.c %_hsc.h %.hs : %.hsc
+	$(HSC2HS_INPLACE) $(HSC2HS_OPTS) $<
+	@touch $(patsubst %.hsc,%_hsc.c,$<)
+endif
 
-%.tex : %.verb
-	@$(RM) $*.tex
-	expand $*.verb | $(VERBATIM) > $*.tex
+#-----------------------------------------------------------------------------
+# Green-card Suffix Rules
+#
 
-%.tex : %.tib
-	@$(RM) $*.tex $*.verb-t.tex
-	$(TIB) $*.tib
-	expand $*.tib-t.tex | $(VERBATIM) > $*.tex
-	@$(RM) $*.tib-t.tex
+%.hs %_stub_ffi.c %_stub_ffi.h : %.gc
+	$(GREENCARD) $(GC_OPTS) $<
 
-%.ps : %.fig
-	@$(RM) $@
-	fig2dev -L ps $< $@
+%.lhs : %.gc
+	$(GREENCARD) $(GC_OPTS) $< -o $@
 
-%.tex : %.fig
-	@$(RM) $@
-	fig2dev -L latex $< $@
+%.gc : %.pgc
+	$(CPP) $(GC_CPP_OPTS) $< | perl -pe 's#\\n#\n#g' > $@
 
 #-----------------------------------------------------------------------------
-# SGML suffix rules
-#
-# make sure these don't conflict with the literate rules!
-
-%.sgml : %.vsgml
-	@$(RM) $@
-	expand $*.verb | $(SGMLVERB) > $@
+# C-related suffix rules
 
-%.dvi : %.sgml
-	@$(RM) $@
-	$(SGML2LATEX) -m --output=dvi $<
+# UseGhcForCc is only relevant when not booting from HC files.
+ifeq "$(UseGhcForCc) $(BootingFromHc)" "YES NO"
 
-%.html : %.sgml
+$(odir_)%.$(way_)o : %.c
 	@$(RM) $@
-	$(SGML2HTML) $<
+	$(HC) $(GHC_CC_OPTS) -c $< -o $@
 
-%.info : %.sgml
+$(odir_)%.$(way_)o : %.$(way_)s
 	@$(RM) $@
-	$(SGML2INFO) $<
+	$(HC) $(GHC_CC_OPTS) -c $< -o $@
 
-%.txt : %.sgml
+$(odir_)%.$(way_)o : %.S
 	@$(RM) $@
-	$(SGML2TXT) $<
-
-#-----------------------------------------------------------------------------
-# Literate suffix rules
-
-# ToDo: somehow macroize this lot. (if only!)
+	$(HC) $(GHC_CC_OPTS) -c $< -o $@
 
-%.itxi : %.lit
+$(odir_)%.$(way_)s : %.c
 	@$(RM) $@
-	$(LIT2TEXI) -c $(LIT2TEXI_OPTS) -o $@ $<
-	@chmod 444 $@
+	$(HC) $(GHC_CC_OPTS) -S $< -o $@
 
-%.txt : %.lit
-	@$(RM) $@
-	$(LIT2TEXT) $(LIT2TEXT_OPTS) -o $@ $<
-	@chmod 444 $@
+else
 
-%.ihtml : %.lit
+$(odir_)%.$(way_)o : %.c
 	@$(RM) $@
-	$(LIT2HTML) -c $(LIT2HTML_OPTS) -o $@ $<
-	@chmod 444 $@
+	$(CC) $(CC_OPTS) -c $< -o $@
 
-%.itex : %.lit
+$(odir_)%.$(way_)o : %.$(way_)s
 	@$(RM) $@
-	$(LIT2LATEX) -c $(LIT2LATEX_OPTS) -o $@ $<
-	@chmod 444 $@
+	$(AS) $(AS_OPTS) -o $@ $<
 
-#
-# Produce stand-alone TEX documents
-#
-%.tex : %.itex
+$(odir_)%.$(way_)o : %.S
 	@$(RM) $@
-	$(LIT2LATEX) -S $(LIT2LATEX_OPTS) -o $@ $<
-	@chmod 444 $@
+	$(CC) $(CC_OPTS) -c $< -o $@
 
-%.tex : %.lhs
+$(odir_)%.$(way_)s : %.c
 	@$(RM) $@
-	$(LIT2LATEX) -S $(LIT2LATEX_OPTS) -o $@ $<
-	@chmod 444 $@
+	$(CC) $(CC_OPTS) -S $< -o $@
 
-%.texi : %.lhs
-	@$(RM) $@
-	$(LIT2TEXI) -S $(LIT2TEXI_OPTS) -o $@ $<
-	@chmod 444 $@
+endif
 
-%.html : %.lhs
-	@$(RM) $@ 
-	$(LIT2TEXI) $(LIT2TEXI_OPTS) -o $(patsubst %.html,%.texi,$@) $<
-	$(TEXI2HTML) $(TEXI2HTML_OPTS) $(patsubst %.lhs,%.texi,$<) 
-	@touch $@
+# stubs are automatically generated and compiled by GHC
+%_stub.$(way_)o: %.o
+	@:
 
-%.info:: %.texi
-	@$(RM) $@
-	$(MAKEINFO) $(MAKEINFO_OPTS) $< && $(POSTMAKEINFO) $@
+# -----------------------------------------------------------------------------
+# Flex/lex
 
-%.hs : %.lhs
-	@$(RM) $@
-	$(LIT2PGM) $(LIT2PGM_OPTS) -o $@ $<
-	@chmod 444 $@
-
-%.itxi : %.lhs
+%.c : %.flex
 	@$(RM) $@
-	$(LIT2TEXI) -c $(LIT2TEXI_OPTS) -o $@ $<
-	@chmod 444 $@
-
-%.ihtml : %.lhs
+	$(FLEX) -t $(FLEX_OPTS) $< > $@
+%.c : %.lex
 	@$(RM) $@
-	$(LIT2HTML) -c $(LIT2HTML_OPTS) -o $@ $<
-	@chmod 444 $@
+	$(FLEX) -t $(FLEX_OPTS) $< > $@
 
-%.itex : %.lhs
-	@$(RM) $@
-	$(LIT2LATEX) -c $(LIT2LATEX_OPTS) -o $@ $<
-	@chmod 444 $@
+#-----------------------------------------------------------------------------
+# Runtest rules for calling $(HC) on a single-file Haskell program
 
-%.tex : %.lhs
-	$(LIT2LATEX) -S -c $(LIT2LATEX_OPTS) -o $@ $<
-	$(HC) $(HC_OPTS) -c $< -o $@
+%.runtest : %.hs
+	$(TIME) $(RUNTEST) $(HC) $(RUNTEST_OPTS) $<
 
+#-----------------------------------------------------------------------------
+# DocBook XML suffix rules
+#
 
-%.itxi : %.lhc
-	@$(RM) $@
-	$(LIT2TEXI) -c $(LIT2TEXI_OPTS) -o $@ $<
-	@chmod 444 $@
+%.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 $@
 
-%.ihtml : %.lhc
-	@$(RM) $@
-	$(LIT2HTML) -c $(LIT2HTML_OPTS) -o $@ $<
-	@chmod 444 $@
+%.pdf : %.fo
+	$(FOP) $(FOP_OPTS) -fo $< -pdf $@
+endif
 
-%.itex : %.lhc
-	@$(RM) $@
-	$(LIT2LATEX) -c $(LIT2LATEX_OPTS) -o $@ $<
-	@chmod 444 $@
+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
 #
-# Temporary, until either unlit is lifted out of ghc/
-# or literate is properly set up locally -- SOF
+# ToDo: make these more robust
 #
-%.prl : %.lprl
-	@$(RM) $@
-	$(UNLIT) $(UNLIT_OPTS) $< $@
-	@chmod 444 $@
-
-%.itxi : %.lprl
+%.ps : %.dvi
 	@$(RM) $@
-	$(LIT2TEXI) -c $(LIT2TEXI_OPTS) -o $@ $<
-	@chmod 444 $@
+	$(DVIPS) $< -o $@
 
-%.ihtml : %.lprl
-	@$(RM) $@
-	$(LIT2HTML) -c $(LIT2HTML_OPTS) -o $@ $<
-	@chmod 444 $@
-
-%.itex : %.lprl
-	@$(RM) $@
-	$(LIT2LATEX) -c $(LIT2LATEX_OPTS) -o $@ $<
-	@chmod 444 $@
+%.tex : %.tib
+	@$(RM) $*.tex $*.verb-t.tex
+	$(TIB) $*.tib
+	expand $*.tib-t.tex | $(VERBATIM) > $*.tex
+	@$(RM) $*.tib-t.tex
 
-%.sh : %.lsh
+%.ps : %.fig
 	@$(RM) $@
-	$(LIT2PGM) $(LIT2PGM_OPTS) -o $@ $<
-	@chmod 444 $@
+	fig2dev -L ps $< $@
 
-%.itxi : %.lsh
+%.tex : %.fig
 	@$(RM) $@
-	$(LIT2TEXI) -c $(LIT2TEXI_OPTS) -o $@ $<
-	@chmod 444 $@
+	fig2dev -L latex $< $@
 
-%.ihtml : %.lsh
-	@$(RM) $@
-	$(LIT2HTML) -c $(LIT2HTML_OPTS) -o $@ $<
-	@chmod 444 $@
+#-----------------------------------------------------------------------------
+# Literate suffix rules
 
-%.itex : %.lsh
+%.prl : %.lprl
 	@$(RM) $@
-	$(LIT2LATEX) -c $(LIT2LATEX_OPTS) -o $@ $<
+	$(UNLIT) $(UNLIT_OPTS) $< $@
 	@chmod 444 $@
 
 %.c : %.lc
 	@$(RM) $@
-	$(UNLIT) $< $@
-	@chmod 444 $@
-
-%.itxi : %.lc
-	@$(RM) $@
-	$(LIT2TEXI) -c $(LIT2TEXI_OPTS) -o $@ $<
-	@chmod 444 $@
-
-%.ihtml : %.lc
-	@$(RM) $@
-	$(LIT2HTML) -c $(LIT2HTML_OPTS) -o $@ $<
-	@chmod 444 $@
-
-%.itex : %.lc
-	@$(RM) $@
-	$(LIT2LATEX) -c $(LIT2LATEX_OPTS) -o $@ $<
+	$(UNLIT) $(UNLIT_OPTS) $< $@
 	@chmod 444 $@
 
 %.h : %.lh
 	@$(RM) $@
-	$(UNLIT) $< $@
-	@chmod 444 $@
-
-%.itxi : %.lh
-	@$(RM) $@
-	$(LIT2TEXI) -c $(LIT2TEXI_OPTS) -o $@ $<
-	@chmod 444 $@
-
-%.ihtml : %.lh
-	@$(RM) $@
-	$(LIT2HTML) -c $(LIT2HTML_OPTS) -o $@ $<
+	$(UNLIT) $(UNLIT_OPTS) $< $@
 	@chmod 444 $@
 
-%.itex : %.lh
-	@$(RM) $@
-	$(LIT2LATEX) -c $(LIT2LATEX_OPTS) -o $@ $<
-	@chmod 444 $@
+#-----------------------------------------------------------------------------
+# Win32 resource files
+#
+# The default is to use the GNU resource compiler.
+#
 
-%.flex : %.lflex
+%.$(way_)o : %.$(way_)rc
 	@$(RM) $@
-	$(LIT2PGM) $(LIT2PGM_OPTS) -o $@ $<
-	@chmod 444 $@
+	windres $< $@
 
-%.itxi : %.lflex
-	@$(RM) $@
-	$(LIT2TEXI) -c $(LIT2TEXI_OPTS) -o $@ $<
-	@chmod 444 $@
+#-----------------------------------------------------------------------------
+# Preprocessor suffix rule
 
-%.ihtml : %.lflex
-	@$(RM) $@
-	$(LIT2HTML) -c $(LIT2HTML_OPTS) -o $@ $<
-	@chmod 444 $@
+# Note use of -P option to prevent #line pragmas being left in the CPP
+# output.
 
-%.itex : %.lflex
+% : %.pp
 	@$(RM) $@
-	$(LIT2LATEX) -c $(LIT2LATEX_OPTS) -o $@ $<
-	@chmod 444 $@
-
+	$(CPP) $(RAWCPP_FLAGS) -P $(CPP_OPTS) -x c $< | \
+	grep -v '^#pragma GCC' > $@