scons: Revamp how to specify targets to build.

Use scons target and dependency system instead of ad-hoc options.

Now is simply a matter of naming what to build. For example:

  scons libgl-xlib

  scons libgl-gdi

  scons graw-progs

  scons llvmpipe

and so on. And there is also the possibility of scepcified subdirs, e.g.

  scons src/gallium/drivers

If nothing is specified then everything will be build.

There might be some rough corners over the next days. Please bare with me.

1 files changed, 315 insertions, 314 deletions

diff --git a/src/mesa/SConscript b/src/mesa/SConscript
index e54737aed18..7550c6d5ed4 100644
--- a/src/mesa/SConscript
+++ b/src/mesa/SConscript
@@ -4,322 +4,323 @@
 
 Import('*')
 
-if env['platform'] != 'winddk':
+env = env.Clone()
 
-	env = env.Clone()
-	
-	env.Append(CPPPATH = [
-		'#/src/mapi',
-		'#/src/glsl',
-		'#/src/mesa',
-	])
-	
-	if env['platform'] == 'windows':
-		env.Append(CPPDEFINES = [
-			'_GDI32_', # prevent gl* being declared __declspec(dllimport) in MS headers
-			'BUILD_GL32', # declare gl* as __declspec(dllexport) in Mesa headers 
-			'WIN32_THREADS', # use Win32 thread API
-		])	 
-        env.Prepend(CPPPATH = ['#src/talloc'])
+env.Append(CPPPATH = [
+    '#/src/mapi',
+    '#/src/glsl',
+    '#/src/mesa',
+])
 
