THRIFT-1552 Include paths for c/c++ should be prefixed with 'thrift/'
To ensure there are no include path collisions the C and C++ header
include paths should include 'thrift' as the root leaf. This will
prevent having to place /usr/include/thrift into the compilers include
header search path, which might otherwise result in the compiler
accidentally picking up headers that it shouldn't.
e.g. #include <foo/bar.h> should be #include <thrift/foo/bar.h>
Change-Id: I48f2b0f549bda0fc81e85506ac857adc800b98a1
git-svn-id: https://svn.apache.org/repos/asf/thrift/trunk@1325674 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/lib/c_glib/Makefile.am b/lib/c_glib/Makefile.am
index 2f03e3d..d89b22c 100644
--- a/lib/c_glib/Makefile.am
+++ b/lib/c_glib/Makefile.am
@@ -24,7 +24,7 @@
lib_LTLIBRARIES = libthrift_c_glib.la
pkgconfig_DATA = thrift_c_glib.pc
-common_cflags = -g -Wall -W -Werror -Isrc $(GLIB_CFLAGS)
+common_cflags = -g -Wall -W -Werror -Isrc -I src/thrift $(GLIB_CFLAGS)
common_ldflags = -g -Wall -W $(GLIB_LDFLAGS) @GCOV_LDFLAGS@
# this removes optimizations and adds coverage flags
@@ -32,56 +32,56 @@
# Define the source files for the module
-libthrift_c_glib_la_SOURCES = src/thrift.c \
- src/thrift_struct.c \
- src/thrift_application_exception.c \
- src/processor/thrift_processor.c \
- src/protocol/thrift_protocol.c \
- src/protocol/thrift_protocol_factory.c \
- src/protocol/thrift_binary_protocol.c \
- src/protocol/thrift_binary_protocol_factory.c \
- src/transport/thrift_transport.c \
- src/transport/thrift_transport_factory.c \
- src/transport/thrift_socket.c \
- src/transport/thrift_server_transport.c \
- src/transport/thrift_server_socket.c \
- src/transport/thrift_buffered_transport.c \
- src/transport/thrift_framed_transport.c \
- src/transport/thrift_memory_buffer.c \
- src/server/thrift_server.c \
- src/server/thrift_simple_server.c
+libthrift_c_glib_la_SOURCES = src/thrift/thrift.c \
+ src/thrift/thrift_struct.c \
+ src/thrift/thrift_application_exception.c \
+ src/thrift/processor/thrift_processor.c \
+ src/thrift/protocol/thrift_protocol.c \
+ src/thrift/protocol/thrift_protocol_factory.c \
+ src/thrift/protocol/thrift_binary_protocol.c \
+ src/thrift/protocol/thrift_binary_protocol_factory.c \
+ src/thrift/transport/thrift_transport.c \
+ src/thrift/transport/thrift_transport_factory.c \
+ src/thrift/transport/thrift_socket.c \
+ src/thrift/transport/thrift_server_transport.c \
+ src/thrift/transport/thrift_server_socket.c \
+ src/thrift/transport/thrift_buffered_transport.c \
+ src/thrift/transport/thrift_framed_transport.c \
+ src/thrift/transport/thrift_memory_buffer.c \
+ src/thrift/server/thrift_server.c \
+ src/thrift/server/thrift_simple_server.c
libthrift_c_glib_la_CFLAGS = $(common_cflags)
include_thriftdir = $(includedir)/thrift/c_glib
include_thrift_HEADERS = \
$(top_builddir)/config.h \
- src/thrift.h \
- src/thrift_application_exception.h \
- src/thrift_struct.h
+ src/thrift/thrift.h \
+ src/thrift/thrift_application_exception.h \
+ src/thrift/thrift_struct.h
include_protocoldir = $(include_thriftdir)/protocol
-include_protocol_HEADERS = src/protocol/thrift_protocol.h \
- src/protocol/thrift_protocol_factory.h \
- src/protocol/thrift_binary_protocol.h \
- src/protocol/thrift_binary_protocol_factory.h
+include_protocol_HEADERS = src/thrift/protocol/thrift_protocol.h \
+ src/thrift/protocol/thrift_protocol_factory.h \
+ src/thrift/protocol/thrift_binary_protocol.h \
+ src/thrift/protocol/thrift_binary_protocol_factory.h
include_transportdir = $(include_thriftdir)/transport
-include_transport_HEADERS = src/transport/thrift_buffered_transport.h \
- src/transport/thrift_framed_transport.h \
- src/transport/thrift_memory_buffer.h \
- src/transport/thrift_server_socket.h \
- src/transport/thrift_server_transport.h \
- src/transport/thrift_socket.h \
- src/transport/thrift_transport.h \
- src/transport/thrift_transport_factory.h
+include_transport_HEADERS = src/thrift/transport/thrift_buffered_transport.h \
+ src/thrift/transport/thrift_framed_transport.h \
+ src/thrift/transport/thrift_memory_buffer.h \
+ src/thrift/transport/thrift_server_socket.h \
+ src/thrift/transport/thrift_server_transport.h \
+ src/thrift/transport/thrift_socket.h \
+ src/thrift/transport/thrift_transport.h \
+ src/thrift/transport/thrift_transport_factory.h
include_serverdir = $(include_thriftdir)/server
-include_server_HEADERS = src/server/thrift_server.h \
- src/server/thrift_simple_server.h
+include_server_HEADERS = src/thrift/server/thrift_server.h \
+ src/thrift/server/thrift_simple_server.h
include_processordir = $(include_thriftdir)/processor
-include_processor_HEADERS = src/processor/thrift_processor.h
+include_processor_HEADERS = src/thrift/processor/thrift_processor.h
EXTRA_DIST = \