null+****@clear*****
null+****@clear*****
2012年 1月 10日 (火) 18:59:30 JST
Kouhei Sutou 2012-01-10 18:59:30 +0900 (Tue, 10 Jan 2012)
New Revision: 99676b72b64cc4a776367c7902ef54880212cfe6
Log:
use relative path for include in Makefile.am.
Added files:
doc/locale/en/LC_MESSAGES/LC_MESSAGES.am
doc/locale/en/LC_MESSAGES/files.am
doc/locale/en/LC_MESSAGES/gettext.am
doc/locale/en/LC_MESSAGES/sphinx-build.am
doc/locale/en/files.am
doc/locale/en/locale.am
doc/locale/en/sphinx-build.am
doc/locale/en/sphinx.am
doc/locale/ja/LC_MESSAGES/LC_MESSAGES.am
doc/locale/ja/LC_MESSAGES/files.am
doc/locale/ja/LC_MESSAGES/gettext.am
doc/locale/ja/LC_MESSAGES/sphinx-build.am
doc/locale/ja/files.am
doc/locale/ja/locale.am
doc/locale/ja/sphinx-build.am
doc/locale/ja/sphinx.am
Modified files:
build/makefiles/LC_MESSAGES.am
build/makefiles/gettext.am
build/makefiles/locale.am
build/makefiles/sphinx.am
doc/Makefile.am
doc/locale/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
lib/Makefile.am
Modified: build/makefiles/LC_MESSAGES.am (+1 -1)
===================================================================
--- build/makefiles/LC_MESSAGES.am 2012-01-10 16:22:12 +0900 (acfc3da)
+++ build/makefiles/LC_MESSAGES.am 2012-01-10 18:59:30 +0900 (3b4c494)
@@ -2,4 +2,4 @@ BUILT_SOURCES =
EXTRA_DIST =
SUFFIXES =
-include $(top_srcdir)/build/makefiles/gettext.am
+include $(srcdir)/gettext.am
Modified: build/makefiles/gettext.am (+2 -2)
===================================================================
--- build/makefiles/gettext.am 2012-01-10 16:22:12 +0900 (b4b8f85)
+++ build/makefiles/gettext.am 2012-01-10 18:59:30 +0900 (b50ec44)
@@ -1,5 +1,5 @@
-include $(top_srcdir)/doc/files.am
-include $(top_srcdir)/build/makefiles/sphinx-build.am
+include $(srcdir)/files.am
+include $(srcdir)/sphinx-build.am
if ENABLE_DOCUMENT
BUILT_SOURCES += \
Modified: build/makefiles/locale.am (+1 -1)
===================================================================
--- build/makefiles/locale.am 2012-01-10 16:22:12 +0900 (414c19a)
+++ build/makefiles/locale.am 2012-01-10 18:59:30 +0900 (b90499e)
@@ -3,7 +3,7 @@ SUBDIRS = LC_MESSAGES
BUILT_SOURCES =
EXTRA_DIST =
-include $(top_srcdir)/build/makefiles/sphinx.am
+include $(srcdir)/sphinx.am
init:
cd LC_MESSAGES && $(MAKE) $@
Modified: build/makefiles/sphinx.am (+2 -2)
===================================================================
--- build/makefiles/sphinx.am 2012-01-10 16:22:12 +0900 (202c6ac)
+++ build/makefiles/sphinx.am 2012-01-10 18:59:30 +0900 (a75621a)
@@ -1,5 +1,5 @@
-include $(top_srcdir)/doc/files.am
-include $(top_srcdir)/build/makefiles/sphinx-build.am
+include $(srcdir)/files.am
+include $(srcdir)/sphinx-build.am
$(html_files): html-build-stamp
$(html_files_relative_from_locale_dir): html-build-stamp
Modified: doc/Makefile.am (+1 -1)
===================================================================
--- doc/Makefile.am 2012-01-10 16:22:12 +0900 (b58fab6)
+++ doc/Makefile.am 2012-01-10 18:59:30 +0900 (c3c7cf9)
@@ -3,7 +3,7 @@ SUBDIRS = \
all:
-include $(top_srcdir)/doc/files.am
+include $(srcdir)/files.am
update-examples:
PATH=$(top_builddir)/src:$(top_builddir)/src/suggest:$$PATH \
Modified: doc/locale/Makefile.am (+4 -0)
===================================================================
--- doc/locale/Makefile.am 2012-01-10 16:22:12 +0900 (eed4598)
+++ doc/locale/Makefile.am 2012-01-10 18:59:30 +0900 (111ecb7)
@@ -8,9 +8,13 @@ add:
echo "e.g.: make add LOCALE=ja"; \
false)
mkdir -p $(srcdir)/$(LOCALE)/LC_MESSAGES
+ cp $(srcdir)/$(LOCALE)/*.am \
+ $(srcdir)/$(LOCALE)/
sed -e 's,%LOCALE%,$(LOCALE),g' \
$(srcdir)/template.locale.Makefile.am \
> $(srcdir)/$(LOCALE)/Makefile.am
+ cp $(srcdir)/$(LOCALE)/LC_MESSAGES/*.am \
+ $(srcdir)/$(LOCALE)/LC_MESSAGES/
sed -e 's,%LOCALE%,$(LOCALE),g' \
$(srcdir)/template.locale.LC_MESSAGES.Makefile.am \
> $(srcdir)/$(LOCALE)/LC_MESSAGES/Makefile.am
Added: doc/locale/en/LC_MESSAGES/LC_MESSAGES.am (+1 -0) 100644
===================================================================
--- /dev/null
+++ doc/locale/en/LC_MESSAGES/LC_MESSAGES.am 2012-01-10 18:59:30 +0900 (cd8d6c1)
@@ -0,0 +1 @@
+include $(srcdir)/../../../../build/makefiles/LC_MESSAGES.am
Modified: doc/locale/en/LC_MESSAGES/Makefile.am (+1 -1)
===================================================================
--- doc/locale/en/LC_MESSAGES/Makefile.am 2012-01-10 16:22:12 +0900 (25b1b2c)
+++ doc/locale/en/LC_MESSAGES/Makefile.am 2012-01-10 18:59:30 +0900 (d464d08)
@@ -1,4 +1,4 @@
LOCALE = en
-include $(top_srcdir)/build/makefiles/LC_MESSAGES.am
+include $(srcdir)/LC_MESSAGES.am
Added: doc/locale/en/LC_MESSAGES/files.am (+1 -0) 100644
===================================================================
--- /dev/null
+++ doc/locale/en/LC_MESSAGES/files.am 2012-01-10 18:59:30 +0900 (f1fc9a7)
@@ -0,0 +1 @@
+include $(srcdir)/../../../files.am
Added: doc/locale/en/LC_MESSAGES/gettext.am (+1 -0) 100644
===================================================================
--- /dev/null
+++ doc/locale/en/LC_MESSAGES/gettext.am 2012-01-10 18:59:30 +0900 (1f10661)
@@ -0,0 +1 @@
+include $(srcdir)/../../../../build/makefiles/gettext.am
Added: doc/locale/en/LC_MESSAGES/sphinx-build.am (+1 -0) 100644
===================================================================
--- /dev/null
+++ doc/locale/en/LC_MESSAGES/sphinx-build.am 2012-01-10 18:59:30 +0900 (9a898c7)
@@ -0,0 +1 @@
+include $(srcdir)/../../../../build/makefiles/sphinx-build.am
Modified: doc/locale/en/Makefile.am (+1 -1)
===================================================================
--- doc/locale/en/Makefile.am 2012-01-10 16:22:12 +0900 (7647c85)
+++ doc/locale/en/Makefile.am 2012-01-10 18:59:30 +0900 (480d6ae)
@@ -1,6 +1,6 @@
LOCALE = en
-include $(top_srcdir)/build/makefiles/locale.am
+include $(srcdir)/locale.am
if ENABLE_DOCUMENT
dist_man1_MANS = $(man_files)
Added: doc/locale/en/files.am (+1 -0) 100644
===================================================================
--- /dev/null
+++ doc/locale/en/files.am 2012-01-10 18:59:30 +0900 (cb37d19)
@@ -0,0 +1 @@
+include $(srcdir)/../../files.am
Added: doc/locale/en/locale.am (+1 -0) 100644
===================================================================
--- /dev/null
+++ doc/locale/en/locale.am 2012-01-10 18:59:30 +0900 (bf8dabf)
@@ -0,0 +1 @@
+include $(srcdir)/../../../build/makefiles/locale.am
Added: doc/locale/en/sphinx-build.am (+1 -0) 100644
===================================================================
--- /dev/null
+++ doc/locale/en/sphinx-build.am 2012-01-10 18:59:30 +0900 (415c284)
@@ -0,0 +1 @@
+include $(srcdir)/../../../build/makefiles/sphinx-build.am
Added: doc/locale/en/sphinx.am (+1 -0) 100644
===================================================================
--- /dev/null
+++ doc/locale/en/sphinx.am 2012-01-10 18:59:30 +0900 (f6f9d74)
@@ -0,0 +1 @@
+include $(srcdir)/../../../build/makefiles/sphinx.am
Added: doc/locale/ja/LC_MESSAGES/LC_MESSAGES.am (+1 -0) 100644
===================================================================
--- /dev/null
+++ doc/locale/ja/LC_MESSAGES/LC_MESSAGES.am 2012-01-10 18:59:30 +0900 (cd8d6c1)
@@ -0,0 +1 @@
+include $(srcdir)/../../../../build/makefiles/LC_MESSAGES.am
Modified: doc/locale/ja/LC_MESSAGES/Makefile.am (+1 -1)
===================================================================
--- doc/locale/ja/LC_MESSAGES/Makefile.am 2012-01-10 16:22:12 +0900 (a474e7e)
+++ doc/locale/ja/LC_MESSAGES/Makefile.am 2012-01-10 18:59:30 +0900 (d7e8d61)
@@ -1,3 +1,3 @@
LOCALE = ja
-include $(top_srcdir)/build/makefiles/LC_MESSAGES.am
+include $(srcdir)/LC_MESSAGES.am
Added: doc/locale/ja/LC_MESSAGES/files.am (+1 -0) 100644
===================================================================
--- /dev/null
+++ doc/locale/ja/LC_MESSAGES/files.am 2012-01-10 18:59:30 +0900 (f1fc9a7)
@@ -0,0 +1 @@
+include $(srcdir)/../../../files.am
Added: doc/locale/ja/LC_MESSAGES/gettext.am (+1 -0) 100644
===================================================================
--- /dev/null
+++ doc/locale/ja/LC_MESSAGES/gettext.am 2012-01-10 18:59:30 +0900 (1f10661)
@@ -0,0 +1 @@
+include $(srcdir)/../../../../build/makefiles/gettext.am
Added: doc/locale/ja/LC_MESSAGES/sphinx-build.am (+1 -0) 100644
===================================================================
--- /dev/null
+++ doc/locale/ja/LC_MESSAGES/sphinx-build.am 2012-01-10 18:59:30 +0900 (9a898c7)
@@ -0,0 +1 @@
+include $(srcdir)/../../../../build/makefiles/sphinx-build.am
Modified: doc/locale/ja/Makefile.am (+1 -1)
===================================================================
--- doc/locale/ja/Makefile.am 2012-01-10 16:22:12 +0900 (308a2f1)
+++ doc/locale/ja/Makefile.am 2012-01-10 18:59:30 +0900 (2e882b1)
@@ -1,6 +1,6 @@
LOCALE = ja
-include $(top_srcdir)/build/makefiles/locale.am
+include $(srcdir)/locale.am
if ENABLE_DOCUMENT
ja_man1dir = $(mandir)/ja/man1
Added: doc/locale/ja/files.am (+1 -0) 100644
===================================================================
--- /dev/null
+++ doc/locale/ja/files.am 2012-01-10 18:59:30 +0900 (cb37d19)
@@ -0,0 +1 @@
+include $(srcdir)/../../files.am
Added: doc/locale/ja/locale.am (+1 -0) 100644
===================================================================
--- /dev/null
+++ doc/locale/ja/locale.am 2012-01-10 18:59:30 +0900 (bf8dabf)
@@ -0,0 +1 @@
+include $(srcdir)/../../../build/makefiles/locale.am
Added: doc/locale/ja/sphinx-build.am (+1 -0) 100644
===================================================================
--- /dev/null
+++ doc/locale/ja/sphinx-build.am 2012-01-10 18:59:30 +0900 (415c284)
@@ -0,0 +1 @@
+include $(srcdir)/../../../build/makefiles/sphinx-build.am
Added: doc/locale/ja/sphinx.am (+1 -0) 100644
===================================================================
--- /dev/null
+++ doc/locale/ja/sphinx.am 2012-01-10 18:59:30 +0900 (f6f9d74)
@@ -0,0 +1 @@
+include $(srcdir)/../../../build/makefiles/sphinx.am
Modified: doc/locale/template.locale.LC_MESSAGES.Makefile.am (+1 -1)
===================================================================
--- doc/locale/template.locale.LC_MESSAGES.Makefile.am 2012-01-10 16:22:12 +0900 (3e81b8c)
+++ doc/locale/template.locale.LC_MESSAGES.Makefile.am 2012-01-10 18:59:30 +0900 (0ad70b3)
@@ -1,3 +1,3 @@
LOCALE = %LOCALE%
-include $(top_srcdir)/build/makefiles/LC_MESSAGES.am
+include $(srcdir)/LC_MESSAGES.am
Modified: doc/locale/template.locale.Makefile.am (+1 -1)
===================================================================
--- doc/locale/template.locale.Makefile.am 2012-01-10 16:22:12 +0900 (601cf49)
+++ doc/locale/template.locale.Makefile.am 2012-01-10 18:59:30 +0900 (4750559)
@@ -1,6 +1,6 @@
LOCALE = %LOCALE%
-include $(top_srcdir)/build/makefiles/locale.am
+include $(srcdir)/locale.am
if ENABLE_DOCUMENT
%LOCALE%_man1dir = $(mandir)/%LOCALE%/man1
Modified: lib/Makefile.am (+1 -1)
===================================================================
--- lib/Makefile.am 2012-01-10 16:22:12 +0900 (a453309)
+++ lib/Makefile.am 2012-01-10 18:59:30 +0900 (bfe972b)
@@ -2,7 +2,7 @@ SUBDIRS = dat
lib_LTLIBRARIES = libgroonga.la
-include $(top_srcdir)/version.sh
+include $(srcdir)/../version.sh
AM_CFLAGS = -fno-strict-aliasing $(COVERAGE_CFLAGS) $(GRN_CFLAGS)
DEFAULT_INCLUDES = -I$(top_builddir) -I$(top_srcdir)/include
DEFS += -D_REENTRANT -DGROONGA_VERSION=\"$(GROONGA_VERSION)\" $(GRN_DEFS)