Kouhei Sutou
null+****@clear*****
Thu Oct 4 10:28:38 JST 2012
Kouhei Sutou 2010-09-02 13:27:23 +0900 (Thu, 02 Sep 2010) New Revision: 181fd4bf9c0a706676d25091f1e81a411628c08d https://github.com/mroonga/mroonga/commit/181fd4bf9c0a706676d25091f1e81a411628c08d Log: use libgroonga_storage_engine for static library name. Modified files: Makefile.am plug.in Modified: Makefile.am (+7 -7) =================================================================== --- Makefile.am 2010-09-02 12:27:06 +0900 (b3ca97d) +++ Makefile.am 2010-09-02 13:27:23 +0900 (7427a61) @@ -4,17 +4,17 @@ ACLOCAL_AMFLAGS = $$ACLOCAL_ARGS noinst_HEADERS = mrnsys.h ha_mroonga.h -pkgplugin_LTLIBRARIES = ha_groonga.la +plugin_LTLIBRARIES = ha_groonga.la ha_groonga_la_LDFLAGS = -module $(GROONGA_LIBS) $(MECAB_LIBS) ha_groonga_la_CXXFLAGS = $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN ha_groonga_la_CFLAGS = $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN -ha_groonga_la_SOURCES = ha_mroonga.cc ha_mroonga.h mrnsys.c mrnsys.h +ha_groonga_la_SOURCES = ha_mroonga.cc mrnsys.c -pkgplugin_LIBRARIES = ha_groonga.a -ha_groonga_a_LDFLANGS = $(GROONGA_LIBS) $(MECAB_LIBS) -ha_groonga_a_CXXFLAGS = $(AM_CFLAGS) -ha_groonga_a_CFLAGS = $(AM_CFLAGS) -ha_groonga_a_SOURCES = ha_mroonga.cc mrnsys.c +plugin_LIBRARIES = libgroonga_storage_engine.a +libgroonga_storage_engine_a_LDFLANGS = $(GROONGA_LIBS) $(MECAB_LIBS) +libgroonga_storage_engine_a_CXXFLAGS = $(AM_CFLAGS) +libgroonga_storage_engine_a_CFLAGS = $(AM_CFLAGS) +libgroonga_storage_engine_a_SOURCES = ha_mroonga.cc mrnsys.c SUBDIRS = test apt Modified: plug.in (+1 -1) =================================================================== --- plug.in 2010-09-02 12:27:06 +0900 (db30b9c) +++ plug.in 2010-09-02 13:27:23 +0900 (e5066c4) @@ -2,5 +2,5 @@ MYSQL_STORAGE_ENGINE(groonga,,[groonga storage engine], [Fulltext search, column base], [max,max-no-ndb]) MYSQL_PLUGIN_DIRECTORY(groonga, [storage/groonga-storage-engine]) -MYSQL_PLUGIN_STATIC(groonga, [ha_groonga.a]) +MYSQL_PLUGIN_STATIC(groonga, [libgroonga_storage_engine.a]) MYSQL_PLUGIN_DYNAMIC(groonga, [ha_groonga.la]) -------------- next part -------------- HTML����������������������������...Download