glxl/tests: Use X11_INCLUDES instead of X11_CFLAGS

[mesa.git] / src / glx / tests / Makefile.am

diff --git a/src/glx/tests/Makefile.am b/src/glx/tests/Makefile.am
index d940712a6c517dd655c72bcd01a4c52cb92e5983..bdc78c0d5aff6dfd81e382d44ef2a61b3403c344 100644 (file)
--- a/src/glx/tests/Makefile.am
+++ b/src/glx/tests/Makefile.am
@@ -2,11 +2,15 @@ if HAVE_SHARED_GLAPI
 AM_CFLAGS = $(PTHREAD_CFLAGS)
 AM_CPPFLAGS = \
        -I$(top_srcdir)/src/gtest/include \
+       -I$(top_srcdir)/src \
        -I$(top_srcdir)/src/mapi \
        -I$(top_srcdir)/src/mesa \
        -I$(top_srcdir)/src/glx \
        -I$(top_srcdir)/include \
-       $(X11_CFLAGS)
+       -I$(top_srcdir)/include/GL/internal \
+       $(DEFINES) \
+       $(LIBDRM_CFLAGS) \
+       $(X11_INCLUDES)
 
 TESTS = glx-test
 check_PROGRAMS = glx-test
@@ -16,7 +20,15 @@ glx_test_SOURCES =                   \
        create_context_unittest.cpp     \
        enum_sizes.cpp                  \
        fake_glx_screen.cpp             \
-       indirect_api.cpp
+       fake_glx_screen.h               \
+       indirect_api.cpp                \
+       mock_xdisplay.h                 \
+       query_renderer_unittest.cpp
+
+if HAVE_DRI2
+glx_test_SOURCES += \
+       query_renderer_implementation_unittest.cpp
+endif
 
 glx_test_LDADD = \
        $(top_builddir)/src/glx/libglx.la \