Kouhei Sutou
null+****@clear*****
Mon Nov 24 09:43:18 JST 2014
Kouhei Sutou 2014-11-24 09:43:18 +0900 (Mon, 24 Nov 2014) New Revision: ad5c2fe40a509b3dcb5ffe9f80e3b51d50648748 https://github.com/groonga/groonga/commit/ad5c2fe40a509b3dcb5ffe9f80e3b51d50648748 Message: Use #include <...> for including lib/*.h Modified files: CMakeLists.txt src/Makefile.am src/grnslap.c src/groonga.c src/groonga_benchmark.c src/groonga_mruby.c Modified: CMakeLists.txt (+1 -1) =================================================================== --- CMakeLists.txt 2014-11-23 22:16:06 +0900 (1679c26) +++ CMakeLists.txt 2014-11-24 09:43:18 +0900 (b8fd4cb) @@ -173,8 +173,8 @@ endif() include_directories( BEFORE ${CMAKE_CURRENT_BINARY_DIR} - ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include + ${CMAKE_CURRENT_SOURCE_DIR}/lib ) macro(ac_check_headers header) Modified: src/Makefile.am (+1 -2) =================================================================== --- src/Makefile.am 2014-11-23 22:16:06 +0900 (5666725) +++ src/Makefile.am 2014-11-24 09:43:18 +0900 (c8680b2) @@ -25,9 +25,8 @@ AM_LDFLAGS = -no-undefined DEFAULT_INCLUDES = \ -I$(top_builddir) \ - -I$(srcdir) \ - -I$(top_srcdir) \ -I$(top_srcdir)/include \ + -I$(top_srcdir)/lib \ $(GROONGA_INCLUDEDIR) include groonga_sources.am Modified: src/grnslap.c (+2 -2) =================================================================== --- src/grnslap.c 2014-11-23 22:16:06 +0900 (d2c5049) +++ src/grnslap.c 2014-11-24 09:43:18 +0900 (be2f181) @@ -16,8 +16,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "lib/grn_com.h" -#include "lib/grn_ctx_impl.h" +#include <grn_com.h> +#include <grn_ctx_impl.h> #include <string.h> #include <stdio.h> #ifdef HAVE_SYS_WAIT_H Modified: src/groonga.c (+7 -6) =================================================================== --- src/groonga.c 2014-11-23 22:16:06 +0900 (88f160d) +++ src/groonga.c 2014-11-24 09:43:18 +0900 (b786a7a) @@ -19,13 +19,14 @@ #ifdef WIN32 # define GROONGA_MAIN #endif /* WIN32 */ -#include "lib/grn.h" +#include <grn.h> + +#include <grn_com.h> +#include <grn_ctx_impl.h> +#include <grn_proc.h> +#include <grn_db.h> +#include <grn_util.h> -#include "lib/grn_com.h" -#include "lib/grn_ctx_impl.h" -#include "lib/grn_proc.h" -#include "lib/grn_db.h" -#include "lib/grn_util.h" #include <string.h> #include <stdio.h> #include <ctype.h> Modified: src/groonga_benchmark.c (+4 -4) =================================================================== --- src/groonga_benchmark.c 2014-11-23 22:16:06 +0900 (dd6150f) +++ src/groonga_benchmark.c 2014-11-24 09:43:18 +0900 (e7e426e) @@ -17,7 +17,7 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include <config.h> #endif /* HAVE_CONFIG_H */ #include <stdio.h> @@ -37,9 +37,9 @@ #include <netinet/in.h> #endif /* HAVE_NETINET_IN_H */ -#include "lib/grn_str.h" -#include "lib/grn_com.h" -#include "lib/grn_db.h" +#include <grn_str.h> +#include <grn_com.h> +#include <grn_db.h> #ifdef WIN32 #include <windows.h> Modified: src/groonga_mruby.c (+1 -1) =================================================================== --- src/groonga_mruby.c 2014-11-23 22:16:06 +0900 (8fb9f76) +++ src/groonga_mruby.c 2014-11-24 09:43:18 +0900 (9978a00) @@ -16,7 +16,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "../lib/grn_mrb.h" +#include <grn_mrb.h> #include <stdio.h> #include <stdlib.h> -------------- next part -------------- HTML����������������������������...下载
