From bacad6ee225001ec39b6263ceb4aa99d55a67ba6 Mon Sep 17 00:00:00 2001
From: Allan LeSage <allanlesage@gmail.com>
Date: Thu, 15 Mar 2012 18:22:37 -0500
Subject: Temp commit for review by charles.

---
 test/Makefile.am | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

(limited to 'test/Makefile.am')

diff --git a/test/Makefile.am b/test/Makefile.am
index fa7bace..7b59f54 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,24 +1,28 @@
 
 check_LIBRARIES = libgtest.a
+check_PROGRAMS = test-gtest
+
+TESTS =
 
 AM_CPPFLAGS = $(GTEST_CPPFLAGS)
 
 nodist_libgtest_a_SOURCES = $(GTEST_SOURCE)/src/gtest-all.cc
-libgtest_a_CPPFLAGS = $(GTEST_CPPFLAGS) -w
-libgtest_a_CXXFLAGS = $(AM_CXXFLAGS)
-
 libgtest_a_SOURCES = \
 	$(GTEST_SOURCE)/src/gtest-all.cc \
-	$(GTEST_SOURCE)/src/gtest-main.cc
-lib_gtest_a_CPPFLAGS = \
-	$(GTEST_CPPFLAGS) \
-	-I$(top_srcdir)/include \
-	-I$(top_srcdir)
-libxorg_gtest_a_CXXFLAGS = $(GTEST_CXXFLAGS) $(AM_CXXFLAGS)
-
-check_PROGRAMS = test_gtest
+	$(GTEST_SOURCE)/src/gtest_main.cc
+libgtest_a_CPPFLAGS = \
+	$(GTEST_CPPFLAGS) -w
+libgtest_a_CXXFLAGS = \
+	$(AM_CXXFLAGS)
 
-test_gtest_SOURCES = test-gtest.cpp
+TESTS += test-gtest
 
+test_gtest_SOURCES = \
+	test-gtest.cpp
+test_gtest_CPPFLAGS = \
+	$(APPLET_CFLAGS) \
+	-I$(top_srcdir)/src
+test_gtest_LDFLAGS = -pthread
 test_gtest_LDADD = \
+	$(APPLET_LIBS) \
 	libgtest.a
-- 
cgit v1.2.3