-	#
-	# Source files
-	#
-	
-	main_sources = [
-		'main/api_arrayelt.c',
-		'main/api_exec.c',
-		'main/api_loopback.c',
-		'main/api_noop.c',
-		'main/api_validate.c',
-		'main/accum.c',
-		'main/arbprogram.c',
-		'main/atifragshader.c',
-		'main/attrib.c',
-		'main/arrayobj.c',
-		'main/blend.c',
-		'main/bufferobj.c',
-		'main/buffers.c',
-		'main/clear.c',
-		'main/clip.c',
-		'main/colortab.c',
-		'main/condrender.c',
-		'main/context.c',
-		'main/convolve.c',
-		'main/cpuinfo.c',
-		'main/debug.c',
-		'main/depth.c',
-		'main/depthstencil.c',
-		'main/dlist.c',
-		'main/dlopen.c',
-		'main/drawpix.c',
-		'main/drawtex.c',
-		'main/enable.c',
-		'main/enums.c',
-		'main/eval.c',
-		'main/execmem.c',
-		'main/extensions.c',
-		'main/fbobject.c',
-		'main/feedback.c',
-		'main/ffvertex_prog.c',
-		'main/fog.c',
-		'main/formats.c',
-		'main/framebuffer.c',
-		'main/get.c',
-		'main/getstring.c',
-		'main/hash.c',
-		'main/hint.c',
-		'main/histogram.c',
-		'main/image.c',
-		'main/imports.c',
-		'main/light.c',
-		'main/lines.c',
-		'main/matrix.c',
-		'main/mipmap.c',
-		'main/mm.c',
-		'main/multisample.c',
-		'main/nvprogram.c',
-		'main/pack.c',
-		'main/pixel.c',
-		'main/pixelstore.c',
-		'main/pixeltransfer.c',
-		'main/points.c',
-		'main/polygon.c',
-		'main/querymatrix.c',
-		'main/queryobj.c',
-		'main/rastpos.c',
-		'main/readpix.c',
-		'main/remap.c',
-		'main/renderbuffer.c',
-		'main/scissor.c',
-		'main/shaderapi.c',
-		'main/shaderobj.c',
-		'main/shared.c',
-		'main/state.c',
-		'main/stencil.c',
-		'main/syncobj.c',
-		'main/texcompress.c',
-		'main/texcompress_s3tc.c',
-		'main/texcompress_fxt1.c',
-		'main/texenv.c',
-		'main/texenvprogram.c',
-		'main/texfetch.c',
-		'main/texformat.c',
-		'main/texgen.c',
-		'main/texgetimage.c',
-		'main/teximage.c',
-		'main/texobj.c',
-		'main/texpal.c',
-		'main/texparam.c',
-		'main/texrender.c',
-		'main/texstate.c',
-		'main/texstore.c',
-		'main/transformfeedback.c',
-		'main/uniforms.c',
-		'main/varray.c',
-		'main/version.c',
-		'main/viewport.c',
-		'main/vtxfmt.c',
-	]
-	
-	math_sources = [
-		'math/m_debug_clip.c',
-		'math/m_debug_norm.c',
-		'math/m_debug_xform.c',
-		'math/m_eval.c',
-		'math/m_matrix.c',
-		'math/m_translate.c',
-		'math/m_vector.c',
-		'math/m_xform.c',
-	]
-	
-	vbo_sources = [
-		'vbo/vbo_context.c',
-		'vbo/vbo_exec.c',
-		'vbo/vbo_exec_api.c',
-		'vbo/vbo_exec_array.c',
-		'vbo/vbo_exec_draw.c',
-		'vbo/vbo_exec_eval.c',
-		'vbo/vbo_rebase.c',
-		'vbo/vbo_split.c',
-		'vbo/vbo_split_copy.c',
-		'vbo/vbo_split_inplace.c',
-		'vbo/vbo_save.c',
-		'vbo/vbo_save_api.c',
-		'vbo/vbo_save_draw.c',
-		'vbo/vbo_save_loopback.c',
-	]
-	
-	vf_sources = [
-		'vf/vf.c',
-		'vf/vf_generic.c',
-		'vf/vf_sse.c',
-	]
-	
-	statetracker_sources = [
-		'state_tracker/st_atom.c',
-		'state_tracker/st_atom_blend.c',
-		'state_tracker/st_atom_clip.c',
-		'state_tracker/st_atom_constbuf.c',
-		'state_tracker/st_atom_depth.c',
-		'state_tracker/st_atom_framebuffer.c',
-		'state_tracker/st_atom_msaa.c',
-		'state_tracker/st_atom_pixeltransfer.c',
-		'state_tracker/st_atom_sampler.c',
-		'state_tracker/st_atom_scissor.c',
-		'state_tracker/st_atom_shader.c',
-		'state_tracker/st_atom_rasterizer.c',
-		'state_tracker/st_atom_stipple.c',
-		'state_tracker/st_atom_texture.c',
-		'state_tracker/st_atom_viewport.c',
-		'state_tracker/st_cb_accum.c',
-		'state_tracker/st_cb_bitmap.c',
-		'state_tracker/st_cb_blit.c',
-		'state_tracker/st_cb_bufferobjects.c',
-		'state_tracker/st_cb_clear.c',
-		'state_tracker/st_cb_condrender.c',
-		'state_tracker/st_cb_flush.c',
-		'state_tracker/st_cb_drawpixels.c',
-		'state_tracker/st_cb_drawtex.c',
-		'state_tracker/st_cb_eglimage.c',
-		'state_tracker/st_cb_fbo.c',
-		'state_tracker/st_cb_feedback.c',
-		'state_tracker/st_cb_program.c',
-		'state_tracker/st_cb_queryobj.c',
-		'state_tracker/st_cb_rasterpos.c',
-		'state_tracker/st_cb_readpixels.c',
-		'state_tracker/st_cb_strings.c',
-		'state_tracker/st_cb_texture.c',
-		'state_tracker/st_cb_viewport.c',
-		'state_tracker/st_cb_xformfb.c',
-		'state_tracker/st_context.c',
-		'state_tracker/st_debug.c',
-		'state_tracker/st_draw.c',
-		'state_tracker/st_draw_feedback.c',
-		'state_tracker/st_extensions.c',
-		'state_tracker/st_format.c',
-		'state_tracker/st_gen_mipmap.c',
-		'state_tracker/st_manager.c',
-		'state_tracker/st_mesa_to_tgsi.c',
-		'state_tracker/st_program.c',
-		'state_tracker/st_texture.c',
-	]
-	
-	program_sources = [
-		'program/arbprogparse.c',
-		'program/hash_table.c',
-        'program/ir_to_mesa.cpp',
-		'program/lex.yy.c',
-		'program/nvfragparse.c',
-		'program/nvvertparse.c',
-		'program/program.c',
-		'program/program_parse.tab.c',
-		'program/program_parse_extra.c',
-		'program/prog_cache.c',
-		'program/prog_execute.c',
-		'program/prog_instruction.c',
-		'program/prog_noise.c',
-		'program/prog_optimize.c',
-		'program/prog_parameter.c',
-		'program/prog_parameter_layout.c',
-		'program/prog_print.c',
-		'program/prog_statevars.c',
-		'program/prog_uniform.c',
-		'program/programopt.c',
-		'program/sampler.cpp',
-		'program/symbol_table.c',
-	]
-	
-	mesa_sources = (
-		main_sources +
-		math_sources +
-		program_sources +
-		vbo_sources +
-		vf_sources +
-		statetracker_sources
-	)
+if env['platform'] == 'windows':
+    env.Append(CPPDEFINES = [
+        '_GDI32_', # prevent gl* being declared __declspec(dllimport) in MS headers
+        'BUILD_GL32', # declare gl* as __declspec(dllexport) in Mesa headers
+        'WIN32_THREADS', # use Win32 thread API
+    ])
+    env.Prepend(CPPPATH = ['#src/talloc'])
 
