targets/omx: introduce GALLIUM_OMX_LIB_DEPS

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Christian König <christian.koenig@amd.com>

diff --git a/src/gallium/Automake.inc b/src/gallium/Automake.inc
index 1acc99ef51baad9f83feee65a23e6443cdd7240c..39475d7dc613f159c34a2de6237e066516d6b2eb 100644 (file)
--- 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 98b064fdbf26f4002af824b8450637c24077155f..3776771841e4737b563469b6d6a6017f47f305a3 100644 (file)
--- 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 14e9dbb6af519d39c9923bab84ec83391db9e5ea..1eaa4b137074c8b43ff45152e97efb18bb5caad4 100644 (file)
--- 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)