Kouhei Sutou
null+****@clear*****
Wed Sep 11 18:06:04 JST 2013
Kouhei Sutou 2013-09-11 18:06:04 +0900 (Wed, 11 Sep 2013) New Revision: 3741897c31ae5bd10de574fb9a077bf4cc636633 https://github.com/groonga/groonga/commit/3741897c31ae5bd10de574fb9a077bf4cc636633 Message: Use subdir-objects option in Automake automake 1.14 showes the following warning: vendor/mruby/sources.am:1: warning: source file '../mruby-4728070/src/vm.c' is in a subdirectory, vendor/mruby/sources.am:1: but option 'subdir-objects' is disabled vendor/mruby/Makefile.am:11: 'vendor/mruby/sources.am' included from here So I use subdir-objects option. See: http://www.gnu.org/software/automake/manual/automake.html#index-subdir_002dobjects Modified files: configure.ac vendor/mruby/sources.am vendor/mruby/update_files.sh Modified: configure.ac (+1 -1) =================================================================== --- configure.ac 2013-09-11 17:39:59 +0900 (29e4db2) +++ configure.ac 2013-09-11 18:06:04 +0900 (414c801) @@ -3,7 +3,7 @@ m4_define([groonga_version], m4_include(base_version)) AC_INIT([groonga], groonga_version, [groonga �� razil.jp]) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(tar-pax) +AM_INIT_AUTOMAKE([tar-pax subdir-objects]) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) # for Autoconf 2.60 or earlier. Modified: vendor/mruby/sources.am (+52 -52) =================================================================== --- vendor/mruby/sources.am 2013-09-11 17:39:59 +0900 (366999b) +++ vendor/mruby/sources.am 2013-09-11 18:06:04 +0900 (571b2e4) @@ -1,55 +1,55 @@ libmruby_la_SOURCES = \ - $(srcdir)/../mruby-4728070/src/array.c \ - $(srcdir)/../mruby-4728070/src/cdump.c \ - $(srcdir)/../mruby-4728070/src/class.c \ - $(srcdir)/../mruby-4728070/src/codegen.c \ - $(srcdir)/../mruby-4728070/src/compar.c \ - $(srcdir)/../mruby-4728070/src/crc.c \ - $(srcdir)/../mruby-4728070/src/dump.c \ - $(srcdir)/../mruby-4728070/src/encoding.h \ - $(srcdir)/../mruby-4728070/src/enum.c \ - $(srcdir)/../mruby-4728070/src/error.c \ - $(srcdir)/../mruby-4728070/src/error.h \ - $(srcdir)/../mruby-4728070/src/etc.c \ - $(srcdir)/../mruby-4728070/src/gc.c \ - $(srcdir)/../mruby-4728070/src/hash.c \ - $(srcdir)/../mruby-4728070/src/init.c \ - $(srcdir)/../mruby-4728070/src/init_ext.c \ - $(srcdir)/../mruby-4728070/src/kernel.c \ - $(srcdir)/../mruby-4728070/src/load.c \ - $(srcdir)/../mruby-4728070/src/math.c \ - $(srcdir)/../mruby-4728070/src/mrblib.c \ - $(srcdir)/../mruby-4728070/src/name2ctype.h \ - $(srcdir)/../mruby-4728070/src/node.h \ - $(srcdir)/../mruby-4728070/src/numeric.c \ - $(srcdir)/../mruby-4728070/src/object.c \ - $(srcdir)/../mruby-4728070/src/oniguruma.h \ - $(srcdir)/../mruby-4728070/src/opcode.h \ - $(srcdir)/../mruby-4728070/src/parse.c \ - $(srcdir)/../mruby-4728070/src/pool.c \ - $(srcdir)/../mruby-4728070/src/print.c \ - $(srcdir)/../mruby-4728070/src/proc.c \ - $(srcdir)/../mruby-4728070/src/range.c \ - $(srcdir)/../mruby-4728070/src/re.c \ - $(srcdir)/../mruby-4728070/src/re.h \ - $(srcdir)/../mruby-4728070/src/regcomp.c \ - $(srcdir)/../mruby-4728070/src/regenc.c \ - $(srcdir)/../mruby-4728070/src/regenc.h \ - $(srcdir)/../mruby-4728070/src/regerror.c \ - $(srcdir)/../mruby-4728070/src/regex.h \ - $(srcdir)/../mruby-4728070/src/regexec.c \ - $(srcdir)/../mruby-4728070/src/regint.h \ - $(srcdir)/../mruby-4728070/src/regparse.c \ - $(srcdir)/../mruby-4728070/src/regparse.h \ - $(srcdir)/../mruby-4728070/src/sprintf.c \ - $(srcdir)/../mruby-4728070/src/st.c \ - $(srcdir)/../mruby-4728070/src/st.h \ - $(srcdir)/../mruby-4728070/src/state.c \ - $(srcdir)/../mruby-4728070/src/string.c \ - $(srcdir)/../mruby-4728070/src/struct.c \ - $(srcdir)/../mruby-4728070/src/symbol.c \ - $(srcdir)/../mruby-4728070/src/time.c \ - $(srcdir)/../mruby-4728070/src/variable.c \ - $(srcdir)/../mruby-4728070/src/vm.c \ + ../mruby-4728070/src/array.c \ + ../mruby-4728070/src/cdump.c \ + ../mruby-4728070/src/class.c \ + ../mruby-4728070/src/codegen.c \ + ../mruby-4728070/src/compar.c \ + ../mruby-4728070/src/crc.c \ + ../mruby-4728070/src/dump.c \ + ../mruby-4728070/src/encoding.h \ + ../mruby-4728070/src/enum.c \ + ../mruby-4728070/src/error.c \ + ../mruby-4728070/src/error.h \ + ../mruby-4728070/src/etc.c \ + ../mruby-4728070/src/gc.c \ + ../mruby-4728070/src/hash.c \ + ../mruby-4728070/src/init.c \ + ../mruby-4728070/src/init_ext.c \ + ../mruby-4728070/src/kernel.c \ + ../mruby-4728070/src/load.c \ + ../mruby-4728070/src/math.c \ + ../mruby-4728070/src/mrblib.c \ + ../mruby-4728070/src/name2ctype.h \ + ../mruby-4728070/src/node.h \ + ../mruby-4728070/src/numeric.c \ + ../mruby-4728070/src/object.c \ + ../mruby-4728070/src/oniguruma.h \ + ../mruby-4728070/src/opcode.h \ + ../mruby-4728070/src/parse.c \ + ../mruby-4728070/src/pool.c \ + ../mruby-4728070/src/print.c \ + ../mruby-4728070/src/proc.c \ + ../mruby-4728070/src/range.c \ + ../mruby-4728070/src/re.c \ + ../mruby-4728070/src/re.h \ + ../mruby-4728070/src/regcomp.c \ + ../mruby-4728070/src/regenc.c \ + ../mruby-4728070/src/regenc.h \ + ../mruby-4728070/src/regerror.c \ + ../mruby-4728070/src/regex.h \ + ../mruby-4728070/src/regexec.c \ + ../mruby-4728070/src/regint.h \ + ../mruby-4728070/src/regparse.c \ + ../mruby-4728070/src/regparse.h \ + ../mruby-4728070/src/sprintf.c \ + ../mruby-4728070/src/st.c \ + ../mruby-4728070/src/st.h \ + ../mruby-4728070/src/state.c \ + ../mruby-4728070/src/string.c \ + ../mruby-4728070/src/struct.c \ + ../mruby-4728070/src/symbol.c \ + ../mruby-4728070/src/time.c \ + ../mruby-4728070/src/variable.c \ + ../mruby-4728070/src/vm.c \ $(NULL) Modified: vendor/mruby/update_files.sh (+0 -1) =================================================================== --- vendor/mruby/update_files.sh 2013-09-11 17:39:59 +0900 (8c6eb7f) +++ vendor/mruby/update_files.sh 2013-09-11 18:06:04 +0900 (75e94f0) @@ -14,5 +14,4 @@ list_paths() mruby_dir=$1 find "${mruby_dir}/src" -type f -name '*.[ch]' | \ - sed -e 's,^,$(srcdir)/,g' | \ list_paths "libmruby_la_SOURCES" -------------- next part -------------- HTML����������������������������...Download