scons: Aggregate all tiny libraries in a single library.

Makes integration of gallium into out of tree components much easier. No
pratical change for components in this tree,

diff --git a/src/gallium/SConscript b/src/gallium/SConscript
index 8be84cddbe727df6187556b9fdda6a12bb31633c..eea32b1314b1a28e4b906095a17c5f7bb14550a5 100644 (file)
--- a/src/gallium/SConscript
+++ b/src/gallium/SConscript
@@ -2,29 +2,7 @@ import os
 
 Import('*')
 
-env = env.Clone()
-
-auxiliaries = []
-
-Export('auxiliaries')
-
-
-if llvm:
-       SConscript(['auxiliary/gallivm/SConscript'])
-
-SConscript([
-       # NOTE: order matters!
-       'auxiliary/util/SConscript',
-       'auxiliary/rtasm/SConscript',
-       'auxiliary/tgsi/SConscript',
-       'auxiliary/cso_cache/SConscript',
-       'auxiliary/translate/SConscript',
-       'auxiliary/draw/SConscript',
-       'auxiliary/pipebuffer/SConscript',
-       'auxiliary/indices/SConscript',
-       'auxiliary/rbug/SConscript',
-       'auxiliary/vl/SConscript',
-])
+SConscript('auxiliary/SConscript')
 
 for driver in env['drivers']:
        SConscript(os.path.join('drivers', driver, 'SConscript'))

