diff options
| author | Christian Heimes <christian@cheimes.de> | 2007-12-17 20:04:13 (GMT) |
|---|---|---|
| committer | Christian Heimes <christian@cheimes.de> | 2007-12-17 20:04:13 (GMT) |
| commit | 2c1816160639f00489aa8bac6178e44bb51e7adb (patch) | |
| tree | 2b0cf29416e1b6bacef23bf4c1736a464f864c19 /Doc/Makefile | |
| parent | 3377055486af6021e7662fc53f1504bd26981ea6 (diff) | |
| download | cpython-2c1816160639f00489aa8bac6178e44bb51e7adb.zip cpython-2c1816160639f00489aa8bac6178e44bb51e7adb.tar.gz cpython-2c1816160639f00489aa8bac6178e44bb51e7adb.tar.bz2 | |
Merged revisions 59512-59540 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r59513 | raymond.hettinger | 2007-12-15 01:07:25 +0100 (Sat, 15 Dec 2007) | 6 lines
Optimize PyList_AsTuple(). Improve cache performance by doing the
pointer copy and object increment in one pass. For small lists,
save the overhead of the call to memcpy() -- this comes up in
calls like f(*listcomp).
........
r59519 | christian.heimes | 2007-12-15 06:38:35 +0100 (Sat, 15 Dec 2007) | 2 lines
Fixed #1624: Remove output comparison for test_pep277
I had to modify Brett's patch slightly.
........
r59520 | georg.brandl | 2007-12-15 10:34:59 +0100 (Sat, 15 Dec 2007) | 2 lines
Add note about future import needed for with statement.
........
r59522 | georg.brandl | 2007-12-15 10:36:37 +0100 (Sat, 15 Dec 2007) | 2 lines
Argh, wrong version.
........
r59524 | georg.brandl | 2007-12-16 12:06:09 +0100 (Sun, 16 Dec 2007) | 2 lines
Dummy commit to investigate #1617.
........
r59525 | georg.brandl | 2007-12-16 12:21:48 +0100 (Sun, 16 Dec 2007) | 2 lines
Revert dummy commit now that the build slave is building.
........
r59527 | georg.brandl | 2007-12-16 16:47:46 +0100 (Sun, 16 Dec 2007) | 2 lines
Remove orphaned footnote reference.
........
r59528 | georg.brandl | 2007-12-16 16:53:49 +0100 (Sun, 16 Dec 2007) | 2 lines
Remove gratuitous unicode character.
........
r59529 | georg.brandl | 2007-12-16 16:59:19 +0100 (Sun, 16 Dec 2007) | 2 lines
Remove another unnecessary Unicode character.
........
r59530 | georg.brandl | 2007-12-16 17:00:36 +0100 (Sun, 16 Dec 2007) | 2 lines
Remove curious space-like characters.
........
r59532 | georg.brandl | 2007-12-16 20:36:51 +0100 (Sun, 16 Dec 2007) | 2 lines
Adapt conf.py to new option names.
........
r59533 | christian.heimes | 2007-12-16 22:39:43 +0100 (Sun, 16 Dec 2007) | 1 line
Fixed #1638: %zd configure test fails on Linux
........
r59536 | georg.brandl | 2007-12-17 00:11:16 +0100 (Mon, 17 Dec 2007) | 2 lines
Simplify.
........
r59537 | georg.brandl | 2007-12-17 00:13:29 +0100 (Mon, 17 Dec 2007) | 2 lines
Use PEP 8.
........
r59539 | georg.brandl | 2007-12-17 00:15:07 +0100 (Mon, 17 Dec 2007) | 2 lines
Don't use quotes for non-string code.
........
r59540 | facundo.batista | 2007-12-17 15:18:42 +0100 (Mon, 17 Dec 2007) | 4 lines
Removed the private _rounding_decision: it was not needed, and the code
is now simpler. Thanks Mark Dickinson.
........
Diffstat (limited to 'Doc/Makefile')
| -rw-r--r-- | Doc/Makefile | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/Doc/Makefile b/Doc/Makefile index 84a297a..22f852b 100644 --- a/Doc/Makefile +++ b/Doc/Makefile @@ -7,16 +7,19 @@ PYTHON = python2.5 SVNROOT = http://svn.python.org/projects SPHINXOPTS = +PAPER = -ALLSPHINXOPTS = -b$(BUILDER) -dbuild/doctrees $(SPHINXOPTS) . build/$(BUILDER) +ALLSPHINXOPTS = -b $(BUILDER) -d build/doctrees -D latex_paper_size=$(PAPER) \ + $(SPHINXOPTS) . build/$(BUILDER) .PHONY: help checkout update build html web htmlhelp clean help: @echo "Please use \`make <target>' where <target> is one of" - @echo " html to make standalone HTML files" - @echo " web to make file usable by Sphinx.web" + @echo " html to make standalone HTML files" + @echo " web to make file usable by Sphinx.web" @echo " htmlhelp to make HTML files and a HTML help project" + @echo " latex to make LaTeX files, you can set PAPER=a4 or PAPER=letter" checkout: @if [ ! -d tools/sphinx ]; then \ @@ -60,6 +63,8 @@ htmlhelp: build latex: BUILDER = latex latex: build @echo "Build finished; the LaTeX files are in build/latex." + @echo "Run \`make all-pdf' or \`make all-ps' in that directory to" \ + "run these through (pdf)latex." clean: -rm -rf build/* |