summaryrefslogtreecommitdiffstats
path: root/src/gallium
diff options
context:
space:
mode:
authorEmil Velikov <emil.l.velikov@gmail.com>2013-11-09 22:55:59 +0000
committerEmil Velikov <emil.l.velikov@gmail.com>2013-11-16 16:31:04 +0000
commitdfcdece7c55edcdff1e2eece94e4be0ececcea79 (patch)
tree1a995af460d726eb8859b01bf9ff00e289a1beed /src/gallium
parentbfda1460b136511fa3363802377b9f34aa4f3d15 (diff)
downloadexternal_mesa3d-dfcdece7c55edcdff1e2eece94e4be0ececcea79.zip
external_mesa3d-dfcdece7c55edcdff1e2eece94e4be0ececcea79.tar.gz
external_mesa3d-dfcdece7c55edcdff1e2eece94e4be0ececcea79.tar.bz2
targets/xvmc: consolidate lib deps into Automake.inc
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Diffstat (limited to 'src/gallium')
-rw-r--r--src/gallium/Automake.inc6
-rw-r--r--src/gallium/targets/r600/xvmc/Makefile.am5
-rw-r--r--src/gallium/targets/xvmc-nouveau/Makefile.am5
3 files changed, 8 insertions, 8 deletions
diff --git a/src/gallium/Automake.inc b/src/gallium/Automake.inc
index f33bc37..5ed6a3d 100644
--- a/src/gallium/Automake.inc
+++ b/src/gallium/Automake.inc
@@ -57,6 +57,12 @@ GALLIUM_VDPAU_LIB_DEPS = \
$(VDPAU_LIBS) \
$(LIBDRM_LIBS)
+GALLIUM_XVMC_LIB_DEPS = \
+ $(top_builddir)/src/gallium/auxiliary/libgallium.la \
+ $(top_builddir)/src/gallium/state_trackers/xvmc/libxvmctracker.la \
+ $(XVMC_LIBS) \
+ $(LIBDRM_LIBS)
+
GALLIUM_WINSYS_CFLAGS = \
-I$(top_srcdir)/include \
-I$(top_srcdir)/src/gallium/include \
diff --git a/src/gallium/targets/r600/xvmc/Makefile.am b/src/gallium/targets/r600/xvmc/Makefile.am
index 1a75f52..a21da80 100644
--- a/src/gallium/targets/r600/xvmc/Makefile.am
+++ b/src/gallium/targets/r600/xvmc/Makefile.am
@@ -36,14 +36,11 @@ libXvMCr600_la_LDFLAGS = \
$(GALLIUM_XVMC_LINKER_FLAGS)
libXvMCr600_la_LIBADD = \
- $(top_builddir)/src/gallium/auxiliary/libgallium.la \
$(top_builddir)/src/gallium/drivers/r600/libr600.la \
- $(top_builddir)/src/gallium/state_trackers/xvmc/libxvmctracker.la \
$(top_builddir)/src/gallium/winsys/radeon/drm/libradeonwinsys.la \
$(top_builddir)/src/gallium/drivers/trace/libtrace.la \
+ $(GALLIUM_XVMC_LIB_DEPS) \
$(GALLIUM_DRI_LIB_DEPS) \
- $(XVMC_LIBS) \
- $(LIBDRM_LIBS) \
$(RADEON_LIBS)
if HAVE_MESA_LLVM
diff --git a/src/gallium/targets/xvmc-nouveau/Makefile.am b/src/gallium/targets/xvmc-nouveau/Makefile.am
index 4328c05..bd30e4d 100644
--- a/src/gallium/targets/xvmc-nouveau/Makefile.am
+++ b/src/gallium/targets/xvmc-nouveau/Makefile.am
@@ -37,14 +37,11 @@ libXvMCnouveau_la_LDFLAGS = \
$(GALLIUM_XVMC_LINKER_FLAGS)
libXvMCnouveau_la_LIBADD = \
- $(top_builddir)/src/gallium/auxiliary/libgallium.la \
- $(top_builddir)/src/gallium/state_trackers/xvmc/libxvmctracker.la \
$(top_builddir)/src/gallium/winsys/nouveau/drm/libnouveaudrm.la \
$(top_builddir)/src/gallium/drivers/nouveau/libnouveau.la \
$(top_builddir)/src/gallium/drivers/trace/libtrace.la \
+ $(GALLIUM_XVMC_LIB_DEPS) \
$(GALLIUM_DRI_LIB_DEPS) \
- $(XVMC_LIBS) \
- $(LIBDRM_LIBS) \
$(NOUVEAU_LIBS)
if HAVE_MESA_LLVM