Straighten out dependencies so changes in the texinputs/* get reflected.

diff --git a/Doc/Makefile.deps b/Doc/Makefile.deps
index e360cfd63e79fbdf5d0266ae9f383908e37e1a3b..77bd8ae8acddc1ba556f692a223ed3a015e6f603 100644 (file)
--- a/Doc/Makefile.deps
+++ b/Doc/Makefile.deps
@@ -1,17 +1,34 @@
 # LaTeX source dependencies; note that the files are named relative to a
 # child directory and not the directory this file is located in.
 
+COMMONSTYLES= ../texinputs/python.sty \
+       ../texinputs/pypaper.sty \
+       ../texinputs/python.ist
 
-APIFILES= ../api/api.tex
+COMMONTEX= ../texinputs/copyright.tex \
+       ../texinputs/boilerplate.tex
 
-DOCFILES= ../doc/doc.tex
+MANSTYLES= ../texinputs/fncychap.sty \
+       ../texinputs/manual.cls \
+       $(COMMONSTYLES)
 
-EXTFILES= ../ext/ext.tex
+HOWTOSTYLES= ../texinputs/howto.cls \
+       $(COMMONSTYLES)
 
-TUTFILES= ../tut/tut.tex
+
+APIFILES= ../api/api.tex $(MANSTYLES) $(COMMONTEX)
+
+DOCFILES= $(HOWTOSTYLES) $(COMMONTEX) \
+       ../texinputs/ltxmarkup.sty \
+       ../doc/doc.tex
+
+EXTFILES= ../ext/ext.tex $(MANSTYLES) $(COMMONTEX)
+
+TUTFILES= ../tut/tut.tex $(MANSTYLES) $(COMMONTEX)
 
 # LaTeX source files for the Python Reference Manual
-REFFILES= ../ref/ref.tex \
+REFFILES= $(MANSTYLES) $(COMMONTEX) \
+       ../ref/ref.tex \
        ../ref/ref1.tex \
        ../ref/ref2.tex \
        ../ref/ref3.tex \
@@ -22,7 +39,8 @@ REFFILES= ../ref/ref.tex \
        ../ref/ref8.tex
 
 # LaTeX source files for the Python Library Reference
-LIBFILES= ../lib/lib.tex \
+LIBFILES= $(MANSTYLES) $(COMMONTEX) \
+       ../lib/lib.tex \
        ../lib/libintro.tex \
        ../lib/libobjs.tex \
        ../lib/libstdtypes.tex \
@@ -207,7 +225,8 @@ LIBFILES= ../lib/lib.tex \
        ../lib/libcfgparser.tex
 
 # LaTeX source files for Macintosh Library Modules.
-MACFILES= ../mac/mac.tex \
+MACFILES= $(HOWTOSTYLES) $(COMMONTEX) \
+       ../mac/mac.tex \
        ../mac/libmac.tex \
        ../mac/libctb.tex \
        ../mac/libmacconsole.tex \

diff --git a/Doc/paper-letter/Makefile b/Doc/paper-letter/Makefile
index dc1bb20e163176507d5eecc2bc51f2b2f2b512d7..a87653b6f0bf5abc3fb4bbd2f8180b3c375f7827 100644 (file)
--- a/Doc/paper-letter/Makefile
+++ b/Doc/paper-letter/Makefile
@@ -35,31 +35,14 @@ PSFILES=    $(MANPSFILES) $(HOWTOPSFILES)
 
 include ../Makefile.deps
 
-COMMONSTYLES= ../texinputs/python.sty \
-       ../texinputs/pypaper.sty \
-       ../texinputs/python.ist
-
-COMMONTEX= ../texinputs/copyright.tex \
-       ../texinputs/boilerplate.tex
-
-MANSTYLES= ../texinputs/fncychap.sty \
-       ../texinputs/manual.cls \
-       $(COMMONSTYLES)
-
-HOWTOSTYLES= ../texinputs/howto.cls \
-       $(COMMONSTYLES)
-
 
 SCRIPTS:         ../tools/fix_hack ../tools/mkdvi.sh ../tools/indfix.py
 
-$(DVIFILES):     $(SCRIPTS) $(COMMONTEX)
-$(PDFFILES):     $(SCRIPTS) $(COMMONTEX)
-
-$(MANDVIFILES):          $(MANSTYLES)
-$(MANPDFFILES):          $(MANSTYLES)
+$(DVIFILES):     $(SCRIPTS)
+$(PDFFILES):     $(SCRIPTS)
 
-$(HOWTODVIFILES): ../tools/mkhowto $(HOWTOSTYLES)
-$(HOWTOPDFFILES): ../tools/mkhowto $(HOWTOSTYLES)
+$(HOWTODVIFILES): ../tools/mkhowto
+$(HOWTOPDFFILES): ../tools/mkhowto
 
 
 # Rules to build PostScript and PDF formats
@@ -87,10 +70,10 @@ api.pdf: $(APIFILES)
        $(MKPDF) api
 
 # Documenting Python
-doc.dvi: $(DOCFILES) ../texinputs/ltxmarkup.sty
+doc.dvi: $(DOCFILES)
        $(MKHOWTO) --dvi ../doc/doc.tex
 
-doc.pdf: $(DOCCFILES) ../texinputs/ltxmarkup.sty
+doc.pdf: $(DOCFILES)
        $(MKHOWTO) --pdf ../doc/doc.tex
 
 # Extending and Embedding the Python Interpreter