summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2013-01-11 11:40:23 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2013-01-15 08:16:39 +1000
commit676b62af8cc28755e4b17b5b0d2d78f0704ebcfd (patch)
tree81e187b7e255896f6d8ea8da4611c3671506204e
parent275ee0295257e57688fe0f4331c064633d2dba89 (diff)
test: fix device-test to include our include dir before system dirs
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-rw-r--r--test/Makefile.am4
1 files changed, 2 insertions, 2 deletions
diff --git a/test/Makefile.am b/test/Makefile.am
index a8ec35a..13485ab 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -63,7 +63,7 @@ xserver_test_helper_SOURCES = xserver-test-helper.cpp
xserver_test_helper_CPPFLAGS = $(AM_CPPFLAGS)
device_test_SOURCES = device-test.cpp
-device_test_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/include
+device_test_CPPFLAGS = -I$(top_srcdir)/include $(AM_CPPFLAGS)
device_test_LDADD = $(tests_libraries)
check_LIBRARIES = libgtest.a libxorg-gtest.a
@@ -76,9 +76,9 @@ libgtest_a_CXXFLAGS = $(AM_CXXFLAGS)
# build xorg-gtest as static lib
libxorg_gtest_a_SOURCES = $(top_srcdir)/src/xorg-gtest-all.cpp
libxorg_gtest_a_CPPFLAGS = \
- $(AM_CPPFLAGS) \
-I$(top_srcdir)/include \
-I$(top_srcdir) \
+ $(AM_CPPFLAGS) \
-DDUMMY_CONF_PATH="\"$(abs_top_srcdir)/data/xorg/gtest/dummy.conf\""
libxorg_gtest_a_CXXFLAGS = $(AM_CXXFLAGS)