-	#
-	# Assembly sources
-	#
-	if gcc and env['machine'] == 'x86':
-		env.Append(CPPDEFINES = [
-			'USE_X86_ASM', 
-			'USE_MMX_ASM',
-			'USE_3DNOW_ASM',
-			'USE_SSE_ASM',
-		])
-		mesa_sources += [
-			'x86/common_x86.c',
-			'x86/x86_xform.c',
-			'x86/3dnow.c',
-			'x86/sse.c',
-			'x86/common_x86_asm.S',
-			'x86/x86_xform2.S',
-			'x86/x86_xform3.S',
-			'x86/x86_xform4.S',
-			'x86/x86_cliptest.S',
-			'x86/mmx_blend.S',
-			'x86/3dnow_xform1.S',
-			'x86/3dnow_xform2.S',
-			'x86/3dnow_xform3.S',
-			'x86/3dnow_xform4.S',
-			'x86/3dnow_normal.S',
-			'x86/sse_xform1.S',
-			'x86/sse_xform2.S',
-			'x86/sse_xform3.S',
-			'x86/sse_xform4.S',
-			'x86/sse_normal.S',
-			'x86/read_rgba_span_x86.S',
-		]
-	elif gcc and env['machine'] == 'x86_64':
-		env.Append(CPPDEFINES = [
-			'USE_X86_64_ASM', 
-		])
-		mesa_sources += [
-			'x86-64/x86-64.c',
-			'x86-64/xform4.S',
-		]
-	elif gcc and env['machine'] == 'ppc':
-		env.Append(CPPDEFINES = [
-			'USE_PPC_ASM', 
-			'USE_VMX_ASM', 
-		])
-		mesa_sources += [
-			'ppc/common_ppc.c',
-		]
-	elif gcc and env['machine'] == 'sparc':
-		mesa_sources += [
-			'sparc/sparc.c',
-			'sparc/clip.S',
-			'sparc/norm.S',
-			'sparc/xform.S',
-		]
-	else:
-		pass
-	
-	# Generate matypes.h
-	if gcc and env['machine'] in ('x86', 'x86_64'):
-		# See http://www.scons.org/wiki/UsingCodeGenerators
-		gen_matypes = env.Program(
-			target = 'gen_matypes',
-			source = 'x86/gen_matypes.c',
-		)
-		matypes = env.Command(
-			'matypes.h',
-			gen_matypes,
-			gen_matypes[0].abspath + ' > $TARGET',
-		)
-		# Add the dir containing the generated header (somewhere inside  the
-		# build dir) to the include path  
-		env.Append(CPPPATH = [matypes[0].dir])
+#
+# Source files
+#
 
