From 23cdf8de32fc25bc509a8e110b065ea6395ec2dd Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Sat, 9 Nov 2013 22:42:44 +0000 Subject: [PATCH] targets/r600: move drm_target.c to common folder ... and symlink for each target. Make automake's subdir-objects work for r600. Signed-off-by: Emil Velikov --- src/gallium/targets/r600/{ => common}/drm_target.c | 0 src/gallium/targets/r600/dri/Makefile.am | 2 +- src/gallium/targets/r600/dri/drm_target.c | 1 + src/gallium/targets/r600/vdpau/Makefile.am | 2 +- src/gallium/targets/r600/vdpau/drm_target.c | 1 + src/gallium/targets/r600/xvmc/Makefile.am | 2 +- src/gallium/targets/r600/xvmc/drm_target.c | 1 + 7 files changed, 6 insertions(+), 3 deletions(-) rename src/gallium/targets/r600/{ => common}/drm_target.c (100%) create mode 120000 src/gallium/targets/r600/dri/drm_target.c create mode 120000 src/gallium/targets/r600/vdpau/drm_target.c create mode 120000 src/gallium/targets/r600/xvmc/drm_target.c diff --git a/src/gallium/targets/r600/drm_target.c b/src/gallium/targets/r600/common/drm_target.c similarity index 100% rename from src/gallium/targets/r600/drm_target.c rename to src/gallium/targets/r600/common/drm_target.c diff --git a/src/gallium/targets/r600/dri/Makefile.am b/src/gallium/targets/r600/dri/Makefile.am index c7fca320f2b..b5ea37a28b8 100644 --- a/src/gallium/targets/r600/dri/Makefile.am +++ b/src/gallium/targets/r600/dri/Makefile.am @@ -41,7 +41,7 @@ dridir = $(DRI_DRIVER_INSTALL_DIR) dri_LTLIBRARIES = r600_dri.la r600_dri_la_SOURCES = \ - ../drm_target.c + drm_target.c r600_dri_la_LDFLAGS = $(DRI_DRIVER_LDFLAGS) diff --git a/src/gallium/targets/r600/dri/drm_target.c b/src/gallium/targets/r600/dri/drm_target.c new file mode 120000 index 00000000000..6955421104a --- /dev/null +++ b/src/gallium/targets/r600/dri/drm_target.c @@ -0,0 +1 @@ +../common/drm_target.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 7c975859a72..70af0bffa0f 100644 --- a/src/gallium/targets/r600/vdpau/Makefile.am +++ b/src/gallium/targets/r600/vdpau/Makefile.am @@ -37,7 +37,7 @@ vdpau_LTLIBRARIES = libvdpau_r600.la EXPORTS = '^(vdp_imp_device_create_x11|radeon_drm_winsys_create)$$' libvdpau_r600_la_SOURCES = \ - ../drm_target.c \ + drm_target.c \ $(top_srcdir)/src/gallium/auxiliary/vl/vl_winsys_dri.c libvdpau_r600_la_LDFLAGS = \ diff --git a/src/gallium/targets/r600/vdpau/drm_target.c b/src/gallium/targets/r600/vdpau/drm_target.c new file mode 120000 index 00000000000..6955421104a --- /dev/null +++ b/src/gallium/targets/r600/vdpau/drm_target.c @@ -0,0 +1 @@ +../common/drm_target.c \ No newline at end of file diff --git a/src/gallium/targets/r600/xvmc/Makefile.am b/src/gallium/targets/r600/xvmc/Makefile.am index 2083b8719ac..44cd511d747 100644 --- a/src/gallium/targets/r600/xvmc/Makefile.am +++ b/src/gallium/targets/r600/xvmc/Makefile.am @@ -35,7 +35,7 @@ xvmcdir = $(XVMC_LIB_INSTALL_DIR) xvmc_LTLIBRARIES = libXvMCr600.la libXvMCr600_la_SOURCES = \ - ../drm_target.c \ + drm_target.c \ $(top_srcdir)/src/gallium/auxiliary/vl/vl_winsys_dri.c libXvMCr600_la_LDFLAGS = \ diff --git a/src/gallium/targets/r600/xvmc/drm_target.c b/src/gallium/targets/r600/xvmc/drm_target.c new file mode 120000 index 00000000000..6955421104a --- /dev/null +++ b/src/gallium/targets/r600/xvmc/drm_target.c @@ -0,0 +1 @@ +../common/drm_target.c \ No newline at end of file -- 2.30.2