diff --git a/src/gallium/auxiliary/SConscript b/src/gallium/auxiliary/SConscript
new file mode 100644 (file)
index 0000000..782eb53
--- /dev/null
+++ b/src/gallium/auxiliary/SConscript
@@ -0,0 +1,185 @@
+Import('*')
+
+from sys import executable as python_cmd
+
+env.Append(CPPPATH = [
+    'indices',
+    'util',
+])
+
+env.CodeGenerate(
+    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', 
+    source = [],
+    command = python_cmd + ' $SCRIPT > $TARGET'
+)
+
+env.CodeGenerate(
+    target = 'util/u_format_table.c',
+    script = 'util/u_format_table.py',
+    source = ['util/u_format.csv'],
+    command = 'python $SCRIPT $SOURCE > $TARGET'
+)
+
+env.CodeGenerate(
+    target = 'util/u_format_access.c',
+    script = 'util/u_format_access.py',
+    source = ['util/u_format.csv'],
+    command = 'python $SCRIPT $SOURCE > $TARGET'
+)
+
+source = [
+    'cso_cache/cso_context.c',
+    'cso_cache/cso_cache.c',
+    'cso_cache/cso_hash.c',
+    'draw/draw_context.c',
+    'draw/draw_pipe.c',
+    'draw/draw_pipe_aaline.c',
+    'draw/draw_pipe_aapoint.c',
+    'draw/draw_pipe_clip.c',
+    'draw/draw_pipe_cull.c',
+    'draw/draw_pipe_flatshade.c',
+    'draw/draw_pipe_offset.c',
+    'draw/draw_pipe_pstipple.c',
+    'draw/draw_pipe_stipple.c',
+    'draw/draw_pipe_twoside.c',
+    'draw/draw_pipe_unfilled.c',
+    'draw/draw_pipe_util.c',
+    'draw/draw_pipe_validate.c',
+    'draw/draw_pipe_vbuf.c',
+    'draw/draw_pipe_wide_line.c',
+    'draw/draw_pipe_wide_point.c',
+    'draw/draw_pt.c',
+    'draw/draw_pt_elts.c',
+    'draw/draw_pt_emit.c',
+    'draw/draw_pt_fetch.c',
+    'draw/draw_pt_fetch_emit.c',
+    'draw/draw_pt_fetch_shade_emit.c',
+    'draw/draw_pt_fetch_shade_pipeline.c',
+    'draw/draw_pt_post_vs.c',
+    'draw/draw_pt_util.c',
+    'draw/draw_pt_varray.c',
+    'draw/draw_pt_vcache.c',
+    'draw/draw_vertex.c',
+    'draw/draw_vs.c',
+    'draw/draw_vs_aos.c',
+    'draw/draw_vs_aos_io.c',
+    'draw/draw_vs_aos_machine.c',
+    'draw/draw_vs_exec.c',
+    'draw/draw_vs_llvm.c',
+    'draw/draw_vs_ppc.c',
+    'draw/draw_vs_sse.c',
+    'draw/draw_vs_varient.c',
+    'draw/draw_gs.c',
+    #'indices/u_indices.c',
+    #'indices/u_unfilled_indices.c',
+    'indices/u_indices_gen.c',
+    'indices/u_unfilled_gen.c',
+    'pipebuffer/pb_buffer_fenced.c',
+    'pipebuffer/pb_buffer_malloc.c',
+    'pipebuffer/pb_bufmgr_alt.c',
+    'pipebuffer/pb_bufmgr_cache.c',
+    'pipebuffer/pb_bufmgr_debug.c',
+    'pipebuffer/pb_bufmgr_fenced.c',
+    'pipebuffer/pb_bufmgr_mm.c',
+    'pipebuffer/pb_bufmgr_ondemand.c',
+    'pipebuffer/pb_bufmgr_pool.c',
+    'pipebuffer/pb_bufmgr_slab.c',
+    'pipebuffer/pb_validate.c',
+    'rbug/rbug_core.c',
+    'rbug/rbug_shader.c',
+    'rbug/rbug_context.c',
+    'rbug/rbug_texture.c',
+    'rbug/rbug_demarshal.c',
+    'rbug/rbug_connection.c',
+    'rtasm/rtasm_cpu.c',
+    'rtasm/rtasm_execmem.c',
+    'rtasm/rtasm_x86sse.c',
+    'rtasm/rtasm_ppc.c',
+    'rtasm/rtasm_ppc_spe.c',
+    'tgsi/tgsi_build.c',
+    'tgsi/tgsi_dump.c',
+    'tgsi/tgsi_dump_c.c',
+    'tgsi/tgsi_exec.c',
+    'tgsi/tgsi_info.c',
+    'tgsi/tgsi_iterate.c',
+    'tgsi/tgsi_parse.c',
+    'tgsi/tgsi_sanity.c',
+    'tgsi/tgsi_scan.c',
+    'tgsi/tgsi_ppc.c',
+    'tgsi/tgsi_sse2.c',
+    'tgsi/tgsi_text.c',
+    'tgsi/tgsi_transform.c',
+    'tgsi/tgsi_ureg.c',
+    'tgsi/tgsi_util.c',
+    'translate/translate_generic.c',
+    'translate/translate_sse.c',
+    'translate/translate.c',
+    'translate/translate_cache.c',
+    'util/u_bitmask.c',
+    'util/u_blit.c',
+    'util/u_blitter.c',
+    'util/u_cache.c',
+    'util/u_cpu_detect.c',
+    'util/u_debug.c',
+    'util/u_debug_dump.c',
+    'util/u_debug_memory.c',
+    'util/u_debug_stack.c',
+    'util/u_debug_symbol.c',
+    'util/u_dl.c',
+    'util/u_draw_quad.c',
+    'util/u_format.c',
+    'util/u_format_access.c',
+    'util/u_format_table.c',
+    'util/u_gen_mipmap.c',
+    'util/u_handle_table.c',
+    'util/u_hash.c',
+    'util/u_hash_table.c',
+    'util/u_keymap.c',
+    'util/u_network.c',
+    'util/u_math.c',
+    'util/u_mm.c',
+    'util/u_rect.c',
+    'util/u_simple_shaders.c',
+    'util/u_snprintf.c',
+    'util/u_stream_stdc.c',
+    'util/u_stream_wd.c',
+    'util/u_surface.c',
+    'util/u_texture.c',
+    'util/u_tile.c',
+    'util/u_time.c',
+    'util/u_timed_winsys.c',
+    'util/u_upload_mgr.c',
+    'util/u_simple_screen.c',
+    'vl/vl_bitstream_parser.c',
+    'vl/vl_mpeg12_mc_renderer.c',
+    'vl/vl_compositor.c',
+    'vl/vl_csc.c',
+    'vl/vl_shader_build.c',
+]
+
+if env['llvm']:
+    source += [
+        'gallivm/gallivm.cpp',
+        'gallivm/gallivm_cpu.cpp',
+        'gallivm/instructions.cpp',
+        'gallivm/loweringpass.cpp',
+        'gallivm/tgsitollvm.cpp',
+        'gallivm/storage.cpp',
+        'gallivm/storagesoa.cpp',
+        'gallivm/instructionssoa.cpp',
+    ]
+
+gallium = env.ConvenienceLibrary(
+    target = 'gallium',
+    source = source,
+)
+
+Export('gallium')

