null+****@clear*****
null+****@clear*****
2011年 5月 19日 (木) 14:22:50 JST
Kouhei Sutou 2011-05-19 05:22:50 +0000 (Thu, 19 May 2011)
New Revision: 9b0624fcdc23de71005c09711eb43b59fa2af0cd
Log:
[doc] use $(top_srcdir) instead of $(abs_top_srcdir).
Automake only supports $(srcdir) and $(top_srcdir).
Added files:
build/makefiles/LC_MESSAGES.am
build/makefiles/common.am
Copied files:
build/makefiles/locale.am
(from doc/locale/en/Makefile.am)
Modified files:
build/makefiles/gettext-files.am
build/makefiles/gettext.am
build/makefiles/sphinx.am
doc/Makefile.am
doc/locale/en/LC_MESSAGES/Makefile.am
doc/locale/en/Makefile.am
doc/locale/ja/LC_MESSAGES/Makefile.am
doc/locale/ja/Makefile.am
doc/locale/template.locale.LC_MESSAGES.Makefile.am
doc/locale/template.locale.Makefile.am
Added: build/makefiles/LC_MESSAGES.am (+5 -0) 100644
===================================================================
--- /dev/null
+++ build/makefiles/LC_MESSAGES.am 2011-05-19 05:22:50 +0000 (acfc3da)
@@ -0,0 +1,5 @@
+BUILT_SOURCES =
+EXTRA_DIST =
+SUFFIXES =
+
+include $(top_srcdir)/build/makefiles/gettext.am
Added: build/makefiles/common.am (+1 -0) 100644
===================================================================
--- /dev/null
+++ build/makefiles/common.am 2011-05-19 05:22:50 +0000 (86f0b1c)
@@ -0,0 +1 @@
+NULL =
Modified: build/makefiles/gettext-files.am (+0 -2)
===================================================================
--- build/makefiles/gettext-files.am 2011-05-18 09:07:41 +0000 (4a29d63)
+++ build/makefiles/gettext-files.am 2011-05-19 05:22:50 +0000 (c6a722e)
@@ -1,5 +1,3 @@
-NULL =
-
# (cd ../../doc; echo "po_files = \\"; find pot -type f -name '*.pot' | sort | sed -e 's,^pot/,\t,g' -e 's,pot$,po \\,'; echo -n "\t\$(NULL)")
po_files = \
characteristic.po \
Modified: build/makefiles/gettext.am (+7 -3)
===================================================================
--- build/makefiles/gettext.am 2011-05-18 09:07:41 +0000 (5298a2e)
+++ build/makefiles/gettext.am 2011-05-19 05:22:50 +0000 (d930f8b)
@@ -1,15 +1,19 @@
-include $(abs_top_srcdir)/build/makefiles/gettext-files.am
-include $(abs_top_srcdir)/build/makefiles/sphinx-build.am
+include $(top_srcdir)/build/makefiles/gettext-files.am
+include $(top_srcdir)/build/makefiles/sphinx-build.am
+
+BUILT_SOURCES += \
+ $(mo_files)
EXTRA_DIST += \
$(po_files) \
$(mo_files)
+SUFFIXES += .pot .po .mo
+
.PHONY: gettext update build
all:
-.SUFFIXES: .pot .po .mo
.pot.po:
msgmerge --quiet --update --sort-by-file $@ $<
.po.mo:
Copied: build/makefiles/locale.am (+2 -3) 62%
===================================================================
--- doc/locale/en/Makefile.am 2011-05-18 09:07:41 +0000 (46b8091)
+++ build/makefiles/locale.am 2011-05-19 05:22:50 +0000 (527a32b)
@@ -1,7 +1,6 @@
SUBDIRS = LC_MESSAGES
-LOCALE = en
+BUILT_SOURCES =
+EXTRA_DIST =
include $(top_srcdir)/build/makefiles/sphinx.am
-
-dist_man1_MANS = $(man_files)
Modified: build/makefiles/sphinx.am (+10 -10)
===================================================================
--- build/makefiles/sphinx.am 2011-05-18 09:07:41 +0000 (536deb6)
+++ build/makefiles/sphinx.am 2011-05-19 05:22:50 +0000 (a0d7bd7)
@@ -1,20 +1,25 @@
-NULL =
+include $(top_srcdir)/build/makefiles/sphinx-build.am
+include $(top_srcdir)/build/makefiles/gettext-files.am
doc_localedir = $(docdir)/$(LOCALE)
-all:
+if ENABLE_DOCUMENT
+BUILT_SOURCES += $(required_build_stamps)
-include $(abs_top_srcdir)/build/makefiles/sphinx-build.am
-include $(abs_top_srcdir)/build/makefiles/gettext-files.am
+nobase_dist_doc_locale_DATA = \
+ $(html_files)
+endif
document_source_files = \
$(source_files) \
$(mo_files_relative_from_locale_dir)
-EXTRA_DIST = \
+required_build_stamps = \
html-build-stamp \
man-build-stamp
+EXTRA_DIST += $(required_build_stamps)
+
man_files = \
man/groonga.1
@@ -250,10 +255,6 @@ doctest: sphinx-ensure-updated
$(ALLSPHINXOPTS) \
doctest
-if ENABLE_DOCUMENT
-nobase_dist_doc_locale_DATA = \
- $(html_files)
-
# (cd ../../doc/locale/en; echo "html_files = \\"; find html -type f | sort | sed -e 's,^,\t,' -e 's,$, \\,'; echo "\t\$(NULL)")
html_files = \
html/.buildinfo \
@@ -420,4 +421,3 @@ html_files = \
html/tutorial/tutorial10.html \
html/type.html \
$(NULL)
-endif
Modified: doc/Makefile.am (+1 -3)
===================================================================
--- doc/Makefile.am 2011-05-18 09:07:41 +0000 (6003dda)
+++ doc/Makefile.am 2011-05-19 05:22:50 +0000 (8b7bff6)
@@ -1,11 +1,9 @@
SUBDIRS = \
locale
-NULL =
-
all:
-include $(abs_top_srcdir)/build/makefiles/sphinx-build.am
+include $(top_srcdir)/build/makefiles/sphinx-build.am
update-examples:
GROONGA=$(GROONGA) $(srcdir)/source/update_execution_example.py
Modified: doc/locale/en/LC_MESSAGES/Makefile.am (+2 -1)
===================================================================
--- doc/locale/en/LC_MESSAGES/Makefile.am 2011-05-18 09:07:41 +0000 (f2e6dd6)
+++ doc/locale/en/LC_MESSAGES/Makefile.am 2011-05-19 05:22:50 +0000 (25b1b2c)
@@ -1,3 +1,4 @@
LOCALE = en
-include $(abs_top_srcdir)/build/makefiles/gettext.am
+include $(top_srcdir)/build/makefiles/LC_MESSAGES.am
+
Modified: doc/locale/en/Makefile.am (+3 -3)
===================================================================
--- doc/locale/en/Makefile.am 2011-05-18 09:07:41 +0000 (46b8091)
+++ doc/locale/en/Makefile.am 2011-05-19 05:22:50 +0000 (7647c85)
@@ -1,7 +1,7 @@
-SUBDIRS = LC_MESSAGES
-
LOCALE = en
-include $(top_srcdir)/build/makefiles/sphinx.am
+include $(top_srcdir)/build/makefiles/locale.am
+if ENABLE_DOCUMENT
dist_man1_MANS = $(man_files)
+endif
Modified: doc/locale/ja/LC_MESSAGES/Makefile.am (+1 -1)
===================================================================
--- doc/locale/ja/LC_MESSAGES/Makefile.am 2011-05-18 09:07:41 +0000 (f0b355c)
+++ doc/locale/ja/LC_MESSAGES/Makefile.am 2011-05-19 05:22:50 +0000 (a474e7e)
@@ -1,3 +1,3 @@
LOCALE = ja
-include $(abs_top_srcdir)/build/makefiles/gettext.am
+include $(top_srcdir)/build/makefiles/LC_MESSAGES.am
Modified: doc/locale/ja/Makefile.am (+3 -3)
===================================================================
--- doc/locale/ja/Makefile.am 2011-05-18 09:07:41 +0000 (1afaaf0)
+++ doc/locale/ja/Makefile.am 2011-05-19 05:22:50 +0000 (308a2f1)
@@ -1,8 +1,8 @@
-SUBDIRS = LC_MESSAGES
-
LOCALE = ja
-include $(top_srcdir)/build/makefiles/sphinx.am
+include $(top_srcdir)/build/makefiles/locale.am
+if ENABLE_DOCUMENT
ja_man1dir = $(mandir)/ja/man1
dist_ja_man1_DATA = $(man_files)
+endif
Modified: doc/locale/template.locale.LC_MESSAGES.Makefile.am (+1 -1)
===================================================================
--- doc/locale/template.locale.LC_MESSAGES.Makefile.am 2011-05-18 09:07:41 +0000 (a863ef3)
+++ doc/locale/template.locale.LC_MESSAGES.Makefile.am 2011-05-19 05:22:50 +0000 (3e81b8c)
@@ -1,3 +1,3 @@
LOCALE = %LOCALE%
-include $(abs_top_srcdir)/build/makefiles/gettext.am
+include $(top_srcdir)/build/makefiles/LC_MESSAGES.am
Modified: doc/locale/template.locale.Makefile.am (+4 -3)
===================================================================
--- doc/locale/template.locale.Makefile.am 2011-05-18 09:07:41 +0000 (6a72c63)
+++ doc/locale/template.locale.Makefile.am 2011-05-19 05:22:50 +0000 (601cf49)
@@ -1,8 +1,9 @@
-SUBDIRS = LC_MESSAGES
-
LOCALE = %LOCALE%
-include $(top_srcdir)/build/makefiles/sphinx.am
+include $(top_srcdir)/build/makefiles/locale.am
+if ENABLE_DOCUMENT
%LOCALE%_man1dir = $(mandir)/%LOCALE%/man1
dist_%LOCALE%_man1_DATA = $(man_files)
+endif
+