[Mesa-dev] [PATCH 13/24] targets/omx: use GALLIUM_OMX_LINKER_FLAGS

[Christian König]

Am 27.03.2014 22:00, schrieb Emil Velikov:
> Cc: Christian König <christian.koenig at amd.com>
> Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>

Reviewed-by: Christian König <christian.koenig at amd.com>

> ---
>   src/gallium/Automake.inc                     |  6 ++++++
>   src/gallium/targets/r600/omx/Makefile.am     | 10 +++-------
>   src/gallium/targets/radeonsi/omx/Makefile.am | 10 +++-------
>   3 files changed, 12 insertions(+), 14 deletions(-)
>
> diff --git a/src/gallium/Automake.inc b/src/gallium/Automake.inc
> index 39475d7..f064a87 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 3776771..0aa469b 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 1eaa4b1..e85eb11 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 \