Update the rules to separate the two phases for the ESIS generation,

entirely so that debugging can be performed independently.
This commit is contained in:
Fred Drake 2000-11-22 16:54:20 +00:00
parent d397f236d5
commit 97be740cd8
2 changed files with 27 additions and 22 deletions

View File

@ -1,4 +1,4 @@
# Simple makefile to control SGML generation for the entire document tree. # Simple makefile to control XML generation for the entire document tree.
# This should be used from the top-level directory (Doc/), not the directory # This should be used from the top-level directory (Doc/), not the directory
# that actually contains this file: # that actually contains this file:
# #
@ -10,18 +10,15 @@ TOPDIR=.
TOOLSDIR=tools TOOLSDIR=tools
SGMLRULES=../$(TOOLSDIR)/sgmlconv/make.rules SGMLRULES=../$(TOOLSDIR)/sgmlconv/make.rules
SUBDIRS=api ext lib mac ref tut # The 'inst' directory breaks the conversion, so skip it for now.
SUBDIRS=api dist ext lib mac ref tut
SUBMAKE=$(MAKE) -f $(SGMLRULES) TOOLSDIR=../$(TOOLSDIR) SUBMAKE=$(MAKE) -f $(SGMLRULES) TOOLSDIR=../$(TOOLSDIR)
all: xml all: xml
.PHONY: sgml xml .PHONY: esis xml
.PHONY: $(SUBDIRS) .PHONY: $(SUBDIRS)
sgml:
for DIR in $(SUBDIRS) ; do \
(cd $$DIR; $(SUBMAKE) sgml) || exit $$? ; done
xml: xml:
for DIR in $(SUBDIRS) ; do \ for DIR in $(SUBDIRS) ; do \
(cd $$DIR; $(SUBMAKE) xml) || exit $$? ; done (cd $$DIR; $(SUBMAKE) xml) || exit $$? ; done
@ -30,15 +27,25 @@ esis:
for DIR in $(SUBDIRS) ; do \ for DIR in $(SUBDIRS) ; do \
(cd $$DIR; $(SUBMAKE) esis) || exit $$? ; done (cd $$DIR; $(SUBMAKE) esis) || exit $$? ; done
tarball: sgml esis1:
tar cf - sgml tools/sgmlconv */*.sgml | gzip -9 >sgml-1.5.2b2.tgz for DIR in $(SUBDIRS) ; do \
(cd $$DIR; $(SUBMAKE) esis1) || exit $$? ; done
tarball: xml
tar cf - tools/sgmlconv */*.xml | gzip -9 >xml-1.5.2b2.tgz
api: api:
cd api; $(SUBMAKE) cd api; $(SUBMAKE)
dist:
cd dist; $(SUBMAKE)
ext: ext:
cd ext; $(SUBMAKE) cd ext; $(SUBMAKE)
inst:
cd inst; $(SUBMAKE)
lib: lib:
cd lib; $(SUBMAKE) cd lib; $(SUBMAKE)

View File

@ -1,6 +1,6 @@
# -*- makefile -*- # -*- makefile -*-
# #
# Extra magic needed by the LaTeX->SGML conversion process. This requires # Extra magic needed by the LaTeX->XML conversion process. This requires
# $(TOOLSDIR) to be properly defined. # $(TOOLSDIR) to be properly defined.
DOCFIXER= $(TOOLSDIR)/sgmlconv/docfixer.py DOCFIXER= $(TOOLSDIR)/sgmlconv/docfixer.py
@ -9,7 +9,7 @@ LATEX2ESIS= $(TOOLSDIR)/sgmlconv/latex2esis.py
CONVERSION= $(TOOLSDIR)/sgmlconv/conversion.xml CONVERSION= $(TOOLSDIR)/sgmlconv/conversion.xml
ESISTARGETS= $(patsubst %.tex,%.esis,$(wildcard *.tex)) ESISTARGETS= $(patsubst %.tex,%.esis,$(wildcard *.tex))
SGMLTARGETS= $(patsubst %.tex,%.sgml,$(wildcard *.tex)) ESIS1TARGETS= $(patsubst %.tex,%.esis1,$(wildcard *.tex))
XMLTARGETS= $(patsubst %.tex,%.xml,$(wildcard *.tex)) XMLTARGETS= $(patsubst %.tex,%.xml,$(wildcard *.tex))
L2EFLAGS= L2EFLAGS=
@ -17,34 +17,32 @@ L2EFLAGS=
all: xml all: xml
esis: $(ESISTARGETS) esis: $(ESISTARGETS)
sgml: $(SGMLTARGETS) esis1: $(ESIS1TARGETS)
xml: $(XMLTARGETS) xml: $(XMLTARGETS)
ESISTOOLS= $(TOOLSDIR)/sgmlconv/esistools.py ESISTOOLS= $(TOOLSDIR)/sgmlconv/esistools.py
$(ESISTARGETS): $(LATEX2ESIS) $(DOCFIXER) $(ESISTOOLS) $(CONVERSION) $(ESISTARGETS): $(LATEX2ESIS) $(DOCFIXER) $(ESISTOOLS) $(CONVERSION)
$(ESIS1TARGETS): $(LATEX2ESIS) $(CONVERSION)
# This variant is easier to work with while debugging the conversion spec: # This variant is easier to work with while debugging the conversion spec:
#$(ESISTARGETS): $(LATEX2ESIS) $(DOCFIXER) $(ESISTOOLS) #$(ESISTARGETS): $(LATEX2ESIS) $(DOCFIXER) $(ESISTOOLS)
$(SGMLTARGETS): $(ESIS2ML)
$(XMLTARGETS): $(ESIS2ML) $(XMLTARGETS): $(ESIS2ML)
.SUFFIXES: .esis .sgml .tex .xml .SUFFIXES: .esis .esis1 .tex .xml
.tex.esis: .tex.esis1:
$(LATEX2ESIS) $(L2EFLAGS) $< temp.esis $(LATEX2ESIS) $(L2EFLAGS) $< $@
$(DOCFIXER) temp.esis $@
rm temp.esis
.esis.sgml: .esis1.esis:
$(ESIS2ML) --sgml --autoclose para $< $@ $(DOCFIXER) $< $@
.esis.xml: .esis.xml:
$(ESIS2ML) --xml $< $@ $(ESIS2ML) --xml $< $@
clean: clean:
rm -f *.esis rm -f *.esis *.esis1
clobber: clean clobber: clean
rm -f *.sgml *.xml rm -f *.xml