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

entirely so that debugging can be performed independently.

1 files changed, 16 insertions, 9 deletions

diff --git a/Doc/tools/sgmlconv/Makefile b/Doc/tools/sgmlconv/Makefile
index d48e098..30a846e 100644
--- a/Doc/tools/sgmlconv/Makefile
+++ b/Doc/tools/sgmlconv/Makefile
@@ -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
 # that actually contains this file:
 #
@@ -10,18 +10,15 @@ TOPDIR=.
 TOOLSDIR=tools
 
 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)
 
 all:	xml
 
-.PHONY: sgml xml
+.PHONY: esis xml
 .PHONY: $(SUBDIRS)
 
-sgml:
-	for DIR in $(SUBDIRS) ; do \
-	    (cd $$DIR; $(SUBMAKE) sgml) || exit $$? ; done
-
 xml:
 	for DIR in $(SUBDIRS) ; do \
 	    (cd $$DIR; $(SUBMAKE) xml) || exit $$? ; done
@@ -30,15 +27,25 @@ esis:
 	for DIR in $(SUBDIRS) ; do \
 	    (cd $$DIR; $(SUBMAKE) esis) || exit $$? ; done
 
-tarball:  sgml
-	tar cf - sgml tools/sgmlconv */*.sgml | gzip -9 >sgml-1.5.2b2.tgz
+esis1:
+	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:
 	cd api; $(SUBMAKE)
 
+dist:
+	cd dist; $(SUBMAKE)
+
 ext:
 	cd ext; $(SUBMAKE)
 
+inst:
+	cd inst; $(SUBMAKE)
+
 lib:
 	cd lib; $(SUBMAKE)