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/gallium/state_trackers/Makefile.am | 2 +- src/gallium/state_trackers/dri/Makefile.am | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'src/gallium/state_trackers') diff --git a/src/gallium/state_trackers/Makefile.am b/src/gallium/state_trackers/Makefile.am index 209856041ee..3ced6adb482 100644 --- a/src/gallium/state_trackers/Makefile.am +++ b/src/gallium/state_trackers/Makefile.am @@ -29,7 +29,7 @@ if HAVE_GALLIUM_OSMESA SUBDIRS += osmesa endif -if HAVE_DRI +if HAVE_DRICOMMON SUBDIRS += dri endif diff --git a/src/gallium/state_trackers/dri/Makefile.am b/src/gallium/state_trackers/dri/Makefile.am index 9428b555512..b89d02f2a2b 100644 --- a/src/gallium/state_trackers/dri/Makefile.am +++ b/src/gallium/state_trackers/dri/Makefile.am @@ -20,7 +20,11 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER # DEALINGS IN THE SOFTWARE. -SUBDIRS = sw +SUBDIRS = + +if HAVE_DRISW +SUBDIRS += sw +endif if HAVE_LIBDRM SUBDIRS += drm -- cgit v1.2.3