Index: grammar/Imakefile.inc
===================================================================
RCS file: /cvs/fd/xorg/xc/lib/GL/mesa/shader/grammar/Imakefile.inc,v
retrieving revision 1.1
diff -u -r1.1 Imakefile.inc
--- grammar/Imakefile.inc	31 Jul 2005 17:19:24 -0000	1.1
+++ grammar/Imakefile.inc	21 Aug 2005 09:02:49 -0000
@@ -1,12 +1,7 @@
-XCOMM $XFree86:$
+XCOMM $XFree86$
 
-#ifndef MesaGrammarBuildDir
-#define MesaGrammarBuildDir $(GLXLIBSRC)/mesa/shader/grammar/
-#endif
-
-MESAGRAMMARBUILDDIR = MesaGrammarBuildDir
 
-  MESA_GRAMMAR_SRCS =	$(MESAGRAMMARBUILDDIR)grammar_mesa.c
+  MESA_GRAMMAR_SRCS =	$ grammar_mesa.c
 
 #ifdef NeedToLinkMesaSrc
 LinkSourceFile(grammar.c, $(MESASRCDIR)/src/mesa/shader/grammar)
@@ -16,14 +11,5 @@
 LinkSourceFile(grammar_mesa.h, $(MESASRCDIR)/src/mesa/shader/grammar)
 #endif
 
-  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_OBJS =	 grammar_mesa.o
 
-  MESA_GRAMMAR_POBJS =	$(MESAGRAMMARBUILDDIR)profiled/grammar_mesa.o
Index: slang/Imakefile.inc
===================================================================
RCS file: /cvs/fd/xorg/xc/lib/GL/mesa/shader/slang/Imakefile.inc,v
retrieving revision 1.1
diff -u -r1.1 Imakefile.inc
--- slang/Imakefile.inc	31 Jul 2005 17:19:24 -0000	1.1
+++ slang/Imakefile.inc	21 Aug 2005 09:02:49 -0000
@@ -1,21 +1,15 @@
-XCOMM $XFree86:$
+XCOMM $XFree86$
 
-#ifndef MesaSlangBuildDir
-#define MesaSlangBuildDir $(GLXLIBSRC)/mesa/shader/slang/
-#endif
-
-MESASLANGBUILDDIR = MesaSlangBuildDir
-
-  MESA_SLANG_SRCS =	$(MESASLANGBUILDDIR)slang_assemble_assignment.c \
-                        $(MESASLANGBUILDDIR)slang_assemble.c \
-                        $(MESASLANGBUILDDIR)slang_assemble_conditional.c \
-                        $(MESASLANGBUILDDIR)slang_assemble_constructor.c \
-                        $(MESASLANGBUILDDIR)slang_assemble_typeinfo.c \
-                        $(MESASLANGBUILDDIR)slang_compile.c \
-                        $(MESASLANGBUILDDIR)slang_execute.c \
-                        $(MESASLANGBUILDDIR)slang_preprocess.c \
-                        $(MESASLANGBUILDDIR)slang_storage.c \
-                        $(MESASLANGBUILDDIR)slang_utility.c
+  MESA_SLANG_SRCS =	slang_assemble_assignment.c \
+                        slang_assemble.c \
+                        slang_assemble_conditional.c \
+                        slang_assemble_constructor.c \
+                        slang_assemble_typeinfo.c \
+                        slang_compile.c \
+                        slang_execute.c \
+                        slang_preprocess.c \
+                        slang_storage.c \
+                        slang_utility.c
 
 #ifdef NeedToLinkMesaSrc
 LinkSourceFile(slang_assemble_assignment.c, $(MESASRCDIR)/src/mesa/shader/slang)
@@ -41,51 +35,14 @@
 LinkSourceFile(traverse_wrap.h, $(MESASRCDIR)/src/mesa/shader/slang)
 #endif
 
-  MESA_SLANG_OBJS =	$(MESASLANGBUILDDIR)slang_assemble_assignment.o \
-                        $(MESASLANGBUILDDIR)slang_assemble.o \
-                        $(MESASLANGBUILDDIR)slang_assemble_conditional.o \
-                        $(MESASLANGBUILDDIR)slang_assemble_constructor.o \
-                        $(MESASLANGBUILDDIR)slang_assemble_typeinfo.o \
-                        $(MESASLANGBUILDDIR)slang_compile.o \
-                        $(MESASLANGBUILDDIR)slang_execute.o \
-                        $(MESASLANGBUILDDIR)slang_preprocess.o \
-                        $(MESASLANGBUILDDIR)slang_storage.o \
-                        $(MESASLANGBUILDDIR)slang_utility.o
-
-#if defined(DoSharedLib) && DoSharedLib
-  MESA_SLANG_UOBJS =	$(MESASLANGBUILDDIR)slang_assemble_assignment.o \
-                        $(MESASLANGBUILDDIR)slang_assemble.o \
-                        $(MESASLANGBUILDDIR)slang_assemble_conditional.o \
-                        $(MESASLANGBUILDDIR)slang_assemble_constructor.o \
-                        $(MESASLANGBUILDDIR)slang_assemble_typeinfo.o \
-                        $(MESASLANGBUILDDIR)slang_compile.o \
-                        $(MESASLANGBUILDDIR)slang_execute.o \
-                        $(MESASLANGBUILDDIR)slang_preprocess.o \
-                        $(MESASLANGBUILDDIR)slang_storage.o \
-                        $(MESASLANGBUILDDIR)slang_utility.o
-
-#else
- MESA_SLANG_UOBJS = $(MESA_SLANG_OBJS)
-#endif
-
-  MESA_SLANG_DOBJS =	$(MESASLANGBUILDDIR)slang_assemble_assignment.o \
-                        $(MESASLANGBUILDDIR)slang_assemble.o \
-                        $(MESASLANGBUILDDIR)slang_assemble_conditional.o \
-                        $(MESASLANGBUILDDIR)slang_assemble_constructor.o \
-                        $(MESASLANGBUILDDIR)slang_assemble_typeinfo.o \
-                        $(MESASLANGBUILDDIR)slang_compile.o \
-                        $(MESASLANGBUILDDIR)slang_execute.o \
-                        $(MESASLANGBUILDDIR)slang_preprocess.o \
-                        $(MESASLANGBUILDDIR)slang_storage.o \
-                        $(MESASLANGBUILDDIR)slang_utility.o
+  MESA_SLANG_OBJS =	slang_assemble_assignment.o \
+                        slang_assemble.o \
+                        slang_assemble_conditional.o \
+                        slang_assemble_constructor.o \
+                        slang_assemble_typeinfo.o \
+                        slang_compile.o \
+                        slang_execute.o \
+                        slang_preprocess.o \
+                        slang_storage.o \
+                        slang_utility.o
 
-  MESA_SLANG_POBJS =	$(MESASLANGBUILDDIR)slang_assemble_assignment.o \
-                        $(MESASLANGBUILDDIR)slang_assemble.o \
-                        $(MESASLANGBUILDDIR)slang_assemble_conditional.o \
-                        $(MESASLANGBUILDDIR)slang_assemble_constructor.o \
-                        $(MESASLANGBUILDDIR)slang_assemble_typeinfo.o \
-                        $(MESASLANGBUILDDIR)slang_compile.o \
-                        $(MESASLANGBUILDDIR)slang_execute.o \
-                        $(MESASLANGBUILDDIR)slang_preprocess.o \
-                        $(MESASLANGBUILDDIR)slang_storage.o \
-                        $(MESASLANGBUILDDIR)slang_utility.o