null+****@clear*****
null+****@clear*****
2010年 11月 1日 (月) 15:07:42 JST
Kouhei Sutou 2010-11-01 06:07:42 +0000 (Mon, 01 Nov 2010)
New Revision: 3c8b5c56dd0fb31758c941dafe9a33f6f16d4e32
Log:
module -> plugin. #624
Modified files:
Makefile.am
configure.ac
examples/Makefile.am
lib/Makefile.am
lib/ctx.c
lib/db.c
lib/io.c
lib/ql.h
src/Makefile.am
test/benchmark/Makefile.am
test/unit/Makefile.am
test/unit/core/Makefile.am
test/unit/core/test-register.c
test/unit/fixtures/Makefile.am
test/unit/fixtures/performance/Makefile.am
test/unit/fixtures/stress/Makefile.am
test/unit/lib/Makefile.am
test/unit/memcached/Makefile.am
test/unit/run-test.sh
test/unit/story/Makefile.am
test/unit/util/Makefile.am
Renamed files:
include/groonga.h
(from groonga.h)
include/groonga/plugin.h
(from lib/module_impl.h)
lib/plugin.c
(from lib/module.c)
lib/plugin_in.h
(from lib/module.h)
plugins/Makefile.am
(from modules/Makefile.am)
plugins/suggest/Makefile.am
(from modules/suggest/Makefile.am)
plugins/suggest/suggest.c
(from modules/suggest/suggest.c)
plugins/tokenizers/Makefile.am
(from modules/tokenizers/Makefile.am)
plugins/tokenizers/mecab.c
(from modules/tokenizers/mecab.c)
test/unit/fixtures/plugins/Makefile.am
(from test/unit/fixtures/modules/Makefile.am)
test/unit/fixtures/plugins/string.c
(from test/unit/fixtures/modules/string.c)
Modified: Makefile.am (+3 -3)
===================================================================
--- Makefile.am 2010-10-22 03:37:57 +0000 (30da23b)
+++ Makefile.am 2010-11-01 06:07:42 +0000 (09e6452)
@@ -1,8 +1,7 @@
AUTOMAKE_OPTIONS = 1.9.7
-SUBDIRS = lib modules src examples test apt rpm yum data resource doc
+SUBDIRS = include lib plugins src examples test apt rpm yum data resource doc
#dist_data_DATA =
EXTRA_DIST = bindings version-gen.sh
-pkginclude_HEADERS = groonga.h
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = groonga.pc
@@ -27,6 +26,7 @@ win32-installer: all
cp -p $(builddir)/lib/.libs/*.dll dist/bin/
cp -p $(builddir)/lib/.libs/*.dll.a dist/lib/
cp -p $(builddir)/lib/.libs/libgroonga.dll.a dist/lib/groonga.lib
- cp -p $(builddir)/groonga.h dist/include/
+ cp -p $(builddir)/include/groonga.h dist/include/
+ cp -rp $(builddir)/include/groonga/ dist/include/
nkf -Wsc $(builddir)/doc/ja/README > dist/doc/README.txt
makensis setup.nsi
Modified: configure.ac (+18 -16)
===================================================================
--- configure.ac 2010-10-22 03:37:57 +0000 (01243de)
+++ configure.ac 2010-11-01 06:07:42 +0000 (b6bc223)
@@ -89,9 +89,11 @@ m4_ifdef([LT_OUTPUT], [LT_OUTPUT])
AC_CONFIG_FILES([Makefile
src/Makefile
lib/Makefile
- modules/Makefile
- modules/tokenizers/Makefile
- modules/suggest/Makefile
+ include/Makefile
+ include/groonga/Makefile
+ plugins/Makefile
+ plugins/tokenizers/Makefile
+ plugins/suggest/Makefile
examples/Makefile
examples/dictionary/Makefile
examples/dictionary/edict/Makefile
@@ -119,7 +121,7 @@ AC_CONFIG_FILES([Makefile
test/unit/fixtures/inverted-index/Makefile
test/unit/fixtures/stress/Makefile
test/unit/fixtures/performance/Makefile
- test/unit/fixtures/modules/Makefile
+ test/unit/fixtures/plugins/Makefile
test/unit/fixtures/story/Makefile
test/unit/fixtures/story/taiyaki/Makefile
test/unit/util/Makefile
@@ -662,25 +664,25 @@ AM_CONDITIONAL([ENABLE_DOCUMENT],
AC_MSG_CHECKING([for sphinx availablity])
AC_MSG_RESULT($ac_sphinx_available (sphinx-build=$SPHINX_BUILD version=$sphinx_build_version required=$sphinx_required_version))
-# modules check
-modulesdir="\${libdir}/\$(PACKAGE)/modules"
-AC_SUBST(modulesdir)
+# plugins check
+pluginsdir="\${libdir}/\$(PACKAGE)/plugins"
+AC_SUBST(pluginsdir)
-tokenizer_modulesdir="\${modulesdir}/tokenizers"
-AC_SUBST(tokenizer_modulesdir)
+tokenizer_pluginsdir="\${pluginsdir}/tokenizers"
+AC_SUBST(tokenizer_pluginsdir)
-suggest_modulesdir="\${modulesdir}/suggest"
-AC_SUBST(suggest_modulesdir)
+suggest_pluginsdir="\${pluginsdir}/suggest"
+AC_SUBST(suggest_pluginsdir)
-AC_MSG_CHECKING(for the suffix of module shared libraries)
+AC_MSG_CHECKING(for the suffix of plugin shared libraries)
shrext_cmds=$(./libtool --config | grep '^shrext_cmds=')
eval $shrext_cmds
-module=yes eval suffix="$shrext_cmds"
+plugin=yes eval suffix="$shrext_cmds"
AC_MSG_RESULT($suffix)
if test -z "$suffix"; then
- AC_MSG_ERROR([can't detect module suffix])
+ AC_MSG_ERROR([can't detect plugin suffix])
fi
-AC_DEFINE_UNQUOTED(GRN_MODULE_SUFFIX, ["$suffix"], "module suffix")
+AC_DEFINE_UNQUOTED(GRN_PLUGIN_SUFFIX, ["$suffix"], "plugin suffix")
# for examples
examplesdir="\$(pkgdatadir)/examples"
@@ -691,7 +693,7 @@ AC_SUBST(examples_dictionarydir)
# flags for compile groonga
CFLAGS="$CFLAGS $OPT_CFLAGS "
-CFLAGS="$CFLAGS -DMODULES_DIR=\\\"\"\$(modulesdir)\"\\\""
+CFLAGS="$CFLAGS -DPLUGINS_DIR=\\\"\"\$(pluginsdir)\"\\\""
CFLAGS="$CFLAGS -DGROONGA_LOG_PATH=\\\"\"\$(groonga_log_path)\"\\\""
LIBS="$LIBS $ZLIB_LIBS $LZO_LIBS $RT_LIBS $PTHREAD_LIBS $M_LIBS $NSL_LIBS $SOCKET_LIBS $WINDOWS_LIBS"
AC_DEFINE_UNQUOTED(CONFIGURE_OPTIONS, "$ac_configure_args", "specified configure options")
Modified: examples/Makefile.am (+1 -1)
===================================================================
--- examples/Makefile.am 2010-10-22 03:37:57 +0000 (b34a336)
+++ examples/Makefile.am 2010-11-01 06:07:42 +0000 (c2d4d02)
@@ -2,7 +2,7 @@ SUBDIRS = dictionary
noinst_PROGRAMS = kv
-DEFAULT_INCLUDES = -I$(top_srcdir) $(GROONGA_INCLUDEDIR)
+DEFAULT_INCLUDES = -I$(top_srcdir)/include $(GROONGA_INCLUDEDIR)
kv_SOURCES = kv.c
kv_LDADD = $(top_builddir)/lib/libgroonga.la
Renamed: include/groonga.h (+1 -1) 99%
===================================================================
--- groonga.h 2010-10-22 03:37:57 +0000 (ab99d5f)
+++ include/groonga.h 2010-11-01 06:07:42 +0000 (83c7431)
@@ -589,7 +589,7 @@ typedef struct {
grn_obj value;
} grn_expr_var;
-typedef grn_rc (*grn_module_func)(grn_ctx *ctx);
+typedef grn_rc (*grn_plugin_func)(grn_ctx *ctx);
typedef enum {
GRN_PROC_TOKENIZER = 1,
Renamed: include/groonga/plugin.h (+11 -11) 66%
===================================================================
--- lib/module_impl.h 2010-10-22 03:37:57 +0000 (77afa12)
+++ include/groonga/plugin.h 2010-11-01 06:07:42 +0000 (0c5d7f3)
@@ -14,8 +14,8 @@
License along with this library; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef GRN_MODULE_IMPL_H
-#define GRN_MODULE_IMPL_H
+#ifndef GRN_PLUGIN_H
+#define GRN_PLUGIN_H
#include "groonga.h"
@@ -23,22 +23,22 @@
extern "C" {
#endif
-#define GRN_MODULE_INIT grn_module_impl_init
-#define GRN_MODULE_REGISTER grn_module_impl_register
-#define GRN_MODULE_FIN grn_module_impl_fin
+#define GRN_PLUGIN_INIT grn_plugin_impl_init
+#define GRN_PLUGIN_REGISTER grn_plugin_impl_register
+#define GRN_PLUGIN_FIN grn_plugin_impl_fin
#if defined(_WIN32) || defined(_WIN64)
-# define GRN_MODULE_EXPORT __declspec(dllexpoert)
+# define GRN_PLUGIN_EXPORT __declspec(dllexpoert)
#else /* defined(_WIN32) || defined(_WIN64) */
-# define GRN_MODULE_EXPORT
+# define GRN_PLUGIN_EXPORT
#endif /* defined(_WIN32) || defined(_WIN64) */
-GRN_MODULE_EXPORT grn_rc GRN_MODULE_INIT(grn_ctx *ctx);
-GRN_MODULE_EXPORT grn_rc GRN_MODULE_REGISTER(grn_ctx *ctx);
-GRN_MODULE_EXPORT grn_rc GRN_MODULE_FIN(grn_ctx *ctx);
+GRN_PLUGIN_EXPORT grn_rc GRN_PLUGIN_INIT(grn_ctx *ctx);
+GRN_PLUGIN_EXPORT grn_rc GRN_PLUGIN_REGISTER(grn_ctx *ctx);
+GRN_PLUGIN_EXPORT grn_rc GRN_PLUGIN_FIN(grn_ctx *ctx);
#ifdef __cplusplus
}
#endif
-#endif /* GRN_MODULE_IMPL_H */
+#endif /* GRN_PLUGIN_H */
Modified: lib/Makefile.am (+3 -6)
===================================================================
--- lib/Makefile.am 2010-10-22 03:37:57 +0000 (22b6ac6)
+++ lib/Makefile.am 2010-11-01 06:07:42 +0000 (1d1b3dc)
@@ -2,20 +2,17 @@ lib_LTLIBRARIES = libgroonga.la
include $(top_srcdir)/version.sh
AM_CFLAGS = -fno-strict-aliasing $(COVERAGE_CFLAGS)
-DEFAULT_INCLUDES = -I$(top_builddir) -I$(top_srcdir)
+DEFAULT_INCLUDES = -I$(top_builddir) -I$(top_srcdir)/include
DEFS += -D_REENTRANT -DGROONGA_VERSION=\"$(GROONGA_VERSION)\"
-libgroonga_la_SOURCES = io.c str.c nfkc.c snip.c query.c store.c com.c ql.c scm.c ctx.c hash.c db.c pat.c ii.c token.c proc.c expr.c util.c module.c output.c geo.c
+libgroonga_la_SOURCES = io.c str.c nfkc.c snip.c query.c store.c com.c ql.c scm.c ctx.c hash.c db.c pat.c ii.c token.c proc.c expr.c util.c plugin.c output.c geo.c
libgroonga_la_LDFLAGS = \
-version-info 0:0:0 \
-no-undefined \
$(WINDOWS_LDFLAGS)
-noinst_HEADERS = com.h io.h ql.h nfkc.h groonga_in.h snip.h store.h str.h ctx.h hash.h db.h pat.h ii.h token.h proc.h util.h module.h output.h geo.h
-
-groonga_includedir = $(pkgincludedir)/groonga
-groonga_include_HEADERS = module_impl.h
+noinst_HEADERS = com.h io.h ql.h nfkc.h groonga_in.h snip.h store.h str.h ctx.h hash.h db.h pat.h ii.h token.h proc.h util.h plugin_in.h output.h geo.h
EXTRA_DIST = ecmascript.c ecmascript.h ecmascript.y
Modified: lib/ctx.c (+5 -5)
===================================================================
--- lib/ctx.c 2010-10-22 03:37:57 +0000 (58fcaa3)
+++ lib/ctx.c 2010-11-01 06:07:42 +0000 (1a126c2)
@@ -20,7 +20,7 @@
#include "token.h"
#include "ql.h"
#include "pat.h"
-#include "module.h"
+#include "plugin_in.h"
#include "snip.h"
#include <stdio.h>
#include <stdarg.h>
@@ -325,7 +325,7 @@ grn_ctx_impl_init(grn_ctx *ctx)
GRN_TEXT_INIT(&ctx->impl->subbuf, 0);
ctx->impl->edge = NULL;
grn_loader_init(&ctx->impl->loader);
- ctx->impl->module_path = NULL;
+ ctx->impl->plugin_path = NULL;
}
void
@@ -676,8 +676,8 @@ grn_init(void)
GRN_LOG(ctx, GRN_LOG_ALERT, "io initialize failed (%d)", rc);
return rc;
}
- if ((rc = grn_modules_init())) {
- GRN_LOG(ctx, GRN_LOG_ALERT, "modules initialize failed (%d)", rc);
+ if ((rc = grn_plugins_init())) {
+ GRN_LOG(ctx, GRN_LOG_ALERT, "plugins initialize failed (%d)", rc);
return rc;
}
if ((rc = grn_token_init())) {
@@ -763,7 +763,7 @@ grn_fin(void)
}
grn_cache_fin();
grn_token_fin();
- grn_modules_fin();
+ grn_plugins_fin();
grn_io_fin();
grn_ctx_fin(ctx);
grn_com_fin();
Modified: lib/db.c (+5 -5)
===================================================================
--- lib/db.c 2010-10-22 03:37:57 +0000 (db1859d)
+++ lib/db.c 2010-11-01 06:07:42 +0000 (3a550d2)
@@ -22,7 +22,7 @@
#include "ql.h"
#include "token.h"
#include "proc.h"
-#include "module.h"
+#include "plugin_in.h"
#include "geo.h"
#include "util.h"
#include <string.h>
@@ -344,13 +344,13 @@ grn_proc_create(grn_ctx *ctx, const char *name, unsigned name_size, grn_proc_typ
grn_id range;
int added = 0;
grn_obj *db;
- const char *path = ctx->impl->module_path;
+ const char *path = ctx->impl->plugin_path;
if (!ctx || !ctx->impl || !(db = ctx->impl->db)) {
ERR(GRN_INVALID_ARGUMENT, "db not initialized");
return NULL;
}
GRN_API_ENTER;
- range = path ? grn_module_get(ctx, path) : GRN_ID_NIL;
+ range = path ? grn_plugin_get(ctx, path) : GRN_ID_NIL;
if (grn_db_check_name(ctx, name, name_size)) {
GRN_DB_CHECK_NAME_ERR();
GRN_API_RETURN(NULL);
@@ -5963,7 +5963,7 @@ grn_obj_close(grn_ctx *ctx, grn_obj *obj)
}
GRN_REALLOC(p->vars, 0);
grn_obj_close(ctx, &p->name_buf);
- grn_module_close(ctx, p->obj.range);
+ grn_plugin_close(ctx, p->obj.range);
GRN_FREE(obj);
rc = GRN_SUCCESS;
}
@@ -6107,7 +6107,7 @@ grn_obj_path(grn_ctx *ctx, grn_obj *obj)
grn_io *io;
char *path = NULL;
if (obj->header.type == GRN_PROC) {
- return grn_module_path(ctx, DB_OBJ(obj)->range);
+ return grn_plugin_path(ctx, DB_OBJ(obj)->range);
}
GRN_API_ENTER;
io = grn_obj_io(obj);
Modified: lib/io.c (+2 -3)
===================================================================
--- lib/io.c 2010-10-22 03:37:57 +0000 (3c24403)
+++ lib/io.c 2010-11-01 06:07:42 +0000 (8be1913)
@@ -28,10 +28,9 @@
#include "ctx.h"
#include "io.h"
-#include "module.h"
+#include "plugin_in.h"
#include "hash.h"
#include "ql.h"
-#include "module.h"
#define GRN_IO_IDSTR "GROONGA:IO:00001"
@@ -1389,7 +1388,7 @@ grn_expire_(grn_ctx *ctx, int count_thresh, uint32_t limit)
uint32_t n = 0;
grn_cell *obj;
GRN_HASH_EACH(ctx, grn_gctx.impl->symbols, id, NULL, NULL, (void **) &obj, {
- grn_module_close(ctx, id);
+ grn_plugin_close(ctx, id);
n += grn_io_expire(ctx, (grn_io *) obj->u.p.value, count_thresh, limit);
if (n >= limit) { break; }
});
Renamed: lib/plugin.c (+84 -84) 58%
===================================================================
--- lib/module.c 2010-10-22 03:37:57 +0000 (dbdf9c7)
+++ lib/plugin.c 2010-11-01 06:07:42 +0000 (9a291f8)
@@ -18,10 +18,10 @@
#include <stdio.h>
#include <string.h>
#include "db.h"
-#include "module.h"
+#include "plugin_in.h"
#include "ql.h"
-static grn_hash *grn_modules = NULL;
+static grn_hash *grn_plugins = NULL;
#define PATHLEN(filename) (strlen(filename) + 1)
@@ -45,30 +45,30 @@ static grn_hash *grn_modules = NULL;
#endif
grn_id
-grn_module_get(grn_ctx *ctx, const char *filename)
+grn_plugin_get(grn_ctx *ctx, const char *filename)
{
- return grn_hash_get(ctx, grn_modules, filename, PATHLEN(filename), NULL);
+ return grn_hash_get(ctx, grn_plugins, filename, PATHLEN(filename), NULL);
}
const char *
-grn_module_path(grn_ctx *ctx, grn_id id)
+grn_plugin_path(grn_ctx *ctx, grn_id id)
{
uint32_t key_size;
- return _grn_hash_key(ctx, grn_modules, id, &key_size);
+ return _grn_hash_key(ctx, grn_plugins, id, &key_size);
}
-#define GRN_MODULE_FUNC_PREFIX "grn_module_impl_"
+#define GRN_PLUGIN_FUNC_PREFIX "grn_plugin_impl_"
static grn_rc
-grn_module_initialize(grn_ctx *ctx, grn_module *module,
+grn_plugin_initialize(grn_ctx *ctx, grn_plugin *plugin,
grn_dl dl, grn_id id, const char *path)
{
- module->dl = dl;
+ plugin->dl = dl;
#define GET_SYMBOL(type) \
grn_dl_clear_error; \
- module->type ## _func = grn_dl_sym(dl, GRN_MODULE_FUNC_PREFIX #type); \
- if (!module->type ## _func) { \
+ plugin->type ## _func = grn_dl_sym(dl, GRN_PLUGIN_FUNC_PREFIX #type); \
+ if (!plugin->type ## _func) { \
const char *label; \
label = grn_dl_sym_error_label; \
SERR(label); \
@@ -80,48 +80,48 @@ grn_module_initialize(grn_ctx *ctx, grn_module *module,
#undef GET_SYMBOL
- if (!module->init_func || !module->register_func || !module->fin_func) {
+ if (!plugin->init_func || !plugin->register_func || !plugin->fin_func) {
ERR(GRN_INVALID_FORMAT,
"init func (%s) %sfound, "
"register func (%s) %sfound and "
"fin func (%s) %sfound",
- GRN_MODULE_FUNC_PREFIX "init", module->init_func ? "" : "not ",
- GRN_MODULE_FUNC_PREFIX "register", module->register_func ? "" : "not ",
- GRN_MODULE_FUNC_PREFIX "fin", module->fin_func ? "" : "not ");
+ GRN_PLUGIN_FUNC_PREFIX "init", plugin->init_func ? "" : "not ",
+ GRN_PLUGIN_FUNC_PREFIX "register", plugin->register_func ? "" : "not ",
+ GRN_PLUGIN_FUNC_PREFIX "fin", plugin->fin_func ? "" : "not ");
}
if (!ctx->rc) {
- ctx->impl->module_path = path;
- grn_module_init(ctx, id);
- ctx->impl->module_path = NULL;
+ ctx->impl->plugin_path = path;
+ grn_plugin_init(ctx, id);
+ ctx->impl->plugin_path = NULL;
}
return ctx->rc;
}
grn_id
-grn_module_open(grn_ctx *ctx, const char *filename)
+grn_plugin_open(grn_ctx *ctx, const char *filename)
{
grn_id id;
grn_dl dl;
- grn_module **module;
+ grn_plugin **plugin;
- if ((id = grn_hash_get(ctx, grn_modules, filename, PATHLEN(filename),
- (void **)&module))) {
+ if ((id = grn_hash_get(ctx, grn_plugins, filename, PATHLEN(filename),
+ (void **)&plugin))) {
return id;
}
if ((dl = grn_dl_open(filename))) {
- if ((id = grn_hash_add(ctx, grn_modules, filename, PATHLEN(filename),
- (void **)&module, NULL))) {
- *module = GRN_GMALLOCN(grn_module, 1);
- if (*module) {
- if (grn_module_initialize(ctx, *module, dl, id, filename)) {
- GRN_GFREE(*module);
- *module = NULL;
+ if ((id = grn_hash_add(ctx, grn_plugins, filename, PATHLEN(filename),
+ (void **)&plugin, NULL))) {
+ *plugin = GRN_GMALLOCN(grn_plugin, 1);
+ if (*plugin) {
+ if (grn_plugin_initialize(ctx, *plugin, dl, id, filename)) {
+ GRN_GFREE(*plugin);
+ *plugin = NULL;
}
}
- if (!*module) {
- grn_hash_delete_by_id(ctx, grn_modules, id, NULL);
+ if (!*plugin) {
+ grn_hash_delete_by_id(ctx, grn_plugins, id, NULL);
if (!grn_dl_close(dl)) {
const char *label;
label = grn_dl_close_error_label;
@@ -145,34 +145,34 @@ grn_module_open(grn_ctx *ctx, const char *filename)
}
grn_rc
-grn_module_close(grn_ctx *ctx, grn_id id)
+grn_plugin_close(grn_ctx *ctx, grn_id id)
{
- grn_module *module;
+ grn_plugin *plugin;
- grn_module_fin(ctx, id);
- if (!grn_hash_get_value(ctx, grn_modules, id, &module)) {
+ grn_plugin_fin(ctx, id);
+ if (!grn_hash_get_value(ctx, grn_plugins, id, &plugin)) {
return GRN_INVALID_ARGUMENT;
}
- if (!grn_dl_close(module->dl)) {
+ if (!grn_dl_close(plugin->dl)) {
const char *label;
label = grn_dl_close_error_label;
SERR(label);
}
- GRN_GFREE(module);
- return grn_hash_delete_by_id(ctx, grn_modules, id, NULL);
+ GRN_GFREE(plugin);
+ return grn_hash_delete_by_id(ctx, grn_plugins, id, NULL);
}
void *
-grn_module_sym(grn_ctx *ctx, grn_id id, const char *symbol)
+grn_plugin_sym(grn_ctx *ctx, grn_id id, const char *symbol)
{
- grn_module *module;
+ grn_plugin *plugin;
grn_dl_symbol func;
- if (!grn_hash_get_value(ctx, grn_modules, id, &module)) {
+ if (!grn_hash_get_value(ctx, grn_plugins, id, &plugin)) {
return NULL;
}
grn_dl_clear_error;
- if (!(func = grn_dl_sym(module->dl, symbol))) {
+ if (!(func = grn_dl_sym(plugin->dl, symbol))) {
const char *label;
label = grn_dl_sym_error_label;
SERR(label);
@@ -181,62 +181,62 @@ grn_module_sym(grn_ctx *ctx, grn_id id, const char *symbol)
}
grn_rc
-grn_module_init (grn_ctx *ctx, grn_id id)
+grn_plugin_init (grn_ctx *ctx, grn_id id)
{
- grn_module *module;
- if (!grn_hash_get_value(ctx, grn_modules, id, &module)) {
+ grn_plugin *plugin;
+ if (!grn_hash_get_value(ctx, grn_plugins, id, &plugin)) {
return GRN_INVALID_ARGUMENT;
}
- if (module->init_func) {
- return module->init_func(ctx);
+ if (plugin->init_func) {
+ return plugin->init_func(ctx);
}
return GRN_SUCCESS;
}
grn_rc
-grn_module_register (grn_ctx *ctx, grn_id id)
+grn_plugin_register (grn_ctx *ctx, grn_id id)
{
- grn_module *module;
- if (!grn_hash_get_value(ctx, grn_modules, id, &module)) {
+ grn_plugin *plugin;
+ if (!grn_hash_get_value(ctx, grn_plugins, id, &plugin)) {
return GRN_INVALID_ARGUMENT;
}
- if (module->register_func) {
- return module->register_func(ctx);
+ if (plugin->register_func) {
+ return plugin->register_func(ctx);
}
return GRN_SUCCESS;
}
grn_rc
-grn_module_fin(grn_ctx *ctx, grn_id id)
+grn_plugin_fin(grn_ctx *ctx, grn_id id)
{
- grn_module *module;
- if (!grn_hash_get_value(ctx, grn_modules, id, &module)) {
+ grn_plugin *plugin;
+ if (!grn_hash_get_value(ctx, grn_plugins, id, &plugin)) {
return GRN_INVALID_ARGUMENT;
}
- if (module->fin_func) {
- return module->fin_func(ctx);
+ if (plugin->fin_func) {
+ return plugin->fin_func(ctx);
}
return GRN_SUCCESS;
}
grn_rc
-grn_modules_init(void)
+grn_plugins_init(void)
{
- grn_modules = grn_hash_create(&grn_gctx, NULL, PATH_MAX, sizeof(grn_module *),
+ grn_plugins = grn_hash_create(&grn_gctx, NULL, PATH_MAX, sizeof(grn_plugin *),
GRN_OBJ_KEY_VAR_SIZE);
- if (!grn_modules) { return GRN_NO_MEMORY_AVAILABLE; }
+ if (!grn_plugins) { return GRN_NO_MEMORY_AVAILABLE; }
return GRN_SUCCESS;
}
grn_rc
-grn_modules_fin(void)
+grn_plugins_fin(void)
{
grn_ctx *ctx = &grn_gctx;
- if (!grn_modules) { return GRN_INVALID_ARGUMENT; }
- GRN_HASH_EACH(ctx, grn_modules, id, NULL, NULL, NULL, {
- grn_module_close(ctx, id);
+ if (!grn_plugins) { return GRN_INVALID_ARGUMENT; }
+ GRN_HASH_EACH(ctx, grn_plugins, id, NULL, NULL, NULL, {
+ grn_plugin_close(ctx, id);
});
- return grn_hash_close(&grn_gctx, grn_modules);
+ return grn_hash_close(&grn_gctx, grn_plugins);
}
grn_rc
@@ -250,19 +250,19 @@ grn_db_register(grn_ctx *ctx, const char *path)
}
GRN_API_ENTER;
if (GRN_DB_P(db)) {
- FILE *module_file;
+ FILE *plugin_file;
char complemented_path[PATH_MAX];
- module_file = fopen(path, "r");
- if (module_file) {
- fclose(module_file);
- id = grn_module_open(ctx, path);
+ plugin_file = fopen(path, "r");
+ if (plugin_file) {
+ fclose(plugin_file);
+ id = grn_plugin_open(ctx, path);
} else {
ctx->errlvl = GRN_OK;
ctx->rc = GRN_SUCCESS;
strcpy(complemented_path, path);
- strcat(complemented_path, GRN_MODULE_SUFFIX);
- id = grn_module_open(ctx, complemented_path);
+ strcat(complemented_path, GRN_PLUGIN_SUFFIX);
+ id = grn_plugin_open(ctx, complemented_path);
if (id) {
path = complemented_path;
} else {
@@ -276,8 +276,8 @@ grn_db_register(grn_ctx *ctx, const char *path)
strncat(complemented_path, path, base_name - path);
strcat(complemented_path, "/.libs");
strcat(complemented_path, base_name);
- strcat(complemented_path, GRN_MODULE_SUFFIX);
- id = grn_module_open(ctx, complemented_path);
+ strcat(complemented_path, GRN_PLUGIN_SUFFIX);
+ id = grn_plugin_open(ctx, complemented_path);
if (id) {
path = complemented_path;
}
@@ -286,11 +286,11 @@ grn_db_register(grn_ctx *ctx, const char *path)
}
if (id) {
- ctx->impl->module_path = path;
- ctx->rc = grn_module_register(ctx, id);
- ctx->impl->module_path = NULL;
+ ctx->impl->plugin_path = path;
+ ctx->rc = grn_plugin_register(ctx, id);
+ ctx->impl->plugin_path = NULL;
if (ctx->rc) {
- grn_module_close(ctx, id);
+ grn_plugin_close(ctx, id);
}
}
} else {
@@ -302,16 +302,16 @@ grn_db_register(grn_ctx *ctx, const char *path)
grn_rc
grn_db_register_by_name(grn_ctx *ctx, const char *name)
{
- const char *modules_dir;
+ const char *plugins_dir;
char dir_last_char;
char path[PATH_MAX];
- modules_dir = getenv("GRN_MODULES_DIR");
- if (!modules_dir) {
- modules_dir = MODULES_DIR;
+ plugins_dir = getenv("GRN_PLUGINS_DIR");
+ if (!plugins_dir) {
+ plugins_dir = PLUGINS_DIR;
}
- strcpy(path, modules_dir);
- dir_last_char = modules_dir[strlen(modules_dir) - 1];
+ strcpy(path, plugins_dir);
+ dir_last_char = plugins_dir[strlen(plugins_dir) - 1];
if (dir_last_char != PATH_SEPARATOR[0]) {
strcat(path, PATH_SEPARATOR);
}
Renamed: lib/plugin_in.h (+18 -18) 62%
===================================================================
--- lib/module.h 2010-10-22 03:37:57 +0000 (2c088ce)
+++ lib/plugin_in.h 2010-11-01 06:07:42 +0000 (5cab93e)
@@ -14,8 +14,8 @@
License along with this library; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef GRN_MODULE_H
-#define GRN_MODULE_H
+#ifndef GRN_PLUGIN_H
+#define GRN_PLUGIN_H
#ifndef GROONGA_IN_H
#include "groonga_in.h"
@@ -42,28 +42,28 @@ typedef void * grn_dl;
typedef void * grn_dl_symbol;
#endif
-typedef struct _grn_module grn_module;
+typedef struct _grn_plugin grn_plugin;
-struct _grn_module {
+struct _grn_plugin {
grn_dl dl;
- grn_module_func init_func;
- grn_module_func register_func;
- grn_module_func unregister_func;
- grn_module_func fin_func;
+ grn_plugin_func init_func;
+ grn_plugin_func register_func;
+ grn_plugin_func unregister_func;
+ grn_plugin_func fin_func;
};
-grn_rc grn_modules_init(void);
-grn_rc grn_modules_fin(void);
-grn_id grn_module_open(grn_ctx *ctx, const char *filename);
-grn_rc grn_module_close(grn_ctx *ctx, grn_id id);
-grn_rc grn_module_init(grn_ctx *ctx, grn_id id);
-grn_rc grn_module_register(grn_ctx *ctx, grn_id id);
-grn_rc grn_module_fin(grn_ctx *ctx, grn_id id);
-grn_id grn_module_get(grn_ctx *ctx, const char *filename);
-const char *grn_module_path(grn_ctx *ctx, grn_id id);
+grn_rc grn_plugins_init(void);
+grn_rc grn_plugins_fin(void);
+grn_id grn_plugin_open(grn_ctx *ctx, const char *filename);
+grn_rc grn_plugin_close(grn_ctx *ctx, grn_id id);
+grn_rc grn_plugin_init(grn_ctx *ctx, grn_id id);
+grn_rc grn_plugin_register(grn_ctx *ctx, grn_id id);
+grn_rc grn_plugin_fin(grn_ctx *ctx, grn_id id);
+grn_id grn_plugin_get(grn_ctx *ctx, const char *filename);
+const char *grn_plugin_path(grn_ctx *ctx, grn_id id);
#ifdef __cplusplus
}
#endif
-#endif /* GRN_MODULE_H */
+#endif /* GRN_PLUGIN_H */
Modified: lib/ql.h (+2 -2)
===================================================================
--- lib/ql.h 2010-10-22 03:37:57 +0000 (a5b2b12)
+++ lib/ql.h 2010-11-01 06:07:42 +0000 (9a9edae)
@@ -209,8 +209,8 @@ struct _grn_ctx_impl {
grn_edge *edge;
grn_loader loader;
- /* module portion */
- const char *module_path;
+ /* plugin portion */
+ const char *plugin_path;
/* output portion */
grn_content_type output_type;
Renamed: plugins/Makefile.am (+0 -0) 100%
===================================================================
Renamed: plugins/suggest/Makefile.am (+2 -2) 75%
===================================================================
--- modules/suggest/Makefile.am 2010-10-22 03:37:57 +0000 (caa664f)
+++ plugins/suggest/Makefile.am 2010-11-01 06:07:42 +0000 (8c6548b)
@@ -1,6 +1,6 @@
INCLUDES = \
-I$(top_builddir) \
- -I$(top_srcdir) \
+ -I$(top_srcdir)/include \
-I$(top_srcdir)/lib
AM_LDFLAGS = \
@@ -11,6 +11,6 @@ AM_LDFLAGS = \
LIBS = \
$(top_builddir)/lib/libgroonga.la
-suggest_modules_LTLIBRARIES = suggest.la
+suggest_plugins_LTLIBRARIES = suggest.la
suggest_la_SOURCES = suggest.c
Renamed: plugins/suggest/suggest.c (+4 -4) 99%
===================================================================
--- modules/suggest/suggest.c 2010-10-22 03:37:57 +0000 (5850e5a)
+++ plugins/suggest/suggest.c 2010-11-01 06:07:42 +0000 (1c7c00e)
@@ -20,7 +20,7 @@
#include "ii.h"
#include "token.h"
#include "output.h"
-#include "module_impl.h"
+#include <groonga/plugin.h>
#include <string.h>
#define VAR GRN_PROC_GET_VAR_BY_OFFSET
@@ -508,13 +508,13 @@ func_suggest_preparer(grn_ctx *ctx, int nargs, grn_obj **args, grn_user_data *us
}
grn_rc
-GRN_MODULE_INIT(grn_ctx *ctx)
+GRN_PLUGIN_INIT(grn_ctx *ctx)
{
return GRN_SUCCESS;
}
grn_rc
-GRN_MODULE_REGISTER(grn_ctx *ctx)
+GRN_PLUGIN_REGISTER(grn_ctx *ctx)
{
/* TODO: offset/limit */
grn_expr_var vars[] = {
@@ -544,7 +544,7 @@ GRN_MODULE_REGISTER(grn_ctx *ctx)
}
grn_rc
-GRN_MODULE_FIN(grn_ctx *ctx)
+GRN_PLUGIN_FIN(grn_ctx *ctx)
{
return GRN_SUCCESS;
}
Renamed: plugins/tokenizers/Makefile.am (+3 -3) 77%
===================================================================
--- modules/tokenizers/Makefile.am 2010-10-22 03:37:57 +0000 (98de20b)
+++ plugins/tokenizers/Makefile.am 2010-11-01 06:07:42 +0000 (898db4b)
@@ -1,6 +1,6 @@
INCLUDES = \
-I$(top_builddir) \
- -I$(top_srcdir) \
+ -I$(top_srcdir)/include \
-I$(top_srcdir)/lib
AM_LDFLAGS = \
@@ -11,9 +11,9 @@ AM_LDFLAGS = \
LIBS = \
$(top_builddir)/lib/libgroonga.la
-tokenizer_modules_LTLIBRARIES =
+tokenizer_plugins_LTLIBRARIES =
if WITH_MECAB
-tokenizer_modules_LTLIBRARIES += mecab.la
+tokenizer_plugins_LTLIBRARIES += mecab.la
endif
mecab_la_CPPFLAGS = $(MECAB_CPPFLAGS)
Renamed: plugins/tokenizers/mecab.c (+5 -4) 98%
===================================================================
--- modules/tokenizers/mecab.c 2010-10-22 03:37:57 +0000 (12b55b7)
+++ plugins/tokenizers/mecab.c 2010-11-01 06:07:42 +0000 (fc14586)
@@ -21,7 +21,8 @@
#include <str.h>
#include <token.h>
-#include <module_impl.h>
+#include <groonga.h>
+#include <groonga/plugin.h>
#include <mecab.h>
@@ -209,7 +210,7 @@ check_mecab_dictionary_encoding(grn_ctx *ctx)
}
grn_rc
-GRN_MODULE_INIT(grn_ctx *ctx)
+GRN_PLUGIN_INIT(grn_ctx *ctx)
{
sole_mecab = NULL;
CRITICAL_SECTION_INIT(sole_mecab_lock);
@@ -220,7 +221,7 @@ GRN_MODULE_INIT(grn_ctx *ctx)
}
grn_rc
-GRN_MODULE_REGISTER(grn_ctx *ctx)
+GRN_PLUGIN_REGISTER(grn_ctx *ctx)
{
grn_obj *obj;
grn_expr_var vars[] = {
@@ -240,7 +241,7 @@ GRN_MODULE_REGISTER(grn_ctx *ctx)
}
grn_rc
-GRN_MODULE_FIN(grn_ctx *ctx)
+GRN_PLUGIN_FIN(grn_ctx *ctx)
{
if (sole_mecab) {
mecab_destroy(sole_mecab);
Modified: src/Makefile.am (+1 -1)
===================================================================
--- src/Makefile.am 2010-10-22 03:37:57 +0000 (20af7a5)
+++ src/Makefile.am 2010-11-01 06:07:42 +0000 (b36288b)
@@ -4,7 +4,7 @@ noinst_PROGRAMS = grnslap
AM_CFLAGS = -fno-strict-aliasing $(COVERAGE_CFLAGS) \
-DDEFAULT_DOCUMENT_ROOT=\"$(pkgdatadir)/admin_html\"
-DEFAULT_INCLUDES = -I$(top_builddir) -I$(srcdir) -I$(top_srcdir) $(GROONGA_INCLUDEDIR)
+DEFAULT_INCLUDES = -I$(top_builddir) -I$(srcdir) -I$(top_srcdir)/include $(GROONGA_INCLUDEDIR)
groonga_SOURCES = groonga.c
groonga_CFLAGS = $(AM_CFLAGS) $(LIBEDIT_CFLAGS)
Modified: test/benchmark/Makefile.am (+1 -1)
===================================================================
--- test/benchmark/Makefile.am 2010-10-22 03:37:57 +0000 (c50258b)
+++ test/benchmark/Makefile.am 2010-11-01 06:07:42 +0000 (bfe53b8)
@@ -10,7 +10,7 @@ endif
INCLUDES = \
-I$(srcdir) \
-I$(srcdir)/lib \
- -I$(top_srcdir) \
+ -I$(top_srcdir)/include \
-I$(top_srcdir)/lib \
$(GROONGA_INCLUDEDIR)
Modified: test/unit/Makefile.am (+1 -1)
===================================================================
--- test/unit/Makefile.am 2010-10-22 03:37:57 +0000 (42755b7)
+++ test/unit/Makefile.am 2010-11-01 06:07:42 +0000 (409d43b)
@@ -29,7 +29,7 @@ EXTRA_DIST = \
INCLUDES = \
-I$(srcdir) \
- -I$(top_srcdir) \
+ -I$(top_srcdir)/include \
-I$(top_srcdir)/lib \
$(GROONGA_INCLUDEDIR)
Modified: test/unit/core/Makefile.am (+1 -1)
===================================================================
--- test/unit/core/Makefile.am 2010-10-22 03:37:57 +0000 (2431b4f)
+++ test/unit/core/Makefile.am 2010-11-01 06:07:42 +0000 (cd9ec8d)
@@ -56,7 +56,7 @@ noinst_LTLIBRARIES = \
endif
INCLUDES = \
- -I$(top_srcdir) \
+ -I$(top_srcdir)/include \
-I$(top_srcdir)/lib \
$(GROONGA_INCLUDEDIR)
Modified: test/unit/core/test-register.c (+14 -14)
===================================================================
--- test/unit/core/test-register.c 2010-10-22 03:37:57 +0000 (7d28246)
+++ test/unit/core/test-register.c 2010-11-01 06:07:42 +0000 (f438037)
@@ -25,7 +25,7 @@
void test_register_function(void);
-static gchar *tmp_directory, *modules_dir, *modules_dir_env;
+static gchar *tmp_directory, *plugins_dir, *plugins_dir_env;
static grn_ctx *context;
static grn_obj *database;
@@ -51,15 +51,15 @@ remove_tmp_directory(void)
}
static void
-setup_modules_dir(void)
+setup_plugins_dir(void)
{
- modules_dir = g_build_filename(grn_test_get_build_dir(),
+ plugins_dir = g_build_filename(grn_test_get_build_dir(),
"fixtures",
- "modules",
+ "plugins",
".libs",
NULL);
- modules_dir_env = g_strdup(g_getenv("GRN_MODULES_DIR"));
- g_setenv("GRN_MODULES_DIR", modules_dir, TRUE);
+ plugins_dir_env = g_strdup(g_getenv("GRN_PLUGINS_DIR"));
+ g_setenv("GRN_PLUGINS_DIR", plugins_dir, TRUE);
}
void
@@ -76,25 +76,25 @@ cut_setup(void)
database_path = cut_build_path(tmp_directory, "database.groonga", NULL);
database = grn_db_create(context, database_path, NULL);
- setup_modules_dir();
+ setup_plugins_dir();
}
static void
-teardown_modules_dir(void)
+teardown_plugins_dir(void)
{
- if (modules_dir_env) {
- g_setenv("GRN_MODULES_DIR", modules_dir_env, TRUE);
+ if (plugins_dir_env) {
+ g_setenv("GRN_PLUGINS_DIR", plugins_dir_env, TRUE);
} else {
- g_unsetenv("GRN_MODULES_DIR");
+ g_unsetenv("GRN_PLUGINS_DIR");
}
- g_free(modules_dir_env);
- g_free(modules_dir);
+ g_free(plugins_dir_env);
+ g_free(plugins_dir);
}
void
cut_teardown(void)
{
- teardown_modules_dir();
+ teardown_plugins_dir();
if (context) {
grn_ctx_fin(context);
Modified: test/unit/fixtures/Makefile.am (+2 -2)
===================================================================
--- test/unit/fixtures/Makefile.am 2010-10-22 03:37:57 +0000 (f606e0b)
+++ test/unit/fixtures/Makefile.am 2010-11-01 06:07:42 +0000 (c7446a7)
@@ -2,7 +2,7 @@ SUBDIRS = \
stress \
performance \
inverted-index \
- modules \
+ plugins \
story
if WITH_CUTTER
@@ -13,7 +13,7 @@ endif
INCLUDES = \
-I$(srcdir) \
-I$(srcdir)/../lib \
- -I$(top_srcdir) \
+ -I$(top_srcdir)/include \
-I$(top_srcdir)/lib \
$(GROONGA_INCLUDEDIR)
Modified: test/unit/fixtures/performance/Makefile.am (+1 -1)
===================================================================
--- test/unit/fixtures/performance/Makefile.am 2010-10-22 03:37:57 +0000 (79b61f8)
+++ test/unit/fixtures/performance/Makefile.am 2010-11-01 06:07:42 +0000 (5e5e2a9)
@@ -6,7 +6,7 @@ endif
INCLUDES = \
-I$(srcdir) \
-I$(top_srcdir)/test/unit/lib \
- -I$(top_srcdir) \
+ -I$(top_srcdir)/include \
-I$(top_srcdir)/lib \
$(GROONGA_INCLUDEDIR)
Renamed: test/unit/fixtures/plugins/Makefile.am (+1 -1) 90%
===================================================================
--- test/unit/fixtures/modules/Makefile.am 2010-10-22 03:37:57 +0000 (2f420fa)
+++ test/unit/fixtures/plugins/Makefile.am 2010-11-01 06:07:42 +0000 (82e5037)
@@ -1,6 +1,6 @@
INCLUDES = \
-I$(top_builddir) \
- -I$(top_srcdir) \
+ -I$(top_srcdir)/include \
-I$(top_srcdir)/lib
AM_LDFLAGS = \
Renamed: test/unit/fixtures/plugins/string.c (+4 -4) 93%
===================================================================
--- test/unit/fixtures/modules/string.c 2010-10-22 03:37:57 +0000 (7aca6b2)
+++ test/unit/fixtures/plugins/string.c 2010-11-01 06:07:42 +0000 (c5c202c)
@@ -19,7 +19,7 @@
#include <string.h>
#include <str.h>
-#include <module_impl.h>
+#include <groonga/plugin.h>
static grn_obj *
func_str_len(grn_ctx *ctx, int nargs, grn_obj **args, grn_user_data *user_data)
@@ -45,13 +45,13 @@ func_str_len(grn_ctx *ctx, int nargs, grn_obj **args, grn_user_data *user_data)
}
grn_rc
-GRN_MODULE_INIT(grn_ctx *ctx)
+GRN_PLUGIN_INIT(grn_ctx *ctx)
{
return GRN_SUCCESS;
}
grn_rc
-GRN_MODULE_REGISTER(grn_ctx *ctx)
+GRN_PLUGIN_REGISTER(grn_ctx *ctx)
{
grn_proc_create(ctx, "str_len", strlen("str_len"), GRN_PROC_FUNCTION,
func_str_len, NULL, NULL, 0, NULL);
@@ -60,7 +60,7 @@ GRN_MODULE_REGISTER(grn_ctx *ctx)
}
grn_rc
-GRN_MODULE_FIN(grn_ctx *ctx)
+GRN_PLUGIN_FIN(grn_ctx *ctx)
{
return GRN_SUCCESS;
}
Modified: test/unit/fixtures/stress/Makefile.am (+1 -1)
===================================================================
--- test/unit/fixtures/stress/Makefile.am 2010-10-22 03:37:57 +0000 (1cef3bc)
+++ test/unit/fixtures/stress/Makefile.am 2010-11-01 06:07:42 +0000 (24fb340)
@@ -7,7 +7,7 @@ endif
INCLUDES = \
-I$(srcdir) \
-I$(top_srcdir)/test/unit/lib \
- -I$(top_srcdir) \
+ -I$(top_srcdir)/include \
-I$(top_srcdir)/lib \
$(GROONGA_INCLUDEDIR)
Modified: test/unit/lib/Makefile.am (+1 -1)
===================================================================
--- test/unit/lib/Makefile.am 2010-10-22 03:37:57 +0000 (77db95c)
+++ test/unit/lib/Makefile.am 2010-11-01 06:07:42 +0000 (3f14356)
@@ -14,7 +14,7 @@ endif
INCLUDES = \
-I$(srcdir) \
- -I$(top_srcdir) \
+ -I$(top_srcdir)/include \
-I$(top_srcdir)/lib \
$(GROONGA_INCLUDEDIR)
Modified: test/unit/memcached/Makefile.am (+1 -1)
===================================================================
--- test/unit/memcached/Makefile.am 2010-10-22 03:37:57 +0000 (0ad853d)
+++ test/unit/memcached/Makefile.am 2010-11-01 06:07:42 +0000 (9147f58)
@@ -6,7 +6,7 @@ endif
endif
INCLUDES = \
- -I$(top_srcdir) \
+ -I$(top_srcdir)/include \
-I$(top_srcdir)/lib \
$(GROONGA_INCLUDEDIR)
Modified: test/unit/run-test.sh (+2 -2)
===================================================================
--- test/unit/run-test.sh 2010-10-22 03:37:57 +0000 (dafdec3)
+++ test/unit/run-test.sh 2010-11-01 06:07:42 +0000 (b0b0c5e)
@@ -53,8 +53,8 @@ CUTTER_ARGS="$CUTTER_ARGS --exclude-directory fixtures"
CUTTER_ARGS="$CUTTER_ARGS --exclude-directory lib"
CUTTER_ARGS="$CUTTER_ARGS --exclude-file test-performance.so"
-GRN_MODULES_DIR="$top_dir/modules"
-export GRN_MODULES_DIR
+GRN_PLUGINS_DIR="$top_dir/plugins"
+export GRN_PLUGINS_DIR
case `uname` in
Darwin)
Modified: test/unit/story/Makefile.am (+1 -1)
===================================================================
--- test/unit/story/Makefile.am 2010-10-22 03:37:57 +0000 (be047b0)
+++ test/unit/story/Makefile.am 2010-11-01 06:07:42 +0000 (5cc9dcc)
@@ -4,7 +4,7 @@ noinst_LTLIBRARIES = \
endif
INCLUDES = \
- -I$(top_srcdir) \
+ -I$(top_srcdir)/include \
-I$(top_srcdir)/lib \
$(GROONGA_INCLUDEDIR)
Modified: test/unit/util/Makefile.am (+1 -1)
===================================================================
--- test/unit/util/Makefile.am 2010-10-22 03:37:57 +0000 (158c094)
+++ test/unit/util/Makefile.am 2010-11-01 06:07:42 +0000 (f1b0d34)
@@ -5,7 +5,7 @@ noinst_LTLIBRARIES = \
endif
INCLUDES = \
- -I$(top_srcdir) \
+ -I$(top_srcdir)/include \
-I$(top_srcdir)/lib \
$(GROONGA_INCLUDEDIR)