summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEmil Velikov <[email protected]>2013-11-09 22:42:44 +0000
committerEmil Velikov <[email protected]>2013-11-16 14:02:52 +0000
commit23cdf8de32fc25bc509a8e110b065ea6395ec2dd (patch)
treeb627ac86ec1e8d44b9e0f539aff60172186b7f94
parenta9a30295412bb26ff2edd5599975ff24f004b345 (diff)
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 <[email protected]>
-rw-r--r--src/gallium/targets/r600/common/drm_target.c (renamed from src/gallium/targets/r600/drm_target.c)0
-rw-r--r--src/gallium/targets/r600/dri/Makefile.am2
l---------src/gallium/targets/r600/dri/drm_target.c1
-rw-r--r--src/gallium/targets/r600/vdpau/Makefile.am2
l---------src/gallium/targets/r600/vdpau/drm_target.c1
-rw-r--r--src/gallium/targets/r600/xvmc/Makefile.am2
l---------src/gallium/targets/r600/xvmc/drm_target.c1
7 files changed, 6 insertions, 3 deletions
diff --git a/src/gallium/targets/r600/drm_target.c b/src/gallium/targets/r600/common/drm_target.c
index 28004ac58e2..28004ac58e2 100644
--- a/src/gallium/targets/r600/drm_target.c
+++ b/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