[Mesa-dev] [PATCH 17/37] targets/vdpau: symlink vl_winsys_{dri, xsp}.c for each target

[Christian König]

Am 02.11.2013 20:00, schrieb Emil Velikov:
> Make automake's subdir-objects work.
>
> Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>

You can drop this and patch 18, I have a patch in the pipeline to 
entirely remove vl_winsys_xsp.c.

Just waiting for Mareks patchset to be committed.

Christian.

> ---
>   src/gallium/targets/r300/vdpau/Makefile.am         | 2 +-
>   src/gallium/targets/r300/vdpau/vl_winsys_dri.c     | 1 +
>   src/gallium/targets/r600/vdpau/Makefile.am         | 2 +-
>   src/gallium/targets/r600/vdpau/vl_winsys_dri.c     | 1 +
>   src/gallium/targets/radeonsi/vdpau/Makefile.am     | 2 +-
>   src/gallium/targets/radeonsi/vdpau/vl_winsys_dri.c | 1 +
>   src/gallium/targets/vdpau-nouveau/Makefile.am      | 2 +-
>   src/gallium/targets/vdpau-nouveau/vl_winsys_dri.c  | 1 +
>   src/gallium/targets/vdpau-softpipe/Makefile.am     | 2 +-
>   src/gallium/targets/vdpau-softpipe/vl_winsys_xsp.c | 1 +
>   10 files changed, 10 insertions(+), 5 deletions(-)
>   create mode 120000 src/gallium/targets/r300/vdpau/vl_winsys_dri.c
>   create mode 120000 src/gallium/targets/r600/vdpau/vl_winsys_dri.c
>   create mode 120000 src/gallium/targets/radeonsi/vdpau/vl_winsys_dri.c
>   create mode 120000 src/gallium/targets/vdpau-nouveau/vl_winsys_dri.c
>   create mode 120000 src/gallium/targets/vdpau-softpipe/vl_winsys_xsp.c
>
> diff --git a/src/gallium/targets/r300/vdpau/Makefile.am b/src/gallium/targets/r300/vdpau/Makefile.am
> index d4855b2..f7a2d6f 100644
> --- a/src/gallium/targets/r300/vdpau/Makefile.am
> +++ b/src/gallium/targets/r300/vdpau/Makefile.am
> @@ -39,7 +39,7 @@ EXPORTS = '^(vdp_imp_device_create_x11|radeon_drm_winsys_create)$$'
>   nodist_EXTRA_libvdpau_r300_la_SOURCES = dummy.cpp
>   libvdpau_r300_la_SOURCES = \
>   	../drm_target.c \
> -	$(top_srcdir)/src/gallium/auxiliary/vl/vl_winsys_dri.c
> +	vl_winsys_dri.c
>   
>   libvdpau_r300_la_LDFLAGS = \
>   	-module \
> diff --git a/src/gallium/targets/r300/vdpau/vl_winsys_dri.c b/src/gallium/targets/r300/vdpau/vl_winsys_dri.c
> new file mode 120000
> index 0000000..f132503
> --- /dev/null
> +++ b/src/gallium/targets/r300/vdpau/vl_winsys_dri.c
> @@ -0,0 +1 @@
> +../../../auxiliary/vl/vl_winsys_dri.c
> \ No newline at end of file
> diff --git a/src/gallium/targets/r600/vdpau/Makefile.am b/src/gallium/targets/r600/vdpau/Makefile.am
> index 7c97585..043c49c 100644
> --- a/src/gallium/targets/r600/vdpau/Makefile.am
> +++ b/src/gallium/targets/r600/vdpau/Makefile.am
> @@ -38,7 +38,7 @@ EXPORTS = '^(vdp_imp_device_create_x11|radeon_drm_winsys_create)$$'
>   
>   libvdpau_r600_la_SOURCES = \
>   	../drm_target.c \
> -	$(top_srcdir)/src/gallium/auxiliary/vl/vl_winsys_dri.c
> +	vl_winsys_dri.c
>   
>   libvdpau_r600_la_LDFLAGS = \
>   	-module \
> diff --git a/src/gallium/targets/r600/vdpau/vl_winsys_dri.c b/src/gallium/targets/r600/vdpau/vl_winsys_dri.c
> new file mode 120000
> index 0000000..f132503
> --- /dev/null
> +++ b/src/gallium/targets/r600/vdpau/vl_winsys_dri.c
> @@ -0,0 +1 @@
> +../../../auxiliary/vl/vl_winsys_dri.c
> \ No newline at end of file
> diff --git a/src/gallium/targets/radeonsi/vdpau/Makefile.am b/src/gallium/targets/radeonsi/vdpau/Makefile.am
> index f21b340..f271fa2 100644
> --- a/src/gallium/targets/radeonsi/vdpau/Makefile.am
> +++ b/src/gallium/targets/radeonsi/vdpau/Makefile.am
> @@ -39,7 +39,7 @@ EXPORTS = '^(vdp_imp_device_create_x11|radeon_drm_winsys_create)$$'
>   nodist_EXTRA_libvdpau_radeonsi_la_SOURCES = dummy.cpp
>   libvdpau_radeonsi_la_SOURCES = \
>   	../drm_target.c \
> -	$(top_srcdir)/src/gallium/auxiliary/vl/vl_winsys_dri.c
> +	vl_winsys_dri.c
>   
>   libvdpau_radeonsi_la_LDFLAGS = \
>   	-module \
> diff --git a/src/gallium/targets/radeonsi/vdpau/vl_winsys_dri.c b/src/gallium/targets/radeonsi/vdpau/vl_winsys_dri.c
> new file mode 120000
> index 0000000..f132503
> --- /dev/null
> +++ b/src/gallium/targets/radeonsi/vdpau/vl_winsys_dri.c
> @@ -0,0 +1 @@
> +../../../auxiliary/vl/vl_winsys_dri.c
> \ No newline at end of file
> diff --git a/src/gallium/targets/vdpau-nouveau/Makefile.am b/src/gallium/targets/vdpau-nouveau/Makefile.am
> index 213725a..cff6095 100644
> --- a/src/gallium/targets/vdpau-nouveau/Makefile.am
> +++ b/src/gallium/targets/vdpau-nouveau/Makefile.am
> @@ -36,7 +36,7 @@ vdpau_LTLIBRARIES = libvdpau_nouveau.la
>   nodist_EXTRA_libvdpau_nouveau_la_SOURCES = dummy.cpp
>   libvdpau_nouveau_la_SOURCES = \
>   	target.c \
> -	$(top_srcdir)/src/gallium/auxiliary/vl/vl_winsys_dri.c
> +	vl_winsys_dri.c
>   
>   libvdpau_nouveau_la_LDFLAGS = \
>   	-module \
> diff --git a/src/gallium/targets/vdpau-nouveau/vl_winsys_dri.c b/src/gallium/targets/vdpau-nouveau/vl_winsys_dri.c
> new file mode 120000
> index 0000000..be81d8a
> --- /dev/null
> +++ b/src/gallium/targets/vdpau-nouveau/vl_winsys_dri.c
> @@ -0,0 +1 @@
> +../../auxiliary/vl/vl_winsys_dri.c
> \ No newline at end of file
> diff --git a/src/gallium/targets/vdpau-softpipe/Makefile.am b/src/gallium/targets/vdpau-softpipe/Makefile.am
> index 7bde2f8..fd103dd 100644
> --- a/src/gallium/targets/vdpau-softpipe/Makefile.am
> +++ b/src/gallium/targets/vdpau-softpipe/Makefile.am
> @@ -35,7 +35,7 @@ vdpaudir = $(VDPAU_LIB_INSTALL_DIR)
>   vdpau_LTLIBRARIES = libvdpau_softpipe.la
>   
>   libvdpau_softpipe_la_SOURCES = \
> -	$(top_srcdir)/src/gallium/auxiliary/vl/vl_winsys_xsp.c
> +	vl_winsys_xsp.c
>   
>   libvdpau_softpipe_la_LDFLAGS = \
>   	-module \
> diff --git a/src/gallium/targets/vdpau-softpipe/vl_winsys_xsp.c b/src/gallium/targets/vdpau-softpipe/vl_winsys_xsp.c
> new file mode 120000
> index 0000000..7f5ff53
> --- /dev/null
> +++ b/src/gallium/targets/vdpau-softpipe/vl_winsys_xsp.c
> @@ -0,0 +1 @@
> +../../auxiliary/vl/vl_winsys_xsp.c
> \ No newline at end of file