diff --git a/src/gallium/auxiliary/cso_cache/SConscript b/src/gallium/auxiliary/cso_cache/SConscript
deleted file mode 100644 (file)
index 651e68a..0000000
--- a/src/gallium/auxiliary/cso_cache/SConscript
+++ /dev/null
@@ -1,11 +0,0 @@
-Import('*')
-
-cso_cache = env.ConvenienceLibrary(
-       target = 'cso_cache',
-       source = [
-               'cso_context.c',
-               'cso_cache.c',
-               'cso_hash.c',
-       ])
-
-auxiliaries.insert(0, cso_cache)

diff --git a/src/gallium/auxiliary/draw/SConscript b/src/gallium/auxiliary/draw/SConscript
deleted file mode 100644 (file)
index a022c14..0000000
--- a/src/gallium/auxiliary/draw/SConscript
+++ /dev/null
@@ -1,47 +0,0 @@
-Import('*')
-
-draw = env.ConvenienceLibrary(
-       target = 'draw',
-       source = [
-               'draw_context.c',
-               'draw_pipe.c',
-               'draw_pipe_aaline.c',
-               'draw_pipe_aapoint.c',
-               'draw_pipe_clip.c',
-               'draw_pipe_cull.c',
-               'draw_pipe_flatshade.c',
-               'draw_pipe_offset.c',
-               'draw_pipe_pstipple.c',
-               'draw_pipe_stipple.c',
-               'draw_pipe_twoside.c',
-               'draw_pipe_unfilled.c',
-               'draw_pipe_util.c',
-               'draw_pipe_validate.c',
-               'draw_pipe_vbuf.c',
-               'draw_pipe_wide_line.c',
-               'draw_pipe_wide_point.c',
-               'draw_pt.c',
-               'draw_pt_elts.c',
-               'draw_pt_emit.c',
-               'draw_pt_fetch.c',
-               'draw_pt_fetch_emit.c',
-               'draw_pt_fetch_shade_emit.c',
-               'draw_pt_fetch_shade_pipeline.c',
-               'draw_pt_post_vs.c',
-               'draw_pt_util.c',
-               'draw_pt_varray.c',
-               'draw_pt_vcache.c',
-               'draw_vertex.c',
-               'draw_vs.c',
-               'draw_vs_aos.c',
-               'draw_vs_aos_io.c',
-               'draw_vs_aos_machine.c',
-               'draw_vs_exec.c',
-               'draw_vs_llvm.c',
-               'draw_vs_ppc.c',
-               'draw_vs_sse.c',
-               'draw_vs_varient.c',
-                'draw_gs.c'
-       ])
-
-auxiliaries.insert(0, draw)

diff --git a/src/gallium/auxiliary/gallivm/SConscript b/src/gallium/auxiliary/gallivm/SConscript
deleted file mode 100644 (file)
index c0aa51b..0000000
--- a/src/gallium/auxiliary/gallivm/SConscript
+++ /dev/null
@@ -1,16 +0,0 @@
-Import('*')
-
-gallivm = env.ConvenienceLibrary(
-       target = 'gallivm',
-       source = [
-        'gallivm.cpp',
-        'gallivm_cpu.cpp',
-        'instructions.cpp',
-        'loweringpass.cpp',
-        'tgsitollvm.cpp',
-        'storage.cpp',
-        'storagesoa.cpp',
-        'instructionssoa.cpp',
-       ])
-
-auxiliaries.insert(0, gallivm)

