From: Emil Velikov Date: Wed, 3 May 2017 21:04:20 +0000 (+0100) Subject: gallium/targets: link against XCB only as needed X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=fcbedce31012ee319d9e083a10bc44120f830e4d;p=mesa.git gallium/targets: link against XCB only as needed OMX and VA can optionally use the X11 DRI2/DRI3, thus we should link only as required. Cc: Signed-off-by: Emil Velikov --- diff --git a/src/gallium/targets/omx/Makefile.am b/src/gallium/targets/omx/Makefile.am index 5912241b38d..928e0182a66 100644 --- a/src/gallium/targets/omx/Makefile.am +++ b/src/gallium/targets/omx/Makefile.am @@ -29,11 +29,15 @@ libomx_mesa_la_LIBADD = \ $(top_builddir)/src/gallium/auxiliary/libgallium.la \ $(top_builddir)/src/util/libmesautil.la \ $(OMX_LIBS) \ - $(VL_LIBS) \ - $(XCB_DRI3_LIBS) \ $(LIBDRM_LIBS) \ $(GALLIUM_COMMON_LIB_DEPS) +if HAVE_PLATFORM_X11 +libomx_mesa_la_LIBADD += \ + $(VL_LIBS) \ + $(XCB_DRI3_LIBS) +endif + EXTRA_libomx_mesa_la_DEPENDENCIES = omx.sym EXTRA_DIST = omx.sym diff --git a/src/gallium/targets/va/Makefile.am b/src/gallium/targets/va/Makefile.am index f8616406ada..3fcc88e06c1 100644 --- a/src/gallium/targets/va/Makefile.am +++ b/src/gallium/targets/va/Makefile.am @@ -29,11 +29,15 @@ gallium_drv_video_la_LIBADD = \ $(top_builddir)/src/gallium/auxiliary/libgalliumvl.la \ $(top_builddir)/src/gallium/auxiliary/libgallium.la \ $(top_builddir)/src/util/libmesautil.la \ - $(VL_LIBS) \ - $(XCB_DRI3_LIBS) \ $(LIBDRM_LIBS) \ $(GALLIUM_COMMON_LIB_DEPS) +if HAVE_PLATFORM_X11 +gallium_drv_video_la_LIBADD += \ + $(VL_LIBS) \ + $(XCB_DRI3_LIBS) +endif + EXTRA_gallium_drv_video_la_DEPENDENCIES = va.sym EXTRA_DIST = va.sym