Mesa (master): scons: Detabify
Jakob Bornecrantz
wallbraker at kemper.freedesktop.org
Fri Nov 5 20:59:18 UTC 2010
Module: Mesa
Branch: master
Commit: b4ac0adb75bddc1c17c57eb19c7e6dde52e4b7e7
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=b4ac0adb75bddc1c17c57eb19c7e6dde52e4b7e7
Author: Jakob Bornecrantz <jakob at vmware.com>
Date: Thu Nov 4 21:12:30 2010 +0000
scons: Detabify
Drivers scons files for a later time
---
src/gallium/SConscript | 29 +++++-----
src/gallium/state_trackers/dri/SConscript | 4 +-
src/gallium/state_trackers/dri/drm/SConscript | 16 +++---
src/gallium/state_trackers/dri/sw/SConscript | 16 +++---
src/gallium/state_trackers/vega/SConscript | 54 +++++++++---------
src/gallium/state_trackers/wgl/SConscript | 6 +-
src/gallium/targets/SConscript.dri | 76 ++++++++++++------------
src/gallium/targets/xorg-vmwgfx/SConscript | 2 +-
src/gallium/winsys/svga/drm/SConscript | 42 +++++++-------
9 files changed, 122 insertions(+), 123 deletions(-)
diff --git a/src/gallium/SConscript b/src/gallium/SConscript
index b5bc9ec..63435a3 100644
--- a/src/gallium/SConscript
+++ b/src/gallium/SConscript
@@ -50,14 +50,14 @@ SConscript('winsys/sw/null/SConscript')
SConscript('state_trackers/python/SConscript')
if env['platform'] != 'embedded':
- SConscript('state_trackers/glx/xlib/SConscript')
- SConscript('state_trackers/dri/SConscript')
- SConscript('state_trackers/xorg/SConscript')
- SConscript('state_trackers/egl/SConscript')
- SConscript('state_trackers/vega/SConscript')
+ SConscript('state_trackers/glx/xlib/SConscript')
+ SConscript('state_trackers/dri/SConscript')
+ SConscript('state_trackers/xorg/SConscript')
+ SConscript('state_trackers/egl/SConscript')
+ SConscript('state_trackers/vega/SConscript')
if env['platform'] == 'windows':
- SConscript('state_trackers/wgl/SConscript')
+ SConscript('state_trackers/wgl/SConscript')
#
# Winsys
@@ -89,13 +89,13 @@ if env['platform'] == 'windows':
if env['dri']:
SConscript([
'targets/SConscript.dri',
- 'targets/dri-i915/SConscript',
- 'targets/dri-i965/SConscript',
- #'targets/dri-nouveau/SConscript',
- 'targets/dri-r300/SConscript',
+ 'targets/dri-i915/SConscript',
+ 'targets/dri-i965/SConscript',
+ #'targets/dri-nouveau/SConscript',
+ 'targets/dri-r300/SConscript',
'targets/dri-r600/SConscript',
- 'targets/dri-swrast/SConscript',
- 'targets/dri-vmwgfx/SConscript',
+ 'targets/dri-swrast/SConscript',
+ 'targets/dri-vmwgfx/SConscript',
])
if env['xorg']:
@@ -113,6 +113,5 @@ if env['xorg']:
#
if env['platform'] != 'embedded':
- SConscript('tests/unit/SConscript')
- SConscript('tests/graw/SConscript')
-
+ SConscript('tests/unit/SConscript')
+ SConscript('tests/graw/SConscript')
diff --git a/src/gallium/state_trackers/dri/SConscript b/src/gallium/state_trackers/dri/SConscript
index aba60fb..7702d8e 100644
--- a/src/gallium/state_trackers/dri/SConscript
+++ b/src/gallium/state_trackers/dri/SConscript
@@ -1,6 +1,6 @@
Import('*')
SConscript([
- 'sw/SConscript',
- 'drm/SConscript',
+ 'sw/SConscript',
+ 'drm/SConscript',
])
diff --git a/src/gallium/state_trackers/dri/drm/SConscript b/src/gallium/state_trackers/dri/drm/SConscript
index 2a0af65..7e3a264 100644
--- a/src/gallium/state_trackers/dri/drm/SConscript
+++ b/src/gallium/state_trackers/dri/drm/SConscript
@@ -12,16 +12,16 @@ if env['dri']:
env.Append(CPPPATH = [
'#/src/mapi',
'#/src/mesa',
- '#/src/gallium/state_trackers/dri/common',
- '#/src/mesa/drivers/dri/common',
+ '#/src/gallium/state_trackers/dri/common',
+ '#/src/mesa/drivers/dri/common',
])
st_dri = env.ConvenienceLibrary(
- target = 'st_dri',
- source = [ 'dri_context.c',
- 'dri_drawable.c',
- 'dri_screen.c',
- 'dri2.c',
- ]
+ target = 'st_dri',
+ source = [ 'dri_context.c',
+ 'dri_drawable.c',
+ 'dri_screen.c',
+ 'dri2.c',
+ ]
)
Export('st_dri')
diff --git a/src/gallium/state_trackers/dri/sw/SConscript b/src/gallium/state_trackers/dri/sw/SConscript
index d2eb666..03c2ef6 100644
--- a/src/gallium/state_trackers/dri/sw/SConscript
+++ b/src/gallium/state_trackers/dri/sw/SConscript
@@ -10,18 +10,18 @@ if env['dri']:
env.Append(CPPPATH = [
'#/src/mapi',
'#/src/mesa',
- '#/src/gallium/state_trackers/dri/common',
- '#/src/mesa/drivers/dri/common',
+ '#/src/gallium/state_trackers/dri/common',
+ '#/src/mesa/drivers/dri/common',
])
env.Append(CPPDEFINES = [('__NOT_HAVE_DRM_H', '1')])
st_drisw = env.ConvenienceLibrary(
- target = 'st_drisw',
- source = [ 'dri_context.c',
- 'dri_drawable.c',
- 'dri_screen.c',
- 'drisw.c',
- ]
+ target = 'st_drisw',
+ source = [ 'dri_context.c',
+ 'dri_drawable.c',
+ 'dri_screen.c',
+ 'drisw.c',
+ ]
)
Export('st_drisw')
diff --git a/src/gallium/state_trackers/vega/SConscript b/src/gallium/state_trackers/vega/SConscript
index 4c6e18f..a25b847 100644
--- a/src/gallium/state_trackers/vega/SConscript
+++ b/src/gallium/state_trackers/vega/SConscript
@@ -10,33 +10,33 @@ env.Append(CPPPATH = [
])
vega_sources = [
- 'api.c',
- 'api_context.c',
- 'api_filters.c',
- 'api_images.c',
- 'api_masks.c',
- 'api_misc.c',
- 'api_paint.c',
- 'api_params.c',
- 'api_path.c',
- 'api_text.c',
- 'api_transform.c',
- 'vgu.c',
- 'vg_context.c',
- 'vg_manager.c',
- 'vg_state.c',
- 'vg_translate.c',
- 'polygon.c',
- 'bezier.c',
- 'path.c',
- 'paint.c',
- 'arc.c',
- 'image.c',
- 'renderer.c',
- 'stroker.c',
- 'mask.c',
- 'shader.c',
- 'shaders_cache.c',
+ 'api.c',
+ 'api_context.c',
+ 'api_filters.c',
+ 'api_images.c',
+ 'api_masks.c',
+ 'api_misc.c',
+ 'api_paint.c',
+ 'api_params.c',
+ 'api_path.c',
+ 'api_text.c',
+ 'api_transform.c',
+ 'vgu.c',
+ 'vg_context.c',
+ 'vg_manager.c',
+ 'vg_state.c',
+ 'vg_translate.c',
+ 'polygon.c',
+ 'bezier.c',
+ 'path.c',
+ 'paint.c',
+ 'arc.c',
+ 'image.c',
+ 'renderer.c',
+ 'stroker.c',
+ 'mask.c',
+ 'shader.c',
+ 'shaders_cache.c',
]
# vgapi_header must be generated first
diff --git a/src/gallium/state_trackers/wgl/SConscript b/src/gallium/state_trackers/wgl/SConscript
index 0f580b8..994b0c8 100644
--- a/src/gallium/state_trackers/wgl/SConscript
+++ b/src/gallium/state_trackers/wgl/SConscript
@@ -7,9 +7,9 @@ if env['platform'] in ['windows']:
env = env.Clone()
env.Append(CPPPATH = [
- '#src/mapi',
- '#src/mesa',
- '.',
+ '#src/mapi',
+ '#src/mesa',
+ '.',
])
env.AppendUnique(CPPDEFINES = [
diff --git a/src/gallium/targets/SConscript.dri b/src/gallium/targets/SConscript.dri
index 092223b..bc3671a 100644
--- a/src/gallium/targets/SConscript.dri
+++ b/src/gallium/targets/SConscript.dri
@@ -9,65 +9,65 @@ if not env['dri']:
drienv = env.Clone()
drienv.Replace(CPPPATH = [
- '#src/mesa/drivers/dri/common',
- '#include',
- '#include/GL/internal',
- '#src/mapi',
- '#src/gallium/include',
- '#src/gallium/auxiliary',
- '#src/gallium/drivers',
- '#src/gallium/winsys',
- '#src/mesa',
- '#src/mesa/main',
- '#src/mesa/glapi',
- '#src/mesa/math',
- '#src/mesa/transform',
- '#src/mesa/shader',
- '#src/mesa/swrast',
- '#src/mesa/swrast_setup',
- '#src/egl/main',
- '#src/egl/drivers/dri',
+ '#src/mesa/drivers/dri/common',
+ '#include',
+ '#include/GL/internal',
+ '#src/mapi',
+ '#src/gallium/include',
+ '#src/gallium/auxiliary',
+ '#src/gallium/drivers',
+ '#src/gallium/winsys',
+ '#src/mesa',
+ '#src/mesa/main',
+ '#src/mesa/glapi',
+ '#src/mesa/math',
+ '#src/mesa/transform',
+ '#src/mesa/shader',
+ '#src/mesa/swrast',
+ '#src/mesa/swrast_setup',
+ '#src/egl/main',
+ '#src/egl/drivers/dri',
])
drienv.ParseConfig('pkg-config --cflags --libs libdrm')
dri_common_utils = drienv.SharedObject(
- target = 'utils.o',
- source = '#src/mesa/drivers/dri/common/utils.c'
+ target = 'utils.o',
+ source = '#src/mesa/drivers/dri/common/utils.c'
)
dri_common_xmlconfig = drienv.SharedObject(
- target = 'xmlconfig.o',
- source = '#src/mesa/drivers/dri/common/xmlconfig.c'
+ target = 'xmlconfig.o',
+ source = '#src/mesa/drivers/dri/common/xmlconfig.c'
)
dri_common_vblank = drienv.SharedObject(
- target = 'vblank.o',
- source = '#src/mesa/drivers/dri/common/vblank.c'
+ target = 'vblank.o',
+ source = '#src/mesa/drivers/dri/common/vblank.c'
)
dri_common_dri_util = drienv.SharedObject(
- target = 'dri_util.o',
- source = '#src/mesa/drivers/dri/common/dri_util.c'
+ target = 'dri_util.o',
+ source = '#src/mesa/drivers/dri/common/dri_util.c'
)
dri_common_drisw_util = drienv.SharedObject(
- target = 'drisw_util.o',
- source = '#src/mesa/drivers/dri/common/drisw_util.c'
+ target = 'drisw_util.o',
+ source = '#src/mesa/drivers/dri/common/drisw_util.c'
)
COMMON_DRI_SW_OBJECTS = [
- dri_common_utils,
- dri_common_xmlconfig,
- dri_common_drisw_util,
+ dri_common_utils,
+ dri_common_xmlconfig,
+ dri_common_drisw_util,
]
COMMON_DRI_DRM_OBJECTS = [
- dri_common_utils,
- dri_common_xmlconfig,
- dri_common_vblank,
- dri_common_dri_util,
+ dri_common_utils,
+ dri_common_xmlconfig,
+ dri_common_vblank,
+ dri_common_dri_util,
]
drienv.AppendUnique(LIBS = [
@@ -76,7 +76,7 @@ drienv.AppendUnique(LIBS = [
])
Export([
- 'drienv',
- 'COMMON_DRI_SW_OBJECTS',
- 'COMMON_DRI_DRM_OBJECTS',
+ 'drienv',
+ 'COMMON_DRI_SW_OBJECTS',
+ 'COMMON_DRI_DRM_OBJECTS',
])
diff --git a/src/gallium/targets/xorg-vmwgfx/SConscript b/src/gallium/targets/xorg-vmwgfx/SConscript
index f9172aa..099d49c 100644
--- a/src/gallium/targets/xorg-vmwgfx/SConscript
+++ b/src/gallium/targets/xorg-vmwgfx/SConscript
@@ -40,7 +40,7 @@ env.Prepend(LIBS = [
st_xorg,
svgadrm,
svga,
- gallium,
+ gallium,
])
sources = [
diff --git a/src/gallium/winsys/svga/drm/SConscript b/src/gallium/winsys/svga/drm/SConscript
index 3ad4c72..b049ea6 100644
--- a/src/gallium/winsys/svga/drm/SConscript
+++ b/src/gallium/winsys/svga/drm/SConscript
@@ -5,37 +5,37 @@ env = env.Clone()
env.ParseConfig('pkg-config --cflags libdrm')
if env['gcc']:
- env.Append(CCFLAGS = ['-fvisibility=hidden'])
- env.Append(CPPDEFINES = [
- 'HAVE_STDINT_H',
- 'HAVE_SYS_TYPES_H',
- '-D_FILE_OFFSET_BITS=64',
- ])
-
+ env.Append(CCFLAGS = ['-fvisibility=hidden'])
+ env.Append(CPPDEFINES = [
+ 'HAVE_STDINT_H',
+ 'HAVE_SYS_TYPES_H',
+ '-D_FILE_OFFSET_BITS=64',
+ ])
+
env.Prepend(CPPPATH = [
- 'include',
- '#/src/gallium/drivers/svga',
- '#/src/gallium/drivers/svga/include',
+ 'include',
+ '#/src/gallium/drivers/svga',
+ '#/src/gallium/drivers/svga/include',
])
env.Append(CPPDEFINES = [
])
sources = [
- 'vmw_buffer.c',
- 'vmw_context.c',
- 'vmw_fence.c',
- 'vmw_screen.c',
- 'vmw_screen_dri.c',
- 'vmw_screen_ioctl.c',
- 'vmw_screen_pools.c',
- 'vmw_screen_svga.c',
- 'vmw_surface.c',
+ 'vmw_buffer.c',
+ 'vmw_context.c',
+ 'vmw_fence.c',
+ 'vmw_screen.c',
+ 'vmw_screen_dri.c',
+ 'vmw_screen_ioctl.c',
+ 'vmw_screen_pools.c',
+ 'vmw_screen_svga.c',
+ 'vmw_surface.c',
]
svgadrm = env.ConvenienceLibrary(
- target = 'svgadrm',
- source = sources,
+ target = 'svgadrm',
+ source = sources,
)
Export('svgadrm')
More information about the mesa-commit
mailing list