From 601498ae73e654c2de997ea75075613a694d604d Mon Sep 17 00:00:00 2001
From: José Fonseca <jfonseca@vmware.com>
Date: Mon, 1 Nov 2010 13:30:22 +0000
Subject: 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.
---
 src/gallium/targets/xorg-vmwgfx/SConscript | 114 ++++++++++++++---------------
 1 file changed, 55 insertions(+), 59 deletions(-)

(limited to 'src/gallium/targets/xorg-vmwgfx')

diff --git a/src/gallium/targets/xorg-vmwgfx/SConscript b/src/gallium/targets/xorg-vmwgfx/SConscript
index 43b2c74f9c..0a81b33651 100644
--- a/src/gallium/targets/xorg-vmwgfx/SConscript
+++ b/src/gallium/targets/xorg-vmwgfx/SConscript
@@ -2,62 +2,58 @@ import os.path
 
 Import('*')
 
-if not 'svga' in env['drivers']:
-    print 'warning: svga pipe driver not built skipping vmwgfx_drv.so'
-    Return()
-
-if env['platform'] == 'linux':
-
-	env = env.Clone()
-
-	env.ParseConfig('pkg-config --cflags --libs libdrm xorg-server')
-
-	env.Prepend(CPPPATH = [
-		'#/include',
-		'#/src/gallium',
-		'#/src/mesa',
-		'#/src/gallium/drivers/svga',
-		'#/src/gallium/drivers/svga/include',
-	])
-
-	env.Append(CPPDEFINES = [
-	])
-
-	if env['gcc']:
-		env.Append(CPPDEFINES = [
-			'HAVE_STDINT_H',
-			'HAVE_SYS_TYPES_H',
-		])
-
-	env.Append(CFLAGS = [
-		'-std=gnu99',
-		'-D_FILE_OFFSET_BITS=64',
-	])
-
-	env.Prepend(LIBPATH = [
-	])
-
-	env.Prepend(LIBS = [
-		trace,
-		rbug,
-		st_xorg,
-		svgadrm,
-		svga,
-                gallium,
-	])
-
-	sources = [
-		'vmw_ioctl.c',
-		'vmw_ctrl.c',
-		'vmw_screen.c',
-		'vmw_video.c',
-		'vmw_xorg.c',
-	]
-
-	# TODO: write a wrapper function http://www.scons.org/wiki/WrapperFunctions
-	env.LoadableModule(
-		target ='vmwgfx_drv.so',
-		source = sources,
-		LIBS = env['LIBS'],
-		SHLIBPREFIX = '',
-	)
+env = env.Clone()
+
+env.ParseConfig('pkg-config --cflags --libs libdrm xorg-server')
+
+env.Prepend(CPPPATH = [
+    '#/include',
+    '#/src/gallium',
+    '#/src/mesa',
+    '#/src/gallium/drivers/svga',
+    '#/src/gallium/drivers/svga/include',
+])
+
+env.Append(CPPDEFINES = [
+])
+
+if env['gcc']:
+    env.Append(CPPDEFINES = [
+        'HAVE_STDINT_H',
+        'HAVE_SYS_TYPES_H',
+    ])
+
+env.Append(CFLAGS = [
+    '-std=gnu99',
+    '-D_FILE_OFFSET_BITS=64',
+])
+
+env.Prepend(LIBPATH = [
+])
+
+env.Prepend(LIBS = [
+    trace,
+    rbug,
+    st_xorg,
+    svgadrm,
+    svga,
+            gallium,
+])
+
+sources = [
+    'vmw_ioctl.c',
+    'vmw_ctrl.c',
+    'vmw_screen.c',
+    'vmw_video.c',
+    'vmw_xorg.c',
+]
+
+# TODO: write a wrapper function http://www.scons.org/wiki/WrapperFunctions
+module = env.LoadableModule(
+    target ='vmwgfx_drv.so',
+    source = sources,
+    LIBS = env['LIBS'],
+    SHLIBPREFIX = '',
+)
+
+env.Alias('xorg-vmwgfx', module)
-- 
cgit v1.2.3