Mesa (7.9): Remove talloc from the SCons build system.

[Kenneth Graunke]

Module: Mesa
Branch: 7.9
Commit: f7993b66a6ef6cddf466337be7c312f8b0079141
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=f7993b66a6ef6cddf466337be7c312f8b0079141

Author: Kenneth Graunke <kenneth at whitecape.org>
Date:   Thu Feb  3 16:45:56 2011 -0800

Remove talloc from the SCons build system.

(cherry picked from commit 1f4fbc56e52ff2215f7eac7fc84ef8d8a8ec3c2f)

Conflicts:
	src/gallium/targets/libgl-gdi/SConscript
	src/mesa/SConscript

---

 src/gallium/targets/SConscript.dri        |    1 -
 src/gallium/targets/libgl-gdi/SConscript  |    1 -
 src/gallium/targets/libgl-xlib/SConscript |    1 -
 src/glsl/SConscript                       |    6 ++----
 src/mesa/SConscript                       |    1 -
 src/talloc/SConscript                     |   20 --------------------
 6 files changed, 2 insertions(+), 28 deletions(-)

diff --git a/src/gallium/targets/SConscript.dri b/src/gallium/targets/SConscript.dri
index bc8d179..e5981c2 100644
--- a/src/gallium/targets/SConscript.dri
+++ b/src/gallium/targets/SConscript.dri
@@ -69,7 +69,6 @@ COMMON_DRI_DRM_OBJECTS = [
 
 drienv.AppendUnique(LIBS = [
     'expat',
-    'talloc',
 ])
 
 Export([
diff --git a/src/gallium/targets/libgl-gdi/SConscript b/src/gallium/targets/libgl-gdi/SConscript
index 12fe403..144084f 100644
--- a/src/gallium/targets/libgl-gdi/SConscript
+++ b/src/gallium/targets/libgl-gdi/SConscript
@@ -17,7 +17,6 @@ if env['platform'] == 'windows':
         'user32',
         'kernel32',
         'ws2_32',
-        talloc,
     ])
 
     sources = []
diff --git a/src/gallium/targets/libgl-xlib/SConscript b/src/gallium/targets/libgl-xlib/SConscript
index 27b562e..b9764e8 100644
--- a/src/gallium/targets/libgl-xlib/SConscript
+++ b/src/gallium/targets/libgl-xlib/SConscript
@@ -35,7 +35,6 @@ env.Prepend(LIBS = [
     mesa,
     glsl,
     gallium,
-    'talloc'
 ])
 
 sources = [
diff --git a/src/glsl/SConscript b/src/glsl/SConscript
index 330c673..59e2098 100644
--- a/src/glsl/SConscript
+++ b/src/glsl/SConscript
@@ -7,11 +7,9 @@ env = env.Clone()
 env.Prepend(CPPPATH = [
     '#src/mapi',
     '#src/mesa',
+    '#src/glsl',
 ])
 
-if env['platform'] == 'windows':
-    env.Prepend(CPPPATH = ['#src/talloc'])
-
 sources = [
     'glcpp/glcpp-lex.c',
     'glcpp/glcpp-parse.c',
@@ -99,7 +97,7 @@ if env['platform'] == 'windows':
         'user32',
     ])
 
-env.Prepend(LIBS = [glsl, talloc])
+env.Prepend(LIBS = [glsl])
 
 env.Program(
     target = 'glsl2',
diff --git a/src/mesa/SConscript b/src/mesa/SConscript
index 28598f4..a4e3ea8 100644
--- a/src/mesa/SConscript
+++ b/src/mesa/SConscript
@@ -20,7 +20,6 @@ if env['platform'] != 'winddk':
 			'BUILD_GL32', # declare gl* as __declspec(dllexport) in Mesa headers 
 			'WIN32_THREADS', # use Win32 thread API
 		])	 
-        env.Prepend(CPPPATH = ['#src/talloc'])
 
 	#
 	# Source files
diff --git a/src/talloc/SConscript b/src/talloc/SConscript
deleted file mode 100644
index 3bf7029..0000000
--- a/src/talloc/SConscript
+++ /dev/null
@@ -1,20 +0,0 @@
-Import('*')
-
-if env['platform'] != 'windows':
-    Return()
-
-env = env.Clone()
-
-talloc = env.SharedLibrary(
-    target = 'talloc',
-    source = ['talloc.c', 'talloc.def'],
-)
-
-env.InstallSharedLibrary(talloc)
-
-if env['platform'] == 'windows':
-    talloc = env.FindIxes(talloc, 'LIBPREFIX', 'LIBSUFFIX')
-else:
-    talloc = env.FindIxes(talloc, 'SHLIBPREFIX', 'SHLIBSUFFIX')
-
-Export('talloc')