Kouhei Sutou
null+****@clear*****
Sat Dec 31 00:23:52 JST 2016
Kouhei Sutou 2016-12-31 00:23:52 +0900 (Sat, 31 Dec 2016) New Revision: 6445ab8dd18101dab67dd8a8b69e0b90479c48d3 https://github.com/pgroonga/pgroonga/commit/6445ab8dd18101dab67dd8a8b69e0b90479c48d3 Message: Move sub Makefiles to makefiles/ Modified files: CMakeLists.txt pgroonga-check.mk pgroonga.mk Renamed files: makefiles/pgrn-pgxs.mk (from pgrn-pgxs.mk) makefiles/pgroonga-check-sources.mk (from pgroonga-check-sources.mk) makefiles/pgroonga-sources.mk (from pgroonga-sources.mk) Modified: CMakeLists.txt (+5 -2) =================================================================== --- CMakeLists.txt 2016-12-31 00:16:55 +0900 (79c2119) +++ CMakeLists.txt 2016-12-31 00:23:52 +0900 (e7af64e) @@ -66,13 +66,16 @@ include_directories( link_directories( "${PGRN_POSTGRESQL_DIR}/lib") -file(READ ${CMAKE_CURRENT_SOURCE_DIR}/pgroonga-sources.mk PGRN_SOURCES) +file(READ + ${CMAKE_CURRENT_SOURCE_DIR}/makefiles/pgroonga-sources.mk + PGRN_SOURCES) string(REGEX REPLACE "^.*=[ \t]*\\\\" "" PGRN_SOURCES "${PGRN_SOURCES}") string(REGEX REPLACE "[ \t\n]" "" PGRN_SOURCES "${PGRN_SOURCES}") string(REGEX REPLACE "\\\\" ";" PGRN_SOURCES "${PGRN_SOURCES}") -file(READ ${CMAKE_CURRENT_SOURCE_DIR}/pgroonga-check-sources.mk +file(READ + ${CMAKE_CURRENT_SOURCE_DIR}/makefiles/pgroonga-check-sources.mk PGRN_CHECK_SOURCES) string(REGEX REPLACE "^.*=[ \t]*\\\\" "" PGRN_CHECK_SOURCES "${PGRN_CHECK_SOURCES}") Renamed: makefiles/pgrn-pgxs.mk (+0 -0) 100% =================================================================== Renamed: makefiles/pgroonga-check-sources.mk (+0 -0) 100% =================================================================== Renamed: makefiles/pgroonga-sources.mk (+0 -0) 100% =================================================================== Modified: pgroonga-check.mk (+2 -2) =================================================================== --- pgroonga-check.mk 2016-12-31 00:16:55 +0900 (1ad5cab) +++ pgroonga-check.mk 2016-12-31 00:23:52 +0900 (a70c551) @@ -1,8 +1,8 @@ PACKAGES = MODULE_big = pgroonga-check -include pgroonga-check-sources.mk +include makefiles/pgroonga-check-sources.mk OBJS = $(SRCS:.c=.o) -include pgrn-pgxs.mk +include makefiles/pgrn-pgxs.mk Modified: pgroonga.mk (+2 -2) =================================================================== --- pgroonga.mk 2016-12-31 00:16:55 +0900 (bcbf97b) +++ pgroonga.mk 2016-12-31 00:23:52 +0900 (a587f4b) @@ -4,7 +4,7 @@ PACKAGES += msgpack endif MODULE_big = pgroonga -include pgroonga-sources.mk +include makefiles/pgroonga-sources.mk OBJS = $(SRCS:.c=.o) EXTENSION = pgroonga @@ -25,7 +25,7 @@ ifdef HAVE_MSGPACK COPT += -DPGRN_HAVE_MSGPACK endif -include pgrn-pgxs.mk +include makefiles/pgrn-pgxs.mk all: data/pgroonga--$(PGRN_VERSION).sql data/pgroonga--$(PGRN_VERSION).sql: data/pgroonga.sql -------------- next part -------------- HTML����������������������������...Download