From 6b410430508457e1a975210eecafea5e600408cf Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Tue, 1 Apr 2014 02:40:32 +0100 Subject: [PATCH] targets/xvmc: use GALLIUM_COMMON_LIB_DEPS MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit The targets do not require expat or selinux. Use GALLIUM_COMMON_LIB_DEPS which provides the core requirements for each gallium target. Cc: Christian König Signed-off-by: Emil Velikov --- src/gallium/Automake.inc | 3 ++- src/gallium/targets/r600/xvmc/Makefile.am | 1 - src/gallium/targets/xvmc-nouveau/Makefile.am | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/gallium/Automake.inc b/src/gallium/Automake.inc index 7a10a77fa97..b4fdfe85588 100644 --- a/src/gallium/Automake.inc +++ b/src/gallium/Automake.inc @@ -109,7 +109,8 @@ GALLIUM_XVMC_LIB_DEPS = \ $(top_builddir)/src/gallium/auxiliary/libgallium.la \ $(top_builddir)/src/gallium/state_trackers/xvmc/libxvmctracker.la \ $(XVMC_LIBS) \ - $(LIBDRM_LIBS) + $(LIBDRM_LIBS) \ + $(GALLIUM_COMMON_LIB_DEPS) GALLIUM_OMX_LIB_DEPS = \ $(top_builddir)/src/gallium/auxiliary/libgallium.la \ diff --git a/src/gallium/targets/r600/xvmc/Makefile.am b/src/gallium/targets/r600/xvmc/Makefile.am index 56b0a6d75bf..a6c22f4b1e2 100644 --- a/src/gallium/targets/r600/xvmc/Makefile.am +++ b/src/gallium/targets/r600/xvmc/Makefile.am @@ -40,5 +40,4 @@ libXvMCr600_la_LIBADD = \ $(top_builddir)/src/gallium/drivers/r600/libr600.la \ $(top_builddir)/src/gallium/winsys/radeon/drm/libradeonwinsys.la \ $(GALLIUM_XVMC_LIB_DEPS) \ - $(GALLIUM_DRI_LIB_DEPS) \ $(RADEON_LIBS) diff --git a/src/gallium/targets/xvmc-nouveau/Makefile.am b/src/gallium/targets/xvmc-nouveau/Makefile.am index 5d72c90e5d4..af7a6fee6c0 100644 --- a/src/gallium/targets/xvmc-nouveau/Makefile.am +++ b/src/gallium/targets/xvmc-nouveau/Makefile.am @@ -40,5 +40,4 @@ libXvMCnouveau_la_LIBADD = \ $(top_builddir)/src/gallium/winsys/nouveau/drm/libnouveaudrm.la \ $(top_builddir)/src/gallium/drivers/nouveau/libnouveau.la \ $(GALLIUM_XVMC_LIB_DEPS) \ - $(GALLIUM_DRI_LIB_DEPS) \ $(NOUVEAU_LIBS) -- 2.30.2