[Groonga-commit] groonga/groonga [master] Revert "use relative path for include in Makefile.am."

Back to archive index

null+****@clear***** null+****@clear*****
2012年 1月 12日 (木) 10:17:44 JST


Kouhei Sutou	2012-01-12 10:17:44 +0900 (Thu, 12 Jan 2012)

  New Revision: ed9e53574bdfb1eed5a8d0a61f6c277e0521e0a8

  Log:
    Revert "use relative path for include in Makefile.am."
    
    This reverts commit 99676b72b64cc4a776367c7902ef54880212cfe6.

  Removed 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-12 10:08:58 +0900 (3b4c494)
+++ build/makefiles/LC_MESSAGES.am    2012-01-12 10:17:44 +0900 (acfc3da)
@@ -2,4 +2,4 @@ BUILT_SOURCES =
 EXTRA_DIST =
 SUFFIXES =
 
-include $(srcdir)/gettext.am
+include $(top_srcdir)/build/makefiles/gettext.am

  Modified: build/makefiles/gettext.am (+2 -2)
===================================================================
--- build/makefiles/gettext.am    2012-01-12 10:08:58 +0900 (b50ec44)
+++ build/makefiles/gettext.am    2012-01-12 10:17:44 +0900 (b4b8f85)
@@ -1,5 +1,5 @@
-include $(srcdir)/files.am
-include $(srcdir)/sphinx-build.am
+include $(top_srcdir)/doc/files.am
+include $(top_srcdir)/build/makefiles/sphinx-build.am
 
 if ENABLE_DOCUMENT
 BUILT_SOURCES +=				\

  Modified: build/makefiles/locale.am (+1 -1)
===================================================================
--- build/makefiles/locale.am    2012-01-12 10:08:58 +0900 (b90499e)
+++ build/makefiles/locale.am    2012-01-12 10:17:44 +0900 (414c19a)
@@ -3,7 +3,7 @@ SUBDIRS = LC_MESSAGES
 BUILT_SOURCES =
 EXTRA_DIST =
 
-include $(srcdir)/sphinx.am
+include $(top_srcdir)/build/makefiles/sphinx.am
 
 init:
 	cd LC_MESSAGES && $(MAKE) $@

  Modified: build/makefiles/sphinx.am (+2 -2)
===================================================================
--- build/makefiles/sphinx.am    2012-01-12 10:08:58 +0900 (a75621a)
+++ build/makefiles/sphinx.am    2012-01-12 10:17:44 +0900 (202c6ac)
@@ -1,5 +1,5 @@
-include $(srcdir)/files.am
-include $(srcdir)/sphinx-build.am
+include $(top_srcdir)/doc/files.am
+include $(top_srcdir)/build/makefiles/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-12 10:08:58 +0900 (c3c7cf9)
+++ doc/Makefile.am    2012-01-12 10:17:44 +0900 (b58fab6)
@@ -3,7 +3,7 @@ SUBDIRS =					\
 
 all:
 
-include $(srcdir)/files.am
+include $(top_srcdir)/doc/files.am
 
 update-examples:
 	PATH=$(top_builddir)/src:$(top_builddir)/src/suggest:$$PATH	\

  Modified: doc/locale/Makefile.am (+0 -4)
===================================================================
--- doc/locale/Makefile.am    2012-01-12 10:08:58 +0900 (111ecb7)
+++ doc/locale/Makefile.am    2012-01-12 10:17:44 +0900 (eed4598)
@@ -8,13 +8,9 @@ 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

  Deleted: doc/locale/en/LC_MESSAGES/LC_MESSAGES.am (+0 -1) 100644
===================================================================
--- doc/locale/en/LC_MESSAGES/LC_MESSAGES.am    2012-01-12 10:08:58 +0900 (cd8d6c1)
+++ /dev/null
@@ -1 +0,0 @@
-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-12 10:08:58 +0900 (d464d08)
+++ doc/locale/en/LC_MESSAGES/Makefile.am    2012-01-12 10:17:44 +0900 (25b1b2c)
@@ -1,4 +1,4 @@
 LOCALE = en
 
