[Mesa-dev] [PATCH 12/24] targets/omx: introduce GALLIUM_OMX_LIB_DEPS

[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     | 5 +----
>   src/gallium/targets/radeonsi/omx/Makefile.am | 5 +----
>   3 files changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/src/gallium/Automake.inc b/src/gallium/Automake.inc
> index 1acc99e..39475d7 100644
> --- a/src/gallium/Automake.inc
> +++ b/src/gallium/Automake.inc
> @@ -90,6 +90,12 @@ GALLIUM_XVMC_LIB_DEPS = \
>   	$(XVMC_LIBS) \
>   	$(LIBDRM_LIBS)
>   
> +GALLIUM_OMX_LIB_DEPS = \
> +	$(top_builddir)/src/gallium/auxiliary/libgallium.la \
> +	$(top_builddir)/src/gallium/state_trackers/omx/libomxtracker.la \
> +	$(GALLIUM_DRI_LIB_DEPS) \
> +	$(OMX_LIBS)
> +
>   GALLIUM_WINSYS_CFLAGS = \
>   	-I$(top_srcdir)/include \
>   	-I$(top_srcdir)/src/gallium/include \
> diff --git a/src/gallium/targets/r600/omx/Makefile.am b/src/gallium/targets/r600/omx/Makefile.am
> index 98b064f..3776771 100644
> --- a/src/gallium/targets/r600/omx/Makefile.am
> +++ b/src/gallium/targets/r600/omx/Makefile.am
> @@ -47,13 +47,10 @@ libomx_r600_la_LDFLAGS = \
>   	-no-undefined
>   
>   libomx_r600_la_LIBADD = \
> -	$(top_builddir)/src/gallium/auxiliary/libgallium.la \
>   	$(top_builddir)/src/gallium/drivers/r600/libr600.la \
> -	$(top_builddir)/src/gallium/state_trackers/omx/libomxtracker.la \
>   	$(top_builddir)/src/gallium/winsys/radeon/drm/libradeonwinsys.la \
>   	$(top_builddir)/src/gallium/drivers/trace/libtrace.la \
> -	$(GALLIUM_DRI_LIB_DEPS) \
> -	$(OMX_LIBS) \
> +	$(GALLIUM_OMX_LIB_DEPS) \
>   	$(LIBDRM_LIBS) \
>   	$(RADEON_LIBS) \
>   	-lstdc++
> diff --git a/src/gallium/targets/radeonsi/omx/Makefile.am b/src/gallium/targets/radeonsi/omx/Makefile.am
> index 14e9dbb..1eaa4b1 100644
> --- a/src/gallium/targets/radeonsi/omx/Makefile.am
> +++ b/src/gallium/targets/radeonsi/omx/Makefile.am
> @@ -47,13 +47,10 @@ libomx_radeonsi_la_LDFLAGS = \
>   	-no-undefined
>   
>   libomx_radeonsi_la_LIBADD = \
> -	$(top_builddir)/src/gallium/auxiliary/libgallium.la \
>   	$(top_builddir)/src/gallium/drivers/radeonsi/libradeonsi.la \
> -	$(top_builddir)/src/gallium/state_trackers/omx/libomxtracker.la \
>   	$(top_builddir)/src/gallium/winsys/radeon/drm/libradeonwinsys.la \
>   	$(top_builddir)/src/gallium/drivers/trace/libtrace.la \
> -	$(GALLIUM_DRI_LIB_DEPS) \
> -	$(OMX_LIBS) \
> +	$(GALLIUM_OMX_LIB_DEPS) \
>   	$(LIBDRM_LIBS) \
>   	$(RADEON_LIBS)
>