Index: shader/grammar/Imakefile
===================================================================
RCS file: /cvs/fd/xorg/xc/lib/GL/mesa/shader/grammar/Imakefile,v
retrieving revision 1.1
diff -u -r1.1 Imakefile
--- shader/grammar/Imakefile	31 Jul 2005 17:19:24 -0000	1.1
+++ shader/grammar/Imakefile	7 Sep 2005 20:14:31 -0000
@@ -31,7 +31,7 @@
 # define LargePICTable YES
 #endif
 
-#define MesaShaderBuildDir /**/
+#define MesaGrammarBuildDir /**/
 #define NeedToLinkMesaSrc
 #include "Imakefile.inc"
 
Index: shader/grammar/Imakefile.inc
===================================================================
RCS file: /cvs/fd/xorg/xc/lib/GL/mesa/shader/grammar/Imakefile.inc,v
retrieving revision 1.3
diff -u -r1.3 Imakefile.inc
--- shader/grammar/Imakefile.inc	7 Sep 2005 08:49:04 -0000	1.3
+++ shader/grammar/Imakefile.inc	7 Sep 2005 20:14:31 -0000
@@ -18,3 +18,12 @@
 
   MESA_GRAMMAR_OBJS =	 $(MESAGRAMMARBUILDDIR)grammar_mesa.o
 
+#if defined(DoSharedLib) && DoSharedLib
+ MESA_GRAMMAR_UOBJS = $(MESAGRAMMARBUILDDIR)unshared/grammar_mesa.o
+#else
+ MESA_GRAMMAR_UOBJS = $(MESA_GRAMMAR_OBJS)
+#endif
+
+ MESA_GRAMMAR_DOBJS = $(MESAGRAMMARBUILDDIR)debugger/grammar_mesa.o
+
+ MESA_GRAMMAR_POBJS = $(MESAGRAMMARBUILDDIR)profiled/grammar_mesa.o
Index: shader/slang/Imakefile
===================================================================
RCS file: /cvs/fd/xorg/xc/lib/GL/mesa/shader/slang/Imakefile,v
retrieving revision 1.1
diff -u -r1.1 Imakefile
--- shader/slang/Imakefile	31 Jul 2005 17:19:24 -0000	1.1
+++ shader/slang/Imakefile	7 Sep 2005 20:14:31 -0000
@@ -31,7 +31,7 @@
 # define LargePICTable YES
 #endif
 
-#define MesaShaderBuildDir /**/
+#define MesaSlangBuildDir /**/
 #define NeedToLinkMesaSrc
 #include "Imakefile.inc"
 
Index: shader/slang/Imakefile.inc
===================================================================
RCS file: /cvs/fd/xorg/xc/lib/GL/mesa/shader/slang/Imakefile.inc,v
retrieving revision 1.3
diff -u -r1.3 Imakefile.inc
--- shader/slang/Imakefile.inc	7 Sep 2005 08:49:04 -0000	1.3
+++ shader/slang/Imakefile.inc	7 Sep 2005 20:14:31 -0000
@@ -52,3 +52,39 @@
                         $(MESASLANGBUILDDIR)slang_storage.o \
                         $(MESASLANGBUILDDIR)slang_utility.o
 
+#if defined(DoSharedLib) && DoSharedLib
+ MESA_SLANG_UOBJS = $(MESASLANGBUILDDIR)unshared/slang_assemble_assignment.o \
+                    $(MESASLANGBUILDDIR)unshared/slang_assemble.o \
+                    $(MESASLANGBUILDDIR)unshared/slang_assemble_conditional.o \
+                    $(MESASLANGBUILDDIR)unshared/slang_assemble_constructor.o \
+                    $(MESASLANGBUILDDIR)unshared/slang_assemble_typeinfo.o \
+                    $(MESASLANGBUILDDIR)unshared/slang_compile.o \
+                    $(MESASLANGBUILDDIR)unshared/slang_execute.o \
+                    $(MESASLANGBUILDDIR)unshared/slang_preprocess.o \
+                    $(MESASLANGBUILDDIR)unshared/slang_storage.o \
+                    $(MESASLANGBUILDDIR)unshared/slang_utility.o
+#else
+ MESA_SLANG_UOBJS = $(MESA_SLANG_OBJS)
+#endif
+
+ MESA_SLANG_DOBJS = $(MESASLANGBUILDDIR)debuggerslang_assemble_assignment.o \
+                    $(MESASLANGBUILDDIR)debuggerslang_assemble.o \
+                    $(MESASLANGBUILDDIR)debuggerslang_assemble_conditional.o \
+                    $(MESASLANGBUILDDIR)debuggerslang_assemble_constructor.o \
+                    $(MESASLANGBUILDDIR)debuggerslang_assemble_typeinfo.o \
+                    $(MESASLANGBUILDDIR)debuggerslang_compile.o \
+                    $(MESASLANGBUILDDIR)debuggerslang_execute.o \
+                    $(MESASLANGBUILDDIR)debuggerslang_preprocess.o \
+                    $(MESASLANGBUILDDIR)debuggerslang_storage.o \
+                    $(MESASLANGBUILDDIR)debuggerslang_utility.o
+
+ MESA_SLANG_POBJS = $(MESASLANGBUILDDIR)profiled/slang_assemble_assignment.o \
+                    $(MESASLANGBUILDDIR)profiled/slang_assemble.o \
+                    $(MESASLANGBUILDDIR)profiled/slang_assemble_conditional.o \
+                    $(MESASLANGBUILDDIR)profiled/slang_assemble_constructor.o \
+                    $(MESASLANGBUILDDIR)profiled/slang_assemble_typeinfo.o \
+                    $(MESASLANGBUILDDIR)profiled/slang_compile.o \
+                    $(MESASLANGBUILDDIR)profiled/slang_execute.o \
+                    $(MESASLANGBUILDDIR)profiled/slang_preprocess.o \
+                    $(MESASLANGBUILDDIR)profiled/slang_storage.o \
+                    $(MESASLANGBUILDDIR)profiled/slang_utility.o