-include $(srcdir)/LC_MESSAGES.am
+include $(top_srcdir)/build/makefiles/LC_MESSAGES.am
 

  Deleted: doc/locale/en/LC_MESSAGES/files.am (+0 -1) 100644
===================================================================
--- doc/locale/en/LC_MESSAGES/files.am    2012-01-12 10:08:58 +0900 (f1fc9a7)
+++ /dev/null
@@ -1 +0,0 @@
-include $(srcdir)/../../../files.am

  Deleted: doc/locale/en/LC_MESSAGES/gettext.am (+0 -1) 100644
===================================================================
--- doc/locale/en/LC_MESSAGES/gettext.am    2012-01-12 10:08:58 +0900 (1f10661)
+++ /dev/null
@@ -1 +0,0 @@
-include $(srcdir)/../../../../build/makefiles/gettext.am

  Deleted: doc/locale/en/LC_MESSAGES/sphinx-build.am (+0 -1) 100644
===================================================================
--- doc/locale/en/LC_MESSAGES/sphinx-build.am    2012-01-12 10:08:58 +0900 (9a898c7)
+++ /dev/null
@@ -1 +0,0 @@
-include $(srcdir)/../../../../build/makefiles/sphinx-build.am

  Modified: doc/locale/en/Makefile.am (+1 -1)
===================================================================
--- doc/locale/en/Makefile.am    2012-01-12 10:08:58 +0900 (480d6ae)
+++ doc/locale/en/Makefile.am    2012-01-12 10:17:44 +0900 (7647c85)
@@ -1,6 +1,6 @@
 LOCALE = en
 
-include $(srcdir)/locale.am
+include $(top_srcdir)/build/makefiles/locale.am
 
 if ENABLE_DOCUMENT
 dist_man1_MANS = $(man_files)

  Deleted: doc/locale/en/files.am (+0 -1) 100644
===================================================================
--- doc/locale/en/files.am    2012-01-12 10:08:58 +0900 (cb37d19)
+++ /dev/null
@@ -1 +0,0 @@
-include $(srcdir)/../../files.am

  Deleted: doc/locale/en/locale.am (+0 -1) 100644
===================================================================
--- doc/locale/en/locale.am    2012-01-12 10:08:58 +0900 (bf8dabf)
+++ /dev/null
@@ -1 +0,0 @@
-include $(srcdir)/../../../build/makefiles/locale.am

  Deleted: doc/locale/en/sphinx-build.am (+0 -1) 100644
===================================================================
--- doc/locale/en/sphinx-build.am    2012-01-12 10:08:58 +0900 (415c284)
+++ /dev/null
@@ -1 +0,0 @@
-include $(srcdir)/../../../build/makefiles/sphinx-build.am

  Deleted: doc/locale/en/sphinx.am (+0 -1) 100644
===================================================================
--- doc/locale/en/sphinx.am    2012-01-12 10:08:58 +0900 (f6f9d74)
+++ /dev/null
@@ -1 +0,0 @@
-include $(srcdir)/../../../build/makefiles/sphinx.am

  Deleted: doc/locale/ja/LC_MESSAGES/LC_MESSAGES.am (+0 -1) 100644
===================================================================
--- doc/locale/ja/LC_MESSAGES/LC_MESSAGES.am    2012-01-12 10:08:58 +0900 (cd8d6c1)
+++ /dev/null
@@ -1 +0,0 @@
-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-12 10:08:58 +0900 (d7e8d61)
+++ doc/locale/ja/LC_MESSAGES/Makefile.am    2012-01-12 10:17:44 +0900 (a474e7e)
@@ -1,3 +1,3 @@
 LOCALE = ja
 
-include $(srcdir)/LC_MESSAGES.am
+include $(top_srcdir)/build/makefiles/LC_MESSAGES.am

  Deleted: doc/locale/ja/LC_MESSAGES/files.am (+0 -1) 100644
===================================================================
--- doc/locale/ja/LC_MESSAGES/files.am    2012-01-12 10:08:58 +0900 (f1fc9a7)
+++ /dev/null
@@ -1 +0,0 @@
-include $(srcdir)/../../../files.am

  Deleted: doc/locale/ja/LC_MESSAGES/gettext.am (+0 -1) 100644
