null+****@clear*****
null+****@clear*****
2010年 8月 20日 (金) 22:59:28 JST
Kouhei Sutou 2010-08-20 13:59:28 +0000 (Fri, 20 Aug 2010)
New Revision: 37f6dd18037904a46ec71846c3093ff19a2568a6
Log:
fix document build dependencies.
Removed files:
doc/ja/build/Makefile.am
Modified files:
.gitignore
configure.ac
doc/ja/Makefile.am
Modified: .gitignore (+4 -4)
===================================================================
--- .gitignore 2010-08-20 12:10:20 +0000 (6747ea6)
+++ .gitignore 2010-08-20 13:59:28 +0000 (4d8bf55)
@@ -37,10 +37,10 @@ Makefile.in
version.sh
/examples/kv
/examples/index
-/doc/ja/build/doctrees/
-/doc/ja/build/html/
-/doc/ja/build/rdoc/
-/doc/ja/build/man/
+/doc/ja/doctrees/
+/doc/ja/html/
+/doc/ja/rdoc/
+/doc/ja/man/
/lib/icudump
/coverage
/coverage.info
Modified: configure.ac (+0 -1)
===================================================================
--- configure.ac 2010-08-20 12:10:20 +0000 (10877f9)
+++ configure.ac 2010-08-20 13:59:28 +0000 (f87105c)
@@ -99,7 +99,6 @@ AC_CONFIG_FILES([Makefile
resource/Makefile
doc/Makefile
doc/ja/Makefile
- doc/ja/build/Makefile
test/Makefile
test/unit/Makefile
test/unit/lib/Makefile
Modified: doc/ja/Makefile.am (+162 -5)
===================================================================
--- doc/ja/Makefile.am 2010-08-20 12:10:20 +0000 (7bffa14)
+++ doc/ja/Makefile.am 2010-08-20 13:59:28 +0000 (0f763f1)
@@ -1,5 +1,3 @@
-SUBDIRS = $(BUILDDIR)
-
docdir = $(pkgdatadir)/doc
doc_jadir = $(docdir)/ja
@@ -10,7 +8,7 @@ doc_jadir = $(docdir)/ja
SPHINXOPTS =
SPHINXBUILD = sphinx-build
PAPER =
-BUILDDIR = build
+BUILDDIR = .
# Internal variables.
PAPEROPT_a4 = -D latex_paper_size=a4
@@ -34,8 +32,21 @@ help:
@echo " linkcheck to check all external links for integrity"
@echo " doctest to run all doctests embedded in the documentation (if enabled)"
-clean:
- -rm -rf $(BUILDDIR)/*
+clean-local:
+ -rm -rf $(BUILDDIR)/doctree
+ -rm -rf $(BUILDDIR)/man
+ -rm -rf $(BUILDDIR)/html
+ -rm -rf $(BUILDDIR)/dirhtml
+ -rm -rf $(BUILDDIR)/pickle
+ -rm -rf $(BUILDDIR)/json
+ -rm -rf $(BUILDDIR)/htmlhelp
+ -rm -rf $(BUILDDIR)/qthelp
+ -rm -rf $(BUILDDIR)/latex
+ -rm -rf $(BUILDDIR)/rdoc
+ -rm -rf $(BUILDDIR)/changes
+ -rm -rf $(BUILDDIR)/linkcheck
+ -rm -rf $(BUILDDIR)/doctest
+ -rm -rf $(BUILDDIR)/pdf
man:
$(SPHINXBUILD) -b man $(ALLSPHINXOPTS) $(BUILDDIR)/man
@@ -232,3 +243,149 @@ nobase_dist_doc_ja_DATA = \
source/tutorial/tutorial10.txt \
source/type.txt \
source/update_execution_example.py
+
+dist_man1_MANS = \
+ man/groonga.1
+
+$(dist_man1_MANS): man
+
+# find html -type f | sort | sed -e 's,^,\t,g'
+nobase_dist_doc_ja_DATA = \
+ html/.buildinfo \
+ html/_sources/characteristic.txt \
+ html/_sources/commands.txt \
+ html/_sources/commands/cache_limit.txt \
+ html/_sources/commands/check.txt \
+ html/_sources/commands/clearlock.txt \
+ html/_sources/commands/column_create.txt \
+ html/_sources/commands/column_list.txt \
+ html/_sources/commands/column_remove.txt \
+ html/_sources/commands/define_selector.txt \
+ html/_sources/commands/defrag.txt \
+ html/_sources/commands/delete.txt \
+ html/_sources/commands/dump.txt \
+ html/_sources/commands/load.txt \
+ html/_sources/commands/log_level.txt \
+ html/_sources/commands/log_put.txt \
+ html/_sources/commands/log_reopen.txt \
+ html/_sources/commands/quit.txt \
+ html/_sources/commands/select.txt \
+ html/_sources/commands/shutdown.txt \
+ html/_sources/commands/status.txt \
+ html/_sources/commands/table_create.txt \
+ html/_sources/commands/table_list.txt \
+ html/_sources/commands/table_remove.txt \
+ html/_sources/commands/view_add.txt \
+ html/_sources/commands_not_implemented/add.txt \
+ html/_sources/commands_not_implemented/get.txt \
+ html/_sources/commands_not_implemented/set.txt \
+ html/_sources/developer.txt \
+ html/_sources/developer/com.txt \
+ html/_sources/developer/document.txt \
+ html/_sources/developer/query.txt \
+ html/_sources/developer/test.txt \
+ html/_sources/execfile.txt \
+ html/_sources/expr.txt \
+ html/_sources/functions.txt \
+ html/_sources/functions/geo_distance.txt \
+ html/_sources/functions/geo_in_circle.txt \
+ html/_sources/functions/geo_in_rectangle.txt \
+ html/_sources/functions/now.txt \
+ html/_sources/functions/rand.txt \
+ html/_sources/grnslap.txt \
+ html/_sources/grntest.txt \
+ html/_sources/http.txt \
+ html/_sources/index.txt \
+ html/_sources/news.txt \
+ html/_sources/process.txt \
+ html/_sources/pseudo_column.txt \
+ html/_sources/reference.txt \
+ html/_sources/tutorial.txt \
+ html/_sources/tutorial/tutorial01.txt \
+ html/_sources/tutorial/tutorial02.txt \
+ html/_sources/tutorial/tutorial03.txt \
+ html/_sources/tutorial/tutorial04.txt \
+ html/_sources/tutorial/tutorial05.txt \
+ html/_sources/tutorial/tutorial06.txt \
+ html/_sources/tutorial/tutorial07.txt \
+ html/_sources/tutorial/tutorial08.txt \
+ html/_sources/tutorial/tutorial09.txt \
+ html/_sources/tutorial/tutorial10.txt \
+ html/_sources/type.txt \
+ html/_static/basic.css \
+ html/_static/default.css \
+ html/_static/doctools.js \
+ html/_static/file.png \
+ html/_static/jquery.js \
+ html/_static/minus.png \
+ html/_static/plus.png \
+ html/_static/pygments.css \
+ html/_static/searchtools.js \
+ html/_static/sidebar.js \
+ html/_static/underscore.js \
+ html/characteristic.html \
+ html/commands.html \
+ html/commands/cache_limit.html \
+ html/commands/check.html \
+ html/commands/clearlock.html \
+ html/commands/column_create.html \
+ html/commands/column_list.html \
+ html/commands/column_remove.html \
+ html/commands/define_selector.html \
+ html/commands/defrag.html \
+ html/commands/delete.html \
+ html/commands/dump.html \
+ html/commands/load.html \
+ html/commands/log_level.html \
+ html/commands/log_put.html \
+ html/commands/log_reopen.html \
+ html/commands/quit.html \
+ html/commands/select.html \
+ html/commands/shutdown.html \
+ html/commands/status.html \
+ html/commands/table_create.html \
+ html/commands/table_list.html \
+ html/commands/table_remove.html \
+ html/commands/view_add.html \
+ html/commands_not_implemented/add.html \
+ html/commands_not_implemented/get.html \
+ html/commands_not_implemented/set.html \
+ html/developer.html \
+ html/developer/com.html \
+ html/developer/document.html \
+ html/developer/query.html \
+ html/developer/test.html \
+ html/execfile.html \
+ html/expr.html \
+ html/functions.html \
+ html/functions/geo_distance.html \
+ html/functions/geo_in_circle.html \
+ html/functions/geo_in_rectangle.html \
+ html/functions/now.html \
+ html/functions/rand.html \
+ html/genindex.html \
+ html/grnslap.html \
+ html/grntest.html \
+ html/http.html \
+ html/index.html \
+ html/news.html \
+ html/objects.inv \
+ html/process.html \
+ html/pseudo_column.html \
+ html/reference.html \
+ html/search.html \
+ html/searchindex.js \
+ html/tutorial.html \
+ html/tutorial/tutorial01.html \
+ html/tutorial/tutorial02.html \
+ html/tutorial/tutorial03.html \
+ html/tutorial/tutorial04.html \
+ html/tutorial/tutorial05.html \
+ html/tutorial/tutorial06.html \
+ html/tutorial/tutorial07.html \
+ html/tutorial/tutorial08.html \
+ html/tutorial/tutorial09.html \
+ html/tutorial/tutorial10.html \
+ html/type.html
+
+$(nobase_dist_doc_ja_DATA): html
Deleted: doc/ja/build/Makefile.am (+0 -150) 100644
===================================================================
--- doc/ja/build/Makefile.am 2010-08-20 12:10:20 +0000 (2c3c743)
+++ /dev/null
@@ -1,150 +0,0 @@
-docdir = $(pkgdatadir)/doc
-doc_jadir = $(docdir)/ja
-
-man/groonga.1:
- $(MAKE) -C .. man
-
-dist_man1_MANS = \
- man/groonga.1
-
-html/.buildinfo:
- $(MAKE) -C .. html
-
-# find html -type f | sort | sed -e 's,^,\t,g'
-nobase_dist_doc_ja_DATA = \
- html/.buildinfo \
- html/_sources/characteristic.txt \
- html/_sources/commands.txt \
- html/_sources/commands/cache_limit.txt \
- html/_sources/commands/check.txt \
- html/_sources/commands/clearlock.txt \
- html/_sources/commands/column_create.txt \
- html/_sources/commands/column_list.txt \
- html/_sources/commands/column_remove.txt \
- html/_sources/commands/define_selector.txt \
- html/_sources/commands/defrag.txt \
- html/_sources/commands/delete.txt \
- html/_sources/commands/dump.txt \
- html/_sources/commands/load.txt \
- html/_sources/commands/log_level.txt \
- html/_sources/commands/log_put.txt \
- html/_sources/commands/log_reopen.txt \
- html/_sources/commands/quit.txt \
- html/_sources/commands/select.txt \
- html/_sources/commands/shutdown.txt \
- html/_sources/commands/status.txt \
- html/_sources/commands/table_create.txt \
- html/_sources/commands/table_list.txt \
- html/_sources/commands/table_remove.txt \
- html/_sources/commands/view_add.txt \
- html/_sources/commands_not_implemented/add.txt \
- html/_sources/commands_not_implemented/get.txt \
- html/_sources/commands_not_implemented/set.txt \
- html/_sources/developer.txt \
- html/_sources/developer/com.txt \
- html/_sources/developer/document.txt \
- html/_sources/developer/query.txt \
- html/_sources/developer/test.txt \
- html/_sources/execfile.txt \
- html/_sources/expr.txt \
- html/_sources/functions.txt \
- html/_sources/functions/geo_distance.txt \
- html/_sources/functions/geo_in_circle.txt \
- html/_sources/functions/geo_in_rectangle.txt \
- html/_sources/functions/now.txt \
- html/_sources/functions/rand.txt \
- html/_sources/grnslap.txt \
- html/_sources/grntest.txt \
- html/_sources/http.txt \
- html/_sources/index.txt \
- html/_sources/news.txt \
- html/_sources/process.txt \
- html/_sources/pseudo_column.txt \
- html/_sources/reference.txt \
- html/_sources/tutorial.txt \
- html/_sources/tutorial/tutorial01.txt \
- html/_sources/tutorial/tutorial02.txt \
- html/_sources/tutorial/tutorial03.txt \
- html/_sources/tutorial/tutorial04.txt \
- html/_sources/tutorial/tutorial05.txt \
- html/_sources/tutorial/tutorial06.txt \
- html/_sources/tutorial/tutorial07.txt \
- html/_sources/tutorial/tutorial08.txt \
- html/_sources/tutorial/tutorial09.txt \
- html/_sources/tutorial/tutorial10.txt \
- html/_sources/type.txt \
- html/_static/basic.css \
- html/_static/default.css \
- html/_static/doctools.js \
- html/_static/file.png \
- html/_static/jquery.js \
- html/_static/minus.png \
- html/_static/plus.png \
- html/_static/pygments.css \
- html/_static/searchtools.js \
- html/_static/sidebar.js \
- html/_static/underscore.js \
- html/characteristic.html \
- html/commands.html \
- html/commands/cache_limit.html \
- html/commands/check.html \
- html/commands/clearlock.html \
- html/commands/column_create.html \
- html/commands/column_list.html \
- html/commands/column_remove.html \
- html/commands/define_selector.html \
- html/commands/defrag.html \
- html/commands/delete.html \
- html/commands/dump.html \
- html/commands/load.html \
- html/commands/log_level.html \
- html/commands/log_put.html \
- html/commands/log_reopen.html \
- html/commands/quit.html \
- html/commands/select.html \
- html/commands/shutdown.html \
- html/commands/status.html \
- html/commands/table_create.html \
- html/commands/table_list.html \
- html/commands/table_remove.html \
- html/commands/view_add.html \
- html/commands_not_implemented/add.html \
- html/commands_not_implemented/get.html \
- html/commands_not_implemented/set.html \
- html/developer.html \
- html/developer/com.html \
- html/developer/document.html \
- html/developer/query.html \
- html/developer/test.html \
- html/execfile.html \
- html/expr.html \
- html/functions.html \
- html/functions/geo_distance.html \
- html/functions/geo_in_circle.html \
- html/functions/geo_in_rectangle.html \
- html/functions/now.html \
- html/functions/rand.html \
- html/genindex.html \
- html/grnslap.html \
- html/grntest.html \
- html/http.html \
- html/index.html \
- html/news.html \
- html/objects.inv \
- html/process.html \
- html/pseudo_column.html \
- html/reference.html \
- html/search.html \
- html/searchindex.js \
- html/tutorial.html \
- html/tutorial/tutorial01.html \
- html/tutorial/tutorial02.html \
- html/tutorial/tutorial03.html \
- html/tutorial/tutorial04.html \
- html/tutorial/tutorial05.html \
- html/tutorial/tutorial06.html \
- html/tutorial/tutorial07.html \
- html/tutorial/tutorial08.html \
- html/tutorial/tutorial09.html \
- html/tutorial/tutorial10.html \
- html/type.html