scons: whitespace cleanup

This text transformation was done automatically via the following shell
command:

$ find -name SCons\* -exec sed -i s/\\s\\+$// '{}' \;

Signed-off-by: Giuseppe Bilotta <giuseppe.bilotta@gmail.com>
Reviewed-by: Brian Paul <brianp@vmware.com>

diff --git a/SConstruct b/SConstruct
index e2e49fcc6ca4aa93f75440517ed89f99cca6dab9..696718c8eb445341d714094c9f8c09a19fa35fa8 100644 (file)
--- a/SConstruct
+++ b/SConstruct
@@ -1,7 +1,7 @@
 #######################################################################
 # Top-level SConstruct
 #
-# For example, invoke scons as 
+# For example, invoke scons as
 #
 #   scons build=debug llvm=yes machine=x86
 #
@@ -12,13 +12,13 @@
 #   build='debug'
 #   llvm=True
 #   machine='x86'
-# 
+#
 # Invoke
 #
 #   scons -h
 #
 # to get the full list of options. See scons manpage for more info.
-#  
+#
 
 import os
 import os.path
@@ -36,7 +36,7 @@ common.AddOptions(opts)
 env = Environment(
        options = opts,
        tools = ['gallium'],
-       toolpath = ['#scons'],  
+       toolpath = ['#scons'],
        ENV = os.environ,
 )
 
@@ -53,7 +53,7 @@ else:
     print 'scons: warning: targets option is deprecated; pass the targets on their own such as'
     print
     print '  scons %s' % ' '.join(targets)
-    print 
+    print
     COMMAND_LINE_TARGETS.append(targets)
 
 
@@ -90,8 +90,8 @@ env.AlwaysBuild(check)
 
 
 #######################################################################
-# Invoke host SConscripts 
-# 
+# Invoke host SConscripts
+#
 # For things that are meant to be run on the native host build machine, instead
 # of the target machine.
 #

diff --git a/src/compiler/SConscript.glsl b/src/compiler/SConscript.glsl
index 43a11d105d459f436c28a446578c25097893c72b..73abaf13acf7690cc1d72264be16b6769d020bba 100644 (file)
--- a/src/compiler/SConscript.glsl
+++ b/src/compiler/SConscript.glsl
@@ -51,7 +51,7 @@ glsl_sources = [
     glcpp_parser[0],
     glsl_lexer,
     glsl_parser[0],
-] 
+]
 
 # parse Makefile.sources
 source_lists = env.ParseSourceList('Makefile.sources')

diff --git a/src/gallium/SConscript b/src/gallium/SConscript
index 0c3a3742c1615ad22d66bcfc84cd71997eb6d317..f98268f70cf9dffd41268793204641d8db359037 100644 (file)
--- a/src/gallium/SConscript
+++ b/src/gallium/SConscript
@@ -1,6 +1,6 @@
 Import('env')
 
-# 
+#
 # Auxiliary modules
 #
 

diff --git a/src/gallium/auxiliary/SConscript b/src/gallium/auxiliary/SConscript
index 3d83d4467b41ac33bb4b9a6b7d48ed360aaa97e5..bdd9a1beaa105e008159c3a7ad8d849f0f57ea45 100644 (file)
--- a/src/gallium/auxiliary/SConscript
+++ b/src/gallium/auxiliary/SConscript
@@ -13,15 +13,15 @@ env = env.Clone()
 env.MSVC2013Compat()
 
 env.CodeGenerate(
-    target = 'indices/u_indices_gen.c', 
-    script = 'indices/u_indices_gen.py', 
+    target = 'indices/u_indices_gen.c',
+    script = 'indices/u_indices_gen.py',
     source = [],
     command = python_cmd + ' $SCRIPT > $TARGET'
 )
 
 env.CodeGenerate(
-    target = 'indices/u_unfilled_gen.c', 
-    script = 'indices/u_unfilled_gen.py', 
+    target = 'indices/u_unfilled_gen.c',
+    script = 'indices/u_unfilled_gen.py',
     source = [],
     command = python_cmd + ' $SCRIPT > $TARGET'
 )
