Support conversions to both SGML and XML; SGML is the "default".

Add dependency on esistools.py for the ESIS intermediate files.

diff --git a/Doc/tools/sgmlconv/make.rules b/Doc/tools/sgmlconv/make.rules
index b9b31f71868cf1b363d02aaad7bf00c932dd747b..17682547eb94386d01b6bfb8ae15e4c22faa15e5 100644 (file)
--- a/Doc/tools/sgmlconv/make.rules
+++ b/Doc/tools/sgmlconv/make.rules
@@ -2,30 +2,36 @@
 #
 # Extra magic needed by the LaTeX->SGML conversion process.  This requires
 # $(TOOLSDIR) to be properly defined.
-#
-# Note that docfixer.py outputs XML directly; this will be fixed before too
-# much longer.
 
 DOCFIXER=      $(TOOLSDIR)/sgmlconv/docfixer.py
-ESIS2SGML=     $(TOOLSDIR)/sgmlconv/esis2sgml.py
-ESIS2XML=      $(TOOLSDIR)/sgmlconv/esis2sgml.py --xml
+ESIS2ML=       $(TOOLSDIR)/sgmlconv/esis2sgml.py
 FIXGES=                $(TOOLSDIR)/sgmlconv/fixgenents.sh
 LATEX2ESIS=    $(TOOLSDIR)/sgmlconv/latex2esis.py
 
-
 ESISTARGETS=   $(patsubst %.tex,%.esis,$(wildcard *.tex))
+SGMLTARGETS=   $(patsubst %.tex,%.sgml,$(wildcard *.tex))
 XMLTARGETS=    $(patsubst %.tex,%.xml,$(wildcard *.tex))
 
-.SUFFIXES: .esis .tex .xml
 
-.tex.esis:
-       $(LATEX2ESIS) $< $@
+all:   sgml
 
-.esis.xml:
-       $(DOCFIXER) $< | $(FIXGES) > $@
+sgml:  $(SGMLTARGETS)
+xml:   $(XMLTARGETS)
+
+ESISTOOLS=     $(TOOLSDIR)/sgmlconv/esistools.py
 
-all:   $(XMLTARGETS)
+$(ESISTARGETS): $(LATEX2ESIS) $(DOCFIXER) $(ESISTOOLS)
+$(SGMLTARGETS): $(ESIS2ML) $(FIXGES)
+$(XMLTARGETS): $(ESIS2ML) $(FIXGES)
 
 
-$(ESISTARGETS): $(LATEX2ESIS)
-$(XMLTARGETS): $(DOCFIXER) $(FIXGES)
+.SUFFIXES: .esis .sgml .tex .xml
+
+.tex.esis:
+       $(LATEX2ESIS) $< | $(DOCFIXER) > $@
+
+.esis.sgml:
+       $(ESIS2ML) $< | $(FIXGES) > $@
+
+.esis.xml:
+       $(ESIS2ML) --xml $< | $(FIXGES) > $@