susumu.yata
null+****@clear*****
Sat Dec 15 12:37:04 JST 2012
susumu.yata 2012-12-15 12:37:04 +0900 (Sat, 15 Dec 2012) New Revision: a9e64ec5e0f612e1b9383a1236fb4db0a9f88194 https://github.com/groonga/grnxx/commit/a9e64ec5e0f612e1b9383a1236fb4db0a9f88194 Log: Fix configure & make scripts. Modified files: configure.ac lib/Makefile.am lib/alpha/Makefile.am lib/db/Makefile.am lib/io/Makefile.am src/Makefile.am test/Makefile.am Modified: configure.ac (+6 -2) =================================================================== --- configure.ac 2012-12-15 12:35:21 +0900 (72c7057) +++ configure.ac 2012-12-15 12:37:04 +0900 (961f51c) @@ -8,13 +8,17 @@ AC_CONFIG_HEADERS(config.h) AM_INIT_AUTOMAKE # Checks for programs. -LT_INIT +LT_INIT([win32-dll]) AC_PROG_CXX AC_PROG_INSTALL AC_CONFIG_MACRO_DIR([m4]) -CXXFLAGS="${CXXFLAGS} -Wall -Wextra -std=c++0x -fno-strict-aliasing" +AM_CXXFLAGS="-Wall -Wextra -std=c++0x -fno-strict-aliasing" +AM_LTLDFLAGS="-no-undefined" + +AC_SUBST([AM_CXXFLAGS]) +AC_SUBST([AM_LTLDFLAGS]) # Checks for libraries. Modified: lib/Makefile.am (+2 -0) =================================================================== --- lib/Makefile.am 2012-12-15 12:35:21 +0900 (4da1a6c) +++ lib/Makefile.am 2012-12-15 12:37:04 +0900 (58e120f) @@ -7,6 +7,8 @@ libgrnxx_la_LIBADD = \ db/libgrnxx_db.la \ io/libgrnxx_io.la +libgrnxx_la_LDFLAGS = @AM_LTLDFLAGS@ + libgrnxx_la_SOURCES = \ backtrace.cpp \ duration.cpp \ Modified: lib/alpha/Makefile.am (+2 -0) =================================================================== --- lib/alpha/Makefile.am 2012-12-15 12:35:21 +0900 (8044c8d) +++ lib/alpha/Makefile.am 2012-12-15 12:37:04 +0900 (74c010b) @@ -1,5 +1,7 @@ noinst_LTLIBRARIES = libgrnxx_alpha.la +libgrnxx_alpha_la_LDFLAGS = @AM_LTLDFLAGS@ + libgrnxx_alpha_la_SOURCES = \ sample.cpp Modified: lib/db/Makefile.am (+2 -0) =================================================================== --- lib/db/Makefile.am 2012-12-15 12:35:21 +0900 (f60574e) +++ lib/db/Makefile.am 2012-12-15 12:37:04 +0900 (795faf4) @@ -1,5 +1,7 @@ noinst_LTLIBRARIES = libgrnxx_db.la +libgrnxx_db_la_LDFLAGS = @AM_LTLDFLAGS@ + libgrnxx_db_la_SOURCES = \ array.cpp \ blob_vector.cpp \ Modified: lib/io/Makefile.am (+2 -0) =================================================================== --- lib/io/Makefile.am 2012-12-15 12:35:21 +0900 (209a5e1) +++ lib/io/Makefile.am 2012-12-15 12:37:04 +0900 (25ab70d) @@ -1,5 +1,7 @@ noinst_LTLIBRARIES = libgrnxx_io.la +libgrnxx_io_la_LDFLAGS = @AM_LTLDFLAGS@ + libgrnxx_io_la_SOURCES = \ block.cpp \ chunk.cpp \ Modified: src/Makefile.am (+1 -1) =================================================================== --- src/Makefile.am 2012-12-15 12:35:21 +0900 (0630b73) +++ src/Makefile.am 2012-12-15 12:37:04 +0900 (a4f0064) @@ -1,4 +1,4 @@ -AM_CXXFLAGS = -I$(top_srcdir)/lib +AM_CXXFLAGS = @AM_CXXFLAGS@ -I$(top_srcdir)/lib bin_PROGRAMS = grnxx Modified: test/Makefile.am (+1 -1) =================================================================== --- test/Makefile.am 2012-12-15 12:35:21 +0900 (248074b) +++ test/Makefile.am 2012-12-15 12:37:04 +0900 (70c33b6) @@ -1,4 +1,4 @@ -AM_CXXFLAGS = -I../lib +AM_CXXFLAGS = @AM_CXXFLAGS@ -I$(top_srcdir)/lib TESTS = \ test_backtrace \ -------------- next part -------------- HTML����������������������������...ダウンロード
