aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAllan LeSage <allanlesage@gmail.com>2012-03-19 10:14:53 -0500
committerAllan LeSage <allanlesage@gmail.com>2012-03-19 10:14:53 -0500
commit25fcbef28e8b33fc1ee624359ac4b39fbcb741dc (patch)
tree175374be06851b6afb9460c347daed95b89759d9
parenta5695b6ae268abc5c446a734ea8dbbcc30bc47fb (diff)
downloadayatana-indicator-messages-25fcbef28e8b33fc1ee624359ac4b39fbcb741dc.tar.gz
ayatana-indicator-messages-25fcbef28e8b33fc1ee624359ac4b39fbcb741dc.tar.bz2
ayatana-indicator-messages-25fcbef28e8b33fc1ee624359ac4b39fbcb741dc.zip
Charles-advised changes to test/Makefile.am for proper CPPFLAGS.
-rw-r--r--test/Makefile.am8
1 files 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) \