4 files changed, 38 insertions, 6 deletions
diff --git a/src/gallium/auxiliary/tgsi/Makefile b/src/gallium/auxiliary/tgsi/Makefile
index 12a8bd0409..71f64b747c 100644
--- a/src/gallium/auxiliary/tgsi/Makefile
+++ b/src/gallium/auxiliary/tgsi/Makefile
@@ -1,3 +1,18 @@
-default:
-	cd ../.. ; make
+TOP = ../../../..
+include $(TOP)/configs/current
+
+LIBNAME = tgsi
+
+C_SOURCES = \
+	exec/tgsi_exec.c \
+	exec/tgsi_sse2.c \
+	util/tgsi_build.c \
+	util/tgsi_dump.c \
+	util/tgsi_parse.c \
+	util/tgsi_transform.c \
+	util/tgsi_util.c
+
+include ../../Makefile.template
+
+symlinks:
 
diff --git a/src/gallium/auxiliary/tgsi/SConscript b/src/gallium/auxiliary/tgsi/SConscript
new file mode 100644
index 0000000000..8464bfe944
--- /dev/null
+++ b/src/gallium/auxiliary/tgsi/SConscript
@@ -0,0 +1,14 @@
+Import('*')
+
+tgsi = env.ConvenienceLibrary(
+	target = 'tgsi',
+	source = [
+		'exec/tgsi_exec.c',
+		'exec/tgsi_sse2.c',
+		'util/tgsi_build.c',
+		'util/tgsi_dump.c',
+		'util/tgsi_parse.c',
+		'util/tgsi_util.c',
+	])
+
+auxiliaries.insert(0, tgsi)
diff --git a/src/gallium/auxiliary/tgsi/exec/Makefile b/src/gallium/auxiliary/tgsi/exec/Makefile
deleted file mode 100644
index eb8b14e0e8..0000000000
--- a/src/gallium/auxiliary/tgsi/exec/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-default:
-	cd ../../.. ; make
-
diff --git a/src/gallium/auxiliary/tgsi/exec/tgsi_sse2.c b/src/gallium/auxiliary/tgsi/exec/tgsi_sse2.c
index 62c6a69c63..779b901f2b 100755
--- a/src/gallium/auxiliary/tgsi/exec/tgsi_sse2.c
+++ b/src/gallium/auxiliary/tgsi/exec/tgsi_sse2.c
@@ -32,7 +32,7 @@
 #include "tgsi_exec.h"
 #include "tgsi_sse2.h"
 
-#include "x86/rtasm/x86sse.h"
+#include "rtasm/rtasm_x86sse.h"
 
 #if defined(__i386__) || defined(__386__)
 
@@ -2356,11 +2356,17 @@ tgsi_emit_sse2_fs(
          ok = emit_instruction(
             func,
             &parse.FullToken.FullInstruction );
+
+	 if (!ok) {
+	    debug_printf("failed to translate tgsi opcode %d\n", 
+			 parse.FullToken.FullInstruction.Instruction.Opcode );
+	 }
          break;
 
       case TGSI_TOKEN_TYPE_IMMEDIATE:
          /* XXX implement this */
 	 ok = 0;
+	 debug_printf("failed to emit immediate value\n");
          break;
 
       default: