Kouhei Sutou
null+****@clear*****
Tue Jun 11 17:17:20 JST 2013
Kouhei Sutou 2013-06-11 17:17:20 +0900 (Tue, 11 Jun 2013) New Revision: 31cd5fceee3ba363e12507aedad449f79f333b6c https://github.com/groonga/groonga/commit/31cd5fceee3ba363e12507aedad449f79f333b6c Message: Use AM_CPP_FLAGS instead of INCLUDES Because INCLUDES is deprecated (maybe) since automake 1.13. Modified files: plugins/query_expanders/Makefile.am plugins/suggest/Makefile.am plugins/table/Makefile.am plugins/tokenizers/Makefile.am test/benchmark/Makefile.am test/benchmark/lib/Makefile.am test/unit/Makefile.am test/unit/core/Makefile.am test/unit/core/dat/Makefile.am test/unit/fixtures/Makefile.am test/unit/fixtures/performance/Makefile.am test/unit/fixtures/plugins/Makefile.am test/unit/fixtures/stress/Makefile.am test/unit/lib/Makefile.am test/unit/memcached/Makefile.am test/unit/story/Makefile.am test/unit/util/Makefile.am Modified: plugins/query_expanders/Makefile.am (+1 -1) =================================================================== --- plugins/query_expanders/Makefile.am 2013-06-11 17:08:36 +0900 (cb0abc9) +++ plugins/query_expanders/Makefile.am 2013-06-11 17:17:20 +0900 (ca26760) @@ -1,7 +1,7 @@ EXTRA_DIST = \ CMakeLists.txt -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_builddir) \ -I$(top_srcdir)/include \ -I$(top_srcdir)/lib Modified: plugins/suggest/Makefile.am (+1 -1) =================================================================== --- plugins/suggest/Makefile.am 2013-06-11 17:08:36 +0900 (08c51df) +++ plugins/suggest/Makefile.am 2013-06-11 17:17:20 +0900 (7f321b6) @@ -5,7 +5,7 @@ AM_CFLAGS = \ $(MESSAGE_PACK_CFLAGS) \ $(MRUBY_CFLAGS) -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_builddir) \ -I$(top_srcdir)/include \ -I$(top_srcdir)/lib Modified: plugins/table/Makefile.am (+1 -1) =================================================================== --- plugins/table/Makefile.am 2013-06-11 17:08:36 +0900 (5eb16a9) +++ plugins/table/Makefile.am 2013-06-11 17:17:20 +0900 (4b49b0a) @@ -5,7 +5,7 @@ AM_CFLAGS = \ $(MESSAGE_PACK_CFLAGS) \ $(MRUBY_CFLAGS) -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_builddir) \ -I$(top_srcdir)/include \ -I$(top_srcdir)/lib Modified: plugins/tokenizers/Makefile.am (+1 -1) =================================================================== --- plugins/tokenizers/Makefile.am 2013-06-11 17:08:36 +0900 (ee71305) +++ plugins/tokenizers/Makefile.am 2013-06-11 17:17:20 +0900 (2e8b942) @@ -1,7 +1,7 @@ EXTRA_DIST = \ CMakeLists.txt -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_builddir) \ -I$(top_srcdir)/include \ -I$(top_srcdir)/lib Modified: test/benchmark/Makefile.am (+1 -1) =================================================================== --- test/benchmark/Makefile.am 2013-06-11 17:08:36 +0900 (38347c2) +++ test/benchmark/Makefile.am 2013-06-11 17:17:20 +0900 (3d8a17e) @@ -11,7 +11,7 @@ noinst_PROGRAMS = \ bench-geo-select endif -INCLUDES = \ +AM_CPPFLAGS = \ -I$(srcdir) \ -I$(srcdir)/lib \ -I$(top_srcdir)/include \ Modified: test/benchmark/lib/Makefile.am (+1 -1) =================================================================== --- test/benchmark/lib/Makefile.am 2013-06-11 17:08:36 +0900 (72527dc) +++ test/benchmark/lib/Makefile.am 2013-06-11 17:17:20 +0900 (55d113f) @@ -3,7 +3,7 @@ noinst_LTLIBRARIES = \ libbenchmark.la endif -INCLUDES = \ +AM_CPPFLAGS = \ -I$(srcdir) AM_CFLAGS = \ Modified: test/unit/Makefile.am (+1 -1) =================================================================== --- test/unit/Makefile.am 2013-06-11 17:08:36 +0900 (2e941e7) +++ test/unit/Makefile.am 2013-06-11 17:17:20 +0900 (2bb685a) @@ -35,7 +35,7 @@ EXTRA_DIST = \ run-test.rb \ Gemfile -INCLUDES = \ +AM_CPPFLAGS = \ -I$(srcdir) \ -I$(top_srcdir)/include \ -I$(top_srcdir)/lib \ Modified: test/unit/core/Makefile.am (+1 -1) =================================================================== --- test/unit/core/Makefile.am 2013-06-11 17:08:36 +0900 (f57253e) +++ test/unit/core/Makefile.am 2013-06-11 17:17:20 +0900 (9423c7b) @@ -66,7 +66,7 @@ noinst_LTLIBRARIES = \ test-tokenizer.la endif -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir)/include \ -I$(top_srcdir)/lib \ $(GROONGA_INCLUDEDIR) Modified: test/unit/core/dat/Makefile.am (+1 -1) =================================================================== --- test/unit/core/dat/Makefile.am 2013-06-11 17:08:36 +0900 (c79e3fe) +++ test/unit/core/dat/Makefile.am 2013-06-11 17:17:20 +0900 (7a0f289) @@ -22,7 +22,7 @@ noinst_LTLIBRARIES = \ test-vector.la endif -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir)/include \ -I$(top_srcdir)/lib \ -I$(top_srcdir)/test/unit/lib \ Modified: test/unit/fixtures/Makefile.am (+1 -1) =================================================================== --- test/unit/fixtures/Makefile.am 2013-06-11 17:08:36 +0900 (a9f0a3f) +++ test/unit/fixtures/Makefile.am 2013-06-11 17:17:20 +0900 (9d72904) @@ -11,7 +11,7 @@ noinst_LTLIBRARIES = \ suite-groonga-test-fixtures.la endif -INCLUDES = \ +AM_CPPFLAGS = \ -I$(srcdir) \ -I$(srcdir)/../lib \ -I$(top_srcdir)/include \ Modified: test/unit/fixtures/performance/Makefile.am (+1 -1) =================================================================== --- test/unit/fixtures/performance/Makefile.am 2013-06-11 17:08:36 +0900 (bf7c714) +++ test/unit/fixtures/performance/Makefile.am 2013-06-11 17:17:20 +0900 (d50381a) @@ -3,7 +3,7 @@ noinst_LTLIBRARIES = \ test-read-write.la endif -INCLUDES = \ +AM_CPPFLAGS = \ -I$(srcdir) \ -I$(top_srcdir)/test/unit/lib \ -I$(top_srcdir)/include \ Modified: test/unit/fixtures/plugins/Makefile.am (+1 -1) =================================================================== --- test/unit/fixtures/plugins/Makefile.am 2013-06-11 17:08:36 +0900 (1a4fa66) +++ test/unit/fixtures/plugins/Makefile.am 2013-06-11 17:17:20 +0900 (8a24a61) @@ -1,4 +1,4 @@ -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_builddir) \ -I$(top_srcdir)/include \ -I$(top_srcdir)/lib Modified: test/unit/fixtures/stress/Makefile.am (+1 -1) =================================================================== --- test/unit/fixtures/stress/Makefile.am 2013-06-11 17:08:36 +0900 (a8a5c5d) +++ test/unit/fixtures/stress/Makefile.am 2013-06-11 17:17:20 +0900 (886685a) @@ -4,7 +4,7 @@ noinst_LTLIBRARIES = \ test-stress-patricia-trie.la endif -INCLUDES = \ +AM_CPPFLAGS = \ -I$(srcdir) \ -I$(top_srcdir)/test/unit/lib \ -I$(top_srcdir)/include \ Modified: test/unit/lib/Makefile.am (+1 -1) =================================================================== --- test/unit/lib/Makefile.am 2013-06-11 17:08:36 +0900 (eef518f) +++ test/unit/lib/Makefile.am 2013-06-11 17:17:20 +0900 (06720fa) @@ -12,7 +12,7 @@ noinst_LTLIBRARIES += \ endif endif -INCLUDES = \ +AM_CPPFLAGS = \ -I$(srcdir) \ -I$(top_srcdir)/include \ -I$(top_srcdir)/lib \ Modified: test/unit/memcached/Makefile.am (+1 -1) =================================================================== --- test/unit/memcached/Makefile.am 2013-06-11 17:08:36 +0900 (a400306) +++ test/unit/memcached/Makefile.am 2013-06-11 17:17:20 +0900 (e52770e) @@ -5,7 +5,7 @@ noinst_LTLIBRARIES = \ endif endif -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir)/include \ -I$(top_srcdir)/lib \ $(GROONGA_INCLUDEDIR) Modified: test/unit/story/Makefile.am (+1 -1) =================================================================== --- test/unit/story/Makefile.am 2013-06-11 17:08:36 +0900 (85413f2) +++ test/unit/story/Makefile.am 2013-06-11 17:17:20 +0900 (43bb2f7) @@ -3,7 +3,7 @@ noinst_LTLIBRARIES = \ test-taiyaki.la endif -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir)/include \ -I$(top_srcdir)/lib \ $(GROONGA_INCLUDEDIR) Modified: test/unit/util/Makefile.am (+1 -1) =================================================================== --- test/unit/util/Makefile.am 2013-06-11 17:08:36 +0900 (f3caa10) +++ test/unit/util/Makefile.am 2013-06-11 17:17:20 +0900 (00a36fa) @@ -4,7 +4,7 @@ noinst_LTLIBRARIES = \ test-string.la endif -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir)/include \ -I$(top_srcdir)/lib \ $(GROONGA_INCLUDEDIR) -------------- next part -------------- HTML����������������������������...ダウンロード
