From ad501a535ad731447587b259afe2ea9c0a0a02f5 Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Sat, 9 Nov 2013 22:46:20 +0000 Subject: [PATCH] targets/radeonsi: move drm_target.c to a common folder ... and symlink to each target. Make automake's subdir-objects work for radeonsi. Signed-off-by: Emil Velikov --- src/gallium/targets/radeonsi/{ => common}/drm_target.c | 0 src/gallium/targets/radeonsi/dri/Makefile.am | 2 +- src/gallium/targets/radeonsi/dri/drm_target.c | 1 + src/gallium/targets/radeonsi/vdpau/Makefile.am | 2 +- src/gallium/targets/radeonsi/vdpau/drm_target.c | 1 + 5 files changed, 4 insertions(+), 2 deletions(-) rename src/gallium/targets/radeonsi/{ => common}/drm_target.c (100%) create mode 120000 src/gallium/targets/radeonsi/dri/drm_target.c create mode 120000 src/gallium/targets/radeonsi/vdpau/drm_target.c diff --git a/src/gallium/targets/radeonsi/drm_target.c b/src/gallium/targets/radeonsi/common/drm_target.c similarity index 100% rename from src/gallium/targets/radeonsi/drm_target.c rename to src/gallium/targets/radeonsi/common/drm_target.c diff --git a/src/gallium/targets/radeonsi/dri/Makefile.am b/src/gallium/targets/radeonsi/dri/Makefile.am index 8a78f1b80d4..9eb21cd9f4f 100644 --- a/src/gallium/targets/radeonsi/dri/Makefile.am +++ b/src/gallium/targets/radeonsi/dri/Makefile.am @@ -42,7 +42,7 @@ dri_LTLIBRARIES = radeonsi_dri.la nodist_EXTRA_radeonsi_dri_la_SOURCES = dummy.cpp radeonsi_dri_la_SOURCES = \ - ../drm_target.c + drm_target.c radeonsi_dri_la_LDFLAGS = $(DRI_DRIVER_LDFLAGS) diff --git a/src/gallium/targets/radeonsi/dri/drm_target.c b/src/gallium/targets/radeonsi/dri/drm_target.c new file mode 120000 index 00000000000..6955421104a --- /dev/null +++ b/src/gallium/targets/radeonsi/dri/drm_target.c @@ -0,0 +1 @@ +../common/drm_target.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 f21b3405f2c..a4d97fe6b90 100644 --- a/src/gallium/targets/radeonsi/vdpau/Makefile.am +++ b/src/gallium/targets/radeonsi/vdpau/Makefile.am @@ -38,7 +38,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 \ + drm_target.c \ $(top_srcdir)/src/gallium/auxiliary/vl/vl_winsys_dri.c libvdpau_radeonsi_la_LDFLAGS = \ diff --git a/src/gallium/targets/radeonsi/vdpau/drm_target.c b/src/gallium/targets/radeonsi/vdpau/drm_target.c new file mode 120000 index 00000000000..6955421104a --- /dev/null +++ b/src/gallium/targets/radeonsi/vdpau/drm_target.c @@ -0,0 +1 @@ +../common/drm_target.c \ No newline at end of file -- 2.30.2