[Mesa-dev] [PATCH 35/37] targets/xorg: group common 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/r600/xorg/Makefile.am     | 5 +----
 src/gallium/targets/radeonsi/xorg/Makefile.am | 5 +----
 src/gallium/targets/xorg-i915/Makefile.am     | 5 +----
 src/gallium/targets/xorg-nouveau/Makefile.am  | 5 +----
 5 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/src/gallium/Automake.inc b/src/gallium/Automake.inc
index 647bb7e..1113d9b 100644
--- a/src/gallium/Automake.inc
+++ b/src/gallium/Automake.inc
@@ -82,6 +82,12 @@ GALLIUM_XVMC_LIB_DEPS = \
 	$(XVMC_LIBS) \
 	$(LIBDRM_LIBS)
 
+GALLIUM_XORG_LIB_DEPS = \
+	$(top_builddir)/src/gallium/auxiliary/libgallium.la \
+	$(top_builddir)/src/gallium/state_trackers/xorg/libxorgtracker.la \
+	$(LIBDRM_XORG_LIBS) \
+	$(LIBKMS_XORG_LIBS)
+
 GALLIUM_WINSYS_CFLAGS = \
 	-I$(top_srcdir)/include \
 	-I$(top_srcdir)/src/gallium/include \
diff --git a/src/gallium/targets/r600/xorg/Makefile.am b/src/gallium/targets/r600/xorg/Makefile.am
index 7660864..417c43c 100644
--- a/src/gallium/targets/r600/xorg/Makefile.am
+++ b/src/gallium/targets/r600/xorg/Makefile.am
@@ -39,16 +39,13 @@ r600g_drv_la_SOURCES = \
 r600g_drv_la_LDFLAGS = $(GALLIUM_XORG_LINKER_FLAGS)
 
 r600g_drv_la_LIBADD = \
-	$(top_builddir)/src/gallium/auxiliary/libgallium.la \
-	$(top_builddir)/src/gallium/state_trackers/xorg/libxorgtracker.la \
 	$(top_builddir)/src/gallium/drivers/r600/libr600.la \
 	$(top_builddir)/src/gallium/winsys/radeon/drm/libradeonwinsys.la \
 	$(top_builddir)/src/gallium/drivers/galahad/libgalahad.la \
 	$(top_builddir)/src/gallium/drivers/trace/libtrace.la \
 	$(top_builddir)/src/gallium/drivers/rbug/librbug.la \
+	$(GALLIUM_XORG_LIB_DEPS) \
 	$(GALLIUM_DRI_LIB_DEPS) \
-	$(LIBDRM_XORG_LIBS) \
-	$(LIBKMS_XORG_LIBS) \
 	$(RADEON_LIBS)
 
 if HAVE_MESA_LLVM
diff --git a/src/gallium/targets/radeonsi/xorg/Makefile.am b/src/gallium/targets/radeonsi/xorg/Makefile.am
index 7c628e1..a50cd3c 100644
--- a/src/gallium/targets/radeonsi/xorg/Makefile.am
+++ b/src/gallium/targets/radeonsi/xorg/Makefile.am
@@ -40,16 +40,13 @@ radeonsi_drv_la_SOURCES = \
 radeonsi_drv_la_LDFLAGS = $(GALLIUM_XORG_LINKER_FLAGS)
 
 radeonsi_drv_la_LIBADD = \
-	$(top_builddir)/src/gallium/auxiliary/libgallium.la \
-	$(top_builddir)/src/gallium/state_trackers/xorg/libxorgtracker.la \
 	$(top_builddir)/src/gallium/drivers/radeonsi/libradeonsi.la \
 	$(top_builddir)/src/gallium/winsys/radeon/drm/libradeonwinsys.la \
 	$(top_builddir)/src/gallium/drivers/galahad/libgalahad.la \
 	$(top_builddir)/src/gallium/drivers/trace/libtrace.la \
 	$(top_builddir)/src/gallium/drivers/rbug/librbug.la \
+	$(GALLIUM_XORG_LIB_DEPS) \
 	$(GALLIUM_DRI_LIB_DEPS) \
-	$(LIBDRM_XORG_LIBS) \
-	$(LIBKMS_XORG_LIBS) \
 	$(RADEON_LIBS)
 
 if HAVE_MESA_LLVM
diff --git a/src/gallium/targets/xorg-i915/Makefile.am b/src/gallium/targets/xorg-i915/Makefile.am
index 4b5b18e..d604767 100644
--- a/src/gallium/targets/xorg-i915/Makefile.am
+++ b/src/gallium/targets/xorg-i915/Makefile.am
@@ -39,16 +39,13 @@ i915_drv_la_SOURCES = \
 i915_drv_la_LDFLAGS = $(GALLIUM_XORG_LINKER_FLAGS)
 
 i915_drv_la_LIBADD = \
-	$(top_builddir)/src/gallium/auxiliary/libgallium.la \
-	$(top_builddir)/src/gallium/state_trackers/xorg/libxorgtracker.la \
 	$(top_builddir)/src/gallium/winsys/i915/drm/libi915drm.la \
 	$(top_builddir)/src/gallium/drivers/i915/libi915.la \
 	$(top_builddir)/src/gallium/drivers/galahad/libgalahad.la \
 	$(top_builddir)/src/gallium/drivers/trace/libtrace.la \
 	$(top_builddir)/src/gallium/drivers/rbug/librbug.la \
+	$(GALLIUM_XORG_LIB_DEPS) \
 	$(GALLIUM_DRI_LIB_DEPS) \
-	$(LIBDRM_XORG_LIBS) \
-	$(LIBKMS_XORG_LIBS) \
 	$(INTEL_LIBS)
 
 if HAVE_MESA_LLVM
diff --git a/src/gallium/targets/xorg-nouveau/Makefile.am b/src/gallium/targets/xorg-nouveau/Makefile.am
index 44999b4..6049aee 100644
--- a/src/gallium/targets/xorg-nouveau/Makefile.am
+++ b/src/gallium/targets/xorg-nouveau/Makefile.am
@@ -39,15 +39,12 @@ nouveau2_drv_la_SOURCES = \
 nouveau2_drv_la_LDFLAGS = $(GALLIUM_XORG_LINKER_FLAGS)
 
 nouveau2_drv_la_LIBADD = \
-	$(top_builddir)/src/gallium/auxiliary/libgallium.la \
-	$(top_builddir)/src/gallium/state_trackers/xorg/libxorgtracker.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 \
 	$(top_builddir)/src/gallium/drivers/rbug/librbug.la \
+	$(GALLIUM_XORG_LIB_DEPS) \
 	$(GALLIUM_DRI_LIB_DEPS) \
-	$(LIBDRM_XORG_LIBS) \
-	$(LIBKMS_XORG_LIBS) \
 	$(NOUVEAU_LIBS)
 
 if HAVE_MESA_LLVM
-- 
1.8.4.2