null+****@clear*****
null+****@clear*****
2011年 11月 10日 (木) 21:42:54 JST
Kouhei Sutou 2011-11-10 12:42:54 +0000 (Thu, 10 Nov 2011) New Revision: 7fb34198e0058053d3f0dbefb7008214d2a8bed7 Log: re-support --disable-static. [groonga-dev,00612] Suggested by Kenichi Aramaki. Thanks!!! Modified files: examples/Makefile.am src/Makefile.am src/suggest/Makefile.am test/benchmark/Makefile.am Modified: examples/Makefile.am (+3 -0) =================================================================== --- examples/Makefile.am 2011-11-10 09:50:44 +0000 (c2d4d02) +++ examples/Makefile.am 2011-11-10 12:42:54 +0000 (7211173) @@ -1,8 +1,11 @@ SUBDIRS = dictionary +NONEXISTENT_CXX_SOURCE = nonexistent.cpp + noinst_PROGRAMS = kv DEFAULT_INCLUDES = -I$(top_srcdir)/include $(GROONGA_INCLUDEDIR) kv_SOURCES = kv.c +nodist_EXTRA_kv_SOURCES = $(NONEXISTENT_CXX_SOURCE) kv_LDADD = $(top_builddir)/lib/libgroonga.la Modified: src/Makefile.am (+5 -0) =================================================================== --- src/Makefile.am 2011-11-10 09:50:44 +0000 (ab6adb8) +++ src/Makefile.am 2011-11-10 12:42:54 +0000 (2b00a24) @@ -1,5 +1,7 @@ SUBDIRS = suggest +NONEXISTENT_CXX_SOURCE = nonexistent.cpp + bin_PROGRAMS = groonga grntest noinst_PROGRAMS = grnslap @@ -11,11 +13,14 @@ AM_LDFLAGS = -no-undefined DEFAULT_INCLUDES = -I$(top_builddir) -I$(srcdir) -I$(top_srcdir)/include $(GROONGA_INCLUDEDIR) groonga_SOURCES = groonga.c +nodist_EXTRA_groonga_SOURCES = $(NONEXISTENT_CXX_SOURCE) groonga_CFLAGS = $(AM_CFLAGS) $(LIBEDIT_CFLAGS) groonga_LDADD = $(top_builddir)/lib/libgroonga.la $(LIBEDIT_LIBS) grnslap_SOURCES = grnslap.c +nodist_EXTRA_grnslap_SOURCES = $(NONEXISTENT_CXX_SOURCE) grnslap_LDADD = $(top_builddir)/lib/libgroonga.la grntest_SOURCES = grntest.c +nodist_EXTRA_grntest_SOURCES = $(NONEXISTENT_CXX_SOURCE) grntest_LDADD = $(top_builddir)/lib/libgroonga.la Modified: src/suggest/Makefile.am (+6 -1) =================================================================== --- src/suggest/Makefile.am 2011-11-10 09:50:44 +0000 (3d0a8a9) +++ src/suggest/Makefile.am 2011-11-10 12:42:54 +0000 (269ecb4) @@ -1,5 +1,7 @@ bin_PROGRAMS = +NONEXISTENT_CXX_SOURCE = nonexistent.cpp + if !PLATFORM_WIN32 bin_PROGRAMS += \ groonga-suggest-create-dataset @@ -18,7 +20,7 @@ DEFS += $(GRN_DEFS) AM_LDFLAGS = -no-undefined -DEFAULT_INCLUDES = \ +DEFAULT_INCLUDES = \ -I$(top_builddir) \ -I$(srcdir) \ -I$(top_srcdir)/include \ @@ -26,6 +28,7 @@ DEFAULT_INCLUDES = \ $(GROONGA_INCLUDEDIR) groonga_suggest_learner_SOURCES = groonga_suggest_learner.c +nodist_EXTRA_groonga_suggest_learner_SOURCES = $(NONEXISTENT_CXX_SOURCE) groonga_suggest_learner_CFLAGS = \ $(AM_CFLAGS) \ $(LIBEVENT_CFLAGS) \ @@ -39,6 +42,7 @@ groonga_suggest_learner_LDADD = \ $(MESSAGE_PACK_LIBS) groonga_suggest_httpd_SOURCES = groonga_suggest_httpd.c +nodist_EXTRA_groonga_suggest_httpd_SOURCES = $(NONEXISTENT_CXX_SOURCE) groonga_suggest_httpd_CFLAGS = \ $(AM_CFLAGS) \ $(LIBEVENT_CFLAGS) \ @@ -52,6 +56,7 @@ groonga_suggest_httpd_LDADD = \ $(MESSAGE_PACK_LIBS) groonga_suggest_create_dataset_SOURCES = groonga_suggest_create_dataset.c +nodist_EXTRA_groonga_suggest_create_dataset_SOURCES = $(NONEXISTENT_CXX_SOURCE) groonga_suggest_create_dataset_CFLAGS = \ $(AM_CFLAGS) groonga_suggest_create_dataset_LDADD = \ Modified: test/benchmark/Makefile.am (+7 -0) =================================================================== --- test/benchmark/Makefile.am 2011-11-10 09:50:44 +0000 (8a429cc) +++ test/benchmark/Makefile.am 2011-11-10 12:42:54 +0000 (38347c2) @@ -2,6 +2,8 @@ SUBDIRS = \ fixtures \ lib +NONEXISTENT_CXX_SOURCE = nonexistent.cpp + if WITH_BENCHMARK noinst_PROGRAMS = \ bench-table-factory \ @@ -25,8 +27,13 @@ LIBS = \ $(GLIB_LIBS) bench_table_factory_SOURCES = bench-table-factory.c +nodist_EXTRA_bench_table_factory_SOURCES = $(NONEXISTENT_CXX_SOURCE) + bench_geo_distance_SOURCES = bench-geo-distance.c +nodist_EXTRA_bench_geo_distance_SOURCES = $(NONEXISTENT_CXX_SOURCE) + bench_geo_select_SOURCES = bench-geo-select.c +nodist_EXTRA_bench_geo_select_SOURCES = $(NONEXISTENT_CXX_SOURCE) benchmarks = \ run-bench-table-factory \