[Mesa-dev] [PATCH 31/37] targets/xvmc: consolidate lib deps into Automake.inc

[Emil Velikov]

Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
---
 src/gallium/Automake.inc                      | 6 ++++++
 src/gallium/targets/r300/xvmc/Makefile.am     | 5 +----
 src/gallium/targets/r600/xvmc/Makefile.am     | 5 +----
 src/gallium/targets/xvmc-nouveau/Makefile.am  | 5 +----
 src/gallium/targets/xvmc-softpipe/Makefile.am | 7 ++-----
 5 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/src/gallium/Automake.inc b/src/gallium/Automake.inc
index f33bc37..5ed6a3d 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/r300/xvmc/Makefile.am b/src/gallium/targets/r300/xvmc/Makefile.am
index a10a845..5a2b2b3 100644
--- a/src/gallium/targets/r300/xvmc/Makefile.am
+++ b/src/gallium/targets/r300/xvmc/Makefile.am
@@ -37,15 +37,12 @@ libXvMCr300_la_LDFLAGS = \
 	$(GALLIUM_XVMC_LINKER_FLAGS)
 
 libXvMCr300_la_LIBADD = \
-	$(top_builddir)/src/gallium/auxiliary/libgallium.la \
         $(top_builddir)/src/gallium/drivers/r300/libr300-helper.la \
         $(top_builddir)/src/gallium/drivers/r300/libr300.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/r600/xvmc/Makefile.am b/src/gallium/targets/r600/xvmc/Makefile.am
index 8017680..b317829 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 12aa242..ec97a1c 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
diff --git a/src/gallium/targets/xvmc-softpipe/Makefile.am b/src/gallium/targets/xvmc-softpipe/Makefile.am
index a0de735..7839991 100644
--- a/src/gallium/targets/xvmc-softpipe/Makefile.am
+++ b/src/gallium/targets/xvmc-softpipe/Makefile.am
@@ -37,13 +37,10 @@ libXvMCsoftpipe_la_LDFLAGS = \
 	$(GALLIUM_XVMC_LINKER_FLAGS)
 
 libXvMCsoftpipe_la_LIBADD = \
-	$(top_builddir)/src/gallium/auxiliary/libgallium.la \
-	$(top_builddir)/src/gallium/state_trackers/xvmc/libxvmctracker.la \
 	$(top_builddir)/src/gallium/winsys/sw/xlib/libws_xlib.la \
 	$(top_builddir)/src/gallium/drivers/softpipe/libsoftpipe.la \
-	$(XVMC_LIBS) \
-	$(DLOPEN_LIBS) \
-	$(LIBDRM_LIBS)
+	$(GALLIUM_XVMC_LIB_DEPS) \
+	$(DLOPEN_LIBS)
 
 if HAVE_MESA_LLVM
 libXvMCsoftpipe_la_LINK = $(CXXLINK) $(libXvMCsoftpipe_la_LDFLAGS)
-- 
1.8.4.2