diff options
| -rw-r--r-- | src/gallium/Automake.inc | 7 | ||||
| -rw-r--r-- | src/gallium/targets/r600/vdpau/Makefile.am | 5 | ||||
| -rw-r--r-- | src/gallium/targets/radeonsi/vdpau/Makefile.am | 5 | ||||
| -rw-r--r-- | src/gallium/targets/vdpau-nouveau/Makefile.am | 5 |
4 files changed, 10 insertions, 12 deletions
diff --git a/src/gallium/Automake.inc b/src/gallium/Automake.inc index 765fdd2a17d..86e9b1e2027 100644 --- a/src/gallium/Automake.inc +++ b/src/gallium/Automake.inc @@ -43,3 +43,10 @@ GALLIUM_VDPAU_LINKER_FLAGS = \ -export-symbols-regex $(VDPAU_EXPORTS) \ -shared \ -no-undefined + +GALLIUM_VDPAU_LIB_DEPS = \ + $(top_builddir)/src/gallium/auxiliary/libgallium.la \ + $(top_builddir)/src/gallium/state_trackers/vdpau/libvdpautracker.la \ + $(VDPAU_LIBS) \ + $(LIBDRM_LIBS) + diff --git a/src/gallium/targets/r600/vdpau/Makefile.am b/src/gallium/targets/r600/vdpau/Makefile.am index 3a65a6fa771..5d63eedb57f 100644 --- a/src/gallium/targets/r600/vdpau/Makefile.am +++ b/src/gallium/targets/r600/vdpau/Makefile.am @@ -38,14 +38,11 @@ libvdpau_r600_la_LDFLAGS = \ $(GALLIUM_VDPAU_LINKER_FLAGS) libvdpau_r600_la_LIBADD = \ - $(top_builddir)/src/gallium/auxiliary/libgallium.la \ $(top_builddir)/src/gallium/drivers/r600/libr600.la \ - $(top_builddir)/src/gallium/state_trackers/vdpau/libvdpautracker.la \ $(top_builddir)/src/gallium/winsys/radeon/drm/libradeonwinsys.la \ $(top_builddir)/src/gallium/drivers/trace/libtrace.la \ + $(GALLIUM_VDPAU_LIB_DEPS) \ $(GALLIUM_DRI_LIB_DEPS) \ - $(VDPAU_LIBS) \ - $(LIBDRM_LIBS) \ $(RADEON_LIBS) if HAVE_MESA_LLVM diff --git a/src/gallium/targets/radeonsi/vdpau/Makefile.am b/src/gallium/targets/radeonsi/vdpau/Makefile.am index cd4dcfc1dd7..22d3c280aaf 100644 --- a/src/gallium/targets/radeonsi/vdpau/Makefile.am +++ b/src/gallium/targets/radeonsi/vdpau/Makefile.am @@ -39,16 +39,13 @@ libvdpau_radeonsi_la_LDFLAGS = \ $(GALLIUM_VDPAU_LINKER_FLAGS) libvdpau_radeonsi_la_LIBADD = \ - $(top_builddir)/src/gallium/auxiliary/libgallium.la \ $(top_builddir)/src/gallium/drivers/radeonsi/libradeonsi.la \ - $(top_builddir)/src/gallium/state_trackers/vdpau/libvdpautracker.la \ $(top_builddir)/src/gallium/winsys/radeon/drm/libradeonwinsys.la \ $(top_builddir)/src/gallium/drivers/trace/libtrace.la \ $(top_builddir)/src/gallium/drivers/rbug/librbug.la \ $(top_builddir)/src/gallium/drivers/noop/libnoop.la \ + $(GALLIUM_VDPAU_LIB_DEPS) \ $(GALLIUM_DRI_LIB_DEPS) \ - $(VDPAU_LIBS) \ - $(LIBDRM_LIBS) \ $(RADEON_LIBS) if HAVE_MESA_LLVM diff --git a/src/gallium/targets/vdpau-nouveau/Makefile.am b/src/gallium/targets/vdpau-nouveau/Makefile.am index 8a15d461f1b..001cb4ed1aa 100644 --- a/src/gallium/targets/vdpau-nouveau/Makefile.am +++ b/src/gallium/targets/vdpau-nouveau/Makefile.am @@ -39,14 +39,11 @@ libvdpau_nouveau_la_LDFLAGS = \ $(GALLIUM_VDPAU_LINKER_FLAGS) libvdpau_nouveau_la_LIBADD = \ - $(top_builddir)/src/gallium/auxiliary/libgallium.la \ - $(top_builddir)/src/gallium/state_trackers/vdpau/libvdpautracker.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_VDPAU_LIB_DEPS) \ $(GALLIUM_DRI_LIB_DEPS) \ - $(VDPAU_LIBS) \ - $(LIBDRM_LIBS) \ $(NOUVEAU_LIBS) if HAVE_MESA_LLVM |