From: Emil Velikov <emil.l.velikov@gmail.com>
Date: Sat, 9 Nov 2013 22:55:59 +0000 (+0000)
Subject: targets/xvmc: consolidate lib deps into Automake.inc
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=dfcdece7c55edcdff1e2eece94e4be0ececcea79;p=mesa.git

targets/xvmc: consolidate lib deps into Automake.inc

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
---

diff --git a/src/gallium/Automake.inc b/src/gallium/Automake.inc
index f33bc37c8c6..5ed6a3d852c 100644
--- a/src/gallium/Automake.inc
+++ b/src/gallium/Automake.inc
@@ -57,6 +57,12 @@ GALLIUM_VDPAU_LIB_DEPS = \
 	$(VDPAU_LIBS) \
 	$(LIBDRM_LIBS)
 
+GALLIUM_XVMC_LIB_DEPS = \
+	$(top_builddir)/src/gallium/auxiliary/libgallium.la \
+	$(top_builddir)/src/gallium/state_trackers/xvmc/libxvmctracker.la \
+	$(XVMC_LIBS) \
+	$(LIBDRM_LIBS)
+
 GALLIUM_WINSYS_CFLAGS = \
 	-I$(top_srcdir)/include \
 	-I$(top_srcdir)/src/gallium/include \
diff --git a/src/gallium/targets/r600/xvmc/Makefile.am b/src/gallium/targets/r600/xvmc/Makefile.am
index 1a75f527380..a21da80ad00 100644
--- a/src/gallium/targets/r600/xvmc/Makefile.am
+++ b/src/gallium/targets/r600/xvmc/Makefile.am
@@ -36,14 +36,11 @@ libXvMCr600_la_LDFLAGS = \
 	$(GALLIUM_XVMC_LINKER_FLAGS)
 
 libXvMCr600_la_LIBADD = \
-	$(top_builddir)/src/gallium/auxiliary/libgallium.la \
 	$(top_builddir)/src/gallium/drivers/r600/libr600.la \
-	$(top_builddir)/src/gallium/state_trackers/xvmc/libxvmctracker.la \
 	$(top_builddir)/src/gallium/winsys/radeon/drm/libradeonwinsys.la \
 	$(top_builddir)/src/gallium/drivers/trace/libtrace.la \
+	$(GALLIUM_XVMC_LIB_DEPS) \
 	$(GALLIUM_DRI_LIB_DEPS) \
-	$(XVMC_LIBS) \
-	$(LIBDRM_LIBS) \
 	$(RADEON_LIBS)
 
 if HAVE_MESA_LLVM
diff --git a/src/gallium/targets/xvmc-nouveau/Makefile.am b/src/gallium/targets/xvmc-nouveau/Makefile.am
index 4328c055542..bd30e4de398 100644
--- a/src/gallium/targets/xvmc-nouveau/Makefile.am
+++ b/src/gallium/targets/xvmc-nouveau/Makefile.am
@@ -37,14 +37,11 @@ libXvMCnouveau_la_LDFLAGS = \
 	$(GALLIUM_XVMC_LINKER_FLAGS)
 
 libXvMCnouveau_la_LIBADD = \
-	$(top_builddir)/src/gallium/auxiliary/libgallium.la \
-	$(top_builddir)/src/gallium/state_trackers/xvmc/libxvmctracker.la \
 	$(top_builddir)/src/gallium/winsys/nouveau/drm/libnouveaudrm.la \
 	$(top_builddir)/src/gallium/drivers/nouveau/libnouveau.la \
 	$(top_builddir)/src/gallium/drivers/trace/libtrace.la \
+	$(GALLIUM_XVMC_LIB_DEPS) \
 	$(GALLIUM_DRI_LIB_DEPS) \
-	$(XVMC_LIBS) \
-	$(LIBDRM_LIBS) \
 	$(NOUVEAU_LIBS)
 
 if HAVE_MESA_LLVM