-	#
-	# Libraries
-	# 
+main_sources = [
+    'main/api_arrayelt.c',
+    'main/api_exec.c',
+    'main/api_loopback.c',
+    'main/api_noop.c',
+    'main/api_validate.c',
+    'main/accum.c',
+    'main/arbprogram.c',
+    'main/atifragshader.c',
+    'main/attrib.c',
+    'main/arrayobj.c',
+    'main/blend.c',
+    'main/bufferobj.c',
+    'main/buffers.c',
+    'main/clear.c',
+    'main/clip.c',
+    'main/colortab.c',
+    'main/condrender.c',
+    'main/context.c',
+    'main/convolve.c',
+    'main/cpuinfo.c',
+    'main/debug.c',
+    'main/depth.c',
+    'main/depthstencil.c',
+    'main/dlist.c',
+    'main/dlopen.c',
+    'main/drawpix.c',
+    'main/drawtex.c',
+    'main/enable.c',
+    'main/enums.c',
+    'main/eval.c',
+    'main/execmem.c',
+    'main/extensions.c',
+    'main/fbobject.c',
+    'main/feedback.c',
+    'main/ffvertex_prog.c',
+    'main/fog.c',
+    'main/formats.c',
+    'main/framebuffer.c',
+    'main/get.c',
+    'main/getstring.c',
+    'main/hash.c',
+    'main/hint.c',
+    'main/histogram.c',
+    'main/image.c',
+    'main/imports.c',
+    'main/light.c',
+    'main/lines.c',
+    'main/matrix.c',
+    'main/mipmap.c',
+    'main/mm.c',
+    'main/multisample.c',
+    'main/nvprogram.c',
+    'main/pack.c',
+    'main/pixel.c',
+    'main/pixelstore.c',
+    'main/pixeltransfer.c',
+    'main/points.c',
+    'main/polygon.c',
+    'main/querymatrix.c',
+    'main/queryobj.c',
+    'main/rastpos.c',
+    'main/readpix.c',
+    'main/remap.c',
+    'main/renderbuffer.c',
+    'main/scissor.c',
+    'main/shaderapi.c',
+    'main/shaderobj.c',
+    'main/shared.c',
+    'main/state.c',
+    'main/stencil.c',
+    'main/syncobj.c',
+    'main/texcompress.c',
+    'main/texcompress_s3tc.c',
+    'main/texcompress_fxt1.c',
+    'main/texenv.c',
+    'main/texenvprogram.c',
+    'main/texfetch.c',
+    'main/texformat.c',
+    'main/texgen.c',
+    'main/texgetimage.c',
+    'main/teximage.c',
+    'main/texobj.c',
+    'main/texpal.c',
+    'main/texparam.c',
+    'main/texrender.c',
+    'main/texstate.c',
+    'main/texstore.c',
+    'main/transformfeedback.c',
+    'main/uniforms.c',
+    'main/varray.c',
+    'main/version.c',
+    'main/viewport.c',
+    'main/vtxfmt.c',
+]
 