diff --git a/src/gallium/auxiliary/indices/SConscript b/src/gallium/auxiliary/indices/SConscript
deleted file mode 100644 (file)
index 712e215..0000000
--- a/src/gallium/auxiliary/indices/SConscript
+++ /dev/null
@@ -1,28 +0,0 @@
-Import('*')
-
-from sys import executable as python_cmd
-
-env.CodeGenerate(
-       target = 'u_indices_gen.c', 
-       script = 'u_indices_gen.py', 
-       source = [],
-       command = python_cmd + ' $SCRIPT > $TARGET'
-)
-
-env.CodeGenerate(
-       target = 'u_unfilled_gen.c', 
-       script = 'u_unfilled_gen.py', 
-       source = [],
-       command = python_cmd + ' $SCRIPT > $TARGET'
-)
-
-indices = env.ConvenienceLibrary(
-       target = 'indices',
-       source = [
-#               'u_indices.c',
-#               'u_unfilled_indices.c',
-               'u_indices_gen.c',
-               'u_unfilled_gen.c',
-       ])
-
-auxiliaries.insert(0, indices)

diff --git a/src/gallium/auxiliary/pipebuffer/SConscript b/src/gallium/auxiliary/pipebuffer/SConscript
deleted file mode 100644 (file)
index 8e9f06a..0000000
--- a/src/gallium/auxiliary/pipebuffer/SConscript
+++ /dev/null
@@ -1,19 +0,0 @@
-Import('*')
-
-pipebuffer = env.ConvenienceLibrary(
-       target = 'pipebuffer',
-       source = [
-               'pb_buffer_fenced.c',
-               'pb_buffer_malloc.c',
-               'pb_bufmgr_alt.c',
-               'pb_bufmgr_cache.c',
-               'pb_bufmgr_debug.c',
-               'pb_bufmgr_fenced.c',
-               'pb_bufmgr_mm.c',
-               'pb_bufmgr_ondemand.c',
-               'pb_bufmgr_pool.c',
-               'pb_bufmgr_slab.c',
-               'pb_validate.c',
-       ])
-
-auxiliaries.insert(0, pipebuffer)

diff --git a/src/gallium/auxiliary/rbug/SConscript b/src/gallium/auxiliary/rbug/SConscript
deleted file mode 100644 (file)
index 4a9afb4..0000000
--- a/src/gallium/auxiliary/rbug/SConscript
+++ /dev/null
@@ -1,14 +0,0 @@
-Import('*')
-
-rbug = env.ConvenienceLibrary(
-       target = 'rbug',
-       source = [
-               'rbug_core.c',
-               'rbug_shader.c',
-               'rbug_context.c',
-               'rbug_texture.c',
-               'rbug_demarshal.c',
-               'rbug_connection.c',
-       ])
-
-auxiliaries.insert(0, rbug)

diff --git a/src/gallium/auxiliary/rtasm/SConscript b/src/gallium/auxiliary/rtasm/SConscript
deleted file mode 100644 (file)
index eb48368..0000000
--- a/src/gallium/auxiliary/rtasm/SConscript
+++ /dev/null
@@ -1,13 +0,0 @@
-Import('*')
-
-rtasm = env.ConvenienceLibrary(
-       target = 'rtasm',
-       source = [
-               'rtasm_cpu.c',
-               'rtasm_execmem.c',
-               'rtasm_x86sse.c',
-               'rtasm_ppc.c',
-               'rtasm_ppc_spe.c',
-       ])
-
-auxiliaries.insert(0, rtasm)

