null+****@clear*****
null+****@clear*****
2011年 5月 29日 (日) 13:38:15 JST
Kouhei Sutou 2011-05-29 04:38:15 +0000 (Sun, 29 May 2011)
New Revision: 107916b6f125bd19f4df529a3cd307c3bfce93da
Log:
[doc] fix dependencies on doc/local/${LANGUAGE}/ directory.
Modified files:
build/makefiles/gettext-files.am
build/makefiles/gettext.am
build/makefiles/sphinx-build.am
build/makefiles/sphinx.am
Modified: build/makefiles/gettext-files.am (+27 -0)
===================================================================
--- build/makefiles/gettext-files.am 2011-05-29 03:29:02 +0000 (0f27461)
+++ build/makefiles/gettext-files.am 2011-05-29 04:38:15 +0000 (4b33467)
@@ -25,6 +25,33 @@ po_files = \
type.po \
$(NULL)
+# (cd ../../doc/locale/en; echo "po_files_relative_from_locale_dir = \\"; find LC_MESSAGES -type f -name '*.pot' | sort | sed -e 's,^,\t,g' -e 's,pot$,po \\,'; echo -n "\t\$(NULL)")
+po_files_relative_from_locale_dir = \
+ LC_MESSAGES/characteristic.po \
+ LC_MESSAGES/command_version.po \
+ LC_MESSAGES/commands.po \
+ LC_MESSAGES/community.po \
+ LC_MESSAGES/conf.po \
+ LC_MESSAGES/contribution.po \
+ LC_MESSAGES/execfile.po \
+ LC_MESSAGES/expr.po \
+ LC_MESSAGES/functions.po \
+ LC_MESSAGES/grnslap.po \
+ LC_MESSAGES/grntest.po \
+ LC_MESSAGES/http.po \
+ LC_MESSAGES/index.po \
+ LC_MESSAGES/install.po \
+ LC_MESSAGES/limitations.po \
+ LC_MESSAGES/news.po \
+ LC_MESSAGES/process.po \
+ LC_MESSAGES/pseudo_column.po \
+ LC_MESSAGES/reference.po \
+ LC_MESSAGES/spec.po \
+ LC_MESSAGES/troubleshooting.po \
+ LC_MESSAGES/tutorial.po \
+ LC_MESSAGES/type.po \
+ $(NULL)
+
# (cd ../../doc/locale/en/LC_MESSAGES; echo "mo_files = \\"; find . -type f -name '*.pot' | sort | sed -e 's,^\./,\t,g' -e 's,pot$,mo \\,'; echo -n "\t\$(NULL)")
mo_files = \
characteristic.mo \
Modified: build/makefiles/gettext.am (+1 -1)
===================================================================
--- build/makefiles/gettext.am 2011-05-29 03:29:02 +0000 (e0df5de)
+++ build/makefiles/gettext.am 2011-05-29 04:38:15 +0000 (2a7003e)
@@ -27,7 +27,7 @@ man: build
pdf: build
gettext: sphinx-ensure-updated
- $(SPHINX_BUILD_COMMAND) -d doctrees -b gettext $(ALLSPHINXOPTS) .
+ $(SPHINX_BUILD_COMMAND) -b gettext $(ALLSPHINXOPTS) .
xgettext --language Python --output conf.pot ../../../source/conf.py
init: gettext
Modified: build/makefiles/sphinx-build.am (+3 -3)
===================================================================
--- build/makefiles/sphinx-build.am 2011-05-29 03:29:02 +0000 (df997dd)
+++ build/makefiles/sphinx-build.am 2011-05-29 04:38:15 +0000 (4fe0988)
@@ -1,6 +1,4 @@
# You can set these variables from the command line.
-DOCTREES_BASE = doctrees
-
SPHINXOPTS =
PAPER =
@@ -8,7 +6,7 @@ PAPER =
SOURCE_DIR = $(abs_top_srcdir)/doc/source
PAPEROPT_a4 = -D latex_paper_size=a4
PAPEROPT_letter = -D latex_paper_size=letter
-ALLSPHINXOPTS = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) $(SOURCE_DIR)
+ALLSPHINXOPTS = $(PAPEROPT_$(PAPER)) -E $(SPHINXOPTS) $(SOURCE_DIR)
SPHINX_DIR = $(abs_top_builddir)/doc/sphinx
SPHINX_BUILD = $(SPHINX_DIR)/sphinx-build.py
@@ -66,6 +64,8 @@ source_files = \
$(top_srcdir)/doc/source/contribution/development/query.txt \
$(top_srcdir)/doc/source/contribution/development/test.txt \
$(top_srcdir)/doc/source/contribution/documentation.txt \
+ $(top_srcdir)/doc/source/contribution/documentation/c-api.txt \
+ $(top_srcdir)/doc/source/contribution/documentation/i18n.txt \
$(top_srcdir)/doc/source/contribution/report.txt \
$(top_srcdir)/doc/source/example/tutorial01-1.log \
$(top_srcdir)/doc/source/example/tutorial01-10.log \
Modified: build/makefiles/sphinx.am (+7 -18)
===================================================================
--- build/makefiles/sphinx.am 2011-05-29 03:29:02 +0000 (0cf3416)
+++ build/makefiles/sphinx.am 2011-05-29 04:38:15 +0000 (15a3580)
@@ -13,6 +13,7 @@ endif
document_source_files = \
$(source_files) \
+ $(po_files_relative_from_locale_dir) \
$(mo_files_relative_from_locale_dir)
required_build_stamps = \
@@ -25,7 +26,6 @@ man_files = \
man/groonga.1
generated_files = \
- doctrees \
man \
man-build-stamp \
html \
@@ -50,8 +50,11 @@ generated_files = \
linkcheck-build-stamp \
doctest
-$(mo_files_relative_from_locale_dir):
- cd LC_MESSAGES && $(MAKE) `basename $@`
+$(mo_files_relative_from_locale_dir): mo-build-stamp
+
+mo-build-stamp: $(po_files_relative_from_locale_dir)
+ cd LC_MESSAGES && $(MAKE) build
+ @touch $@
maintainer-clean: maintainer-clean-local
maintainer-clean-local:
@@ -93,7 +96,6 @@ man-build-stamp: $(document_source_files)
$(MAKE) sphinx-ensure-updated
$(SPHINX_BUILD_COMMAND) \
-Dlanguage=$(LOCALE) \
- -d $(DOCTREES_BASE)/man \
-b man \
$(ALLSPHINXOPTS) \
man
@@ -105,13 +107,12 @@ html-build-stamp: $(document_source_files)
$(MAKE) sphinx-ensure-updated
$(SPHINX_BUILD_COMMAND) \
-Dlanguage=$(LOCALE) \
- -d $(DOCTREES_BASE)/html \
-b html \
$(ALLSPHINXOPTS) \
html
@touch $@
clean-html:
- @rm -rf html-build-stamp $(DOCTREES_BASE)/html html
+ @rm -rf html-build-stamp html
pdf: generate-pdf
generate-pdf: pdf-build-stamp
@@ -119,7 +120,6 @@ pdf-build-stamp: $(document_source_files)
$(MAKE) sphinx-ensure-updated
$(SPHINX_BUILD_COMMAND) \
-Dlanguage=$(LOCALE) \
- -d $(DOCTREES_BASE)/pdf \
-b pdf \
$(ALLSPHINXOPTS) \
pdf
@@ -131,7 +131,6 @@ dirhtml-build-stamp: $(document_source_files)
$(MAKE) sphinx-ensure-updated
$(SPHINX_BUILD_COMMAND) \
-Dlanguage=$(LOCALE) \
- -d $(DOCTREES_BASE)/dirhtml \
-b dirhtml \
$(ALLSPHINXOPTS) \
dirhtml
@@ -143,7 +142,6 @@ pickle-build-stamp: $(document_source_files)
$(MAKE) sphinx-ensure-updated
$(SPHINX_BUILD_COMMAND) \
-Dlanguage=$(LOCALE) \
- -d $(DOCTREES_BASE)/pickle \
-b pickle \
$(ALLSPHINXOPTS) \
pickle
@@ -155,7 +153,6 @@ json-build-stamp: $(document_source_files)
$(MAKE) sphinx-ensure-updated
$(SPHINX_BUILD_COMMAND) \
-Dlanguage=$(LOCALE) \
- -d $(DOCTREES_BASE)/json \
-b json \
$(ALLSPHINXOPTS) \
json
@@ -167,7 +164,6 @@ htmlhelp-build-stamp: $(document_source_files)
$(MAKE) sphinx-ensure-updated
$(SPHINX_BUILD_COMMAND) \
-Dlanguage=$(LOCALE) \
- -d $(DOCTREES_BASE)/htmlhelp \
-b htmlhelp \
$(ALLSPHINXOPTS) \
htmlhelp
@@ -179,7 +175,6 @@ qthelp-build-stamp: $(document_source_files)
$(MAKE) sphinx-ensure-updated
$(SPHINX_BUILD_COMMAND) \
-Dlanguage=$(LOCALE) \
- -d $(DOCTREES_BASE)/qthelp \
-b qthelp \
$(ALLSPHINXOPTS) \
qthelp
@@ -196,7 +191,6 @@ latex-build-stamp: $(document_source_files)
$(MAKE) sphinx-ensure-updated
$(SPHINX_BUILD_COMMAND) \
-Dlanguage=$(LOCALE) \
- -d $(DOCTREES_BASE)/latex \
-b latex \
$(ALLSPHINXOPTS) \
latex
@@ -211,7 +205,6 @@ rdoc-build-stamp: $(document_source_files)
$(MAKE) sphinx-ensure-updated
$(SPHINX_BUILD_COMMAND) \
-Dlanguage=$(LOCALE) \
- -d $(DOCTREES_BASE)/rdoc \
-b rdoc \
$(ALLSPHINXOPTS) \
rdoc
@@ -223,7 +216,6 @@ textile-build-stamp: $(document_source_files)
$(MAKE) sphinx-ensure-updated
$(SPHINX_BUILD_COMMAND) \
-Dlanguage=$(LOCALE) \
- -d $(DOCTREES_BASE)/textile \
-b textile \
$(ALLSPHINXOPTS) \
textile
@@ -235,7 +227,6 @@ changes-build-stamp: $(document_source_files)
$(MAKE) sphinx-ensure-updated
$(SPHINX_BUILD_COMMAND) \
-Dlanguage=$(LOCALE) \
- -d $(DOCTREES_BASE)/changes \
-b changes \
$(ALLSPHINXOPTS) \
changes
@@ -247,7 +238,6 @@ linkcheck-build-stamp: $(document_source_files)
$(MAKE) sphinx-ensure-updated
$(SPHINX_BUILD_COMMAND) \
-Dlanguage=$(LOCALE) \
- -d $(DOCTREES_BASE)/linkcheck \
-b linkcheck \
$(ALLSPHINXOPTS) \
linkcheck
@@ -256,7 +246,6 @@ linkcheck-build-stamp: $(document_source_files)
doctest: sphinx-ensure-updated
$(SPHINX_BUILD_COMMAND) \
-Dlanguage=$(LOCALE) \
- -d $(DOCTREES_BASE)/doctest \
-b doctest \
$(ALLSPHINXOPTS) \
doctest