Straighten out dependencies so changes in the texinputs/* get reflected.
diff --git a/Doc/Makefile.deps b/Doc/Makefile.deps
index e360cfd..77bd8ae 100644
--- 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 @@
../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 @@
../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 dc1bb20..a87653b 100644
--- a/Doc/paper-letter/Makefile
+++ b/Doc/paper-letter/Makefile
@@ -35,31 +35,14 @@
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)
+$(DVIFILES): $(SCRIPTS)
+$(PDFFILES): $(SCRIPTS)
-$(MANDVIFILES): $(MANSTYLES)
-$(MANPDFFILES): $(MANSTYLES)
-
-$(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 @@
$(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