[Python-checkins] CVS: python/dist/src/Doc/tools/sgmlconv Makefile,1.7,1.8 make.rules,1.8,1.9

[Fred L. Drake]

Update of /cvsroot/python/python/dist/src/Doc/tools/sgmlconv
In directory slayer.i.sourceforge.net:/tmp/cvs-serv6003

Modified Files:
	Makefile make.rules 
Log Message:

Update the rules to separate the two phases for the ESIS generation,
entirely so that debugging can be performed independently.


Index: Makefile
===================================================================
RCS file: /cvsroot/python/python/dist/src/Doc/tools/sgmlconv/Makefile,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** Makefile	1999/07/22 13:57:12	1.7
--- Makefile	2000/11/22 16:54:20	1.8
***************
*** 1,3 ****
! # Simple makefile to control SGML generation for the entire document tree.
  # This should be used from the top-level directory (Doc/), not the directory
  # that actually contains this file:
--- 1,3 ----
! # 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:
***************
*** 11,26 ****
  
  SGMLRULES=../$(TOOLSDIR)/sgmlconv/make.rules
! SUBDIRS=api ext lib mac ref tut
  SUBMAKE=$(MAKE) -f $(SGMLRULES) TOOLSDIR=../$(TOOLSDIR)
  
  all:	xml
  
! .PHONY: sgml xml
  .PHONY: $(SUBDIRS)
  
- sgml:
- 	for DIR in $(SUBDIRS) ; do \
- 	    (cd $$DIR; $(SUBMAKE) sgml) || exit $$? ; done
- 
  xml:
  	for DIR in $(SUBDIRS) ; do \
--- 11,23 ----
  
  SGMLRULES=../$(TOOLSDIR)/sgmlconv/make.rules
! # 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: esis xml
  .PHONY: $(SUBDIRS)
  
  xml:
  	for DIR in $(SUBDIRS) ; do \
***************
*** 30,42 ****
  	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
  
  api:
  	cd api; $(SUBMAKE)
  
  ext:
  	cd ext; $(SUBMAKE)
  
  lib:
--- 27,49 ----
  	for DIR in $(SUBDIRS) ; do \
  	    (cd $$DIR; $(SUBMAKE) esis) || exit $$? ; done
+ 
+ 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:

Index: make.rules
===================================================================
RCS file: /cvsroot/python/python/dist/src/Doc/tools/sgmlconv/make.rules,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** make.rules	1999/08/26 17:57:18	1.8
--- make.rules	2000/11/22 16:54:20	1.9
***************
*** 1,5 ****
  # -*- makefile -*-
  #
! # Extra magic needed by the LaTeX->SGML conversion process.  This requires
  # $(TOOLSDIR) to be properly defined.
  
--- 1,5 ----
  # -*- makefile -*-
  #
! # Extra magic needed by the LaTeX->XML conversion process.  This requires
  # $(TOOLSDIR) to be properly defined.
  
***************
*** 10,14 ****
  
  ESISTARGETS=	$(patsubst %.tex,%.esis,$(wildcard *.tex))
! SGMLTARGETS=	$(patsubst %.tex,%.sgml,$(wildcard *.tex))
  XMLTARGETS=	$(patsubst %.tex,%.xml,$(wildcard *.tex))
  
--- 10,14 ----
  
  ESISTARGETS=	$(patsubst %.tex,%.esis,$(wildcard *.tex))
! ESIS1TARGETS=	$(patsubst %.tex,%.esis1,$(wildcard *.tex))
  XMLTARGETS=	$(patsubst %.tex,%.xml,$(wildcard *.tex))
  
***************
*** 18,22 ****
  
  esis:	$(ESISTARGETS)
! sgml:	$(SGMLTARGETS)
  xml:	$(XMLTARGETS)
  
--- 18,22 ----
  
  esis:	$(ESISTARGETS)
! esis1:	$(ESIS1TARGETS)
  xml:	$(XMLTARGETS)
  
***************
*** 24,42 ****
  
  $(ESISTARGETS): $(LATEX2ESIS) $(DOCFIXER) $(ESISTOOLS) $(CONVERSION)
  # This variant is easier to work with while debugging the conversion spec:
  #$(ESISTARGETS): $(LATEX2ESIS) $(DOCFIXER) $(ESISTOOLS)
- $(SGMLTARGETS): $(ESIS2ML)
  $(XMLTARGETS): $(ESIS2ML)
  
  
! .SUFFIXES: .esis .sgml .tex .xml
  
! .tex.esis:
! 	$(LATEX2ESIS) $(L2EFLAGS) $< temp.esis
! 	$(DOCFIXER) temp.esis $@
! 	rm temp.esis
  
! .esis.sgml:
! 	$(ESIS2ML) --sgml --autoclose para $< $@
  
  .esis.xml:
--- 24,40 ----
  
  $(ESISTARGETS): $(LATEX2ESIS) $(DOCFIXER) $(ESISTOOLS) $(CONVERSION)
+ $(ESIS1TARGETS): $(LATEX2ESIS) $(CONVERSION)
  # This variant is easier to work with while debugging the conversion spec:
  #$(ESISTARGETS): $(LATEX2ESIS) $(DOCFIXER) $(ESISTOOLS)
  $(XMLTARGETS): $(ESIS2ML)
  
  
! .SUFFIXES: .esis .esis1 .tex .xml
  
! .tex.esis1:
! 	$(LATEX2ESIS) $(L2EFLAGS) $< $@
  
! .esis1.esis:
! 	$(DOCFIXER) $< $@
  
  .esis.xml:
***************
*** 45,50 ****
  
  clean:
! 	rm -f *.esis
  
  clobber: clean
! 	rm -f *.sgml *.xml
--- 43,48 ----
  
  clean:
! 	rm -f *.esis *.esis1
  
  clobber: clean
! 	rm -f *.xml