From 027a45e5cf7092a93922fea980264dc0c31f7df7 Mon Sep 17 00:00:00 2001 From: Chia-I Wu Date: Fri, 19 Aug 2011 14:58:57 +0800 Subject: [PATCH] winsys/r600: share the source list MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Factor out C_SOURCES from Makefile to Makefile.sources, and let Makefile and SConscript share it. Reviewed-by: Marek Olšák --- src/gallium/winsys/r600/drm/Makefile | 8 ++------ src/gallium/winsys/r600/drm/Makefile.sources | 7 +++++++ src/gallium/winsys/r600/drm/SConscript | 8 +------- 3 files changed, 10 insertions(+), 13 deletions(-) create mode 100644 src/gallium/winsys/r600/drm/Makefile.sources diff --git a/src/gallium/winsys/r600/drm/Makefile b/src/gallium/winsys/r600/drm/Makefile index 5ad183d78ae..c23286c8197 100644 --- a/src/gallium/winsys/r600/drm/Makefile +++ b/src/gallium/winsys/r600/drm/Makefile @@ -4,12 +4,8 @@ include $(TOP)/configs/current LIBNAME = r600winsys -C_SOURCES = \ - evergreen_hw_context.c \ - radeon_pciid.c \ - r600_bo.c \ - r600_drm.c \ - r600_hw_context.c +# get C_SOURCES +include Makefile.sources LIBRARY_INCLUDES = -I$(TOP)/src/gallium/drivers/r600 \ -I$(TOP)/include \ diff --git a/src/gallium/winsys/r600/drm/Makefile.sources b/src/gallium/winsys/r600/drm/Makefile.sources new file mode 100644 index 00000000000..97980170e6b --- /dev/null +++ b/src/gallium/winsys/r600/drm/Makefile.sources @@ -0,0 +1,7 @@ +C_SOURCES := \ + evergreen_hw_context.c \ + radeon_pciid.c \ + r600_bo.c \ + r600_drm.c \ + r600_hw_context.c + diff --git a/src/gallium/winsys/r600/drm/SConscript b/src/gallium/winsys/r600/drm/SConscript index ca51b52ea72..2d0d80e8bb9 100644 --- a/src/gallium/winsys/r600/drm/SConscript +++ b/src/gallium/winsys/r600/drm/SConscript @@ -2,13 +2,7 @@ Import('*') env = env.Clone() -r600_sources = [ - 'evergreen_hw_context.c', - 'radeon_pciid.c', - 'r600_bo.c', - 'r600_drm.c', - 'r600_hw_context.c', -] +r600_sources = env.ParseSourceList('Makefile.sources', 'C_SOURCES') env.PkgUseModules('DRM_RADEON') -- 2.30.2