summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEmil Velikov <[email protected]>2014-03-13 02:28:21 +0000
committerEmil Velikov <[email protected]>2014-03-31 12:25:34 +0100
commit1ea1767f72906d833bf9070c2aa9e664885ed72d (patch)
treec16e7311b91db1220bcc14afc455facf129e3bc5
parente6f8db1e56ad4ec2e51963f424d11b72f2b195cb (diff)
targets/omx: use GALLIUM_OMX_LINKER_FLAGS
Signed-off-by: Emil Velikov <[email protected]> Reviewed-by: Christian König <[email protected]>
-rw-r--r--src/gallium/Automake.inc6
-rw-r--r--src/gallium/targets/r600/omx/Makefile.am10
-rw-r--r--src/gallium/targets/radeonsi/omx/Makefile.am10
3 files changed, 12 insertions, 14 deletions
diff --git a/src/gallium/Automake.inc b/src/gallium/Automake.inc
index 39475d7dc61..f064a879313 100644
--- a/src/gallium/Automake.inc
+++ b/src/gallium/Automake.inc
@@ -74,6 +74,12 @@ GALLIUM_XVMC_LINKER_FLAGS = \
-export-symbols-regex '^XvMC' \
-no-undefined
+GALLIUM_OMX_LINKER_FLAGS = \
+ -shared \
+ -module \
+ -no-undefined \
+ -export-symbols-regex $(EXPORTS)
+
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/omx/Makefile.am b/src/gallium/targets/r600/omx/Makefile.am
index 3776771841e..0aa469ba035 100644
--- a/src/gallium/targets/r600/omx/Makefile.am
+++ b/src/gallium/targets/r600/omx/Makefile.am
@@ -20,6 +20,8 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
# DEALINGS IN THE SOFTWARE.
+EXPORTS = '^(omx_component_library_Setup|radeon_drm_winsys_create)$$'
+
include $(top_srcdir)/src/gallium/Automake.inc
AM_CFLAGS = \
@@ -34,17 +36,11 @@ AM_CPPFLAGS = \
omxdir = $(OMX_LIB_INSTALL_DIR)
omx_LTLIBRARIES = libomx_r600.la
-EXPORTS = '^(omx_component_library_Setup|radeon_drm_winsys_create)$$'
-
libomx_r600_la_SOURCES = \
drm_target.c \
$(top_srcdir)/src/gallium/auxiliary/vl/vl_winsys_dri.c
-libomx_r600_la_LDFLAGS = \
- -module \
- -export-symbols-regex $(EXPORTS) \
- -shared \
- -no-undefined
+libomx_r600_la_LDFLAGS = $(GALLIUM_OMX_LINKER_FLAGS)
libomx_r600_la_LIBADD = \
$(top_builddir)/src/gallium/drivers/r600/libr600.la \
diff --git a/src/gallium/targets/radeonsi/omx/Makefile.am b/src/gallium/targets/radeonsi/omx/Makefile.am
index 1eaa4b13707..e85eb11378e 100644
--- a/src/gallium/targets/radeonsi/omx/Makefile.am
+++ b/src/gallium/targets/radeonsi/omx/Makefile.am
@@ -20,6 +20,8 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
# DEALINGS IN THE SOFTWARE.
+EXPORTS = '^(omx_component_library_Setup|radeon_drm_winsys_create)$$'
+
include $(top_srcdir)/src/gallium/Automake.inc
AM_CFLAGS = \
@@ -34,17 +36,11 @@ AM_CPPFLAGS = \
omxdir = $(OMX_LIB_INSTALL_DIR)
omx_LTLIBRARIES = libomx_radeonsi.la
-EXPORTS = '^(omx_component_library_Setup|radeon_drm_winsys_create)$$'
-
libomx_radeonsi_la_SOURCES = \
drm_target.c \
$(top_srcdir)/src/gallium/auxiliary/vl/vl_winsys_dri.c
-libomx_radeonsi_la_LDFLAGS = \
- -module \
- -export-symbols-regex $(EXPORTS) \
- -shared \
- -no-undefined
+libomx_radeonsi_la_LDFLAGS = $(GALLIUM_OMX_LINKER_FLAGS)
libomx_radeonsi_la_LIBADD = \
$(top_builddir)/src/gallium/drivers/radeonsi/libradeonsi.la \