null+****@clear*****
null+****@clear*****
2011年 5月 29日 (日) 13:58:36 JST
Kouhei Sutou 2011-05-29 04:58:36 +0000 (Sun, 29 May 2011)
New Revision: 39dd0a0e227d051aae9c8f4579c360c80fe6122f
Log:
[build][doc] re-add doctree related options.
Modified files:
build/makefiles/gettext.am
build/makefiles/sphinx-build.am
build/makefiles/sphinx.am
Modified: build/makefiles/gettext.am (+1 -1)
===================================================================
--- build/makefiles/gettext.am 2011-05-29 04:38:15 +0000 (2a7003e)
+++ build/makefiles/gettext.am 2011-05-29 04:58:36 +0000 (e0df5de)
@@ -27,7 +27,7 @@ man: build
pdf: build
gettext: sphinx-ensure-updated
- $(SPHINX_BUILD_COMMAND) -b gettext $(ALLSPHINXOPTS) .
+ $(SPHINX_BUILD_COMMAND) -d doctrees -b gettext $(ALLSPHINXOPTS) .
xgettext --language Python --output conf.pot ../../../source/conf.py
init: gettext
Modified: build/makefiles/sphinx-build.am (+2 -0)
===================================================================
--- build/makefiles/sphinx-build.am 2011-05-29 04:38:15 +0000 (4fe0988)
+++ build/makefiles/sphinx-build.am 2011-05-29 04:58:36 +0000 (807bf0f)
@@ -1,4 +1,6 @@
# You can set these variables from the command line.
+DOCTREES_BASE = doctrees
+
SPHINXOPTS =
PAPER =
Modified: build/makefiles/sphinx.am (+14 -0)
===================================================================
--- build/makefiles/sphinx.am 2011-05-29 04:38:15 +0000 (15a3580)
+++ build/makefiles/sphinx.am 2011-05-29 04:58:36 +0000 (664f7eb)
@@ -96,6 +96,7 @@ man-build-stamp: $(document_source_files)
$(MAKE) sphinx-ensure-updated
$(SPHINX_BUILD_COMMAND) \
-Dlanguage=$(LOCALE) \
+ -d $(DOCTREES_BASE)/man \
-b man \
$(ALLSPHINXOPTS) \
man
@@ -107,6 +108,7 @@ html-build-stamp: $(document_source_files)
$(MAKE) sphinx-ensure-updated
$(SPHINX_BUILD_COMMAND) \
-Dlanguage=$(LOCALE) \
+ -d $(DOCTREES_BASE)/html \
-b html \
$(ALLSPHINXOPTS) \
html
@@ -120,6 +122,7 @@ pdf-build-stamp: $(document_source_files)
$(MAKE) sphinx-ensure-updated
$(SPHINX_BUILD_COMMAND) \
-Dlanguage=$(LOCALE) \
+ -d $(DOCTREES_BASE)/pdf \
-b pdf \
$(ALLSPHINXOPTS) \
pdf
@@ -131,6 +134,7 @@ dirhtml-build-stamp: $(document_source_files)
$(MAKE) sphinx-ensure-updated
$(SPHINX_BUILD_COMMAND) \
-Dlanguage=$(LOCALE) \
+ -d $(DOCTREES_BASE)dirhtml \
-b dirhtml \
$(ALLSPHINXOPTS) \
dirhtml
@@ -142,6 +146,7 @@ pickle-build-stamp: $(document_source_files)
$(MAKE) sphinx-ensure-updated
$(SPHINX_BUILD_COMMAND) \
-Dlanguage=$(LOCALE) \
+ -d $(DOCTREES_BASE)pickle \
-b pickle \
$(ALLSPHINXOPTS) \
pickle
@@ -153,6 +158,7 @@ json-build-stamp: $(document_source_files)
$(MAKE) sphinx-ensure-updated
$(SPHINX_BUILD_COMMAND) \
-Dlanguage=$(LOCALE) \
+ -d $(DOCTREES_BASE)json \
-b json \
$(ALLSPHINXOPTS) \
json
@@ -164,6 +170,7 @@ htmlhelp-build-stamp: $(document_source_files)
$(MAKE) sphinx-ensure-updated
$(SPHINX_BUILD_COMMAND) \
-Dlanguage=$(LOCALE) \
+ -d $(DOCTREES_BASE)htmlhelp \
-b htmlhelp \
$(ALLSPHINXOPTS) \
htmlhelp
@@ -175,6 +182,7 @@ qthelp-build-stamp: $(document_source_files)
$(MAKE) sphinx-ensure-updated
$(SPHINX_BUILD_COMMAND) \
-Dlanguage=$(LOCALE) \
+ -d $(DOCTREES_BASE)qthelp \
-b qthelp \
$(ALLSPHINXOPTS) \
qthelp
@@ -191,6 +199,7 @@ latex-build-stamp: $(document_source_files)
$(MAKE) sphinx-ensure-updated
$(SPHINX_BUILD_COMMAND) \
-Dlanguage=$(LOCALE) \
+ -d $(DOCTREES_BASE)latex \
-b latex \
$(ALLSPHINXOPTS) \
latex
@@ -205,6 +214,7 @@ rdoc-build-stamp: $(document_source_files)
$(MAKE) sphinx-ensure-updated
$(SPHINX_BUILD_COMMAND) \
-Dlanguage=$(LOCALE) \
+ -d $(DOCTREES_BASE)rdoc \
-b rdoc \
$(ALLSPHINXOPTS) \
rdoc
@@ -216,6 +226,7 @@ textile-build-stamp: $(document_source_files)
$(MAKE) sphinx-ensure-updated
$(SPHINX_BUILD_COMMAND) \
-Dlanguage=$(LOCALE) \
+ -d $(DOCTREES_BASE)textile \
-b textile \
$(ALLSPHINXOPTS) \
textile
@@ -227,6 +238,7 @@ changes-build-stamp: $(document_source_files)
$(MAKE) sphinx-ensure-updated
$(SPHINX_BUILD_COMMAND) \
-Dlanguage=$(LOCALE) \
+ -d $(DOCTREES_BASE)changes \
-b changes \
$(ALLSPHINXOPTS) \
changes
@@ -238,6 +250,7 @@ linkcheck-build-stamp: $(document_source_files)
$(MAKE) sphinx-ensure-updated
$(SPHINX_BUILD_COMMAND) \
-Dlanguage=$(LOCALE) \
+ -d $(DOCTREES_BASE)linkcheck \
-b linkcheck \
$(ALLSPHINXOPTS) \
linkcheck
@@ -246,6 +259,7 @@ linkcheck-build-stamp: $(document_source_files)
doctest: sphinx-ensure-updated
$(SPHINX_BUILD_COMMAND) \
-Dlanguage=$(LOCALE) \
+ -d $(DOCTREES_BASE)doctest \
-b doctest \
$(ALLSPHINXOPTS) \
doctest