Kouhei Sutou
null+****@clear*****
Mon Oct 9 20:07:26 JST 2017
Kouhei Sutou 2017-10-09 20:07:26 +0900 (Mon, 09 Oct 2017) New Revision: dba548a7efb4a15c24c518caa8da74fcd3115685 https://github.com/pgroonga/pgroonga/commit/dba548a7efb4a15c24c518caa8da74fcd3115685 Message: Add missing header files dependencies Added files: makefiles/pgroonga-headers.mk Modified files: CMakeLists.txt pgroonga.mk Modified: CMakeLists.txt (+9 -0) =================================================================== --- CMakeLists.txt 2017-10-08 09:40:23 +0900 (3413906) +++ CMakeLists.txt 2017-10-09 20:07:26 +0900 (ce90c60) @@ -75,6 +75,14 @@ string(REGEX REPLACE "[ \t\n]" "" PGRN_SOURCES "${PGRN_SOURCES}") string(REGEX REPLACE "\\\\" ";" PGRN_SOURCES "${PGRN_SOURCES}") file(READ + ${CMAKE_CURRENT_SOURCE_DIR}/makefiles/pgroonga-headers.mk + PGRN_HEADERS) +string(REGEX REPLACE "^.*=[ \t]*\\\\" "" + PGRN_HEADERS "${PGRN_HEADERS}") +string(REGEX REPLACE "[ \t\n]" "" PGRN_HEADERS "${PGRN_HEADERS}") +string(REGEX REPLACE "\\\\" ";" PGRN_HEADERS "${PGRN_HEADERS}") + +file(READ ${CMAKE_CURRENT_SOURCE_DIR}/makefiles/pgroonga-check-sources.mk PGRN_CHECK_SOURCES) string(REGEX REPLACE "^.*=[ \t]*\\\\" "" @@ -91,6 +99,7 @@ configure_file( @ONLY) set(PGRN_SOURCES "${CMAKE_CURRENT_BINARY_DIR}/src/pgroonga.rc" + ${PGRN_HEADERS} ${PGRN_SOURCES}) add_library("${PGRN_LIBRARY_NAME}" SHARED ${PGRN_SOURCES}) set_target_properties("${PGRN_LIBRARY_NAME}" Added: makefiles/pgroonga-headers.mk (+27 -0) 100644 =================================================================== --- /dev/null +++ makefiles/pgroonga-headers.mk 2017-10-09 20:07:26 +0900 (c122a89) @@ -0,0 +1,27 @@ +HEADERS = \ + src/pgrn-column-name.h \ + src/pgrn-command-escape-value.h \ + src/pgrn-compatible.h \ + src/pgrn-convert.h \ + src/pgrn-create.h \ + src/pgrn-ctid.h \ + src/pgrn-global.h \ + src/pgrn-groonga-tuple-is-alive.h \ + src/pgrn-groonga.h \ + src/pgrn-highlight-html.h \ + src/pgrn-index-status.h \ + src/pgrn-jsonb.h \ + src/pgrn-keywords.h \ + src/pgrn-match-positions-byte.h \ + src/pgrn-match-positions-character.h \ + src/pgrn-options.h \ + src/pgrn-pg.h \ + src/pgrn-portable.h \ + src/pgrn-query-expand.h \ + src/pgrn-query-extract-keywords.h \ + src/pgrn-search.h \ + src/pgrn-value.h \ + src/pgrn-variables.h \ + src/pgrn-wal.h \ + src/pgroonga.h \ + vendor/xxHash/xxhash.h Modified: pgroonga.mk (+2 -0) =================================================================== --- pgroonga.mk 2017-10-08 09:40:23 +0900 (f6684fb) +++ pgroonga.mk 2017-10-09 20:07:26 +0900 (011ece2) @@ -5,7 +5,9 @@ endif MODULE_big = pgroonga include makefiles/pgroonga-sources.mk +include makefiles/pgroonga-headers.mk OBJS = $(SRCS:.c=.o) +$(OBJS): $(HEADERS) EXTENSION = pgroonga ifdef GP -------------- next part -------------- HTML����������������������������... URL: https://lists.osdn.me/mailman/archives/groonga-commit/attachments/20171009/55966fb5/attachment-0001.htm
