From 2fee65e88f9a5de775df5fe99fe8a9a160bbbdf8 Mon Sep 17 00:00:00 2001
From: Lars Uebernickel <lars.uebernickel@canonical.com>
Date: Mon, 4 Jun 2012 18:21:11 +0200
Subject: test: remove warnings in Makefile.am (duplicate vars)

---
 test/Makefile.am | 8 +++-----
 1 file 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 \
-- 
cgit v1.2.3