diff options
| author | Kevin Wojniak <kainjow@users.noreply.github.com> | 2019-07-01 11:07:45 -0700 |
|---|---|---|
| committer | James E. King III <jking@apache.org> | 2019-07-01 14:07:45 -0400 |
| commit | a392566e9b31edfb3f3da9bb09dc193215c285c2 (patch) | |
| tree | 458b19f71b31758494e866993b966fc1a7e77d33 /lib/c_glib | |
| parent | 3711d9081095551c04980d328a2e4729d9730219 (diff) | |
| download | thrift-a392566e9b31edfb3f3da9bb09dc193215c285c2.tar.gz | |
THRIFT-4896 - prevent cpp and c_glib include directories from leaking into other targets (#1821)
- enable the automake `nostdinc` option
- fix up include paths
Diffstat (limited to 'lib/c_glib')
| -rwxr-xr-x | lib/c_glib/Makefile.am | 4 | ||||
| -rwxr-xr-x | lib/c_glib/test/Makefile.am | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/c_glib/Makefile.am b/lib/c_glib/Makefile.am index 49b5b238c..fd7f93d76 100755 --- a/lib/c_glib/Makefile.am +++ b/lib/c_glib/Makefile.am @@ -16,7 +16,7 @@ # specific language governing permissions and limitations # under the License. # -AUTOMAKE_OPTIONS = serial-tests +AUTOMAKE_OPTIONS = serial-tests nostdinc SUBDIRS = . test pkgconfigdir = $(libdir)/pkgconfig @@ -59,7 +59,7 @@ libthrift_c_glib_la_SOURCES = src/thrift/c_glib/thrift.c \ src/thrift/c_glib/server/thrift_server.c \ src/thrift/c_glib/server/thrift_simple_server.c -libthrift_c_glib_la_CFLAGS = $(AM_CFLAGS) $(GLIB_CFLAGS) $(GOBJECT_CFLAGS) $(OPENSSL_INCLUDES) +libthrift_c_glib_la_CFLAGS = $(AM_CFLAGS) $(GLIB_CFLAGS) $(GOBJECT_CFLAGS) $(OPENSSL_INCLUDES) -I$(top_builddir)/lib/c_glib/src/thrift libthrift_c_glib_la_LDFLAGS = $(AM_LDFLAGS) $(GLIB_LIBS) $(GOBJECT_LIBS) $(OPENSSL_LDFLAGS) $(OPENSSL_LIBS) include_thriftdir = $(includedir)/thrift/c_glib diff --git a/lib/c_glib/test/Makefile.am b/lib/c_glib/test/Makefile.am index 5e9d2ea41..c99e0da83 100755 --- a/lib/c_glib/test/Makefile.am +++ b/lib/c_glib/test/Makefile.am @@ -16,7 +16,7 @@ # specific language governing permissions and limitations # under the License. # -AUTOMAKE_OPTIONS = subdir-objects serial-tests +AUTOMAKE_OPTIONS = subdir-objects serial-tests nostdinc SUBDIRS = @@ -36,7 +36,7 @@ BUILT_SOURCES = \ gen-c_glib/t_test_thrift_test.h \ gen-c_glib/t_test_thrift_test_types.h -AM_CPPFLAGS = -I../src -I./gen-c_glib +AM_CPPFLAGS = -I../src -I./gen-c_glib -I$(top_builddir)/lib/c_glib/src/thrift AM_CFLAGS = -g -Wall -Wextra -pedantic $(GLIB_CFLAGS) $(GOBJECT_CFLAGS) $(OPENSSL_INCLUDES) \ @GCOV_CFLAGS@ AM_CXXFLAGS = $(AM_CFLAGS) |