null+****@clear*****
null+****@clear*****
2010年 11月 16日 (火) 13:22:54 JST
Kouhei Sutou 2010-11-16 04:22:54 +0000 (Tue, 16 Nov 2010)
New Revision: 5f91e64e3605c3884b58504ff17974489a3e54a8
Log:
suppress warnings in CFLAGS macro definitions.
Modified files:
configure.ac
lib/Makefile.am
src/Makefile.am
Modified: configure.ac (+6 -2)
===================================================================
--- configure.ac 2010-11-16 01:05:46 +0000 (11bdeb6)
+++ configure.ac 2010-11-16 04:22:54 +0000 (89a3c48)
@@ -696,9 +696,13 @@ examples_dictionarydir="\$(examplesdir)/dictionary"
AC_SUBST(examples_dictionarydir)
# flags for compile groonga
+GROONGA_CFLAGS=""
+AC_SUBST(GROONGA_CFLAGS)
+GROONGA_DEFS=""
+GROONGA_DEFS="$GROONGA_DEFS -DPLUGINS_DIR=\\\"\"\$(pluginsdir)\"\\\""
+GROONGA_DEFS="$GROONGA_DEFS -DGROONGA_LOG_PATH=\\\"\"\$(groonga_log_path)\"\\\""
+AC_SUBST(GROONGA_DEFS)
CFLAGS="$CFLAGS $OPT_CFLAGS "
-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: lib/Makefile.am (+2 -2)
===================================================================
--- lib/Makefile.am 2010-11-16 01:05:46 +0000 (1d1b3dc)
+++ lib/Makefile.am 2010-11-16 04:22:54 +0000 (8b81521)
@@ -1,9 +1,9 @@
lib_LTLIBRARIES = libgroonga.la
include $(top_srcdir)/version.sh
-AM_CFLAGS = -fno-strict-aliasing $(COVERAGE_CFLAGS)
+AM_CFLAGS = -fno-strict-aliasing $(COVERAGE_CFLAGS) $(GROONGA_CFLAGS)
DEFAULT_INCLUDES = -I$(top_builddir) -I$(top_srcdir)/include
-DEFS += -D_REENTRANT -DGROONGA_VERSION=\"$(GROONGA_VERSION)\"
+DEFS += -D_REENTRANT -DGROONGA_VERSION=\"$(GROONGA_VERSION)\" $(GROONGA_DEFS)
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
Modified: src/Makefile.am (+4 -2)
===================================================================
--- src/Makefile.am 2010-11-16 01:05:46 +0000 (b36288b)
+++ src/Makefile.am 2010-11-16 04:22:54 +0000 (dbcfbe2)
@@ -1,8 +1,10 @@
bin_PROGRAMS = groonga grntest
noinst_PROGRAMS = grnslap
-AM_CFLAGS = -fno-strict-aliasing $(COVERAGE_CFLAGS) \
- -DDEFAULT_DOCUMENT_ROOT=\"$(pkgdatadir)/admin_html\"
+AM_CFLAGS = -fno-strict-aliasing $(COVERAGE_CFLAGS) $(GROONGA_CFLAGS)
+DEFS += $(GROONGA_CFLAGS) -DDEFAULT_DOCUMENT_ROOT=\"$(pkgdatadir)/admin_html\"
+
+AM_LDFLAGS = -no-undefined
DEFAULT_INCLUDES = -I$(top_builddir) -I$(srcdir) -I$(top_srcdir)/include $(GROONGA_INCLUDEDIR)