From 5c1e361b8ead915d5f009d3fd2bd14c951f6cf65 Mon Sep 17 00:00:00 2001
From: Kenneth Graunke <kenneth@whitecape.org>
Date: Thu, 3 Feb 2011 16:11:29 -0800
Subject: Remove talloc from the SCons build system.

(cherry picked from commit 8aac5d123c4636fad5e9d70c3a6706aaa6f1f240)

Conflicts:
	src/SConscript
	src/gallium/targets/egl-static/SConscript
	src/glsl/SConscript
	src/mesa/SConscript
---
 src/SConscript                            |  1 -
 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 --------------------
 7 files changed, 2 insertions(+), 29 deletions(-)
 delete mode 100644 src/talloc/SConscript

diff --git a/src/SConscript b/src/SConscript
index c42d9bff2d7..269e2327f04 100644
--- a/src/SConscript
+++ b/src/SConscript
@@ -4,7 +4,6 @@ SConscript('mapi/vgapi/SConscript')
 
 if env['platform'] == 'windows':
     SConscript('egl/main/SConscript')
-    SConscript('talloc/SConscript')
 
 SConscript('glsl/SConscript')
 SConscript('mapi/glapi/SConscript')
diff --git a/src/gallium/targets/SConscript.dri b/src/gallium/targets/SConscript.dri
index bc3671a256b..101863a6848 100644
--- a/src/gallium/targets/SConscript.dri
+++ b/src/gallium/targets/SConscript.dri
@@ -72,7 +72,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 6fa0851a1ab..ec7dbadb38a 100644
--- a/src/gallium/targets/libgl-gdi/SConscript
+++ b/src/gallium/targets/libgl-gdi/SConscript
@@ -15,7 +15,6 @@ env.Append(LIBS = [
     'user32',
     'kernel32',
     'ws2_32',
-    talloc,
 ])
 
 sources = ['libgl_gdi.c']
diff --git a/src/gallium/targets/libgl-xlib/SConscript b/src/gallium/targets/libgl-xlib/SConscript
index d932736be78..7f0f245cc9e 100644
--- a/src/gallium/targets/libgl-xlib/SConscript
+++ b/src/gallium/targets/libgl-xlib/SConscript
@@ -23,7 +23,6 @@ env.Prepend(LIBS = [
     mesa,
     glsl,
     gallium,
-    'talloc'
 ])
 
 sources = [
diff --git a/src/glsl/SConscript b/src/glsl/SConscript
index d0b79b17504..c1adfe861ad 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',
@@ -97,7 +95,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 cc4ad09fa33..0e93ab7a380 100644
--- a/src/mesa/SConscript
+++ b/src/mesa/SConscript
@@ -17,7 +17,6 @@ if env['platform'] == 'windows':
         '_GDI32_', # prevent gl* being declared __declspec(dllimport) in MS headers
         'BUILD_GL32', # declare gl* as __declspec(dllexport) in Mesa headers
     ])
-    env.Prepend(CPPPATH = ['#src/talloc'])
 else:
     env.Append(CPPDEFINES = [
         'IN_DRI_DRIVER', # enable the remap table (for DRI drivers)
diff --git a/src/talloc/SConscript b/src/talloc/SConscript
deleted file mode 100644
index 3bf7029bb25..00000000000
--- 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')
-- 
cgit v1.2.3