null+****@clear*****
null+****@clear*****
2012年 4月 12日 (木) 19:09:06 JST
Kouhei Sutou 2012-04-12 19:09:06 +0900 (Thu, 12 Apr 2012)
New Revision: 309837492b3c9e965aca22f52a62ac7316922608
Log:
cmake: share grn_dat source file list
Copied files:
lib/dat/sources.am
(from lib/dat/Makefile.am)
Modified files:
lib/CMakeLists.txt
lib/dat/Makefile.am
Modified: lib/CMakeLists.txt (+2 -1)
===================================================================
--- lib/CMakeLists.txt 2012-04-12 19:08:20 +0900 (aa68161)
+++ lib/CMakeLists.txt 2012-04-12 19:09:06 +0900 (072852d)
@@ -20,5 +20,6 @@ include_directories(
include(${CMAKE_SOURCE_DIR}/build/cmake_modules/ReadFileList.cmake)
read_file_list(${CMAKE_CURRENT_SOURCE_DIR}/sources.am LIBGROONGA_SOURCES)
+read_file_list(${CMAKE_CURRENT_SOURCE_DIR}/dat/sources.am LIBGRN_DAT_SOURCES)
-add_library(groonga SHARED ${LIBGROONGA_SOURCES})
+add_library(groonga SHARED ${LIBGROONGA_SOURCES} ${LIBGRNDAT_SOURCES})
Modified: lib/dat/Makefile.am (+1 -31)
===================================================================
--- lib/dat/Makefile.am 2012-04-12 19:08:20 +0900 (6c65a07)
+++ lib/dat/Makefile.am 2012-04-12 19:09:06 +0900 (6bad773)
@@ -7,36 +7,6 @@ DEFAULT_INCLUDES = \
noinst_LTLIBRARIES = libgrndat.la
-libgrndat_la_SOURCES = \
- cursor-factory.cpp \
- file-impl.cpp \
- file.cpp \
- id-cursor.cpp \
- key-cursor.cpp \
- predictive-cursor.cpp \
- prefix-cursor.cpp \
- trie.cpp
-
-noinst_HEADERS = \
- array.hpp \
- base.hpp \
- block.hpp \
- check.hpp \
- cursor-factory.hpp \
- cursor.hpp \
- dat.hpp \
- entry.hpp \
- file-impl.hpp \
- file.hpp \
- header.hpp \
- id-cursor.hpp \
- key-cursor.hpp \
- key.hpp \
- node.hpp \
- predictive-cursor.hpp \
- prefix-cursor.hpp \
- string.hpp \
- trie.hpp \
- vector.hpp
+include sources.am
CLEANFILES = *.gcno *.gcda
Copied: lib/dat/sources.am (+1 -14) 67%
===================================================================
--- lib/dat/Makefile.am 2012-04-12 19:08:20 +0900 (6c65a07)
+++ lib/dat/sources.am 2012-04-12 19:09:06 +0900 (26c9f09)
@@ -1,12 +1,3 @@
-DEFS += -D_REENTRANT $(GRN_DEFS) -DGRN_DAT_EXPORT
-
-DEFAULT_INCLUDES = \
- -I$(top_builddir) \
- -I$(top_srcdir)/include \
- -I$(top_srcdir)/lib
-
-noinst_LTLIBRARIES = libgrndat.la
-
libgrndat_la_SOURCES = \
cursor-factory.cpp \
file-impl.cpp \
@@ -15,9 +6,7 @@ libgrndat_la_SOURCES = \
key-cursor.cpp \
predictive-cursor.cpp \
prefix-cursor.cpp \
- trie.cpp
-
-noinst_HEADERS = \
+ trie.cpp \
array.hpp \
base.hpp \
block.hpp \
@@ -38,5 +27,3 @@ noinst_HEADERS = \
string.hpp \
trie.hpp \
vector.hpp
-
-CLEANFILES = *.gcno *.gcda