From bfda1460b136511fa3363802377b9f34aa4f3d15 Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Sat, 9 Nov 2013 22:54:58 +0000 Subject: [PATCH] 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 --- src/gallium/Automake.inc | 7 +++++++ src/gallium/targets/r600/xvmc/Makefile.am | 5 +---- src/gallium/targets/xvmc-nouveau/Makefile.am | 5 +---- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/gallium/Automake.inc b/src/gallium/Automake.inc index f67b2951f42..f33bc37c8c6 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 367f597dd84..1a75f527380 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 37013f1eb11..4328c055542 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 \ -- 2.30.2