From 3ae04dd910d59dd2f044579f3e098b52fc577700 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Jos=C3=A9=20Fonseca?= <jfonseca@vmware.com>
Date: Tue, 2 Nov 2010 12:35:23 +0000
Subject: [PATCH] scons: Add aliases for several pipe drivers.

---
 src/gallium/drivers/failover/SConscript | 2 ++
 src/gallium/drivers/galahad/SConscript  | 2 ++
 src/gallium/drivers/i915/SConscript     | 6 ++----
 src/gallium/drivers/i965/SConscript     | 4 ----
 src/gallium/drivers/r300/SConscript     | 2 ++
 src/gallium/drivers/r600/SConscript     | 2 ++
 src/gallium/drivers/rbug/SConscript     | 2 ++
 src/gallium/drivers/trace/SConscript    | 2 ++
 8 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/gallium/drivers/failover/SConscript b/src/gallium/drivers/failover/SConscript
index f8e9b1b4911..9347431f4e5 100644
--- a/src/gallium/drivers/failover/SConscript
+++ b/src/gallium/drivers/failover/SConscript
@@ -10,4 +10,6 @@ failover = env.ConvenienceLibrary(
 		'fo_context.c',
 	])
 
+env.Alias('failover', failover)
+
 Export('failover')
diff --git a/src/gallium/drivers/galahad/SConscript b/src/gallium/drivers/galahad/SConscript
index b398a3f0615..1343dfd4548 100644
--- a/src/gallium/drivers/galahad/SConscript
+++ b/src/gallium/drivers/galahad/SConscript
@@ -10,4 +10,6 @@ galahad = env.ConvenienceLibrary(
 		'glhd_screen.c',
 	])
 
+env.Alias('galahad', galahad)
+
 Export('galahad')
diff --git a/src/gallium/drivers/i915/SConscript b/src/gallium/drivers/i915/SConscript
index 1197bbf9620..8f5deed64a9 100644
--- a/src/gallium/drivers/i915/SConscript
+++ b/src/gallium/drivers/i915/SConscript
@@ -2,10 +2,6 @@ Import('*')
 
 env = env.Clone()
 
-if env['msvc']:
-	print 'warning: not building i915g'
-	Return()
-
 i915 = env.ConvenienceLibrary(
 	target = 'i915',
 	source = [
@@ -34,4 +30,6 @@ i915 = env.ConvenienceLibrary(
 		'i915_resource_texture.c',
 	])
 
+env.Alias('i915', i915)
+
 Export('i915')
diff --git a/src/gallium/drivers/i965/SConscript b/src/gallium/drivers/i965/SConscript
index 198275b655c..019af682f68 100644
--- a/src/gallium/drivers/i965/SConscript
+++ b/src/gallium/drivers/i965/SConscript
@@ -2,10 +2,6 @@ Import('*')
 
 env = env.Clone()
 
-if env['msvc']:
-	print 'warning: not building i965g'
-	Return();
-
 i965 = env.ConvenienceLibrary(
 	target = 'i965',
 	source = [
diff --git a/src/gallium/drivers/r300/SConscript b/src/gallium/drivers/r300/SConscript
index bf023daaa56..b49db937994 100644
--- a/src/gallium/drivers/r300/SConscript
+++ b/src/gallium/drivers/r300/SConscript
@@ -39,5 +39,7 @@ r300 = env.ConvenienceLibrary(
         'r300_transfer.c',
     ] + r300compiler) + r300compiler
 
+env.Alias('r300', r300)
+
 Export('r300')
 
diff --git a/src/gallium/drivers/r600/SConscript b/src/gallium/drivers/r600/SConscript
index cdeec191398..3fc1fa94c27 100644
--- a/src/gallium/drivers/r600/SConscript
+++ b/src/gallium/drivers/r600/SConscript
@@ -33,4 +33,6 @@ r600 = env.ConvenienceLibrary(
         'eg_asm.c',
     ])
 
+env.Alias('r600', r600)
+
 Export('r600')
diff --git a/src/gallium/drivers/rbug/SConscript b/src/gallium/drivers/rbug/SConscript
index 3da6ac104a4..169c2718dc3 100644
--- a/src/gallium/drivers/rbug/SConscript
+++ b/src/gallium/drivers/rbug/SConscript
@@ -11,4 +11,6 @@ rbug = env.ConvenienceLibrary(
 		'rbug_screen.c',
 	])
 
+env.Alias('rbug', rbug)
+
 Export('rbug')
diff --git a/src/gallium/drivers/trace/SConscript b/src/gallium/drivers/trace/SConscript
index 06b0c4863a4..1384fe33d72 100644
--- a/src/gallium/drivers/trace/SConscript
+++ b/src/gallium/drivers/trace/SConscript
@@ -12,4 +12,6 @@ trace = env.ConvenienceLibrary(
         'tr_texture.c',
     ])
 
+env.Alias('trace', trace)
+
 Export('trace')
-- 
2.30.2