From 25fcbef28e8b33fc1ee624359ac4b39fbcb741dc Mon Sep 17 00:00:00 2001 From: Allan LeSage Date: Mon, 19 Mar 2012 10:14:53 -0500 Subject: Charles-advised changes to test/Makefile.am for proper CPPFLAGS. --- test/Makefile.am | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/test/Makefile.am b/test/Makefile.am index e262bae..e359ad4 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -4,7 +4,8 @@ check_PROGRAMS = test-gtest TESTS = -AM_CPPFLAGS = $(GTEST_CPPFLAGS) +AM_CPPFLAGS = $(GTEST_CPPFLAGS) \ + -I${top_srcdir}/src nodist_libgtest_a_SOURCES = $(GTEST_SOURCE)/src/gtest-all.cc libgtest_a_SOURCES = \ @@ -14,6 +15,8 @@ libgtest_a_CPPFLAGS = \ $(GTEST_CPPFLAGS) -w libgtest_a_CXXFLAGS = \ $(AM_CXXFLAGS) +libgtest_a_CPPFLAGS = \ + $(AM_CPPFLAGS) TESTS += test-gtest @@ -23,7 +26,8 @@ test_gtest_SOURCES = \ $(top_srcdir)/src/seen-db.c \ test-gtest.cpp test_gtest_CPPFLAGS = \ - $(APPLET_CFLAGS) + $(APPLET_CFLAGS) \ + $(AM_CPPFLAGS) test_gtest_LDFLAGS = -pthread test_gtest_LDADD = \ $(APPLET_LIBS) \ -- cgit v1.2.3