@@ -35,7 +35,7 @@ env.CodeGenerate(
 
 env.Depends('util/u_format_table.c', [
     '#src/gallium/auxiliary/util/u_format_parse.py',
-    'util/u_format_pack.py', 
+    'util/u_format_pack.py',
 ])
 
 source = env.ParseSourceList('Makefile.sources', [

diff --git a/src/gallium/drivers/svga/SConscript b/src/gallium/drivers/svga/SConscript
index aee337fa8462f8abf51384a9fe30d510a992dc61..2d60ceb2be5f7584b3453c2998c0a665bd1c5ca8 100644 (file)
--- a/src/gallium/drivers/svga/SConscript
+++ b/src/gallium/drivers/svga/SConscript
@@ -11,7 +11,7 @@ if env['suncc']:
 env.Append(CPPDEFINES = [
        'HAVE_STDINT_H',
 ])
-       
+
 env.Prepend(CPPPATH = [
        'include',
 ])

diff --git a/src/gallium/state_trackers/wgl/SConscript b/src/gallium/state_trackers/wgl/SConscript
index 6c604a0f204fbc9c383c078c203c4a0587d9bdf0..a7fbb07a89ad98f74463105f0a3e762bfa83f7fb 100644 (file)
--- a/src/gallium/state_trackers/wgl/SConscript
+++ b/src/gallium/state_trackers/wgl/SConscript
@@ -12,7 +12,7 @@ env.Append(CPPPATH = [
 
 env.AppendUnique(CPPDEFINES = [
     '_GDI32_', # prevent wgl* being declared __declspec(dllimport)
-    'BUILD_GL32', # declare gl* as __declspec(dllexport) in Mesa headers 
+    'BUILD_GL32', # declare gl* as __declspec(dllexport) in Mesa headers
     'WIN32_LEAN_AND_MEAN', # http://msdn2.microsoft.com/en-us/library/6dwk3a1z.aspx
 ])
 if not env['gles']:

diff --git a/src/gallium/targets/libgl-gdi/SConscript b/src/gallium/targets/libgl-gdi/SConscript
index 53284e57edb1fa16f78d265dcb52737d3854c36b..2a5236360ba7723453f4d16c6ffd3cf080b268ce 100644 (file)
--- a/src/gallium/targets/libgl-gdi/SConscript
+++ b/src/gallium/targets/libgl-gdi/SConscript
@@ -36,7 +36,7 @@ if env['gcc'] and env['machine'] != 'x86_64':
     sources += ['#src/gallium/state_trackers/wgl/opengl32.mingw.def']
 else:
     sources += ['#src/gallium/state_trackers/wgl/opengl32.def']
-    
+
 drivers += [trace, rbug]
 
 env['no_import_lib'] = 1

diff --git a/src/gallium/tests/graw/SConscript b/src/gallium/tests/graw/SConscript
index c5fa3fe5958da63797096d2a10b8561432fbed94..d9d480e8558b5613484a87c6f67308786e53b413 100644 (file)
--- a/src/gallium/tests/graw/SConscript
+++ b/src/gallium/tests/graw/SConscript
@@ -6,7 +6,7 @@ env.Prepend(LIBS = [mesautil, gallium])
 
 env.Prepend(LIBPATH = [graw.dir])
 env.Prepend(LIBS = ['graw'])
-    
+
 
 if env['platform'] in ('freebsd8', 'sunos'):
     env.Append(LIBS = ['m'])

diff --git a/src/glx/SConscript b/src/glx/SConscript
index 3bb846094cace1500e145138fb713d86ec2ff658..9727803d5a33ef886d2817b8e73843848e233327 100644 (file)
--- a/src/glx/SConscript
+++ b/src/glx/SConscript
@@ -109,14 +109,14 @@ env.CodeGenerate(
     )
 
 env.CodeGenerate(
-    target = 'indirect_size.c', 
+    target = 'indirect_size.c',
     script = GLAPI + 'gen/glX_proto_size.py',
     source = sources,
     command = python_cmd + ' $SCRIPT -f $SOURCE -m size_c --only-set > $TARGET'
 )
 
 env.CodeGenerate(
-    target = 'indirect_init.c', 
+    target = 'indirect_init.c',
     script = GLAPI + 'gen/glX_proto_send.py',
     source = sources,
     command = python_cmd + ' $SCRIPT -f $SOURCE -m init_c > $TARGET'

diff --git a/src/mapi/shared-glapi/SConscript b/src/mapi/shared-glapi/SConscript
index 26bfe7e95290c39f1f7c7ac769a7c33f395c9fad..fc51c3a02062dc33986e16ee2638bebb329bc85b 100644 (file)
--- a/src/mapi/shared-glapi/SConscript
+++ b/src/mapi/shared-glapi/SConscript
@@ -40,7 +40,7 @@ def mapi_objects(env, printer, mode):
         '#/src',
         '#/src/mapi',
     ]
-    
+
     cppdefines = mapi_defines[mode] + [
         'MAPI_ABI_HEADER=\\"%s\\"' % (header_name),
     ]