From 4636768621434e40918be355637ab6e1920ef2ba Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 25 Apr 2012 15:24:26 -0500 Subject: Bring in xorg-gtest to get an X11 wrapper --- tests/Makefile.am | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'tests') diff --git a/tests/Makefile.am b/tests/Makefile.am index 03429c7..04e6cde 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -19,14 +19,15 @@ AM_CPPFLAGS = \ ############################# nodist_libgtest_a_SOURCES = \ + $(XORG_GTEST_SOURCE)/src/xorg-gtest-all.cpp \ $(GTEST_SOURCE)/src/gtest-all.cc \ - $(GTEST_SOURCE)/src/gtest_main.cc + $(XORG_GTEST_SOURCE)/src/xorg-gtest_main.cpp libgtest_a_CPPFLAGS = \ + $(XORG_GTEST_CPPFLAGS) \ + $(AM_CPPFLAGS) \ $(GTEST_CPPFLAGS) -w libgtest_a_CXXFLAGS = \ $(AM_CXXFLAGS) -libgtest_a_CPPFLAGS = \ - $(AM_CPPFLAGS) ############################# # Menuitem tests -- cgit v1.2.3