diff options
| author | Emil Velikov <[email protected]> | 2014-11-09 04:44:14 +0000 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2014-11-26 20:08:40 +0000 |
| commit | 2dbaedaf109aad822d72bd0e761c506efbb29ec4 (patch) | |
| tree | ad6561ed3a4c0caee123a9b0e7ba6076222f4560 /src/gallium/targets/vdpau | |
| parent | 303bc3609a64c8f9b141d54c32edb1170df443d3 (diff) | |
automake: rework VL dependency tracking
Set a single VL_{CFLAG,LIBS} for xcb and friends, and let each target
check for it's relevant library alone. Required as with follow up
commits we'll build aux/vl into a separate module, which needs VL_CFLAGS
Cleanup add a couple of explicit LIBDRM_LIBS linking, as aux/vl itself
requires libdrm, despite that LIBDRM_{RADEON,NOUVEAU...} may provide it
as well.
v2: Rebase. Make sure st/xvmc programs work.
Cc: Christian König <[email protected]>
Signed-off-by: Emil Velikov <[email protected]>
Diffstat (limited to 'src/gallium/targets/vdpau')
| -rw-r--r-- | src/gallium/targets/vdpau/Makefile.am | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/gallium/targets/vdpau/Makefile.am b/src/gallium/targets/vdpau/Makefile.am index 68f72a09363..c363114c2bc 100644 --- a/src/gallium/targets/vdpau/Makefile.am +++ b/src/gallium/targets/vdpau/Makefile.am @@ -1,6 +1,7 @@ include $(top_srcdir)/src/gallium/Automake.inc AM_CFLAGS = \ + $(VL_CFLAGS) \ $(GALLIUM_TARGET_CFLAGS) vdpaudir = $(VDPAU_LIB_INSTALL_DIR) @@ -28,11 +29,12 @@ libvdpau_gallium_la_LDFLAGS += \ -Wl,--dynamic-list=$(top_srcdir)/src/gallium/targets/dri-vdpau.dyn endif # HAVE_LD_DYNAMIC_LIST +# NOTE: libvdpau_gallium does not use(link against) libvdpau libvdpau_gallium_la_LIBADD = \ $(top_builddir)/src/gallium/state_trackers/vdpau/libvdpautracker.la \ $(top_builddir)/src/gallium/auxiliary/libgallium.la \ $(top_builddir)/src/util/libmesautil.la \ - $(VDPAU_LIBS) \ + $(VL_LIBS) \ $(LIBDRM_LIBS) \ $(GALLIUM_COMMON_LIB_DEPS) |