diff --git a/src/gallium/auxiliary/tgsi/SConscript b/src/gallium/auxiliary/tgsi/SConscript
deleted file mode 100644 (file)
index b6bc292..0000000
--- a/src/gallium/auxiliary/tgsi/SConscript
+++ /dev/null
@@ -1,23 +0,0 @@
-Import('*')
-
-tgsi = env.ConvenienceLibrary(
-       target = 'tgsi',
-       source = [
-               'tgsi_build.c',
-               'tgsi_dump.c',
-               'tgsi_dump_c.c',
-               'tgsi_exec.c',
-               'tgsi_info.c',
-               'tgsi_iterate.c',
-               'tgsi_parse.c',
-               'tgsi_sanity.c',
-               'tgsi_scan.c',
-               'tgsi_ppc.c',
-               'tgsi_sse2.c',
-               'tgsi_text.c',
-               'tgsi_transform.c',
-               'tgsi_ureg.c',
-               'tgsi_util.c',
-       ])
-
-auxiliaries.insert(0, tgsi)

diff --git a/src/gallium/auxiliary/translate/SConscript b/src/gallium/auxiliary/translate/SConscript
deleted file mode 100644 (file)
index 9553a67..0000000
--- a/src/gallium/auxiliary/translate/SConscript
+++ /dev/null
@@ -1,12 +0,0 @@
-Import('*')
-
-translate = env.ConvenienceLibrary(
-       target = 'translate',
-       source = [
-               'translate_generic.c',
-               'translate_sse.c',
-               'translate.c',
-               'translate_cache.c',
-       ])
-
-auxiliaries.insert(0, translate)

diff --git a/src/gallium/auxiliary/util/SConscript b/src/gallium/auxiliary/util/SConscript
deleted file mode 100644 (file)
index 2a546d1..0000000
--- a/src/gallium/auxiliary/util/SConscript
+++ /dev/null
@@ -1,61 +0,0 @@
-Import('*')
-
-env.Clone()
-
-env.Append(CPPPATH = ['.'])
-
-env.CodeGenerate(
-       target = 'u_format_table.c',
-       script = 'u_format_table.py',
-       source = ['u_format.csv'],
-       command = 'python $SCRIPT $SOURCE > $TARGET'
-)
-
-env.CodeGenerate(
-       target = 'u_format_access.c',
-       script = 'u_format_access.py',
-       source = ['u_format.csv'],
-       command = 'python $SCRIPT $SOURCE > $TARGET'
-)
-
-util = env.ConvenienceLibrary(
-       target = 'util',
-       source = [
-               'u_bitmask.c',
-               'u_blit.c',
-               'u_blitter.c',
-               'u_cache.c',
-               'u_cpu_detect.c',
-               'u_debug.c',
-               'u_debug_dump.c',
-               'u_debug_memory.c',
-               'u_debug_stack.c',
-               'u_debug_symbol.c',
-               'u_dl.c',
-               'u_draw_quad.c',
-               'u_format.c',
-               'u_format_access.c',
-               'u_format_table.c',
-               'u_gen_mipmap.c',
-               'u_handle_table.c',
-               'u_hash.c',
-               'u_hash_table.c',
-               'u_keymap.c',
-               'u_network.c',
-               'u_math.c',
-               'u_mm.c',
-               'u_rect.c',
-               'u_simple_shaders.c',
-               'u_snprintf.c',
-               'u_stream_stdc.c',
-               'u_stream_wd.c',
-               'u_surface.c',
-               'u_texture.c',
-               'u_tile.c',
-               'u_time.c',
-               'u_timed_winsys.c',
-               'u_upload_mgr.c',
-               'u_simple_screen.c',
-       ])
-
-auxiliaries.insert(0, util)

