null+****@clear*****
null+****@clear*****
2012年 3月 5日 (月) 19:04:23 JST
Kouhei Sutou 2012-03-05 19:04:23 +0900 (Mon, 05 Mar 2012)
New Revision: ad39933d186ede78fde6bd6234bb0548045b3d4a
Log:
Move configured value detection rules to top level Makefile
Modified files:
Makefile.am
test/unit/Makefile.am
test/unit/run-test.sh
Modified: Makefile.am (+14 -0)
===================================================================
--- Makefile.am 2012-03-05 15:23:23 +0900 (ecede29)
+++ Makefile.am 2012-03-05 19:04:23 +0900 (595030d)
@@ -99,3 +99,17 @@ update-document:
rm -rf $${dest_dir}; \
mv tmp-doc/dist/$${locale} $${dest_dir}; \
done
+
+
+echo-cutter:
+ @echo $(CUTTER)
+
+if WITH_RUBY
+echo-ruby:
+ @echo $(RUBY)
+else
+echo-ruby:
+endif
+
+echo-groonga:
+ @echo $(GROONGA)
Modified: test/unit/Makefile.am (+0 -13)
===================================================================
--- test/unit/Makefile.am 2012-03-05 15:23:23 +0900 (202375b)
+++ test/unit/Makefile.am 2012-03-05 19:04:23 +0900 (4a6c32d)
@@ -41,16 +41,3 @@ LIBS = \
$(top_builddir)/lib/libgroonga.la
suite_groonga_test_la_SOURCES = suite-groonga-test.c
-
-echo-cutter:
- @echo $(CUTTER)
-
-if WITH_RUBY
-echo-ruby:
- @echo $(RUBY)
-else
-echo-ruby:
-endif
-
-echo-groonga:
- @echo $(GROONGA)
Modified: test/unit/run-test.sh (+3 -3)
===================================================================
--- test/unit/run-test.sh 2012-03-05 15:23:23 +0900 (e6f7b77)
+++ test/unit/run-test.sh 2012-03-05 19:04:23 +0900 (a223777)
@@ -14,17 +14,17 @@ if test x"$NO_MAKE" != x"yes"; then
fi
if test -z "$CUTTER"; then
- CUTTER="`make -s -C $BUILD_DIR echo-cutter`"
+ CUTTER="`make -s -C $top_dir echo-cutter`"
fi
export CUTTER
if test -z "$RUBY"; then
- RUBY="`make -s -C $BUILD_DIR echo-ruby`"
+ RUBY="`make -s -C $top_dir echo-ruby`"
fi
export RUBY
if test -z "$GROONGA"; then
- GROONGA="`make -s -C $BUILD_DIR echo-groonga`"
+ GROONGA="`make -s -C $top_dir echo-groonga`"
fi
export GROONGA