===================================================================
--- doc/locale/ja/LC_MESSAGES/gettext.am    2012-01-12 10:08:58 +0900 (1f10661)
+++ /dev/null
@@ -1 +0,0 @@
-include $(srcdir)/../../../../build/makefiles/gettext.am

  Deleted: doc/locale/ja/LC_MESSAGES/sphinx-build.am (+0 -1) 100644
===================================================================
--- doc/locale/ja/LC_MESSAGES/sphinx-build.am    2012-01-12 10:08:58 +0900 (9a898c7)
+++ /dev/null
@@ -1 +0,0 @@
-include $(srcdir)/../../../../build/makefiles/sphinx-build.am

  Modified: doc/locale/ja/Makefile.am (+1 -1)
===================================================================
--- doc/locale/ja/Makefile.am    2012-01-12 10:08:58 +0900 (2e882b1)
+++ doc/locale/ja/Makefile.am    2012-01-12 10:17:44 +0900 (308a2f1)
@@ -1,6 +1,6 @@
 LOCALE = ja
 
-include $(srcdir)/locale.am
+include $(top_srcdir)/build/makefiles/locale.am
 
 if ENABLE_DOCUMENT
 ja_man1dir = $(mandir)/ja/man1

  Deleted: doc/locale/ja/files.am (+0 -1) 100644
===================================================================
--- doc/locale/ja/files.am    2012-01-12 10:08:58 +0900 (cb37d19)
+++ /dev/null
@@ -1 +0,0 @@
-include $(srcdir)/../../files.am

  Deleted: doc/locale/ja/locale.am (+0 -1) 100644
===================================================================
--- doc/locale/ja/locale.am    2012-01-12 10:08:58 +0900 (bf8dabf)
+++ /dev/null
@@ -1 +0,0 @@
-include $(srcdir)/../../../build/makefiles/locale.am

  Deleted: doc/locale/ja/sphinx-build.am (+0 -1) 100644
===================================================================
--- doc/locale/ja/sphinx-build.am    2012-01-12 10:08:58 +0900 (415c284)
+++ /dev/null
@@ -1 +0,0 @@
-include $(srcdir)/../../../build/makefiles/sphinx-build.am

  Deleted: doc/locale/ja/sphinx.am (+0 -1) 100644
===================================================================
--- doc/locale/ja/sphinx.am    2012-01-12 10:08:58 +0900 (f6f9d74)
+++ /dev/null
@@ -1 +0,0 @@
-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-12 10:08:58 +0900 (0ad70b3)
+++ doc/locale/template.locale.LC_MESSAGES.Makefile.am    2012-01-12 10:17:44 +0900 (3e81b8c)
@@ -1,3 +1,3 @@
 LOCALE = %LOCALE%
 
-include $(srcdir)/LC_MESSAGES.am
+include $(top_srcdir)/build/makefiles/LC_MESSAGES.am

  Modified: doc/locale/template.locale.Makefile.am (+1 -1)
===================================================================
--- doc/locale/template.locale.Makefile.am    2012-01-12 10:08:58 +0900 (4750559)
+++ doc/locale/template.locale.Makefile.am    2012-01-12 10:17:44 +0900 (601cf49)
@@ -1,6 +1,6 @@
 LOCALE = %LOCALE%
 
-include $(srcdir)/locale.am
+include $(top_srcdir)/build/makefiles/locale.am
 
 if ENABLE_DOCUMENT
 %LOCALE%_man1dir = $(mandir)/%LOCALE%/man1

  Modified: lib/Makefile.am (+1 -1)
===================================================================
--- lib/Makefile.am    2012-01-12 10:08:58 +0900 (bfe972b)
+++ lib/Makefile.am    2012-01-12 10:17:44 +0900 (a453309)
@@ -2,7 +2,7 @@ SUBDIRS = dat
 
 lib_LTLIBRARIES = libgroonga.la
 
-include $(srcdir)/../version.sh
+include $(top_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)




Groonga-commit メーリングリストの案内
Back to archive index