summaryrefslogtreecommitdiffstats
path: root/src/gallium
diff options
context:
space:
mode:
authorEmil Velikov <emil.l.velikov@gmail.com>2013-11-09 22:54:58 +0000
committerEmil Velikov <emil.l.velikov@gmail.com>2013-11-16 16:31:03 +0000
commitbfda1460b136511fa3363802377b9f34aa4f3d15 (patch)
treec9752ec58e820b738f8072f6a13a7fd7688c6ef4 /src/gallium
parent5d7d120af176acb2a02b25868bb65f7e462084e5 (diff)
downloadexternal_mesa3d-bfda1460b136511fa3363802377b9f34aa4f3d15.zip
external_mesa3d-bfda1460b136511fa3363802377b9f34aa4f3d15.tar.gz
external_mesa3d-bfda1460b136511fa3363802377b9f34aa4f3d15.tar.bz2
targets/xvmc: move linker flags to Automake.inc
Minimise duplication and sources of error (eg nouveau was missing shared and no-undefined) Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Diffstat (limited to 'src/gallium')
-rw-r--r--src/gallium/Automake.inc7
-rw-r--r--src/gallium/targets/r600/xvmc/Makefile.am5
-rw-r--r--src/gallium/targets/xvmc-nouveau/Makefile.am5
3 files changed, 9 insertions, 8 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/r600/xvmc/Makefile.am b/src/gallium/targets/r600/xvmc/Makefile.am
index 367f597..1a75f52 100644
--- a/src/gallium/targets/r600/xvmc/Makefile.am
+++ b/src/gallium/targets/r600/xvmc/Makefile.am
@@ -33,10 +33,7 @@ libXvMCr600_la_SOURCES = \
$(top_srcdir)/src/gallium/auxiliary/vl/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 37013f1..4328c05 100644
--- a/src/gallium/targets/xvmc-nouveau/Makefile.am
+++ b/src/gallium/targets/xvmc-nouveau/Makefile.am
@@ -34,10 +34,7 @@ libXvMCnouveau_la_SOURCES = \
$(top_srcdir)/src/gallium/auxiliary/vl/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 \