-	mesa = env.ConvenienceLibrary(
-		target = 'mesa',
-		source = mesa_sources,
-	)
-	Export('mesa')
+math_sources = [
+    'math/m_debug_clip.c',
+    'math/m_debug_norm.c',
+    'math/m_debug_xform.c',
+    'math/m_eval.c',
+    'math/m_matrix.c',
+    'math/m_translate.c',
+    'math/m_vector.c',
+    'math/m_xform.c',
+]
+
+vbo_sources = [
+    'vbo/vbo_context.c',
+    'vbo/vbo_exec.c',
+    'vbo/vbo_exec_api.c',
+    'vbo/vbo_exec_array.c',
+    'vbo/vbo_exec_draw.c',
+    'vbo/vbo_exec_eval.c',
+    'vbo/vbo_rebase.c',
+    'vbo/vbo_split.c',
+    'vbo/vbo_split_copy.c',
+    'vbo/vbo_split_inplace.c',
+    'vbo/vbo_save.c',
+    'vbo/vbo_save_api.c',
+    'vbo/vbo_save_draw.c',
+    'vbo/vbo_save_loopback.c',
+]
+
+vf_sources = [
+    'vf/vf.c',
+    'vf/vf_generic.c',
+    'vf/vf_sse.c',
+]
+
+statetracker_sources = [
+    'state_tracker/st_atom.c',
+    'state_tracker/st_atom_blend.c',
+    'state_tracker/st_atom_clip.c',
+    'state_tracker/st_atom_constbuf.c',
+    'state_tracker/st_atom_depth.c',
+    'state_tracker/st_atom_framebuffer.c',
+    'state_tracker/st_atom_msaa.c',
+    'state_tracker/st_atom_pixeltransfer.c',
+    'state_tracker/st_atom_sampler.c',
+    'state_tracker/st_atom_scissor.c',
+    'state_tracker/st_atom_shader.c',
+    'state_tracker/st_atom_rasterizer.c',
+    'state_tracker/st_atom_stipple.c',
+    'state_tracker/st_atom_texture.c',
+    'state_tracker/st_atom_viewport.c',
+    'state_tracker/st_cb_accum.c',
+    'state_tracker/st_cb_bitmap.c',
+    'state_tracker/st_cb_blit.c',
+    'state_tracker/st_cb_bufferobjects.c',
+    'state_tracker/st_cb_clear.c',
+    'state_tracker/st_cb_condrender.c',
+    'state_tracker/st_cb_flush.c',
+    'state_tracker/st_cb_drawpixels.c',
+    'state_tracker/st_cb_drawtex.c',
+    'state_tracker/st_cb_eglimage.c',
+    'state_tracker/st_cb_fbo.c',
+    'state_tracker/st_cb_feedback.c',
+    'state_tracker/st_cb_program.c',
+    'state_tracker/st_cb_queryobj.c',
+    'state_tracker/st_cb_rasterpos.c',
+    'state_tracker/st_cb_readpixels.c',
+    'state_tracker/st_cb_strings.c',
+    'state_tracker/st_cb_texture.c',
+    'state_tracker/st_cb_viewport.c',
+    'state_tracker/st_cb_xformfb.c',
+    'state_tracker/st_context.c',
+    'state_tracker/st_debug.c',
+    'state_tracker/st_draw.c',
+    'state_tracker/st_draw_feedback.c',
+    'state_tracker/st_extensions.c',
+    'state_tracker/st_format.c',
+    'state_tracker/st_gen_mipmap.c',
+    'state_tracker/st_manager.c',
+    'state_tracker/st_mesa_to_tgsi.c',
+    'state_tracker/st_program.c',
+    'state_tracker/st_texture.c',
+]
+
+program_sources = [
+    'program/arbprogparse.c',
+    'program/hash_table.c',
+    'program/ir_to_mesa.cpp',
+    'program/lex.yy.c',
+    'program/nvfragparse.c',
+    'program/nvvertparse.c',
+    'program/program.c',
+    'program/program_parse.tab.c',
+    'program/program_parse_extra.c',
+    'program/prog_cache.c',
+    'program/prog_execute.c',
+    'program/prog_instruction.c',
+    'program/prog_noise.c',
+    'program/prog_optimize.c',
+    'program/prog_parameter.c',
+    'program/prog_parameter_layout.c',
+    'program/prog_print.c',
+    'program/prog_statevars.c',
+    'program/prog_uniform.c',
+    'program/programopt.c',
+    'program/sampler.cpp',
+    'program/symbol_table.c',
+]
+
+mesa_sources = (
+    main_sources +
+    math_sources +
+    program_sources +
+    vbo_sources +
+    vf_sources +
+    statetracker_sources
+)
+
+#
+# Assembly sources
+#
+if env['gcc'] and env['machine'] == 'x86':
+    env.Append(CPPDEFINES = [
+        'USE_X86_ASM',
+        'USE_MMX_ASM',
+        'USE_3DNOW_ASM',
+        'USE_SSE_ASM',
+    ])
+    mesa_sources += [
+        'x86/common_x86.c',
+        'x86/x86_xform.c',
+        'x86/3dnow.c',
+        'x86/sse.c',
+        'x86/common_x86_asm.S',
+        'x86/x86_xform2.S',
+        'x86/x86_xform3.S',
+        'x86/x86_xform4.S',
+        'x86/x86_cliptest.S',
+        'x86/mmx_blend.S',
+        'x86/3dnow_xform1.S',
+        'x86/3dnow_xform2.S',
+        'x86/3dnow_xform3.S',
+        'x86/3dnow_xform4.S',
+        'x86/3dnow_normal.S',
+        'x86/sse_xform1.S',
+        'x86/sse_xform2.S',
+        'x86/sse_xform3.S',
+        'x86/sse_xform4.S',
+        'x86/sse_normal.S',
+        'x86/read_rgba_span_x86.S',
+    ]
+elif env['gcc'] and env['machine'] == 'x86_64':
+    env.Append(CPPDEFINES = [
+        'USE_X86_64_ASM',
+    ])
+    mesa_sources += [
+        'x86-64/x86-64.c',
+        'x86-64/xform4.S',
+    ]
+elif env['gcc'] and env['machine'] == 'ppc':
+    env.Append(CPPDEFINES = [
+        'USE_PPC_ASM',
+        'USE_VMX_ASM',
+    ])
+    mesa_sources += [
+        'ppc/common_ppc.c',
+    ]
+elif env['gcc'] and env['machine'] == 'sparc':
+    mesa_sources += [
+        'sparc/sparc.c',
+        'sparc/clip.S',
+        'sparc/norm.S',
+        'sparc/xform.S',
+    ]
+else:
+    pass
+
+# Generate matypes.h
+if env['gcc'] and env['machine'] in ('x86', 'x86_64'):
+    # See http://www.scons.org/wiki/UsingCodeGenerators
+    gen_matypes = env.Program(
+        target = 'gen_matypes',
+        source = 'x86/gen_matypes.c',
+    )
+    matypes = env.Command(
+        'matypes.h',
+        gen_matypes,
+        gen_matypes[0].abspath + ' > $TARGET',
+    )
+    # Add the dir containing the generated header (somewhere inside  the
+    # build dir) to the include path
+    env.Append(CPPPATH = [matypes[0].dir])
+
+#
+# Libraries
+#
+
+mesa = env.ConvenienceLibrary(
+    target = 'mesa',
+    source = mesa_sources,
+)
+
+env.Alias('mesa', mesa)
+
+Export('mesa')