diff --git a/src/gallium/auxiliary/vl/SConscript b/src/gallium/auxiliary/vl/SConscript
deleted file mode 100644 (file)
index aed69f5..0000000
--- a/src/gallium/auxiliary/vl/SConscript
+++ /dev/null
@@ -1,13 +0,0 @@
-Import('*')
-
-vl = env.ConvenienceLibrary(
-       target = 'vl',
-       source = [
-               'vl_bitstream_parser.c',
-               'vl_mpeg12_mc_renderer.c',
-               'vl_compositor.c',
-                'vl_csc.c',
-               'vl_shader_build.c',
-       ])
-
-auxiliaries.insert(0, vl)

diff --git a/src/gallium/drivers/llvmpipe/SConscript b/src/gallium/drivers/llvmpipe/SConscript
index de6156795d391dd3eab651e2d2a4d2e2556599a2..78331b44fc9f8a9f12a12d651806c463fee82047 100644 (file)
--- a/src/gallium/drivers/llvmpipe/SConscript
+++ b/src/gallium/drivers/llvmpipe/SConscript
@@ -74,7 +74,7 @@ llvmpipe = env.ConvenienceLibrary(
 
 env = env.Clone()
 
-env.Prepend(LIBS = [llvmpipe] + auxiliaries)
+env.Prepend(LIBS = [llvmpipe] + gallium)
 
 tests = [
     'format',

diff --git a/src/gallium/state_trackers/python/SConscript b/src/gallium/state_trackers/python/SConscript
index ec385e7c447f841672f927a88567561c5f6e6923..4fcaf34d576b99d62acaf8730131f4ef14e359e8 100644 (file)
--- a/src/gallium/state_trackers/python/SConscript
+++ b/src/gallium/state_trackers/python/SConscript
@@ -43,5 +43,5 @@ if 'python' in env['statetrackers']:
         source = [
             'st_hardpipe_winsys.c',
         ],
-        LIBS = [pyst, softpipe, trace] + auxiliaries + env['LIBS'],
+        LIBS = [pyst, softpipe, trace] + gallium + env['LIBS'],
     )

diff --git a/src/gallium/winsys/drm/i965/dri/SConscript b/src/gallium/winsys/drm/i965/dri/SConscript
index 233ef464be5494b60fd0e568392cd78417ced51c..a99533fd2452ed19ee34339376358e60dae9486d 100644 (file)
--- a/src/gallium/winsys/drm/i965/dri/SConscript
+++ b/src/gallium/winsys/drm/i965/dri/SConscript
@@ -14,6 +14,6 @@ drivers = [
 env.LoadableModule(
     target ='i965_dri.so',
     source = COMMON_GALLIUM_SOURCES,
-    LIBS = drivers + mesa + auxiliaries + env['LIBS'],
+    LIBS = drivers + mesa + gallium + env['LIBS'],
     SHLIBPREFIX = '',
 )

diff --git a/src/gallium/winsys/drm/intel/dri/SConscript b/src/gallium/winsys/drm/intel/dri/SConscript
index b1b654d9f8b0ee0148a3b7a58d971aee757daa12..104e987083f4b290850a31652c8f494f6afbed4d 100644 (file)
--- a/src/gallium/winsys/drm/intel/dri/SConscript
+++ b/src/gallium/winsys/drm/intel/dri/SConscript
@@ -15,6 +15,6 @@ drivers = [
 env.LoadableModule(
     target ='i915_dri.so',
     source = COMMON_GALLIUM_SOURCES,
-    LIBS = drivers + mesa + auxiliaries + env['LIBS'],
+    LIBS = drivers + mesa + gallium + env['LIBS'],
     SHLIBPREFIX = '',
 )

diff --git a/src/gallium/winsys/drm/radeon/dri/SConscript b/src/gallium/winsys/drm/radeon/dri/SConscript
index aea987a3acaf4310d5ac9078bdffd167a686253c..c4989d1b595e1f252abd8efcfbdc104d6f203592 100644 (file)
--- a/src/gallium/winsys/drm/radeon/dri/SConscript
+++ b/src/gallium/winsys/drm/radeon/dri/SConscript
@@ -13,5 +13,5 @@ drivers = [
 env.SharedLibrary(
     target ='radeon_dri.so',
     source = COMMON_GALLIUM_SOURCES,
-    LIBS = st_dri + radeonwinsys + mesa + drivers + auxiliaries + env['LIBS'],
+    LIBS = st_dri + radeonwinsys + mesa + drivers + gallium + env['LIBS'],
 )

diff --git a/src/gallium/winsys/drm/radeon/python/SConscript b/src/gallium/winsys/drm/radeon/python/SConscript
index 3200fd8d1b065165cb0410419aa3f794a0d413f9..91cae986975715a525eaa64664880ccfeb2ac2ef 100644 (file)
--- a/src/gallium/winsys/drm/radeon/python/SConscript
+++ b/src/gallium/winsys/drm/radeon/python/SConscript
@@ -29,5 +29,5 @@ if env['platform'] == 'linux':
     env.SharedLibrary(
         target ='_gallium',
         source = sources,
-        LIBS = [pyst] + drivers + auxiliaries + env['LIBS'],
+        LIBS = [pyst] + drivers + gallium + env['LIBS'],
     )

diff --git a/src/gallium/winsys/drm/vmware/dri/SConscript b/src/gallium/winsys/drm/vmware/dri/SConscript
index 1019f577a5fc3752324523f08d62dea2974965c2..84319f91ff127e91f379a2ed77ef12276c98af14 100644 (file)
--- a/src/gallium/winsys/drm/vmware/dri/SConscript
+++ b/src/gallium/winsys/drm/vmware/dri/SConscript
@@ -48,7 +48,7 @@ if env['platform'] == 'linux':
             svgadrm,
             svga,
             mesa,
-            auxiliaries,
+            gallium,
             ])
       
       # TODO: write a wrapper function http://www.scons.org/wiki/WrapperFunctions

diff --git a/src/gallium/winsys/drm/vmware/xorg/SConscript b/src/gallium/winsys/drm/vmware/xorg/SConscript
index b8968e7137ba862673978c7af7444de8dd4830d9..f7ce400a7a52ea460f81dbf137a977bc33300c25 100644 (file)
--- a/src/gallium/winsys/drm/vmware/xorg/SConscript
+++ b/src/gallium/winsys/drm/vmware/xorg/SConscript
@@ -38,7 +38,7 @@ if env['platform'] == 'linux':
                st_xorg,
                svgadrm,
                svga,
-                auxiliaries,
+                gallium,
        ])
 
        sources = [

diff --git a/src/gallium/winsys/gdi/SConscript b/src/gallium/winsys/gdi/SConscript
index 74f6b2fd4751590c34ab53b578c0bc904843f149..bded865785becd3c8a364b25564946374b248828 100644 (file)
--- a/src/gallium/winsys/gdi/SConscript
+++ b/src/gallium/winsys/gdi/SConscript
@@ -45,5 +45,5 @@ if env['platform'] == 'windows':
     env.SharedLibrary(
         target ='opengl32',
         source = sources,
-        LIBS = wgl + glapi + mesa + drivers + auxiliaries + glsl + env['LIBS'],
+        LIBS = wgl + glapi + mesa + drivers + gallium + glsl + env['LIBS'],
     )

diff --git a/src/gallium/winsys/xlib/SConscript b/src/gallium/winsys/xlib/SConscript
index ccec2566b1c33320ea819c65d33f863cccd0479b..713841aeb1b6cb40e4450defa120b1152ab017a0 100644 (file)
--- a/src/gallium/winsys/xlib/SConscript
+++ b/src/gallium/winsys/xlib/SConscript
@@ -46,7 +46,7 @@ if env['platform'] == 'linux' \
     libgl = env.SharedLibrary(
         target ='GL',
         source = sources,
-        LIBS = st_xlib + glapi + mesa + glsl + drivers + auxiliaries + env['LIBS'],
+        LIBS = st_xlib + glapi + mesa + glsl + drivers + gallium + env['LIBS'],
     )
 
     env.InstallSharedLibrary(libgl, version=(1, 5))