diff options
| author | Emil Velikov <[email protected]> | 2013-11-09 22:54:58 +0000 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2013-11-16 16:31:03 +0000 |
| commit | bfda1460b136511fa3363802377b9f34aa4f3d15 (patch) | |
| tree | c9752ec58e820b738f8072f6a13a7fd7688c6ef4 | |
| parent | 5d7d120af176acb2a02b25868bb65f7e462084e5 (diff) | |
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 <[email protected]>
| -rw-r--r-- | src/gallium/Automake.inc | 7 | ||||
| -rw-r--r-- | src/gallium/targets/r600/xvmc/Makefile.am | 5 | ||||
| -rw-r--r-- | 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 \ |