[Mesa-dev] [PATCH 07.1/20] targets/vdpau: use install-gallium-links.mk

[Christian König]

Am 08.03.2014 21:30, schrieb Emil Velikov:
> Drop the duplication across all vdpau targets.
>
> Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>

Reviewed-by: Christian König <christian.koenig at amd.com>

> ---
>   src/gallium/targets/r600/vdpau/Makefile.am     | 6 +-----
>   src/gallium/targets/radeonsi/vdpau/Makefile.am | 6 +-----
>   src/gallium/targets/vdpau-nouveau/Makefile.am  | 6 +-----
>   3 files changed, 3 insertions(+), 15 deletions(-)
>
> diff --git a/src/gallium/targets/r600/vdpau/Makefile.am b/src/gallium/targets/r600/vdpau/Makefile.am
> index 509b954..b760afb 100644
> --- a/src/gallium/targets/r600/vdpau/Makefile.am
> +++ b/src/gallium/targets/r600/vdpau/Makefile.am
> @@ -52,8 +52,4 @@ libvdpau_r600_la_LDFLAGS += $(LLVM_LDFLAGS)
>   libvdpau_r600_la_LIBADD += $(LLVM_LIBS)
>   endif
>   
> -# Provide compatibility with scripts for the old Mesa build system for
> -# a while by putting a link to the driver into /lib of the build tree.
> -all-local: libvdpau_r600.la
> -	$(MKDIR_P) $(top_builddir)/$(LIB_DIR)/gallium
> -	ln -f .libs/libvdpau_r600.so* $(top_builddir)/$(LIB_DIR)/gallium/
> +include $(top_srcdir)/install-gallium-links.mk
> diff --git a/src/gallium/targets/radeonsi/vdpau/Makefile.am b/src/gallium/targets/radeonsi/vdpau/Makefile.am
> index 54d65b3..adad4c6 100644
> --- a/src/gallium/targets/radeonsi/vdpau/Makefile.am
> +++ b/src/gallium/targets/radeonsi/vdpau/Makefile.am
> @@ -49,8 +49,4 @@ libvdpau_radeonsi_la_LDFLAGS += $(LLVM_LDFLAGS)
>   libvdpau_radeonsi_la_LIBADD += $(LLVM_LIBS)
>   endif
>   
> -# Provide compatibility with scripts for the old Mesa build system for
> -# a while by putting a link to the driver into /lib of the build tree.
> -all-local: libvdpau_radeonsi.la
> -	$(MKDIR_P) $(top_builddir)/$(LIB_DIR)/gallium
> -	ln -f .libs/libvdpau_radeonsi.so* $(top_builddir)/$(LIB_DIR)/gallium/
> +include $(top_srcdir)/install-gallium-links.mk
> diff --git a/src/gallium/targets/vdpau-nouveau/Makefile.am b/src/gallium/targets/vdpau-nouveau/Makefile.am
> index 3cdf103..16af16a 100644
> --- a/src/gallium/targets/vdpau-nouveau/Makefile.am
> +++ b/src/gallium/targets/vdpau-nouveau/Makefile.am
> @@ -49,8 +49,4 @@ libvdpau_nouveau_la_LDFLAGS += $(LLVM_LDFLAGS)
>   libvdpau_nouveau_la_LIBADD += $(LLVM_LIBS)
>   endif
>   
> -# Provide compatibility with scripts for the old Mesa build system for
> -# a while by putting a link to the driver into /lib of the build tree.
> -all-local: libvdpau_nouveau.la
> -	$(MKDIR_P) $(top_builddir)/$(LIB_DIR)/gallium
> -	ln -f .libs/libvdpau_nouveau.so* $(top_builddir)/$(LIB_DIR)/gallium/
> +include $(top_srcdir)/install-gallium-links.mk