Minimise duplication and sources of error
(eg nouveau was missing shared and no-undefined)
Signed-off-by: Emil Velikov <emil.l.veli...@gmail.com>
---
src/gallium/Automake.inc | 7 +++++++
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 | 5 +----
5 files changed, 11 insertions(+), 16 deletions(-)
diff --git a/src/gallium/Automake.inc b/src/gallium/Automake.inc
index f67b295..f33bc37 100644
--- a/src/gallium/Automake.inc
+++ b/src/gallium/Automake.inc
@@ -44,6 +44,13 @@ GALLIUM_VDPAU_LINKER_FLAGS = \
-shared \
-no-undefined
+# TODO: add -export-symbols-regex
+GALLIUM_XVMC_LINKER_FLAGS = \
+ -module \
+ -version-number $(XVMC_MAJOR):$(XVMC_MINOR) \
+ -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/r300/xvmc/Makefile.am
b/src/gallium/targets/r300/xvmc/Makefile.am
index 32d40b6..a10a845 100644
--- a/src/gallium/targets/r300/xvmc/Makefile.am
+++ b/src/gallium/targets/r300/xvmc/Makefile.am
@@ -34,10 +34,7 @@ libXvMCr300_la_SOURCES = \
vl_winsys_dri.c
libXvMCr300_la_LDFLAGS = \
- -module \
- -version-number $(XVMC_MAJOR):$(XVMC_MINOR) \
- -shared \
- -no-undefined
+ $(GALLIUM_XVMC_LINKER_FLAGS)
libXvMCr300_la_LIBADD = \
$(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 7a55b86..8017680 100644
--- a/src/gallium/targets/r600/xvmc/Makefile.am
+++ b/src/gallium/targets/r600/xvmc/Makefile.am
@@ -33,10 +33,7 @@ libXvMCr600_la_SOURCES = \
vl_winsys_dri.c
libXvMCr600_la_LDFLAGS = \
- -module \
- -version-number $(XVMC_MAJOR):$(XVMC_MINOR) \
- -shared \
- -no-undefined
+ $(GALLIUM_XVMC_LINKER_FLAGS)
libXvMCr600_la_LIBADD = \
$(top_builddir)/src/gallium/auxiliary/libgallium.la \
diff --git a/src/gallium/targets/xvmc-nouveau/Makefile.am
b/src/gallium/targets/xvmc-nouveau/Makefile.am
index 4100ad7..12aa242 100644
--- a/src/gallium/targets/xvmc-nouveau/Makefile.am
+++ b/src/gallium/targets/xvmc-nouveau/Makefile.am
@@ -34,10 +34,7 @@ libXvMCnouveau_la_SOURCES = \
vl_winsys_dri.c
libXvMCnouveau_la_LDFLAGS = \
- -module \
- -version-number $(XVMC_MAJOR):$(XVMC_MINOR)
- -shared \
- -no-undefined
+ $(GALLIUM_XVMC_LINKER_FLAGS)
libXvMCnouveau_la_LIBADD = \
$(top_builddir)/src/gallium/auxiliary/libgallium.la \
diff --git a/src/gallium/targets/xvmc-softpipe/Makefile.am
b/src/gallium/targets/xvmc-softpipe/Makefile.am
index 1833a8e..a0de735 100644
--- a/src/gallium/targets/xvmc-softpipe/Makefile.am
+++ b/src/gallium/targets/xvmc-softpipe/Makefile.am
@@ -34,10 +34,7 @@ libXvMCsoftpipe_la_SOURCES = \
vl_winsys_xsp.c
libXvMCsoftpipe_la_LDFLAGS = \
- -module \
- -version-number $(XVMC_MAJOR):$(XVMC_MINOR) \
- -shared \
- -no-undefined
+ $(GALLIUM_XVMC_LINKER_FLAGS)
libXvMCsoftpipe_la_LIBADD = \
$(top_builddir)/src/gallium/auxiliary/libgallium.la \
--
1.8.4.2
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
