From: Emil Velikov <emil.l.velikov@gmail.com>
Date: Tue, 11 Mar 2014 02:45:23 +0000 (+0000)
Subject: targets/omx: introduce GALLIUM_OMX_LIB_DEPS
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e6f8db1e56ad4ec2e51963f424d11b72f2b195cb;hp=55bc658e4be37b3298e86a5c7bd9f998d673dca4;p=mesa.git

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 1acc99ef51b..39475d7dc61 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 98b064fdbf2..3776771841e 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 14e9dbb6af5..1eaa4b13707 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)