[Mesa-dev] [PATCH 34/37] targets/xorg: consolidate linker flags into Automake.inc

[Emil Velikov]

Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
---
 src/gallium/Automake.inc                      | 7 +++++++
 src/gallium/targets/r600/xorg/Makefile.am     | 2 +-
 src/gallium/targets/radeonsi/xorg/Makefile.am | 2 +-
 src/gallium/targets/xorg-i915/Makefile.am     | 2 +-
 src/gallium/targets/xorg-nouveau/Makefile.am  | 2 +-
 5 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/gallium/Automake.inc b/src/gallium/Automake.inc
index 016a1e2..647bb7e 100644
--- a/src/gallium/Automake.inc
+++ b/src/gallium/Automake.inc
@@ -63,6 +63,13 @@ GALLIUM_XVMC_LINKER_FLAGS = \
 	-shared \
 	-no-undefined
 
+# TODO: add -export-symbols-regex
+GALLIUM_XORG_LINKER_FLAGS = \
+	-module \
+	-avoid-version \
+	-shared \
+	-no-undefined
+
 GALLIUM_VDPAU_LIB_DEPS = \
 	$(top_builddir)/src/gallium/auxiliary/libgallium.la \
 	$(top_builddir)/src/gallium/state_trackers/vdpau/libvdpautracker.la \
diff --git a/src/gallium/targets/r600/xorg/Makefile.am b/src/gallium/targets/r600/xorg/Makefile.am
index 411df77..7660864 100644
--- a/src/gallium/targets/r600/xorg/Makefile.am
+++ b/src/gallium/targets/r600/xorg/Makefile.am
@@ -36,7 +36,7 @@ r600g_drv_la_SOURCES = \
 	drm_target.c \
 	xorg.c
 
-r600g_drv_la_LDFLAGS = -module -avoid-version -shared -no-undefined
+r600g_drv_la_LDFLAGS = $(GALLIUM_XORG_LINKER_FLAGS)
 
 r600g_drv_la_LIBADD = \
 	$(top_builddir)/src/gallium/auxiliary/libgallium.la \
diff --git a/src/gallium/targets/radeonsi/xorg/Makefile.am b/src/gallium/targets/radeonsi/xorg/Makefile.am
index 1e518e0..7c628e1 100644
--- a/src/gallium/targets/radeonsi/xorg/Makefile.am
+++ b/src/gallium/targets/radeonsi/xorg/Makefile.am
@@ -37,7 +37,7 @@ radeonsi_drv_la_SOURCES = \
 	drm_target.c \
 	xorg.c
 
-radeonsi_drv_la_LDFLAGS = -module -avoid-version -shared -no-undefined
+radeonsi_drv_la_LDFLAGS = $(GALLIUM_XORG_LINKER_FLAGS)
 
 radeonsi_drv_la_LIBADD = \
 	$(top_builddir)/src/gallium/auxiliary/libgallium.la \
diff --git a/src/gallium/targets/xorg-i915/Makefile.am b/src/gallium/targets/xorg-i915/Makefile.am
index 5def18d..4b5b18e 100644
--- a/src/gallium/targets/xorg-i915/Makefile.am
+++ b/src/gallium/targets/xorg-i915/Makefile.am
@@ -36,7 +36,7 @@ i915_drv_la_SOURCES = \
 	intel_target.c \
 	intel_xorg.c
 
-i915_drv_la_LDFLAGS = -module -avoid-version -shared -no-undefined
+i915_drv_la_LDFLAGS = $(GALLIUM_XORG_LINKER_FLAGS)
 
 i915_drv_la_LIBADD = \
 	$(top_builddir)/src/gallium/auxiliary/libgallium.la \
diff --git a/src/gallium/targets/xorg-nouveau/Makefile.am b/src/gallium/targets/xorg-nouveau/Makefile.am
index 55177d3..44999b4 100644
--- a/src/gallium/targets/xorg-nouveau/Makefile.am
+++ b/src/gallium/targets/xorg-nouveau/Makefile.am
@@ -36,7 +36,7 @@ nouveau2_drv_la_SOURCES = \
 	nouveau_target.c \
 	nouveau_xorg.c
 
-nouveau2_drv_la_LDFLAGS = -module -avoid-version -shared -no-undefined
+nouveau2_drv_la_LDFLAGS = $(GALLIUM_XORG_LINKER_FLAGS)
 
 nouveau2_drv_la_LIBADD = \
 	$(top_builddir)/src/gallium/auxiliary/libgallium.la \
-- 
1.8.4.2