From 45f9aae004f7bd723c3f313ee3dd8a25aa420ffa Mon Sep 17 00:00:00 2001 From: Jon TURNEY Date: Mon, 12 May 2014 10:17:06 +0100 Subject: Make DRI dependencies and build depend on the target - Don't require xcb-dri[23] etc. if we aren't building for a target with DRM, as we won't be using dri[23] - Enable a more fine-grained control of what DRI code is built, so that a libGL using direct swrast can be built on targets which don't have DRM. The HAVE_DRI automake conditional is retired in favour of a number of other conditionals: HAVE_DRI2 enables building of code using the DRI2 interface (and possibly DRI3 with HAVE_DRI3) HAVE_DRISW enables building of DRI swrast HAVE_DRICOMMON enables building of target-independent DRI code, and also enables some makefile cases where a more detailled decision is made at a lower level. HAVE_APPLEDRI enables building of an Apple-specific direct rendering interface, still which requires additional fixing up to build properly. v2: Place xfont.c and drisw_glx.c into correct categories. Update 'make check' as well Signed-off-by: Jon TURNEY Reviewed-by: Jeremy Huddleston Sequoia Reviewed-by: Emil Velikov --- src/glx/tests/Makefile.am | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src/glx/tests/Makefile.am') diff --git a/src/glx/tests/Makefile.am b/src/glx/tests/Makefile.am index 4dc358c3261..3599b3d55e8 100644 --- a/src/glx/tests/Makefile.am +++ b/src/glx/tests/Makefile.am @@ -20,9 +20,13 @@ glx_test_SOURCES = \ enum_sizes.cpp \ fake_glx_screen.cpp \ indirect_api.cpp \ - query_renderer_implementation_unittest.cpp \ 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 \ $(top_builddir)/src/gtest/libgtest.la \ -- cgit v1.2.3