aboutsummaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorLars Uebernickel <lars.uebernickel@canonical.com>2012-06-04 18:21:11 +0200
committerLars Uebernickel <lars.uebernickel@canonical.com>2012-06-04 18:21:11 +0200
commit2fee65e88f9a5de775df5fe99fe8a9a160bbbdf8 (patch)
tree93aa7e6092213c587a55f685af348ba3c16629aa /test
parent6ee454ecc225d186195206465254133473bfd749 (diff)
downloadayatana-indicator-messages-2fee65e88f9a5de775df5fe99fe8a9a160bbbdf8.tar.gz
ayatana-indicator-messages-2fee65e88f9a5de775df5fe99fe8a9a160bbbdf8.tar.bz2
ayatana-indicator-messages-2fee65e88f9a5de775df5fe99fe8a9a160bbbdf8.zip
test: remove warnings in Makefile.am (duplicate vars)
Diffstat (limited to 'test')
-rw-r--r--test/Makefile.am8
1 files changed, 3 insertions, 5 deletions
diff --git a/test/Makefile.am b/test/Makefile.am
index 6ceb1d4..a790ba2 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -2,7 +2,7 @@
check_LIBRARIES = libgtest.a
check_PROGRAMS = test-gactionmuxer
-TESTS =
+TESTS = $(check_PROGRAMS)
AM_CPPFLAGS = $(GTEST_CPPFLAGS) \
-I${top_srcdir}/src
@@ -11,13 +11,11 @@ nodist_libgtest_a_SOURCES = \
$(GTEST_SOURCE)/src/gtest-all.cc \
$(GTEST_SOURCE)/src/gtest_main.cc
libgtest_a_CPPFLAGS = \
- $(GTEST_CPPFLAGS) -w
+ $(GTEST_CPPFLAGS) -w \
+ $(AM_CPPFLAGS)
libgtest_a_CXXFLAGS = \
$(AM_CXXFLAGS)
-libgtest_a_CPPFLAGS = \
- $(AM_CPPFLAGS)
-TESTS += test-gactionmuxer
test_gactionmuxer_SOURCES = \
test-gactionmuxer.cpp \