summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorFred Drake <fdrake@acm.org>2000-10-26 19:26:47 (GMT)
committerFred Drake <fdrake@acm.org>2000-10-26 19:26:47 (GMT)
commitca92eeba6f9b33ae0e8be7a11f2229cc2cbfc4fd (patch)
tree6d7e50c9d0b4505a5a8f0120190dca8cc55ca256 /Doc
parent956698819f3f3ab7a8406141da3462e3efb47b6b (diff)
downloadcpython-ca92eeba6f9b33ae0e8be7a11f2229cc2cbfc4fd.zip
cpython-ca92eeba6f9b33ae0e8be7a11f2229cc2cbfc4fd.tar.gz
cpython-ca92eeba6f9b33ae0e8be7a11f2229cc2cbfc4fd.tar.bz2
Update the dependency information to allow the other Makefiles to handle
as much of this as possible. Avoids propogating information about how various outputs relate (or don't!).
Diffstat (limited to 'Doc')
-rw-r--r--Doc/info/Makefile59
1 files changed, 25 insertions, 34 deletions
diff --git a/Doc/info/Makefile b/Doc/info/Makefile
index 1c7505c..24d6057 100644
--- a/Doc/info/Makefile
+++ b/Doc/info/Makefile
@@ -1,9 +1,7 @@
# Generate the Python "info" documentation.
-PAPER=letter
TOPDIR=..
TOOLSDIR=$(TOPDIR)/tools
-PAPERDIR=$(TOPDIR)/paper-$(PAPER)
HTMLDIR=$(TOPDIR)/html
MKINFO=$(TOOLSDIR)/mkinfo
@@ -11,7 +9,8 @@ SCRIPTS=$(TOOLSDIR)/html2texi.pl $(TOOLSDIR)/checkargs.pm $(TOOLSDIR)/mkinfo \
$(TOOLSDIR)/fixinfo.el
all: python-api.info python-ext.info python-lib.info \
- python-ref.info python-tut.info
+ python-ref.info python-tut.info \
+ python-dist.info python-inst.info
python-api.info: $(HTMLDIR)/api/api.html $(SCRIPTS)
@@ -33,6 +32,11 @@ python-ref.info: $(HTMLDIR)/ref/ref.html $(SCRIPTS)
python-tut.info: $(HTMLDIR)/tut/tut.html $(SCRIPTS)
$(MKINFO) $<
+python-dist.info: $(HTMLDIR)/dist/dist.html $(SCRIPTS)
+ $(MKINFO) $<
+
+python-inst.info: $(HTMLDIR)/inst/inst.html $(SCRIPTS)
+ $(MKINFO) $<
clean:
rm -f *.texi~ *.texi
@@ -41,42 +45,29 @@ clobber: clean
rm -f *.texi python-*.info python-*.info-[0-9]*
-# The HTML files are dependent on the .aux files, which are dependent on the
-# LaTeX source documents. This makes sure we can build info files from a
-# "clean" tree:
-
-$(HTMLDIR)/api/api.html: $(PAPERDIR)/api.aux $(BUILDINDEX)
- (cd $(TOPDIR); $(MAKE) htmlapi)
-
-$(HTMLDIR)/ext/ext.html: $(PAPERDIR)/ext.aux
- (cd $(TOPDIR); $(MAKE) htmlext)
-
-$(HTMLDIR)/lib/lib.html: $(PAPERDIR)/lib.aux $(BUILDINDEX)
- (cd $(TOPDIR); $(MAKE) htmllib)
-
-$(HTMLDIR)/mac/mac.html: $(MACFILES) $(BUILDINDEX)
- (cd $(TOPDIR); $(MAKE) htmlmac)
-
-$(HTMLDIR)/ref/ref.html: $(PAPERDIR)/ref.aux $(BUILDINDEX)
- (cd $(TOPDIR); $(MAKE) htmlref)
+# This makes sure we can build info files from a "clean" tree,
+# in case we haven't already built the HTML:
-$(HTMLDIR)/tut/tut.html: $(PAPERDIR)/tut.aux
- (cd $(TOPDIR); $(MAKE) htmltut)
+$(HTMLDIR)/api/api.html:
+ (cd $(HTMLDIR); $(MAKE) api)
+$(HTMLDIR)/ext/ext.html:
+ (cd $(HTMLDIR); $(MAKE) ext)
-include ../Makefile.deps
+$(HTMLDIR)/lib/lib.html:
+ (cd $(HTMLDIR); $(MAKE) lib)
-$(PAPERDIR)/api.aux: $(APIFILES)
- (cd $(PAPERDIR); $(MAKE) PAPER=$(PAPER) api.dvi)
+$(HTMLDIR)/mac/mac.html:
+ (cd $(HTMLDIR); $(MAKE) mac)
-$(PAPERDIR)/ext.aux: $(EXTFILES)
- (cd $(PAPERDIR); $(MAKE) PAPER=$(PAPER) ext.dvi)
+$(HTMLDIR)/ref/ref.html:
+ (cd $(HTMLDIR); $(MAKE) ref)
-$(PAPERDIR)/lib.aux: $(LIBFILES)
- (cd $(PAPERDIR); $(MAKE) PAPER=$(PAPER) lib.dvi)
+$(HTMLDIR)/tut/tut.html:
+ (cd $(HTMLDIR); $(MAKE) tut)
-$(PAPERDIR)/ref.aux: $(REFFILES)
- (cd $(PAPERDIR); $(MAKE) PAPER=$(PAPER) ref.dvi)
+$(HTMLDIR)/dist/dist.html:
+ (cd $(HTMLDIR); $(MAKE) dist)
-$(PAPERDIR)/tut.aux: $(TUTFILES)
- (cd $(PAPERDIR); $(MAKE) PAPER=$(PAPER) tut.dvi)
+$(HTMLDIR)/inst/inst.html:
+ (cd $(HTMLDIR); $(MAKE) inst)