Mesa (master): targets/xvmc: use GALLIUM_COMMON_LIB_DEPS

Emil Velikov evelikov at kemper.freedesktop.org
Sat Apr 5 13:08:53 UTC 2014


Module: Mesa
Branch: master
Commit: 6b410430508457e1a975210eecafea5e600408cf
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=6b410430508457e1a975210eecafea5e600408cf

Author: Emil Velikov <emil.l.velikov at gmail.com>
Date:   Tue Apr  1 02:40:32 2014 +0100

targets/xvmc: use GALLIUM_COMMON_LIB_DEPS

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 <christian.koenig at amd.com>
Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>

---

 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 7a10a77..b4fdfe8 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 56b0a6d..a6c22f4 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 5d72c90..af7a6fe 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)




More information about the mesa-commit mailing list