summaryrefslogtreecommitdiff
path: root/src/gbm
diff options
context:
space:
mode:
authorJon TURNEY <jon.turney@dronecode.org.uk>2014-05-12 10:17:06 +0100
committerJon TURNEY <jon.turney@dronecode.org.uk>2014-05-23 15:24:04 +0100
commit45f9aae004f7bd723c3f313ee3dd8a25aa420ffa (patch)
tree1dc94055f8be1c6bfbc8671c914cea2f0c5d1681 /src/gbm
parentff90a8784cf22ada7bba75f90460b063818abda7 (diff)
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 <jon.turney@dronecode.org.uk> Reviewed-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com> Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
Diffstat (limited to 'src/gbm')
-rw-r--r--src/gbm/Makefile.am2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gbm/Makefile.am b/src/gbm/Makefile.am
index f6545ee5b7d..08369f234cf 100644
--- a/src/gbm/Makefile.am
+++ b/src/gbm/Makefile.am
@@ -40,7 +40,7 @@ AM_CFLAGS += $(WAYLAND_CFLAGS)
libgbm_la_LIBADD += $(top_builddir)/src/egl/wayland/wayland-drm/libwayland-drm.la $(WAYLAND_LIBS)
endif
-if HAVE_DRI
+if HAVE_DRI2
noinst_LTLIBRARIES = libgbm_dri.la
libgbm_dri_la_SOURCES = \
backends/dri/gbm_dri.c \