projects / mesa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 432b577)
targets/xvmc: use GALLIUM_COMMON_LIB_DEPS
authorEmil Velikov <emil.l.velikov@gmail.com>
Tue, 1 Apr 2014 01:40:32 +0000 (02:40 +0100)
committerEmil Velikov <emil.l.velikov@gmail.com>
Sat, 5 Apr 2014 12:02:46 +0000 (13:02 +0100)
The targets do not require expat or selinux. Use GALLIUM_COMMON_LIB_DEPS
which provides the core requirements for each gallium target.

Cc: Christian König <christian.koenig@amd.com>
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
src/gallium/Automake.inc patch | blob | history
src/gallium/targets/r600/xvmc/Makefile.am patch | blob | history
src/gallium/targets/xvmc-nouveau/Makefile.am patch | blob | history

diff --git a/src/gallium/Automake.inc b/src/gallium/Automake.inc
index 7a10a77fa97636edf6774cc5d4f87c9cee064dad..b4fdfe85588ab5cb308a4e3bc26acc9b9cf6e966 100644 (file)
--- a/src/gallium/Automake.inc
+++ b/src/gallium/Automake.inc
@@ -109,7 +109,8 @@ GALLIUM_XVMC_LIB_DEPS = \
        $(top_builddir)/src/gallium/auxiliary/libgallium.la \
        $(top_builddir)/src/gallium/state_trackers/xvmc/libxvmctracker.la \
        $(XVMC_LIBS) \
-       $(LIBDRM_LIBS)
+       $(LIBDRM_LIBS) \
+       $(GALLIUM_COMMON_LIB_DEPS)
 
 GALLIUM_OMX_LIB_DEPS = \
        $(top_builddir)/src/gallium/auxiliary/libgallium.la \
diff --git a/src/gallium/targets/r600/xvmc/Makefile.am b/src/gallium/targets/r600/xvmc/Makefile.am
index 56b0a6d75bf15da8cfd6b796ec9aaed07b5b3d7c..a6c22f4b1e2d17e25ad043b03552dd137925bcc1 100644 (file)
--- a/src/gallium/targets/r600/xvmc/Makefile.am
+++ b/src/gallium/targets/r600/xvmc/Makefile.am
@@ -40,5 +40,4 @@ libXvMCr600_la_LIBADD = \
        $(top_builddir)/src/gallium/drivers/r600/libr600.la \
        $(top_builddir)/src/gallium/winsys/radeon/drm/libradeonwinsys.la \
        $(GALLIUM_XVMC_LIB_DEPS) \
-       $(GALLIUM_DRI_LIB_DEPS) \
        $(RADEON_LIBS)
diff --git a/src/gallium/targets/xvmc-nouveau/Makefile.am b/src/gallium/targets/xvmc-nouveau/Makefile.am
index 5d72c90e5d4afcfaf610eded2da6945feda23523..af7a6fee6c022fd5cd2eb7bd4d6ccc61f5e18b7a 100644 (file)
--- a/src/gallium/targets/xvmc-nouveau/Makefile.am
+++ b/src/gallium/targets/xvmc-nouveau/Makefile.am
@@ -40,5 +40,4 @@ libXvMCnouveau_la_LIBADD = \
        $(top_builddir)/src/gallium/winsys/nouveau/drm/libnouveaudrm.la \
        $(top_builddir)/src/gallium/drivers/nouveau/libnouveau.la \
        $(GALLIUM_XVMC_LIB_DEPS) \
-       $(GALLIUM_DRI_LIB_DEPS) \
        $(NOUVEAU_LIBS)