Imported nx-X11-3.1.0-1.tar.gznx-X11/3.1.0-1

Summary: Imported nx-X11-3.1.0-1.tar.gz Keywords: Imported nx-X11-3.1.0-1.tar.gz into Git repository
author: Reinhard Tartler <siretart@tauware.de> 2011-10-10 17:43:39 +0200
committer: Reinhard Tartler <siretart@tauware.de> 2011-10-10 17:43:39 +0200
commit: f4092abdf94af6a99aff944d6264bc1284e8bdd4 (patch)
tree: 2ac1c9cc16ceb93edb2c4382c088dac5aeafdf0f /nx-X11/lib/GL/mesa
parent: a840692edc9c6d19cd7c057f68e39c7d95eb767d (diff)
download: nx-libs-f4092abdf94af6a99aff944d6264bc1284e8bdd4.tar.gz
nx-libs-f4092abdf94af6a99aff944d6264bc1284e8bdd4.tar.bz2
nx-libs-f4092abdf94af6a99aff944d6264bc1284e8bdd4.zip
63 files changed, 6523 insertions, 0 deletions
diff --git a/nx-X11/lib/GL/mesa/Imakefile b/nx-X11/lib/GL/mesa/Imakefile
new file mode 100644
index 000000000..523123ae8
--- /dev/null
+++ b/nx-X11/lib/GL/mesa/Imakefile
@@ -0,0 +1,73 @@
+XCOMM $XFree86: xc/lib/GL/mesa/src/Imakefile,v 1.30tsi Exp $
+
+#include <Threads.tmpl>
+
+/*
+ * Need both shared and unshared Mesa objects in the following cases:
+ *   GlxDriverUsesMesa
+ *   GlxBuiltInXMesa
+ *   BuildOSMesaLib
+ *
+ * In other cases, only the shared version is needed to link in to loadable
+ * driver modules.
+ */
+
+#if BuildOSMesaLib || (BuildXF86DRI && (GlxDriverUsesMesa || GlxBuiltInXMesa))
+#define DoNormalLib (NormalLibGlx || SharedLibGlxWithoutPIC)
+#define DoSharedLib (SharedLibGlx && !SharedLibGlxWithoutPIC)
+#define DoExtraLib SharedLibGlx
+#define DoDebugLib DebugLibGlx
+#define DoProfileLib ProfileLibGlx
+#else
+#define DoNormalLib SharedLibGlxWithoutPIC
+#define DoSharedLib !SharedLibGlxWithoutPIC
+#define DoExtraLib NO
+#define DoDebugLib NO
+#define DoProfileLib NO
+#endif
+
+/* Large PIC tables needed for Solaris SPARC builds */
+#if (defined(SunArchitecture) && defined(SparcArchitecture))
+# define LargePICTable YES
+#endif
+
+#if Malloc0ReturnsNull
+ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL
+#endif
+
+#if defined(i386Architecture) && MesaUseX86Asm
+#define MesaX86BuildDir /**/
+ASM_SUBDIRS = x86
+#endif
+#ifdef SparcArchitecture
+#define MesaSparcBuildDir /**/
+ASM_SUBDIRS = sparc
+#endif
+#define MesaBuildDir /**/
+#define NeedToLinkMesaSrc
+
+#ifdef UseCompaqMathLibrary
+ MATH_DEFINES = -DCCPML
+#endif
+
+      DEFINES = $(ALLOC_DEFINES) GlxDefines \
+		$(MESA_ASM_DEFINES) $(MATH_DEFINES)
+     INCLUDES = -I$(INCLUDESRC) -I$(XINCLUDESRC) -I$(EXTINCSRC) \
+		-I$(GLXLIBSRC)/dri \
+		-I$(MESASRCDIR)/include -I$(GLXLIBSRC)/include
+
+#include <Library.tmpl>
+
+LibraryObjectRule()
+
+#define IHaveSubdirs
+#define PassCDebugFlags
+
+SUBDIRS = $(ASM_SUBDIRS) array_cache main math swrast swrast_setup tnl tnl_dd shader
+
+
+MakeSubdirs($(SUBDIRS))
+DependSubdirs($(SUBDIRS))
+
+
+DependTarget()
diff --git a/nx-X11/lib/GL/mesa/Imakefile.inc b/nx-X11/lib/GL/mesa/Imakefile.inc
new file mode 100644
index 000000000..03a7971f8
--- /dev/null
+++ b/nx-X11/lib/GL/mesa/Imakefile.inc
@@ -0,0 +1,57 @@
+XCOMM $XFree86: xc/lib/GL/mesa/src/Imakefile.inc,v 1.7tsi Exp $
+
+#ifndef MesaBuildDir
+#define MesaBuildDir $(GLXLIBSRC)/mesa/
+#endif
+
+MESABUILDDIR = MesaBuildDir
+
+COREMESASRCS = $(COREMESABASESRCS) \
+		$(MESA_AC_SRCS) \
+		$(MESA_MATH_SRCS) \
+		$(MESA_SWRAST_SRCS) \
+		$(MESA_SWR_SETUP_SRCS) \
+		$(MESA_TNL_SRCS) \
+		$(MESA_SHADER_SRCS) \
+                $(MESA_GRAMMAR_SRCS) \
+                $(MESA_SLANG_SRCS)
+
+COREMESAOBJS = $(COREMESABASEOBJS) \
+		$(MESA_AC_OBJS) \
+		$(MESA_MATH_OBJS) \
+		$(MESA_SWRAST_OBJS) \
+		$(MESA_SWR_SETUP_OBJS) \
+		$(MESA_TNL_OBJS) \
+		$(MESA_SHADER_OBJS) \
+                $(MESA_GRAMMAR_OBJS) \
+                $(MESA_SLANG_OBJS)
+
+COREMESAUOBJS = $(COREMESABASEUOBJS) \
+		$(MESA_AC_UOBJS) \
+		$(MESA_MATH_UOBJS) \
+		$(MESA_SWRAST_UOBJS) \
+		$(MESA_SWR_SETUP_UOBJS) \
+		$(MESA_TNL_UOBJS) \
+		$(MESA_SHADER_UOBJS) \
+                $(MESA_GRAMMAR_UOBJS) \
+                $(MESA_SLANG_UOBJS)
+
+COREMESADOBJS = $(COREMESABASEDOBJS) \
+		$(MESA_AC_DOBJS) \
+		$(MESA_MATH_DOBJS) \
+		$(MESA_SWRAST_DOBJS) \
+		$(MESA_SWR_SETUP_DOBJS) \
+		$(MESA_TNL_DOBJS) \
+		$(MESA_SHADER_DOBJS) \
+                $(MESA_GRAMMAR_DOBJS) \
+                $(MESA_SLANG_DOBJS)
+
+COREMESAPOBJS = $(COREMESABASEPOBJS) \
+		$(MESA_AC_POBJS) \
+		$(MESA_MATH_POBJS) \
+		$(MESA_SWRAST_POBJS) \
+		$(MESA_SWR_SETUP_POBJS) \
+		$(MESA_TNL_POBJS) \
+		$(MESA_SHADER_POBJS) \
+                $(MESA_GRAMMAR_POBJS) \
+                $(MESA_SLANG_POBJS)
diff --git a/nx-X11/lib/GL/mesa/array_cache/Imakefile b/nx-X11/lib/GL/mesa/array_cache/Imakefile
new file mode 100644
index 000000000..40c9c6b52
--- /dev/null
+++ b/nx-X11/lib/GL/mesa/array_cache/Imakefile
@@ -0,0 +1,91 @@
+XCOMM $XFree86: xc/lib/GL/mesa/src/array_cache/Imakefile,v 1.8 2002/11/25 12:58:55 tsi Exp $
+
+#include <Threads.tmpl>
+
+/*
+ * Need both shared and unshared Mesa objects in the following cases:
+ *   GlxDriverUsesMesa
+ *   GlxBuiltInXMesa
+ *   BuildOSMesaLib
+ *
+ * In other cases, only the shared version is needed to link in to loadable
+ * driver modules.
+ */
+
+#if BuildOSMesaLib || (BuildXF86DRI && (GlxDriverUsesMesa || GlxBuiltInXMesa))
+#define DoNormalLib (NormalLibGlx || SharedLibGlxWithoutPIC)
+#define DoSharedLib (SharedLibGlx && !SharedLibGlxWithoutPIC)
+#define DoExtraLib SharedLibGlx
+#define DoDebugLib DebugLibGlx
+#define DoProfileLib ProfileLibGlx
+#else
+#define DoNormalLib SharedLibGlxWithoutPIC
+#define DoSharedLib !SharedLibGlxWithoutPIC
+#define DoExtraLib NO
+#define DoDebugLib NO
+#define DoProfileLib NO
+#endif
+
+
+#define MesaACBuildDir /**/
+#define NeedToLinkMesaSrc
+#include "Imakefile.inc"
+
+#if Malloc0ReturnsNull
+ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL
+#endif
+
+#if BuildXF86DRI
+  DRI_DEFINES = GlxDefines -DIN_DRI_DRIVER
+ DRI_INCLUDES = -I../../../dri -I../../../glx -I../../dri -I../../../include \
+		-I$(INCLUDESRC)/GL -I$(XF86OSSRC) -I$(SERVERSRC)/GL/dri
+#endif
+
+MESA_INCLUDES = -I$(MESASRCDIR)/src/mesa/main \
+		-I$(MESASRCDIR)/src/mesa/array_cache \
+		-I$(MESASRCDIR)/src/mesa/glapi \
+		-I$(MESASRCDIR)/src/mesa/math \
+		-I$(MESASRCDIR)/src/mesa \
+		-I$(MESASRCDIR)/include \
+		-I../../../include -I$(XINCLUDESRC)
+
+     INCLUDES = $(MESA_INCLUDES) $(DRI_INCLUDES)
+         SRCS = $(MESA_AC_SRCS)
+         OBJS = $(MESA_AC_OBJS)
+
+
+#if defined(i386Architecture) && MesaUseX86Asm
+     ASM_SRCS =
+     ASM_OBJS =
+#if MesaUseMMX
+     MMX_DEFS = -DUSE_MMX_ASM
+#endif
+#if MesaUse3DNow
+   3DNOW_DEFS = -DUSE_3DNOW_ASM
+#endif
+#if MesaUseSSE
+     SSE_DEFS = -DUSE_SSE_ASM
+#endif
+     ASM_DEFS = -DUSE_X86_ASM $(MMX_DEFS) $(3DNOW_DEFS) $(SSE_DEFS)
+#endif
+
+#ifdef SparcArchitecture
+     ASM_SRCS =
+     ASM_OBJS =
+     ASM_DEFS = -DUSE_SPARC_ASM
+#endif
+
+#ifdef UseCompaqMathLibrary
+      MATHDEF = -DCCPML
+#endif
+
+      DEFINES = $(ALLOC_DEFINES) $(DRI_DEFINES) $(ASM_DEFS) $(MATHDEF)
+
+#include <Library.tmpl>
+
+LibraryObjectRule()
+
+SubdirLibraryRule($(OBJS))
+NormalLintTarget($(SRCS))
+
+DependTarget()
diff --git a/nx-X11/lib/GL/mesa/array_cache/Imakefile.inc b/nx-X11/lib/GL/mesa/array_cache/Imakefile.inc
new file mode 100644
index 000000000..9a5044791
--- /dev/null
+++ b/nx-X11/lib/GL/mesa/array_cache/Imakefile.inc
@@ -0,0 +1,34 @@
+XCOMM $XFree86: xc/lib/GL/mesa/src/array_cache/Imakefile.inc,v 1.1tsi Exp $
+
+#ifndef MesaACBuildDir
+#define MesaACBuildDir $(GLXLIBSRC)/mesa/array_cache/
+#endif
+
+MESAACBUILDDIR = MesaACBuildDir
+
+  MESA_AC_SRCS = $(MESAACBUILDDIR)ac_context.c \
+		 $(MESAACBUILDDIR)ac_import.c
+
+#ifdef NeedToLinkMesaSrc
+LinkSourceFile(acache.h, $(MESASRCDIR)/src/mesa/array_cache)
+LinkSourceFile(ac_context.c, $(MESASRCDIR)/src/mesa/array_cache)
+LinkSourceFile(ac_context.h, $(MESASRCDIR)/src/mesa/array_cache)
+LinkSourceFile(ac_import.c, $(MESASRCDIR)/src/mesa/array_cache)
+#endif
+
+  MESA_AC_OBJS = $(MESAACBUILDDIR)ac_context.o \
+		 $(MESAACBUILDDIR)ac_import.o
+
+#if defined(DoSharedLib) && DoSharedLib
+ MESA_AC_UOBJS = $(MESAACBUILDDIR)unshared/ac_context.o \
+		 $(MESAACBUILDDIR)unshared/ac_import.o
+#else
+ MESA_AC_UOBJS = $(MESA_AC_OBJS)
+#endif
+
+ MESA_AC_DOBJS = $(MESAACBUILDDIR)debugger/ac_context.o \
+		 $(MESAACBUILDDIR)debugger/ac_import.o
+
+ MESA_AC_POBJS = $(MESAACBUILDDIR)profiled/ac_context.o \
+		 $(MESAACBUILDDIR)profiled/ac_import.o
+
diff --git a/nx-X11/lib/GL/mesa/drivers/dri/Imakefile b/nx-X11/lib/GL/mesa/drivers/dri/Imakefile
new file mode 100644
index 000000000..eba13848b
--- /dev/null
+++ b/nx-X11/lib/GL/mesa/drivers/dri/Imakefile
@@ -0,0 +1,21 @@
+XCOMM $XFree86: xc/lib/GL/mesa/src/drv/Imakefile,v 1.18 2001/03/23 19:18:38 dawes Exp $
+
+#ifdef DriDrivers
+
+#define IHaveSubdirs
+#define PassCDebugFlags
+
+DRI_DRIVERS = DriDrivers
+
+#if BuildDevelDRIDrivers
+DEVEL_DRI_DRIVERS = DevelDRIDrivers
+#endif
+
+SUBDIRS = common $(DRI_DRIVERS) $(DEVEL_DRI_DRIVERS)
+
+MakeSubdirs($(SUBDIRS))
+DependSubdirs($(SUBDIRS))
+
+DependTarget()
+
+#endif
diff --git a/nx-X11/lib/GL/mesa/drivers/dri/common/Imakefile b/nx-X11/lib/GL/mesa/drivers/dri/common/Imakefile
new file mode 100644
index 000000000..d5c8dc7fa
--- /dev/null
+++ b/nx-X11/lib/GL/mesa/drivers/dri/common/Imakefile
@@ -0,0 +1,44 @@
+XCOMM $XFree86: xc/lib/GL/mesa/src/drv/common/Imakefile,v 1.6 2001/04/03 02:29:34 dawes Exp $
+
+#include <Threads.tmpl>
+
+#if GlxUseBuiltInDRIDriver
+#define DoNormalLib (NormalLibGlx || SharedLibGlxWithoutPIC)
+#define DoSharedLib (SharedLibGlx && !SharedLibGlxWithoutPIC)
+#define DoExtraLib SharedLibGlx
+#define DoDebugLib DebugLibGlx
+#define DoProfileLib ProfileLibGlx
+#else
+#define DoNormalLib SharedLibGlxWithoutPIC
+#define DoSharedLib !SharedLibGlxWithoutPIC
+#define DoExtrasLib NO
+#define DoDebugLib NO
+#define DoProfileLib NO
+#endif
+
+#if defined(i386Architecture) && MesaUseX86Asm
+#include "../../../x86/Imakefile.inc"
+#endif
+#ifdef SparcArchitecture
+#include "../../../sparc/Imakefile.inc"
+#endif
+
+#define NeedToLinkMesaSrc
+#define MesaDrvCommonBuildDir /**/
+#include "Imakefile.inc"
+
+      DEFINES = $(ALLOC_DEFINES) $(COMMON_DRI_DEFINES) $(MESA_ASM_DEFINES)
+     INCLUDES = $(COMMON_X_INCLUDES) $(COMMON_MESA_INCLUDES) \
+		$(COMMON_DRI_INCLUDES) $(EXPATINCLUDES)
+
+         SRCS = $(COMMONSRCS)
+         OBJS = $(COMMONOBJS)
+ 
+#include <Library.tmpl>
+
+LibraryObjectRule()
+
+SubdirLibraryRule($(OBJS))
+NormalLintTarget($(SRCS))
+
+DependTarget()
diff --git a/nx-X11/lib/GL/mesa/drivers/dri/common/Imakefile.inc b/nx-X11/lib/GL/mesa/drivers/dri/common/Imakefile.inc
new file mode 100644
index 000000000..388b724b2
--- /dev/null
+++ b/nx-X11/lib/GL/mesa/drivers/dri/common/Imakefile.inc
@@ -0,0 +1,105 @@
+XCOMM $XFree86: xc/lib/GL/mesa/src/drv/common/Imakefile.inc,v 1.3 2003/05/27 16:34:32 tsi Exp $
+
+#ifndef MesaDrvSrcDir
+#define MesaDrvSrcDir $(MESASRCDIR)/src/mesa/drivers/dri
+#endif
+
+MESADRVSRCDIR = MesaDrvSrcDir
+
+#ifndef MesaDrvCommonBuildDir
+#define MesaDrvCommonBuildDir $(MESADRVSRCDIR)/common/
+#endif
+
+MESADRVCOMMONBUILDDIR = MesaDrvCommonBuildDir
+
+#if Malloc0ReturnsNull
+ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL
+#endif
+
+#if BuildXF86DRI
+ COMMON_DRI_DEFINES = GlxDefines -DX_BYTE_ORDER=$(X_BYTE_ORDER) -DIN_DRI_DRIVER
+ COMMON_DRI_INCLUDES = -I$(GLXLIBSRC)/dri \
+		-I$(XINCLUDESRC) \
+		-I$(GLXLIBSRC)/glx \
+		-I$(GLXLIBSRC)/include \
+		-I$(SERVERSRC)/GL/dri \
+		-I$(XF86OSSRC) \
+		-I$(XF86COMSRC) \
+		-I$(GLXLIBSRC)/dri/drm \
+		-I$(GLXLIBSRC)/include \
+		-I$(DRMSRCDIR)/shared-core \
+                -I$(MESASRCDIR)/include/GL/internal
+#endif
+
+COMMON_MESA_INCLUDES = -I$(MESASRCDIR)/src/mesa \
+		-I$(MESASRCDIR)/src/mesa/main \
+		-I$(MESASRCDIR)/src/mesa/shader \
+		-I$(MESASRCDIR)/src/mesa/glapi \
+		-I$(MESADRVSRCDIR)/common \
+		-I$(MESADRVSRCDIR)/../common \
+		-I$(MESASRCDIR)/include
+   COMMON_X_INCLUDES = -I$(XINCLUDESRC) -I$(EXTINCSRC)
+
+    COMMONSRCS = $(MESADRVCOMMONBUILDDIR)utils.c \
+                 $(MESADRVCOMMONBUILDDIR)vblank.c \
+                 $(MESADRVCOMMONBUILDDIR)texmem.c \
+                 $(MESADRVCOMMONBUILDDIR)xmlconfig.c \
+                 $(MESADRVCOMMONBUILDDIR)driverfuncs.c \
+                 $(MESADRVCOMMONBUILDDIR)dri_util.c \
+                 $(MESADRVCOMMONBUILDDIR)glcontextmodes.c \
+                 $(MESADRVCOMMONBUILDDIR)drirenderbuffer.c
+
+    COMMONOBJS = $(MESADRVCOMMONBUILDDIR)utils.o \
+                 $(MESADRVCOMMONBUILDDIR)vblank.o \
+                 $(MESADRVCOMMONBUILDDIR)texmem.o \
+                 $(MESADRVCOMMONBUILDDIR)xmlconfig.o \
+                 $(MESADRVCOMMONBUILDDIR)driverfuncs.o \
+                 $(MESADRVCOMMONBUILDDIR)dri_util.o \
+                 $(MESADRVCOMMONBUILDDIR)glcontextmodes.o \
+                 $(MESADRVCOMMONBUILDDIR)drirenderbuffer.o
+
+    COMMONUOBJS = $(MESADRVCOMMONBUILDDIR)unshared/utils.o \
+                 $(MESADRVCOMMONBUILDDIR)unshared/vblank.o \
+                 $(MESADRVCOMMONBUILDDIR)unshared/texmem.o \
+                 $(MESADRVCOMMONBUILDDIR)unshared/xmlconfig.o \
+                 $(MESADRVCOMMONBUILDDIR)unshared/driverfuncs.o \
+                 $(MESADRVCOMMONBUILDDIR)unshared/dri_util.o \
+                 $(MESADRVCOMMONBUILDDIR)unshared/glcontextmodes.o \
+                 $(MESADRVCOMMONBUILDDIR)unshared/drirenderbuffer.o
+
+    COMMONDOBJS = $(MESADRVCOMMONBUILDDIR)debugger/utils.o \
+                 $(MESADRVCOMMONBUILDDIR)debugger/vblank.o \
+                 $(MESADRVCOMMONBUILDDIR)debugger/texmem.o \
+                 $(MESADRVCOMMONBUILDDIR)debugger/xmlconfig.o \
+                 $(MESADRVCOMMONBUILDDIR)debugger/driverfuncs.o \
+                 $(MESADRVCOMMONBUILDDIR)debugger/dri_util.o \
+                 $(MESADRVCOMMONBUILDDIR)debugger/glcontextmodes.o \
+                 $(MESADRVCOMMONBUILDDIR)debugger/drirenderbuffer.o
+
+    COMMONPOBJS = $(MESADRVCOMMONBUILDDIR)profiled/utils.o \
+                 $(MESADRVCOMMONBUILDDIR)profiled/vblank.o \
+                 $(MESADRVCOMMONBUILDDIR)profiled/texmem.o \
+                 $(MESADRVCOMMONBUILDDIR)profiled/xmlconfig.o \
+                 $(MESADRVCOMMONBUILDDIR)profiled/driverfuncs.o \
+                 $(MESADRVCOMMONBUILDDIR)profiled/dri_util.o \
+                 $(MESADRVCOMMONBUILDDIR)profiled/glcontextmodes.o \
+                 $(MESADRVCOMMONBUILDDIR)profiled/drirenderbuffer.o
+
+#ifdef NeedToLinkMesaSrc
+LinkSourceFile(texmem.c, $(MESADRVSRCDIR)/common)
+LinkSourceFile(texmem.h, $(MESADRVSRCDIR)/common)
+LinkSourceFile(utils.c, $(MESADRVSRCDIR)/common)
+LinkSourceFile(utils.h, $(MESADRVSRCDIR)/common)
+LinkSourceFile(vblank.c, $(MESADRVSRCDIR)/common)
+LinkSourceFile(vblank.h, $(MESADRVSRCDIR)/common)
+LinkSourceFile(xmlconfig.c, $(MESADRVSRCDIR)/common)
+LinkSourceFile(xmlconfig.h, $(MESADRVSRCDIR)/common)
+LinkSourceFile(driverfuncs.c, $(MESADRVSRCDIR)/../common)
+LinkSourceFile(driverfuncs.h, $(MESADRVSRCDIR)/../common)
+LinkSourceFile(dri_util.c, $(MESADRVSRCDIR)/common)
+LinkSourceFile(dri_util.h, $(MESADRVSRCDIR)/common)
+LinkSourceFile(glcontextmodes.c, $(MESADRVSRCDIR)/common)
+LinkSourceFile(glcontextmodes.h, $(MESADRVSRCDIR)/common)
+LinkSourceFile(drirenderbuffer.c, $(MESADRVSRCDIR)/common)
+LinkSourceFile(drirenderbuffer.h, $(MESADRVSRCDIR)/common)
+#endif
diff --git a/nx-X11/lib/GL/mesa/drivers/dri/ffb/Imakefile b/nx-X11/lib/GL/mesa/drivers/dri/ffb/Imakefile
new file mode 100644
index 000000000..7d98c1912
--- /dev/null
+++ b/nx-X11/lib/GL/mesa/drivers/dri/ffb/Imakefile
@@ -0,0 +1,77 @@
+XCOMM $XFree86: xc/lib/GL/mesa/src/drv/ffb/Imakefile,v 1.15 2002/02/23 00:45:48 dawes Exp $
+
+#include <Threads.tmpl>
+
+#if GlxUseBuiltInDRIDriver
+#define DoNormalLib (NormalLibGlx || SharedLibGlxWithoutPIC)
+#define DoSharedLib (SharedLibGlx && !SharedLibGlxWithoutPIC)
+#define DoExtraLib SharedLibGlx
+#define DoDebugLib DebugLibGlx
+#define DoProfileLib ProfileLibGlx
+#else
+#define DoNormalLib SharedLibGlxWithoutPIC
+#define DoSharedLib !SharedLibGlxWithoutPIC
+#define DoExtrasLib NO
+#define DoDebugLib NO
+#define DoProfileLib NO
+#endif
+
+#define MesaDrvCommonBuildDir ../common/
+#include "../common/Imakefile.inc"
+#include "../../../array_cache/Imakefile.inc"
+#include "../../../main/Imakefile.inc"
+#include "../../../math/Imakefile.inc"
+#include "../../../shader/Imakefile.inc"
+#include "../../../shader/grammar/Imakefile.inc"
+#include "../../../shader/slang/Imakefile.inc"
+#include "../../../shader/slang/library/Imakefile.inc"
+#include "../../../swrast/Imakefile.inc"
+#include "../../../swrast_setup/Imakefile.inc"
+#include "../../../tnl/Imakefile.inc"
+#include "../../../tnl_dd/Imakefile.inc"
+#include "../../../Imakefile.inc"
+#if defined(i386Architecture) && MesaUseX86Asm
+#include "../../../x86/Imakefile.inc"
+#endif
+#ifdef SparcArchitecture
+#include "../../../sparc/Imakefile.inc"
+#endif
+#define NeedToLinkMesaSrc
+#include "Imakefile.inc"
+
+      DEFINES = $(ALLOC_DEFINES) $(DRI_DEFINES) $(MESA_ASM_DEFINES)
+     INCLUDES = $(X_INCLUDES) $(MESA_INCLUDES) $(DRI_INCLUDES) \
+		-I$(XF86DRIVERSRC)/sunffb
+
+      DRMOBJS = $(GLXLIBSRC)/dri/drm/xf86drm.o \
+		$(GLXLIBSRC)/dri/drm/xf86drmHash.o \
+		$(GLXLIBSRC)/dri/drm/xf86drmRandom.o \
+		$(GLXLIBSRC)/dri/drm/xf86drmSL.o
+
+         SRCS = $(FFBSRCS)
+         OBJS = $(DRMOBJS) $(COREMESAOBJS) \
+		$(MESA_ASM_OBJS) $(COMMONOBJS) $(FFBOBJS) 
+
+REQUIREDLIBS = MathLibrary $(LDPRELIB) $(GLXLIB) $(XONLYLIB) $(EXPATLIB)
+
+#include <Library.tmpl>
+
+LibraryObjectRule()
+
+SubdirLibraryRule($(FFBOBJS))
+NormalLintTarget($(SRCS))
+
+#if !GlxUseBuiltInDRIDriver
+LIBNAME = ffb_dri.so
+SharedDriModuleTarget($(LIBNAME),DONE $(OBJS),$(OBJS))
+InstallDynamicModule($(LIBNAME),$(MODULEDIR),dri)
+
+#ifdef GlxSoProf
+SOPROF_LIBNAME = _ffb_dri_p
+NormalDepLibraryTarget($(SOPROF_LIBNAME),DONE $(OBJS),$(OBJS))
+InstallLibrary($(SOPROF_LIBNAME),$(MODULEDIR)/dri)
+#endif
+#endif
+
+DependTarget()
+
diff --git a/nx-X11/lib/GL/mesa/drivers/dri/ffb/Imakefile.inc b/nx-X11/lib/GL/mesa/drivers/dri/ffb/Imakefile.inc
new file mode 100644
index 000000000..3ef08a64a
--- /dev/null
+++ b/nx-X11/lib/GL/mesa/drivers/dri/ffb/Imakefile.inc
@@ -0,0 +1,151 @@
+XCOMM $XFree86: xc/lib/GL/mesa/src/drv/ffb/Imakefile.inc,v 1.3 2002/02/22 21:32:58 dawes Exp $
+
+#ifndef MesaDrvSrcDir
+#define MesaDrvSrcDir $(MESASRCDIR)/src/mesa/drivers/dri
+#endif
+
+MESADRVSRCDIR = MesaDrvSrcDir
+
+#ifndef MesaDrvFfbBuildDir
+#define MesaDrvFfbBuildDir /**/
+#endif
+MESADRVFFBBUILDDIR = MesaDrvFfbBuildDir
+
+#if Malloc0ReturnsNull
+ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL
+#endif
+
+#if BuildXF86DRI
+  DRI_DEFINES = GlxDefines -DX_BYTE_ORDER=ByteOrder -DIN_DRI_DRIVER
+ DRI_INCLUDES = -I$(GLXLIBSRC)/dri \
+		-I$(XINCLUDESRC) \
+		-I$(GLXLIBSRC)/glx \
+		-I$(GLXLIBSRC)/include \
+		-I$(SERVERSRC)/GL/dri \
+		-I$(XF86OSSRC) \
+		-I$(DRMSRCDIR)/shared-core \
+		-I$(GLXLIBSRC)/dri/drm
+#endif
+
+MESA_INCLUDES = -I$(MESASRCDIR)/src/mesa \
+		-I$(MESASRCDIR)/src/mesa/main \
+		-I$(MESASRCDIR)/src/mesa/glapi \
+		-I$(MESASRCDIR)/src/mesa/shader \
+		-I$(MESASRCDIR)/include \
+		-I$(MESADRVSRCDIR)/common \
+		-I$(MESADRVSRCDIR)/ffb
+   X_INCLUDES = -I$(XINCLUDESRC) -I$(EXTINCSRC)
+
+   FFBSRCS    = $(MESADRVFFBBUILDDIR)ffb_bitmap.c \
+		$(MESADRVFFBBUILDDIR)ffb_clear.c \
+		$(MESADRVFFBBUILDDIR)ffb_dd.c \
+		$(MESADRVFFBBUILDDIR)ffb_depth.c \
+		/* $(MESADRVFFBBUILDDIR)ffb_fog.c */ \
+		$(MESADRVFFBBUILDDIR)ffb_lines.c \
+		$(MESADRVFFBBUILDDIR)ffb_points.c \
+		$(MESADRVFFBBUILDDIR)ffb_span.c \
+		$(MESADRVFFBBUILDDIR)ffb_state.c \
+		$(MESADRVFFBBUILDDIR)ffb_stencil.c \
+		$(MESADRVFFBBUILDDIR)ffb_tex.c \
+		$(MESADRVFFBBUILDDIR)ffb_tris.c \
+		$(MESADRVFFBBUILDDIR)ffb_vb.c \
+		$(MESADRVFFBBUILDDIR)ffb_xmesa.c
+
+   FFBOBJS    = $(MESADRVFFBBUILDDIR)ffb_bitmap.o \
+		$(MESADRVFFBBUILDDIR)ffb_clear.o \
+		$(MESADRVFFBBUILDDIR)ffb_dd.o \
+		$(MESADRVFFBBUILDDIR)ffb_depth.o \
+		/* $(MESADRVFFBBUILDDIR)ffb_fog.o */ \
+		$(MESADRVFFBBUILDDIR)ffb_lines.o \
+		$(MESADRVFFBBUILDDIR)ffb_points.o \
+		$(MESADRVFFBBUILDDIR)ffb_span.o \
+		$(MESADRVFFBBUILDDIR)ffb_state.o \
+		$(MESADRVFFBBUILDDIR)ffb_stencil.o \
+		$(MESADRVFFBBUILDDIR)ffb_tex.o \
+		$(MESADRVFFBBUILDDIR)ffb_tris.o \
+		$(MESADRVFFBBUILDDIR)ffb_vb.o \
+		$(MESADRVFFBBUILDDIR)ffb_xmesa.o
+
+   FFBUOBJS   = $(MESADRVFFBBUILDDIR)unshared/ffb_bitmap.o \
+		$(MESADRVFFBBUILDDIR)unshared/ffb_clear.o \
+		$(MESADRVFFBBUILDDIR)unshared/ffb_dd.o \
+		$(MESADRVFFBBUILDDIR)unshared/ffb_depth.o \
+		/* $(MESADRVFFBBUILDDIR)unshared/ffb_fog.o */ \
+		$(MESADRVFFBBUILDDIR)unshared/ffb_lines.o \
+		$(MESADRVFFBBUILDDIR)unshared/ffb_points.o \
+		$(MESADRVFFBBUILDDIR)unshared/ffb_span.o \
+		$(MESADRVFFBBUILDDIR)unshared/ffb_state.o \
+		$(MESADRVFFBBUILDDIR)unshared/ffb_stencil.o \
+		$(MESADRVFFBBUILDDIR)unshared/ffb_tex.o \
+		$(MESADRVFFBBUILDDIR)unshared/ffb_tris.o \
+		$(MESADRVFFBBUILDDIR)unshared/ffb_vb.o \
+		$(MESADRVFFBBUILDDIR)unshared/ffb_xmesa.o
+
+   FFBDOBJS   = $(MESADRVFFBBUILDDIR)debugger/ffb_bitmap.o \
+		$(MESADRVFFBBUILDDIR)debugger/ffb_clear.o \
+		$(MESADRVFFBBUILDDIR)debugger/ffb_dd.o \
+		$(MESADRVFFBBUILDDIR)debugger/ffb_depth.o \
+		/* $(MESADRVFFBBUILDDIR)debugger/ffb_fog.o */ \
+		$(MESADRVFFBBUILDDIR)debugger/ffb_lines.o \
+		$(MESADRVFFBBUILDDIR)debugger/ffb_points.o \
+		$(MESADRVFFBBUILDDIR)debugger/ffb_span.o \
+		$(MESADRVFFBBUILDDIR)debugger/ffb_state.o \
+		$(MESADRVFFBBUILDDIR)debugger/ffb_stencil.o \
+		$(MESADRVFFBBUILDDIR)debugger/ffb_tex.o \
+		$(MESADRVFFBBUILDDIR)debugger/ffb_tris.o \
+		$(MESADRVFFBBUILDDIR)debugger/ffb_vb.o \
+		$(MESADRVFFBBUILDDIR)debugger/ffb_xmesa.o
+
+   FFBPOBJS   = $(MESADRVFFBBUILDDIR)profiled/ffb_bitmap.o \
+		$(MESADRVFFBBUILDDIR)profiled/ffb_clear.o \
+		$(MESADRVFFBBUILDDIR)profiled/ffb_dd.o \
+		$(MESADRVFFBBUILDDIR)profiled/ffb_depth.o \
+		/* $(MESADRVFFBBUILDDIR)profiled/ffb_fog.o */ \
+		$(MESADRVFFBBUILDDIR)profiled/ffb_lines.o \
+		$(MESADRVFFBBUILDDIR)profiled/ffb_points.o \
+		$(MESADRVFFBBUILDDIR)profiled/ffb_span.o \
+		$(MESADRVFFBBUILDDIR)profiled/ffb_state.o \
+		$(MESADRVFFBBUILDDIR)profiled/ffb_stencil.o \
+		$(MESADRVFFBBUILDDIR)profiled/ffb_tex.o \
+		$(MESADRVFFBBUILDDIR)profiled/ffb_tris.o \
+		$(MESADRVFFBBUILDDIR)profiled/ffb_vb.o \
+		$(MESADRVFFBBUILDDIR)profiled/ffb_xmesa.o
+
+#ifdef NeedToLinkMesaSrc
+LinkSourceFile(ffb_bitmap.c, $(MESADRVSRCDIR)/ffb)
+LinkSourceFile(ffb_bitmap.h, $(MESADRVSRCDIR)/ffb)
+LinkSourceFile(ffb_clear.c, $(MESADRVSRCDIR)/ffb)
+LinkSourceFile(ffb_clear.h, $(MESADRVSRCDIR)/ffb)
+LinkSourceFile(ffb_context.h, $(MESADRVSRCDIR)/ffb)
+LinkSourceFile(ffb_dd.c, $(MESADRVSRCDIR)/ffb)
+LinkSourceFile(ffb_dd.h, $(MESADRVSRCDIR)/ffb)
+LinkSourceFile(ffb_depth.c, $(MESADRVSRCDIR)/ffb)
+LinkSourceFile(ffb_depth.h, $(MESADRVSRCDIR)/ffb)
+/* LinkSourceFile(ffb_fog.c, $(MESADRVSRCDIR)/ffb) */
+LinkSourceFile(ffb_fifo.h, $(MESADRVSRCDIR)/ffb)
+LinkSourceFile(ffb_lines.c, $(MESADRVSRCDIR)/ffb)
+LinkSourceFile(ffb_lines.h, $(MESADRVSRCDIR)/ffb)
+LinkSourceFile(ffb_linetmp.h, $(MESADRVSRCDIR)/ffb)
+LinkSourceFile(ffb_lock.h, $(MESADRVSRCDIR)/ffb)
+LinkSourceFile(ffb_points.c, $(MESADRVSRCDIR)/ffb)
+LinkSourceFile(ffb_points.h, $(MESADRVSRCDIR)/ffb)
+LinkSourceFile(ffb_pointtmp.h, $(MESADRVSRCDIR)/ffb)
+LinkSourceFile(ffb_rendertmp.h, $(MESADRVSRCDIR)/ffb)
+LinkSourceFile(ffb_span.c, $(MESADRVSRCDIR)/ffb)
+LinkSourceFile(ffb_span.h, $(MESADRVSRCDIR)/ffb)
+LinkSourceFile(ffb_state.c, $(MESADRVSRCDIR)/ffb)
+LinkSourceFile(ffb_state.h, $(MESADRVSRCDIR)/ffb)
+LinkSourceFile(ffb_stencil.c, $(MESADRVSRCDIR)/ffb)
+LinkSourceFile(ffb_stencil.h, $(MESADRVSRCDIR)/ffb)
+LinkSourceFile(ffb_tex.c, $(MESADRVSRCDIR)/ffb)
+LinkSourceFile(ffb_tex.h, $(MESADRVSRCDIR)/ffb)
+LinkSourceFile(ffb_tris.c, $(MESADRVSRCDIR)/ffb)
+LinkSourceFile(ffb_tris.h, $(MESADRVSRCDIR)/ffb)
+LinkSourceFile(ffb_tritmp.h, $(MESADRVSRCDIR)/ffb)
+LinkSourceFile(ffb_vb.c, $(MESADRVSRCDIR)/ffb)
+LinkSourceFile(ffb_vb.h, $(MESADRVSRCDIR)/ffb)
+LinkSourceFile(ffb_vbtmp.h, $(MESADRVSRCDIR)/ffb)
+LinkSourceFile(ffb_vtxfmt.h, $(MESADRVSRCDIR)/ffb)
+LinkSourceFile(ffb_xmesa.c, $(MESADRVSRCDIR)/ffb)
+LinkSourceFile(ffb_xmesa.h, $(MESADRVSRCDIR)/ffb)
+#endif
diff --git a/nx-X11/lib/GL/mesa/drivers/dri/gamma/Imakefile b/nx-X11/lib/GL/mesa/drivers/dri/gamma/Imakefile
new file mode 100644
index 000000000..490f8ccec
--- /dev/null
+++ b/nx-X11/lib/GL/mesa/drivers/dri/gamma/Imakefile
@@ -0,0 +1,77 @@
+XCOMM $XFree86: xc/lib/GL/mesa/src/drv/gamma/Imakefile,v 1.25 2002/02/23 00:45:49 dawes Exp $
+
+#include <Threads.tmpl>
+
+#if GlxUseBuiltInDRIDriver
+#define DoNormalLib (NormalLibGlx || SharedLibGlxWithoutPIC)
+#define DoSharedLib (SharedLibGlx && !SharedLibGlxWithoutPIC)
+#define DoExtraLib SharedLibGlx
+#define DoDebugLib DebugLibGlx
+#define DoProfileLib ProfileLibGlx
+#else
+#define DoNormalLib SharedLibGlxWithoutPIC
+#define DoSharedLib !SharedLibGlxWithoutPIC
+#define DoExtrasLib NO
+#define DoDebugLib NO
+#define DoProfileLib NO
+#endif
+
+#define MesaDrvCommonBuildDir ../common/
+#include "../common/Imakefile.inc"
+#include "../../../array_cache/Imakefile.inc"
+#include "../../../main/Imakefile.inc"
+#include "../../../math/Imakefile.inc"
+#include "../../../shader/Imakefile.inc"
+#include "../../../shader/grammar/Imakefile.inc"
+#include "../../../shader/slang/Imakefile.inc"
+#include "../../../shader/slang/library/Imakefile.inc"
+#include "../../../swrast/Imakefile.inc"
+#include "../../../swrast_setup/Imakefile.inc"
+#include "../../../tnl/Imakefile.inc"
+#include "../../../tnl_dd/Imakefile.inc"
+#include "../../../Imakefile.inc"
+#if defined(i386Architecture) && MesaUseX86Asm
+#include "../../../x86/Imakefile.inc"
+#endif
+#ifdef SparcArchitecture
+#include "../../../sparc/Imakefile.inc"
+#endif
+#define NeedToLinkMesaSrc
+#include "Imakefile.inc"
+
+
+      DEFINES = $(ALLOC_DEFINES) $(DRI_DEFINES) $(MESA_ASM_DEFINES)
+     INCLUDES = $(X_INCLUDES) $(MESA_INCLUDES) $(DRI_INCLUDES)
+
+      DRMOBJS = $(GLXLIBSRC)/dri/drm/xf86drm.o \
+		$(GLXLIBSRC)/dri/drm/xf86drmHash.o \
+		$(GLXLIBSRC)/dri/drm/xf86drmRandom.o \
+		$(GLXLIBSRC)/dri/drm/xf86drmSL.o
+
+         SRCS = $(GAMMASRCS)
+         OBJS = $(DRMOBJS) $(COREMESAOBJS) \
+		$(MESA_ASM_OBJS) $(COMMONOBJS) $(GAMMAOBJS) 
+
+REQUIREDLIBS = MathLibrary $(LDPRELIB) $(GLXLIB) $(XONLYLIB) $(EXPATLIB)
+
+#include <Library.tmpl>
+
+LibraryObjectRule()
+
+SubdirLibraryRule($(GAMMAOBJS))
+NormalLintTarget($(SRCS))
+
+#if !GlxUseBuiltInDRIDriver
+LIBNAME = gamma_dri.so
+SharedDriModuleTarget($(LIBNAME),DONE $(OBJS),$(OBJS))
+InstallDynamicModule($(LIBNAME),$(MODULEDIR),dri)
+
+#ifdef GlxSoProf
+SOPROF_LIBNAME = _gamma_dri_p
+NormalDepLibraryTarget($(SOPROF_LIBNAME),DONE $(OBJS),$(OBJS))
+InstallLibrary($(SOPROF_LIBNAME),$(MODULEDIR)/dri)
+#endif
+#endif
+
+DependTarget()
+
diff --git a/nx-X11/lib/GL/mesa/drivers/dri/gamma/Imakefile.inc b/nx-X11/lib/GL/mesa/drivers/dri/gamma/Imakefile.inc
new file mode 100644
index 000000000..e42cc5ce6
--- /dev/null
+++ b/nx-X11/lib/GL/mesa/drivers/dri/gamma/Imakefile.inc
@@ -0,0 +1,140 @@
+XCOMM $XFree86: xc/lib/GL/mesa/src/drv/gamma/Imakefile.inc,v 1.2 2001/05/02 15:06:03 dawes Exp $
+
+#ifndef MesaDrvSrcDir
+#define MesaDrvSrcDir $(MESASRCDIR)/src/mesa/drivers/dri
+#endif
+
+MESADRVSRCDIR = MesaDrvSrcDir
+
+#ifndef MesaDrvGammaBuildDir
+#define MesaDrvGammaBuildDir /**/
+#endif
+MESADRVGAMMABUILDDIR = MesaDrvGammaBuildDir
+
+#if Malloc0ReturnsNull
+ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL
+#endif
+
+#if BuildXF86DRI
+  DRI_DEFINES = GlxDefines -DX_BYTE_ORDER=ByteOrder -DIN_DRI_DRIVER
+ DRI_INCLUDES = -I$(GLXLIBSRC)/dri \
+		-I$(XINCLUDESRC) \
+		-I$(GLXLIBSRC)/glx \
+		-I$(GLXLIBSRC)/include \
+		-I$(SERVERSRC)/GL/dri \
+		-I$(XF86OSSRC) \
+		-I$(DRMSRCDIR)/shared-core \
+		-I$(XF86DRIVERSRC)/glint \
+		-I$(GLXLIBSRC)/dri/drm
+#endif
+
+MESA_INCLUDES = -I$(MESASRCDIR)/src/mesa \
+		-I$(MESASRCDIR)/src/mesa/main \
+		-I$(MESASRCDIR)/src/mesa/glapi \
+		-I$(MESASRCDIR)/src/mesa/shader \
+		-I$(MESASRCDIR)/include \
+		-I$(MESADRVSRCDIR)/common \
+		-I$(MESADRVSRCDIR)/gamma
+   X_INCLUDES = -I$(XINCLUDESRC) -I$(EXTINCSRC)
+
+
+    GAMMASRCS = $(MESADRVGAMMABUILDDIR)gamma_context.c \
+		$(MESADRVGAMMABUILDDIR)gamma_dd.c \
+		$(MESADRVGAMMABUILDDIR)gamma_inithw.c \
+		$(MESADRVGAMMABUILDDIR)gamma_lock.c \
+		$(MESADRVGAMMABUILDDIR)gamma_render.c \
+		$(MESADRVGAMMABUILDDIR)gamma_screen.c \
+		$(MESADRVGAMMABUILDDIR)gamma_span.c \
+		$(MESADRVGAMMABUILDDIR)gamma_state.c \
+		$(MESADRVGAMMABUILDDIR)gamma_tex.c \
+		$(MESADRVGAMMABUILDDIR)gamma_texmem.c \
+		$(MESADRVGAMMABUILDDIR)gamma_texstate.c \
+		$(MESADRVGAMMABUILDDIR)gamma_tris.c \
+		$(MESADRVGAMMABUILDDIR)gamma_vb.c \
+		$(MESADRVGAMMABUILDDIR)gamma_xmesa.c
+
+    GAMMAOBJS = $(MESADRVGAMMABUILDDIR)gamma_context.o \
+		$(MESADRVGAMMABUILDDIR)gamma_dd.o \
+		$(MESADRVGAMMABUILDDIR)gamma_inithw.o \
+		$(MESADRVGAMMABUILDDIR)gamma_lock.o \
+		$(MESADRVGAMMABUILDDIR)gamma_render.o \
+		$(MESADRVGAMMABUILDDIR)gamma_screen.o \
+		$(MESADRVGAMMABUILDDIR)gamma_span.o \
+		$(MESADRVGAMMABUILDDIR)gamma_state.o \
+		$(MESADRVGAMMABUILDDIR)gamma_tex.o \
+		$(MESADRVGAMMABUILDDIR)gamma_texmem.o \
+		$(MESADRVGAMMABUILDDIR)gamma_texstate.o \
+		$(MESADRVGAMMABUILDDIR)gamma_tris.o \
+		$(MESADRVGAMMABUILDDIR)gamma_vb.o \
+		$(MESADRVGAMMABUILDDIR)gamma_xmesa.o
+
+    GAMMAUOBJS = $(MESADRVGAMMABUILDDIR)unshared/gamma_context.o \
+		$(MESADRVGAMMABUILDDIR)unshared/gamma_dd.o \
+		$(MESADRVGAMMABUILDDIR)unshared/gamma_inithw.o \
+		$(MESADRVGAMMABUILDDIR)unshared/gamma_lock.o \
+		$(MESADRVGAMMABUILDDIR)unshared/gamma_render.o \
+		$(MESADRVGAMMABUILDDIR)unshared/gamma_screen.o \
+		$(MESADRVGAMMABUILDDIR)unshared/gamma_span.o \
+		$(MESADRVGAMMABUILDDIR)unshared/gamma_state.o \
+		$(MESADRVGAMMABUILDDIR)unshared/gamma_tex.o \
+		$(MESADRVGAMMABUILDDIR)unshared/gamma_texmem.o \
+		$(MESADRVGAMMABUILDDIR)unshared/gamma_texstate.o \
+		$(MESADRVGAMMABUILDDIR)unshared/gamma_tris.o \
+		$(MESADRVGAMMABUILDDIR)unshared/gamma_vb.o \
+		$(MESADRVGAMMABUILDDIR)unshared/gamma_xmesa.o
+
+    GAMMADOBJS = $(MESADRVGAMMABUILDDIR)debugger/gamma_context.o \
+		$(MESADRVGAMMABUILDDIR)debugger/gamma_dd.o \
+		$(MESADRVGAMMABUILDDIR)debugger/gamma_inithw.o \
+		$(MESADRVGAMMABUILDDIR)debugger/gamma_lock.o \
+		$(MESADRVGAMMABUILDDIR)debugger/gamma_render.o \
+		$(MESADRVGAMMABUILDDIR)debugger/gamma_screen.o \
+		$(MESADRVGAMMABUILDDIR)debugger/gamma_span.o \
+		$(MESADRVGAMMABUILDDIR)debugger/gamma_state.o \
+		$(MESADRVGAMMABUILDDIR)debugger/gamma_tex.o \
+		$(MESADRVGAMMABUILDDIR)debugger/gamma_texmem.o \
+		$(MESADRVGAMMABUILDDIR)debugger/gamma_texstate.o \
+		$(MESADRVGAMMABUILDDIR)debugger/gamma_tris.o \
+		$(MESADRVGAMMABUILDDIR)debugger/gamma_vb.o \
+		$(MESADRVGAMMABUILDDIR)debugger/gamma_xmesa.o
+
+    GAMMAPOBJS = $(MESADRVGAMMABUILDDIR)profiled/gamma_context.o \
+		$(MESADRVGAMMABUILDDIR)profiled/gamma_dd.o \
+		$(MESADRVGAMMABUILDDIR)profiled/gamma_inithw.o \
+		$(MESADRVGAMMABUILDDIR)profiled/gamma_lock.o \
+		$(MESADRVGAMMABUILDDIR)profiled/gamma_render.o \
+		$(MESADRVGAMMABUILDDIR)profiled/gamma_screen.o \
+		$(MESADRVGAMMABUILDDIR)profiled/gamma_span.o \
+		$(MESADRVGAMMABUILDDIR)profiled/gamma_state.o \
+		$(MESADRVGAMMABUILDDIR)profiled/gamma_tex.o \
+		$(MESADRVGAMMABUILDDIR)profiled/gamma_texmem.o \
+		$(MESADRVGAMMABUILDDIR)profiled/gamma_texstate.o \
+		$(MESADRVGAMMABUILDDIR)profiled/gamma_tris.o \
+		$(MESADRVGAMMABUILDDIR)profiled/gamma_vb.o \
+		$(MESADRVGAMMABUILDDIR)profiled/gamma_xmesa.o
+
+#ifdef NeedToLinkMesaSrc
+LinkSourceFile(gamma_context.c, $(MESADRVSRCDIR)/gamma)
+LinkSourceFile(gamma_context.h, $(MESADRVSRCDIR)/gamma)
+LinkSourceFile(gamma_client.h, $(MESADRVSRCDIR)/gamma)
+LinkSourceFile(gamma_dd.c, $(MESADRVSRCDIR)/gamma)
+LinkSourceFile(gamma_inithw.c, $(MESADRVSRCDIR)/gamma)
+LinkSourceFile(gamma_lock.c, $(MESADRVSRCDIR)/gamma)
+LinkSourceFile(gamma_lock.h, $(MESADRVSRCDIR)/gamma)
+LinkSourceFile(gamma_macros.h, $(MESADRVSRCDIR)/gamma)
+LinkSourceFile(gamma_render.c, $(MESADRVSRCDIR)/gamma)
+LinkSourceFile(gamma_regs.h, $(MESADRVSRCDIR)/gamma)
+LinkSourceFile(gamma_screen.c, $(MESADRVSRCDIR)/gamma)
+LinkSourceFile(gamma_screen.h, $(MESADRVSRCDIR)/gamma)
+LinkSourceFile(gamma_span.c, $(MESADRVSRCDIR)/gamma)
+LinkSourceFile(gamma_state.c, $(MESADRVSRCDIR)/gamma)
+LinkSourceFile(gamma_tex.c, $(MESADRVSRCDIR)/gamma)
+LinkSourceFile(gamma_texmem.c, $(MESADRVSRCDIR)/gamma)
+LinkSourceFile(gamma_texstate.c, $(MESADRVSRCDIR)/gamma)
+LinkSourceFile(gamma_tris.c, $(MESADRVSRCDIR)/gamma)
+LinkSourceFile(gamma_tris.h, $(MESADRVSRCDIR)/gamma)
+LinkSourceFile(gamma_tritmp.h, $(MESADRVSRCDIR)/gamma)
+LinkSourceFile(gamma_vb.c, $(MESADRVSRCDIR)/gamma)
+LinkSourceFile(gamma_vb.h, $(MESADRVSRCDIR)/gamma)
+LinkSourceFile(gamma_xmesa.c, $(MESADRVSRCDIR)/gamma)
+#endif
diff --git a/nx-X11/lib/GL/mesa/drivers/dri/i810/Imakefile b/nx-X11/lib/GL/mesa/drivers/dri/i810/Imakefile
new file mode 100644
index 000000000..5d16f0108
--- /dev/null
+++ b/nx-X11/lib/GL/mesa/drivers/dri/i810/Imakefile
@@ -0,0 +1,77 @@
+XCOMM $XFree86: xc/lib/GL/mesa/src/drv/i810/Imakefile,v 1.23tsi Exp $
+
+#include <Threads.tmpl>
+
+#if GlxUseBuiltInDRIDriver
+#define DoNormalLib (NormalLibGlx || SharedLibGlxWithoutPIC)
+#define DoSharedLib (SharedLibGlx && !SharedLibGlxWithoutPIC)
+#define DoExtraLib SharedLibGlx
+#define DoDebugLib DebugLibGlx
+#define DoProfileLib ProfileLibGlx
+#else
+#define DoNormalLib SharedLibGlxWithoutPIC
+#define DoSharedLib !SharedLibGlxWithoutPIC
+#define DoExtrasLib NO
+#define DoDebugLib NO
+#define DoProfileLib NO
+#endif
+
+#define MesaDrvCommonBuildDir ../common/
+#include "../common/Imakefile.inc"
+#include "../../../array_cache/Imakefile.inc"
+#include "../../../main/Imakefile.inc"
+#include "../../../math/Imakefile.inc"
+#include "../../../shader/Imakefile.inc"
+#include "../../../shader/grammar/Imakefile.inc"
+#include "../../../shader/slang/Imakefile.inc"
+#include "../../../shader/slang/library/Imakefile.inc"
+#include "../../../swrast/Imakefile.inc"
+#include "../../../swrast_setup/Imakefile.inc"
+#include "../../../tnl/Imakefile.inc"
+#include "../../../tnl_dd/Imakefile.inc"
+#include "../../../Imakefile.inc"
+#if defined(i386Architecture) && MesaUseX86Asm
+#include "../../../x86/Imakefile.inc"
+#endif
+#ifdef SparcArchitecture
+#include "../../../sparc/Imakefile.inc"
+#endif
+#define NeedToLinkMesaSrc
+#include "Imakefile.inc"
+
+      DEFINES = $(ALLOC_DEFINES) $(DRI_DEFINES) $(MESA_ASM_DEFINES)
+
+     INCLUDES = $(X_INCLUDES) $(MESA_INCLUDES) $(DRI_INCLUDES)
+
+      DRMOBJS = $(GLXLIBSRC)/dri/drm/xf86drm.o \
+		$(GLXLIBSRC)/dri/drm/xf86drmHash.o \
+		$(GLXLIBSRC)/dri/drm/xf86drmRandom.o \
+		$(GLXLIBSRC)/dri/drm/xf86drmSL.o
+
+         SRCS = $(I810SRCS)
+         OBJS = $(DRMOBJS) $(COREMESAOBJS) \
+		$(MESA_ASM_OBJS) $(COMMONOBJS) $(I810OBJS) 
+
+REQUIREDLIBS = MathLibrary $(LDPRELIB) $(GLXLIB) $(XONLYLIB) $(EXPATLIB)
+
+#include <Library.tmpl>
+
+LibraryObjectRule()
+
+SubdirLibraryRule($(I810OBJS))
+NormalLintTarget($(SRCS))
+
+#if !GlxUseBuiltInDRIDriver
+LIBNAME = i810_dri.so
+SharedDriModuleTarget($(LIBNAME),DONE $(OBJS),$(OBJS))
+InstallDynamicModule($(LIBNAME),$(MODULEDIR),dri)
+
+#ifdef GlxSoProf
+SOPROF_LIBNAME = _i810_dri_p
+NormalDepLibraryTarget($(SOPROF_LIBNAME),DONE $(OBJS),$(OBJS))
+InstallLibrary($(SOPROF_LIBNAME),$(MODULEDIR)/dri)
+#endif
+#endif
+
+DependTarget()
+
diff --git a/nx-X11/lib/GL/mesa/drivers/dri/i810/Imakefile.inc b/nx-X11/lib/GL/mesa/drivers/dri/i810/Imakefile.inc
new file mode 100644
index 000000000..f540da75b
--- /dev/null
+++ b/nx-X11/lib/GL/mesa/drivers/dri/i810/Imakefile.inc
@@ -0,0 +1,121 @@
+XCOMM $XFree86: xc/lib/GL/mesa/src/drv/i810/Imakefile.inc,v 1.2 2001/05/02 15:06:03 dawes Exp $
+
+#ifndef MesaDrvSrcDir
+#define MesaDrvSrcDir $(MESASRCDIR)/src/mesa/drivers/dri
+#endif
+
+MESADRVSRCDIR = MesaDrvSrcDir
+
+#ifndef MesaDrvI810BuildDir
+#define MesaDrvI810BuildDir /**/
+#endif
+MESADRVI810BUILDDIR = MesaDrvI810BuildDir
+
+#if Malloc0ReturnsNull
+ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL
+#endif
+
+#if BuildXF86DRI
+  DRI_DEFINES = GlxDefines -DX_BYTE_ORDER=ByteOrder -DUSE_NEW_INTERFACE -DIN_DRI_DRIVER
+ DRI_INCLUDES = -I$(GLXLIBSRC)/dri \
+		-I$(XINCLUDESRC) \
+		-I$(GLXLIBSRC)/glx \
+		-I$(GLXLIBSRC)/include \
+		-I$(SERVERSRC)/GL/dri \
+		-I$(XF86OSSRC) \
+		-I$(DRMSRCDIR)/shared-core \
+		-I$(XF86DRIVERSRC)/i810 \
+		-I$(GLXLIBSRC)/dri/drm
+#endif
+
+MESA_INCLUDES = -I$(MESASRCDIR)/src/mesa \
+		-I$(MESASRCDIR)/src/mesa/main \
+		-I$(MESASRCDIR)/src/mesa/glapi \
+		-I$(MESASRCDIR)/src/mesa/shader \
+		-I$(MESASRCDIR)/include \
+		-I$(MESADRVSRCDIR)/common \
+		-I$(MESADRVSRCDIR)/i810
+   X_INCLUDES = -I$(XINCLUDESRC) -I$(EXTINCSRC)
+
+     I810SRCS = $(MESADRVI810BUILDDIR)i810context.c \
+		$(MESADRVI810BUILDDIR)i810ioctl.c \
+		$(MESADRVI810BUILDDIR)i810render.c \
+		$(MESADRVI810BUILDDIR)i810screen.c \
+		$(MESADRVI810BUILDDIR)i810span.c \
+		$(MESADRVI810BUILDDIR)i810state.c \
+		$(MESADRVI810BUILDDIR)i810tex.c \
+		$(MESADRVI810BUILDDIR)i810texmem.c \
+		$(MESADRVI810BUILDDIR)i810texstate.c \
+		$(MESADRVI810BUILDDIR)i810tris.c \
+		$(MESADRVI810BUILDDIR)i810vb.c
+
+     I810OBJS = $(MESADRVI810BUILDDIR)i810context.o \
+		$(MESADRVI810BUILDDIR)i810ioctl.o \
+		$(MESADRVI810BUILDDIR)i810render.o \
+		$(MESADRVI810BUILDDIR)i810screen.o \
+		$(MESADRVI810BUILDDIR)i810span.o \
+		$(MESADRVI810BUILDDIR)i810state.o \
+		$(MESADRVI810BUILDDIR)i810tex.o \
+		$(MESADRVI810BUILDDIR)i810texmem.o \
+		$(MESADRVI810BUILDDIR)i810texstate.o \
+		$(MESADRVI810BUILDDIR)i810tris.o \
+		$(MESADRVI810BUILDDIR)i810vb.o
+
+     I810UOBJS = $(MESADRVI810BUILDDIR)unshared/i810context.o \
+		$(MESADRVI810BUILDDIR)unshared/i810ioctl.o \
+		$(MESADRVI810BUILDDIR)unshared/i810render.o \
+		$(MESADRVI810BUILDDIR)unshared/i810screen.o \
+		$(MESADRVI810BUILDDIR)unshared/i810span.o \
+		$(MESADRVI810BUILDDIR)unshared/i810state.o \
+		$(MESADRVI810BUILDDIR)unshared/i810tex.o \
+		$(MESADRVI810BUILDDIR)unshared/i810texmem.o \
+		$(MESADRVI810BUILDDIR)unshared/i810texstate.o \
+		$(MESADRVI810BUILDDIR)unshared/i810tris.o \
+		$(MESADRVI810BUILDDIR)unshared/i810vb.o
+
+     I810DOBJS = $(MESADRVI810BUILDDIR)debugger/i810context.o \
+		$(MESADRVI810BUILDDIR)debugger/i810ioctl.o \
+		$(MESADRVI810BUILDDIR)debugger/i810render.o \
+		$(MESADRVI810BUILDDIR)debugger/i810screen.o \
+		$(MESADRVI810BUILDDIR)debugger/i810span.o \
+		$(MESADRVI810BUILDDIR)debugger/i810state.o \
+		$(MESADRVI810BUILDDIR)debugger/i810tex.o \
+		$(MESADRVI810BUILDDIR)debugger/i810texmem.o \
+		$(MESADRVI810BUILDDIR)debugger/i810texstate.o \
+		$(MESADRVI810BUILDDIR)debugger/i810tris.o \
+		$(MESADRVI810BUILDDIR)debugger/i810vb.o
+
+     I810POBJS = $(MESADRVI810BUILDDIR)profiled/i810context.o \
+		$(MESADRVI810BUILDDIR)profiled/i810ioctl.o \
+		$(MESADRVI810BUILDDIR)profiled/i810render.o \
+		$(MESADRVI810BUILDDIR)profiled/i810screen.o \
+		$(MESADRVI810BUILDDIR)profiled/i810span.o \
+		$(MESADRVI810BUILDDIR)profiled/i810state.o \
+		$(MESADRVI810BUILDDIR)profiled/i810tex.o \
+		$(MESADRVI810BUILDDIR)profiled/i810texmem.o \
+		$(MESADRVI810BUILDDIR)profiled/i810texstate.o \
+		$(MESADRVI810BUILDDIR)profiled/i810tris.o \
+		$(MESADRVI810BUILDDIR)profiled/i810vb.o
+
+#ifdef NeedToLinkMesaSrc
+LinkSourceFile(i810_3d_reg.h, $(MESADRVSRCDIR)/i810)
+LinkSourceFile(i810context.c, $(MESADRVSRCDIR)/i810)
+LinkSourceFile(i810context.h, $(MESADRVSRCDIR)/i810)
+LinkSourceFile(i810ioctl.c, $(MESADRVSRCDIR)/i810)
+LinkSourceFile(i810ioctl.h, $(MESADRVSRCDIR)/i810)
+LinkSourceFile(i810render.c, $(MESADRVSRCDIR)/i810)
+LinkSourceFile(i810screen.c, $(MESADRVSRCDIR)/i810)
+LinkSourceFile(i810screen.h, $(MESADRVSRCDIR)/i810)
+LinkSourceFile(i810span.c, $(MESADRVSRCDIR)/i810)
+LinkSourceFile(i810span.h, $(MESADRVSRCDIR)/i810)
+LinkSourceFile(i810state.c, $(MESADRVSRCDIR)/i810)
+LinkSourceFile(i810state.h, $(MESADRVSRCDIR)/i810)
+LinkSourceFile(i810tex.c, $(MESADRVSRCDIR)/i810)
+LinkSourceFile(i810tex.h, $(MESADRVSRCDIR)/i810)
+LinkSourceFile(i810texmem.c, $(MESADRVSRCDIR)/i810)
+LinkSourceFile(i810texstate.c, $(MESADRVSRCDIR)/i810)
+LinkSourceFile(i810tris.c, $(MESADRVSRCDIR)/i810)
+LinkSourceFile(i810tris.h, $(MESADRVSRCDIR)/i810)
+LinkSourceFile(i810vb.c, $(MESADRVSRCDIR)/i810)
+LinkSourceFile(i810vb.h, $(MESADRVSRCDIR)/i810)
+#endif
diff --git a/nx-X11/lib/GL/mesa/drivers/dri/i915/Imakefile b/nx-X11/lib/GL/mesa/drivers/dri/i915/Imakefile
new file mode 100644
index 000000000..6aba077ba
--- /dev/null
+++ b/nx-X11/lib/GL/mesa/drivers/dri/i915/Imakefile
@@ -0,0 +1,72 @@
+#include <Threads.tmpl>
+
+#if GlxUseBuiltInDRIDriver
+#define DoNormalLib (NormalLibGlx || SharedLibGlxWithoutPIC)
+#define DoSharedLib (SharedLibGlx && !SharedLibGlxWithoutPIC)
+#define DoExtraLib SharedLibGlx
+#define DoDebugLib DebugLibGlx
+#define DoProfileLib ProfileLibGlx
+#else
+#define DoNormalLib SharedLibGlxWithoutPIC
+#define DoSharedLib !SharedLibGlxWithoutPIC
+#define DoExtrasLib NO
+#define DoDebugLib NO
+#define DoProfileLib NO
+#endif
+
+#define MesaDrvCommonBuildDir ../common/
+#include "../common/Imakefile.inc"
+#include "../../../array_cache/Imakefile.inc"
+#include "../../../main/Imakefile.inc"
+#include "../../../math/Imakefile.inc"
+#include "../../../shader/Imakefile.inc"
+#include "../../../shader/grammar/Imakefile.inc"
+#include "../../../shader/slang/Imakefile.inc"
+#include "../../../shader/slang/library/Imakefile.inc"
+#include "../../../swrast/Imakefile.inc"
+#include "../../../swrast_setup/Imakefile.inc"
+#include "../../../tnl/Imakefile.inc"
+#include "../../../tnl_dd/Imakefile.inc"
+#include "../../../Imakefile.inc"
+#if defined(i386Architecture) && MesaUseX86Asm
+#include "../../../x86/Imakefile.inc"
+#endif
+#define NeedToLinkMesaSrc
+#include "Imakefile.inc"
+
+      DEFINES = $(ALLOC_DEFINES) $(DRI_DEFINES) $(MESA_ASM_DEFINES)
+
+     INCLUDES = $(X_INCLUDES) $(MESA_INCLUDES) $(DRI_INCLUDES)
+
+      DRMOBJS = $(GLXLIBSRC)/dri/drm/xf86drm.o \
+		$(GLXLIBSRC)/dri/drm/xf86drmHash.o \
+		$(GLXLIBSRC)/dri/drm/xf86drmRandom.o \
+		$(GLXLIBSRC)/dri/drm/xf86drmSL.o
+
+         SRCS = $(I915SRCS)
+         OBJS = $(DRMOBJS) $(COREMESAOBJS) \
+		$(MESA_ASM_OBJS) $(COMMONOBJS) $(I915OBJS)
+
+REQUIREDLIBS = MathLibrary $(LDPRELIB) $(GLXLIB) $(XONLYLIB) $(EXPATLIB)
+
+#include <Library.tmpl>
+
+LibraryObjectRule()
+
+SubdirLibraryRule($(I915OBJS))
+NormalLintTarget($(SRCS))
+
+#if !GlxUseBuiltInDRIDriver
+LIBNAME = i915_dri.so
+SharedDriModuleTarget($(LIBNAME),DONE $(OBJS),$(OBJS))
+InstallDynamicModule($(LIBNAME),$(MODULEDIR),dri)
+
+#ifdef GlxSoProf
+SOPROF_LIBNAME = _i915_dri_p
+NormalDepLibraryTarget($(SOPROF_LIBNAME),DONE $(OBJS),$(OBJS))
+InstallLibrary($(SOPROF_LIBNAME),$(MODULEDIR)/dri)
+#endif
+#endif
+
+DependTarget()
+
diff --git a/nx-X11/lib/GL/mesa/drivers/dri/i915/Imakefile.inc b/nx-X11/lib/GL/mesa/drivers/dri/i915/Imakefile.inc
new file mode 100644
index 000000000..56e7e3d93
--- /dev/null
+++ b/nx-X11/lib/GL/mesa/drivers/dri/i915/Imakefile.inc
@@ -0,0 +1,140 @@
+#ifndef MesaDrvSrcDir
+#define MesaDrvSrcDir $(MESASRCDIR)/src/mesa/drivers/dri
+#endif
+
+MESADRVSRCDIR = MesaDrvSrcDir
+
+#ifndef MesaDrvI915BuildDir
+#define MesaDrvI915BuildDir /**/
+#endif
+MESADRVI915BUILDDIR = MesaDrvI915BuildDir
+
+#if Malloc0ReturnsNull
+ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL
+#endif
+
+#if BuildXF86DRI
+  DRI_DEFINES = GlxDefines -DIN_DRI_DRIVER
+  DRI_INCLUDES = -I$(GLXLIBSRC)/dri \
+		-I$(XINCLUDESRC) \
+		-I$(GLXLIBSRC)/glx \
+		-I$(GLXLIBSRC)/include \
+		-I$(SERVERSRC)/GL/dri \
+ 		-I$(XF86OSSRC) \
+ 		-I$(DRMSRCDIR)/shared-core \
+ 		-I$(XF86DRIVERSRC)/i810 \
+		-I$(GLXLIBSRC)/dri/drm
+#endif
+ 
+MESA_INCLUDES = -I$(MESASRCDIR)/src/mesa \
+		-I$(MESASRCDIR)/src/mesa/main \
+		-I$(MESASRCDIR)/src/mesa/glapi \
+		-I$(MESASRCDIR)/src/mesa/shader \
+		-I$(MESASRCDIR)/include \
+		-I$(MESADRVSRCDIR)/common
+   X_INCLUDES = -I$(XINCLUDESRC) -I$(EXTINCSRC)
+
+     I915SRCS = 	$(MESADRVI915BUILDDIR)i830_metaops.c \
+		$(MESADRVI915BUILDDIR)i830_context.c \
+		$(MESADRVI915BUILDDIR)i830_state.c \
+		$(MESADRVI915BUILDDIR)i830_tex.c \
+		$(MESADRVI915BUILDDIR)i830_texstate.c \
+		$(MESADRVI915BUILDDIR)i830_texblend.c \
+		$(MESADRVI915BUILDDIR)i830_vtbl.c \
+		$(MESADRVI915BUILDDIR)i915_metaops.c \
+		$(MESADRVI915BUILDDIR)i915_context.c \
+		$(MESADRVI915BUILDDIR)i915_debug.c \
+		$(MESADRVI915BUILDDIR)i915_fragprog.c \
+		$(MESADRVI915BUILDDIR)i915_state.c \
+		$(MESADRVI915BUILDDIR)i915_tex.c \
+		$(MESADRVI915BUILDDIR)i915_texprog.c \
+		$(MESADRVI915BUILDDIR)i915_texstate.c \
+		$(MESADRVI915BUILDDIR)i915_program.c \
+		$(MESADRVI915BUILDDIR)i915_vtbl.c \
+		$(MESADRVI915BUILDDIR)intel_batchbuffer.c \
+		$(MESADRVI915BUILDDIR)intel_context.c \
+		$(MESADRVI915BUILDDIR)intel_ioctl.c \
+		$(MESADRVI915BUILDDIR)intel_pixel.c \
+		$(MESADRVI915BUILDDIR)intel_render.c \
+		$(MESADRVI915BUILDDIR)intel_screen.c \
+		$(MESADRVI915BUILDDIR)intel_span.c \
+		$(MESADRVI915BUILDDIR)intel_state.c \
+		$(MESADRVI915BUILDDIR)intel_tex.c \
+		$(MESADRVI915BUILDDIR)intel_tris.c 
+
+
+
+     I915OBJS = 	$(MESADRVI915BUILDDIR)i830_metaops.o \
+		$(MESADRVI915BUILDDIR)i830_context.o \
+		$(MESADRVI915BUILDDIR)i830_state.o \
+		$(MESADRVI915BUILDDIR)i830_tex.o \
+		$(MESADRVI915BUILDDIR)i830_texstate.o \
+		$(MESADRVI915BUILDDIR)i830_texblend.o \
+		$(MESADRVI915BUILDDIR)i830_vtbl.o \
+		$(MESADRVI915BUILDDIR)i915_metaops.o \
+		$(MESADRVI915BUILDDIR)i915_context.o \
+		$(MESADRVI915BUILDDIR)i915_debug.o \
+		$(MESADRVI915BUILDDIR)i915_fragprog.o \
+		$(MESADRVI915BUILDDIR)i915_state.o \
+		$(MESADRVI915BUILDDIR)i915_tex.o \
+		$(MESADRVI915BUILDDIR)i915_texprog.o \
+		$(MESADRVI915BUILDDIR)i915_texstate.o \
+		$(MESADRVI915BUILDDIR)i915_program.o \
+		$(MESADRVI915BUILDDIR)i915_vtbl.o \
+		$(MESADRVI915BUILDDIR)intel_batchbuffer.o \
+		$(MESADRVI915BUILDDIR)intel_context.o \
+		$(MESADRVI915BUILDDIR)intel_ioctl.o \
+		$(MESADRVI915BUILDDIR)intel_pixel.o \
+		$(MESADRVI915BUILDDIR)intel_render.o \
+		$(MESADRVI915BUILDDIR)intel_screen.o \
+		$(MESADRVI915BUILDDIR)intel_span.o \
+		$(MESADRVI915BUILDDIR)intel_state.o \
+		$(MESADRVI915BUILDDIR)intel_tex.o \
+		$(MESADRVI915BUILDDIR)intel_tris.o 
+
+    I915UOBJS = 
+    I915DOBJS = 
+    I915POBJS = 
+
+#ifdef NeedToLinkMesaSrc
+LinkSourceFile(i830_metaops.c, $(MESADRVSRCDIR)/i915)
+LinkSourceFile(i830_context.c, $(MESADRVSRCDIR)/i915)
+LinkSourceFile(i830_context.h, $(MESADRVSRCDIR)/i915)
+LinkSourceFile(i830_state.c, $(MESADRVSRCDIR)/i915)
+LinkSourceFile(i830_reg.h, $(MESADRVSRCDIR)/i915)
+LinkSourceFile(i830_tex.c, $(MESADRVSRCDIR)/i915)
+LinkSourceFile(i830_texstate.c, $(MESADRVSRCDIR)/i915)
+LinkSourceFile(i830_texblend.c, $(MESADRVSRCDIR)/i915)
+LinkSourceFile(i830_vtbl.c, $(MESADRVSRCDIR)/i915)
+LinkSourceFile(i915_metaops.c, $(MESADRVSRCDIR)/i915)
+LinkSourceFile(i915_context.c, $(MESADRVSRCDIR)/i915)
+LinkSourceFile(i915_context.h, $(MESADRVSRCDIR)/i915)
+LinkSourceFile(i915_debug.c, $(MESADRVSRCDIR)/i915)
+LinkSourceFile(i915_fragprog.c, $(MESADRVSRCDIR)/i915)
+LinkSourceFile(i915_state.c, $(MESADRVSRCDIR)/i915)
+LinkSourceFile(i915_tex.c, $(MESADRVSRCDIR)/i915)
+LinkSourceFile(i915_texprog.c, $(MESADRVSRCDIR)/i915)
+LinkSourceFile(i915_texstate.c, $(MESADRVSRCDIR)/i915)
+LinkSourceFile(i915_program.c, $(MESADRVSRCDIR)/i915)
+LinkSourceFile(i915_program.h, $(MESADRVSRCDIR)/i915)
+LinkSourceFile(i915_reg.h, $(MESADRVSRCDIR)/i915)
+LinkSourceFile(i915_vtbl.c, $(MESADRVSRCDIR)/i915)
+LinkSourceFile(intel_batchbuffer.c, $(MESADRVSRCDIR)/i915)
+LinkSourceFile(intel_batchbuffer.h, $(MESADRVSRCDIR)/i915)
+LinkSourceFile(intel_context.c, $(MESADRVSRCDIR)/i915)
+LinkSourceFile(intel_context.h, $(MESADRVSRCDIR)/i915)
+LinkSourceFile(intel_ioctl.c, $(MESADRVSRCDIR)/i915)
+LinkSourceFile(intel_ioctl.h, $(MESADRVSRCDIR)/i915)
+LinkSourceFile(intel_pixel.c, $(MESADRVSRCDIR)/i915)
+LinkSourceFile(intel_reg.h, $(MESADRVSRCDIR)/i915)
+LinkSourceFile(intel_render.c, $(MESADRVSRCDIR)/i915)
+LinkSourceFile(intel_screen.c, $(MESADRVSRCDIR)/i915)
+LinkSourceFile(intel_screen.h, $(MESADRVSRCDIR)/i915)
+LinkSourceFile(intel_span.c, $(MESADRVSRCDIR)/i915)
+LinkSourceFile(intel_span.h, $(MESADRVSRCDIR)/i915)
+LinkSourceFile(intel_state.c, $(MESADRVSRCDIR)/i915)
+LinkSourceFile(intel_tex.c, $(MESADRVSRCDIR)/i915)
+LinkSourceFile(intel_tex.h, $(MESADRVSRCDIR)/i915)
+LinkSourceFile(intel_tris.c, $(MESADRVSRCDIR)/i915)
+LinkSourceFile(intel_tris.h, $(MESADRVSRCDIR)/i915)
+#endif
diff --git a/nx-X11/lib/GL/mesa/drivers/dri/mach64/Imakefile b/nx-X11/lib/GL/mesa/drivers/dri/mach64/Imakefile
new file mode 100644
index 000000000..342ffd248
--- /dev/null
+++ b/nx-X11/lib/GL/mesa/drivers/dri/mach64/Imakefile
@@ -0,0 +1,77 @@
+XCOMM $XFree86: xc/lib/GL/mesa/src/drv/mach64/Imakefile,v 1.23tsi Exp $
+
+#include <Threads.tmpl>
+
+#if GlxUseBuiltInDRIDriver
+#define DoNormalLib (NormalLibGlx || SharedLibGlxWithoutPIC)
+#define DoSharedLib (SharedLibGlx && !SharedLibGlxWithoutPIC)
+#define DoExtraLib SharedLibGlx
+#define DoDebugLib DebugLibGlx
+#define DoProfileLib ProfileLibGlx
+#else
+#define DoNormalLib SharedLibGlxWithoutPIC
+#define DoSharedLib !SharedLibGlxWithoutPIC
+#define DoExtrasLib NO
+#define DoDebugLib NO
+#define DoProfileLib NO
+#endif
+
+#define MesaDrvCommonBuildDir ../common/
+#include "../common/Imakefile.inc"
+#include "../../../array_cache/Imakefile.inc"
+#include "../../../main/Imakefile.inc"
+#include "../../../math/Imakefile.inc"
+#include "../../../shader/Imakefile.inc"
+#include "../../../shader/grammar/Imakefile.inc"
+#include "../../../shader/slang/Imakefile.inc"
+#include "../../../shader/slang/library/Imakefile.inc"
+#include "../../../swrast/Imakefile.inc"
+#include "../../../swrast_setup/Imakefile.inc"
+#include "../../../tnl/Imakefile.inc"
+#include "../../../tnl_dd/Imakefile.inc"
+#include "../../../Imakefile.inc"
+#if defined(i386Architecture) && MesaUseX86Asm
+#include "../../../x86/Imakefile.inc"
+#endif
+#ifdef SparcArchitecture
+#include "../../../sparc/Imakefile.inc"
+#endif
+#define NeedToLinkMesaSrc
+#include "Imakefile.inc"
+
+      DEFINES = $(ALLOC_DEFINES) $(DRI_DEFINES) $(MESA_ASM_DEFINES)
+
+     INCLUDES = $(X_INCLUDES) $(MESA_INCLUDES) $(DRI_INCLUDES)
+
+      DRMOBJS = $(GLXLIBSRC)/dri/drm/xf86drm.o \
+		$(GLXLIBSRC)/dri/drm/xf86drmHash.o \
+		$(GLXLIBSRC)/dri/drm/xf86drmRandom.o \
+		$(GLXLIBSRC)/dri/drm/xf86drmSL.o
+
+         SRCS = $(Mach64SRCS)
+         OBJS = $(DRMOBJS) $(COREMESAOBJS) \
+		$(MESA_ASM_OBJS) $(COMMONOBJS) $(Mach64OBJS) 
+
+REQUIREDLIBS = MathLibrary $(LDPRELIB) $(GLXLIB) $(XONLYLIB) $(EXPATLIB)
+
+#include <Library.tmpl>
+
+LibraryObjectRule()
+
+SubdirLibraryRule($(Mach64OBJS))
+NormalLintTarget($(SRCS))
+
+#if !GlxUseBuiltInDRIDriver
+LIBNAME = mach64_dri.so
+SharedDriModuleTarget($(LIBNAME),DONE $(OBJS),$(OBJS))
+InstallDynamicModule($(LIBNAME),$(MODULEDIR),dri)
+
+#ifdef GlxSoProf
+SOPROF_LIBNAME = _mach64_dri_p
+NormalDepLibraryTarget($(SOPROF_LIBNAME),DONE $(OBJS),$(OBJS))
+InstallLibrary($(SOPROF_LIBNAME),$(MODULEDIR)/dri)
+#endif
+#endif
+
+DependTarget()
+
diff --git a/nx-X11/lib/GL/mesa/drivers/dri/mach64/Imakefile.inc b/nx-X11/lib/GL/mesa/drivers/dri/mach64/Imakefile.inc
new file mode 100644
index 000000000..b0074f170
--- /dev/null
+++ b/nx-X11/lib/GL/mesa/drivers/dri/mach64/Imakefile.inc
@@ -0,0 +1,131 @@
+XCOMM $XFree86: xc/lib/GL/mesa/src/drv/mach64/Imakefile.inc,v 1.2 2001/05/02 15:06:03 dawes Exp $
+
+#ifndef MesaDrvSrcDir
+#define MesaDrvSrcDir $(MESASRCDIR)/src/mesa/drivers/dri
+#endif
+
+MESADRVSRCDIR = MesaDrvSrcDir
+
+#ifndef MesaDrvMach64BuildDir
+#define MesaDrvMach64BuildDir /**/
+#endif
+MESADRVMach64BUILDDIR = MesaDrvMach64BuildDir
+
+#if Malloc0ReturnsNull
+ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL
+#endif
+
+#if BuildXF86DRI
+  DRI_DEFINES = GlxDefines -DX_BYTE_ORDER=ByteOrder -DUSE_NEW_INTERFACE -DIN_DRI_DRIVER
+ DRI_INCLUDES = -I$(GLXLIBSRC)/dri \
+		-I$(XINCLUDESRC) \
+		-I$(GLXLIBSRC)/glx \
+		-I$(GLXLIBSRC)/include \
+		-I$(SERVERSRC)/GL/dri \
+		-I$(XF86OSSRC) \
+		-I$(DRMSRCDIR)/shared-core/ \
+		-I$(XF86DRIVERSRC)/ati \
+		-I$(GLXLIBSRC)/dri/drm
+#endif
+
+MESA_INCLUDES = -I$(MESASRCDIR)/src/mesa \
+		-I$(MESASRCDIR)/src/mesa/main \
+		-I$(MESASRCDIR)/src/mesa/glapi \
+		-I$(MESASRCDIR)/include \
+		-I$(MESADRVSRCDIR)/common \
+		-I$(MESADRVSRCDIR)/mach64
+   X_INCLUDES = -I$(XINCLUDESRC) -I$(EXTINCSRC)
+
+     Mach64SRCS = $(MESADRVMach64BUILDDIR)mach64_context.c \
+		$(MESADRVMach64BUILDDIR)mach64_dd.c \
+		$(MESADRVMach64BUILDDIR)mach64_ioctl.c \
+		$(MESADRVMach64BUILDDIR)mach64_lock.c \
+		$(MESADRVMach64BUILDDIR)mach64_screen.c \
+		$(MESADRVMach64BUILDDIR)mach64_span.c \
+		$(MESADRVMach64BUILDDIR)mach64_state.c \
+		$(MESADRVMach64BUILDDIR)mach64_tex.c \
+		$(MESADRVMach64BUILDDIR)mach64_texmem.c \
+		$(MESADRVMach64BUILDDIR)mach64_texstate.c \
+		$(MESADRVMach64BUILDDIR)mach64_tris.c \
+		$(MESADRVMach64BUILDDIR)mach64_vb.c
+
+     Mach64OBJS = $(MESADRVMach64BUILDDIR)mach64_context.o \
+		$(MESADRVMach64BUILDDIR)mach64_dd.o \
+		$(MESADRVMach64BUILDDIR)mach64_ioctl.o \
+		$(MESADRVMach64BUILDDIR)mach64_lock.o \
+		$(MESADRVMach64BUILDDIR)mach64_screen.o \
+		$(MESADRVMach64BUILDDIR)mach64_span.o \
+		$(MESADRVMach64BUILDDIR)mach64_state.o \
+		$(MESADRVMach64BUILDDIR)mach64_tex.o \
+		$(MESADRVMach64BUILDDIR)mach64_texmem.o \
+		$(MESADRVMach64BUILDDIR)mach64_texstate.o \
+		$(MESADRVMach64BUILDDIR)mach64_tris.o \
+		$(MESADRVMach64BUILDDIR)mach64_vb.o
+
+     Mach64UOBJS = $(MESADRVMach64BUILDDIR)unshared/mach64_context.o \
+		$(MESADRVMach64BUILDDIR)unshared/mach64_dd.o \
+		$(MESADRVMach64BUILDDIR)unshared/mach64_ioctl.o \
+		$(MESADRVMach64BUILDDIR)unshared/mach64_lock.o \
+		$(MESADRVMach64BUILDDIR)unshared/mach64_screen.o \
+		$(MESADRVMach64BUILDDIR)unshared/mach64_span.o \
+		$(MESADRVMach64BUILDDIR)unshared/mach64_state.o \
+		$(MESADRVMach64BUILDDIR)unshared/mach64_tex.o \
+		$(MESADRVMach64BUILDDIR)unshared/mach64_texmem.o \
+		$(MESADRVMach64BUILDDIR)unshared/mach64_texstate.o \
+		$(MESADRVMach64BUILDDIR)unshared/mach64_tris.o \
+		$(MESADRVMach64BUILDDIR)unshared/mach64_vb.o
+
+     Mach64DOBJS = $(MESADRVMach64BUILDDIR)debugger/mach64_context.o \
+                $(MESADRVMach64BUILDDIR)debugger/mach64_dd.o \
+                $(MESADRVMach64BUILDDIR)debugger/mach64_ioctl.o \
+                $(MESADRVMach64BUILDDIR)debugger/mach64_lock.o \
+                $(MESADRVMach64BUILDDIR)debugger/mach64_screen.o \
+                $(MESADRVMach64BUILDDIR)debugger/mach64_span.o \
+                $(MESADRVMach64BUILDDIR)debugger/mach64_state.o \
+                $(MESADRVMach64BUILDDIR)debugger/mach64_tex.o \
+                $(MESADRVMach64BUILDDIR)debugger/mach64_texmem.o \
+                $(MESADRVMach64BUILDDIR)debugger/mach64_texstate.o \
+                $(MESADRVMach64BUILDDIR)debugger/mach64_tris.o \
+                $(MESADRVMach64BUILDDIR)debugger/mach64_vb.o
+
+    Mach64POBJS = $(MESADRVMach64BUILDDIR)profiled/mach64_context.o \
+                $(MESADRVMach64BUILDDIR)profiled/mach64_dd.o \
+                $(MESADRVMach64BUILDDIR)profiled/mach64_ioctl.o \
+                $(MESADRVMach64BUILDDIR)profiled/mach64_lock.o \
+                $(MESADRVMach64BUILDDIR)profiled/mach64_screen.o \
+                $(MESADRVMach64BUILDDIR)profiled/mach64_span.o \
+                $(MESADRVMach64BUILDDIR)profiled/mach64_state.o \
+                $(MESADRVMach64BUILDDIR)profiled/mach64_tex.o \
+                $(MESADRVMach64BUILDDIR)profiled/mach64_texmem.o \
+                $(MESADRVMach64BUILDDIR)profiled/mach64_texstate.o \
+                $(MESADRVMach64BUILDDIR)profiled/mach64_tris.o \
+                $(MESADRVMach64BUILDDIR)profiled/mach64_vb.o
+
+#ifdef NeedToLinkMesaSrc
+LinkSourceFile(mach64_reg.h, $(MESADRVSRCDIR)/mach64)
+LinkSourceFile(mach64_context.c, $(MESADRVSRCDIR)/mach64)
+LinkSourceFile(mach64_context.h, $(MESADRVSRCDIR)/mach64)
+LinkSourceFile(mach64_dd.c, $(MESADRVSRCDIR)/mach64)
+LinkSourceFile(mach64_dd.h, $(MESADRVSRCDIR)/mach64)
+LinkSourceFile(mach64_ioctl.c, $(MESADRVSRCDIR)/mach64)
+LinkSourceFile(mach64_ioctl.h, $(MESADRVSRCDIR)/mach64)
+LinkSourceFile(mach64_lock.c, $(MESADRVSRCDIR)/mach64)
+LinkSourceFile(mach64_lock.h, $(MESADRVSRCDIR)/mach64)
+LinkSourceFile(mach64_native_vb.c, $(MESADRVSRCDIR)/mach64)
+LinkSourceFile(mach64_native_vbtmp.h, $(MESADRVSRCDIR)/mach64)
+LinkSourceFile(mach64_screen.c, $(MESADRVSRCDIR)/mach64)
+LinkSourceFile(mach64_screen.h, $(MESADRVSRCDIR)/mach64)
+LinkSourceFile(mach64_span.c, $(MESADRVSRCDIR)/mach64)
+LinkSourceFile(mach64_span.h, $(MESADRVSRCDIR)/mach64)
+LinkSourceFile(mach64_state.c, $(MESADRVSRCDIR)/mach64)
+LinkSourceFile(mach64_state.h, $(MESADRVSRCDIR)/mach64)
+LinkSourceFile(mach64_tex.c, $(MESADRVSRCDIR)/mach64)
+LinkSourceFile(mach64_tex.h, $(MESADRVSRCDIR)/mach64)
+LinkSourceFile(mach64_texmem.c, $(MESADRVSRCDIR)/mach64)
+LinkSourceFile(mach64_texstate.c, $(MESADRVSRCDIR)/mach64)
+LinkSourceFile(mach64_tris.c, $(MESADRVSRCDIR)/mach64)
+LinkSourceFile(mach64_tris.h, $(MESADRVSRCDIR)/mach64)
+LinkSourceFile(mach64_vb.c, $(MESADRVSRCDIR)/mach64)
+LinkSourceFile(mach64_vb.h, $(MESADRVSRCDIR)/mach64)
+LinkSourceFile(mach64_vbtmp.h, $(MESADRVSRCDIR)/mach64)
+#endif
diff --git a/nx-X11/lib/GL/mesa/drivers/dri/mga/Imakefile b/nx-X11/lib/GL/mesa/drivers/dri/mga/Imakefile
new file mode 100644
index 000000000..5df7b681d
--- /dev/null
+++ b/nx-X11/lib/GL/mesa/drivers/dri/mga/Imakefile
@@ -0,0 +1,78 @@
+XCOMM $XFree86: xc/lib/GL/mesa/src/drv/mga/Imakefile,v 1.22 2002/02/23 00:45:50 dawes Exp $
+
+#include <Threads.tmpl>
+
+#if GlxUseBuiltInDRIDriver
+#define DoNormalLib (NormalLibGlx || SharedLibGlxWithoutPIC)
+#define DoSharedLib (SharedLibGlx && !SharedLibGlxWithoutPIC)
+#define DoExtraLib SharedLibGlx
+#define DoDebugLib DebugLibGlx
+#define DoProfileLib ProfileLibGlx
+#else
+#define DoNormalLib SharedLibGlxWithoutPIC
+#define DoSharedLib !SharedLibGlxWithoutPIC
+#define DoExtrasLib NO
+#define DoDebugLib NO
+#define DoProfileLib NO
+#endif
+
+#define MesaDrvCommonBuildDir ../common/
+#include "../common/Imakefile.inc"
+#include "../../../array_cache/Imakefile.inc"
+#include "../../../main/Imakefile.inc"
+#include "../../../math/Imakefile.inc"
+#include "../../../shader/Imakefile.inc"
+#include "../../../shader/grammar/Imakefile.inc"
+#include "../../../shader/slang/Imakefile.inc"
+#include "../../../shader/slang/library/Imakefile.inc"
+#include "../../../swrast/Imakefile.inc"
+#include "../../../swrast_setup/Imakefile.inc"
+#include "../../../tnl/Imakefile.inc"
+#include "../../../tnl_dd/Imakefile.inc"
+#include "../../../Imakefile.inc"
+#if defined(i386Architecture) && MesaUseX86Asm
+#include "../../../x86/Imakefile.inc"
+#endif
+#ifdef SparcArchitecture
+#include "../../../sparc/Imakefile.inc"
+#endif
+#define NeedToLinkMesaSrc
+#include "Imakefile.inc"
+
+
+
+      DEFINES = $(ALLOC_DEFINES) $(DRI_DEFINES) $(MESA_ASM_DEFINES)
+     INCLUDES = $(X_INCLUDES) $(MESA_INCLUDES) $(DRI_INCLUDES)
+
+      DRMOBJS = $(GLXLIBSRC)/dri/drm/xf86drm.o \
+		$(GLXLIBSRC)/dri/drm/xf86drmHash.o \
+		$(GLXLIBSRC)/dri/drm/xf86drmRandom.o \
+		$(GLXLIBSRC)/dri/drm/xf86drmSL.o
+
+         SRCS = $(MGASRCS)
+         OBJS = $(DRMOBJS) $(COREMESAOBJS) \
+		$(MESA_ASM_OBJS) $(COMMONOBJS) $(MGAOBJS) 
+
+REQUIREDLIBS = MathLibrary $(LDPRELIB) $(GLXLIB) $(XONLYLIB) $(EXPATLIB)
+
+#include <Library.tmpl>
+
+LibraryObjectRule()
+
+SubdirLibraryRule($(MGAOBJS))
+NormalLintTarget($(SRCS))
+
+#if !GlxUseBuiltInDRIDriver
+LIBNAME = mga_dri.so
+SharedDriModuleTarget($(LIBNAME),DONE $(OBJS),$(OBJS))
+InstallDynamicModule($(LIBNAME),$(MODULEDIR),dri)
+
+#ifdef GlxSoProf
+SOPROF_LIBNAME = _mga_dri_p
+NormalDepLibraryTarget($(SOPROF_LIBNAME),DONE $(OBJS),$(OBJS))
+InstallLibrary($(SOPROF_LIBNAME),$(MODULEDIR)/dri)
+#endif
+#endif
+
+DependTarget()
+
diff --git a/nx-X11/lib/GL/mesa/drivers/dri/mga/Imakefile.inc b/nx-X11/lib/GL/mesa/drivers/dri/mga/Imakefile.inc
new file mode 100644
index 000000000..a21278779
--- /dev/null
+++ b/nx-X11/lib/GL/mesa/drivers/dri/mga/Imakefile.inc
@@ -0,0 +1,135 @@
+XCOMM $XFree86: xc/lib/GL/mesa/src/drv/mga/Imakefile.inc,v 1.2 2001/05/02 15:06:03 dawes Exp $
+
+#ifndef MesaDrvSrcDir
+#define MesaDrvSrcDir $(MESASRCDIR)/src/mesa/src/drv
+#endif
+
+MESADRVSRCDIR = MesaDrvSrcDir
+
+#ifndef MesaDrvMgaBuildDir
+#define MesaDrvMgaBuildDir /**/
+#endif
+MESADRVMGABUILDDIR = MesaDrvMgaBuildDir
+
+#if Malloc0ReturnsNull
+ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL
+#endif
+
+#if BuildXF86DRI
+  DRI_DEFINES = GlxDefines -DX_BYTE_ORDER=ByteOrder -DUSE_NEW_INTERFACE -DIN_DRI_DRIVER
+ DRI_INCLUDES = -I$(GLXLIBSRC)/dri \
+		-I$(XINCLUDESRC) \
+		-I$(GLXLIBSRC)/glx \
+		-I$(GLXLIBSRC)/include \
+		-I$(SERVERSRC)/GL/dri \
+		-I$(XF86OSSRC) \
+		-I$(DRMSRCDIR)/shared-core \
+		-I$(XF86DRIVERSRC)/mga \
+		-I$(GLXLIBSRC)/dri/drm
+#endif
+
+MESA_INCLUDES = -I$(MESASRCDIR)/src/mesa \
+		-I$(MESASRCDIR)/src/mesa/main \
+		-I$(MESASRCDIR)/src/mesa/glapi \
+		-I$(MESASRCDIR)/src/mesa/shader \
+		-I$(MESASRCDIR)/include \
+		-I$(MESADRVSRCDIR)/common \
+		-I$(MESADRVSRCDIR)/mga
+   X_INCLUDES = -I$(XINCLUDESRC) -I$(EXTINCSRC)
+
+      MGASRCS = $(MESADRVMGABUILDDIR)mgadd.c \
+		$(MESADRVMGABUILDDIR)mgarender.c \
+		$(MESADRVMGABUILDDIR)mgaioctl.c \
+		$(MESADRVMGABUILDDIR)mgapixel.c \
+		$(MESADRVMGABUILDDIR)mgaspan.c \
+		$(MESADRVMGABUILDDIR)mgastate.c \
+		$(MESADRVMGABUILDDIR)mgatex.c \
+		$(MESADRVMGABUILDDIR)mga_texcombine.c \
+		$(MESADRVMGABUILDDIR)mgatexmem.c \
+		$(MESADRVMGABUILDDIR)mga_texstate.c \
+		$(MESADRVMGABUILDDIR)mgatris.c \
+		$(MESADRVMGABUILDDIR)mgavb.c \
+		$(MESADRVMGABUILDDIR)mga_xmesa.c \
+
+      MGAOBJS = $(MESADRVMGABUILDDIR)mgadd.o \
+		$(MESADRVMGABUILDDIR)mgarender.o \
+		$(MESADRVMGABUILDDIR)mgaioctl.o \
+		$(MESADRVMGABUILDDIR)mgapixel.o \
+		$(MESADRVMGABUILDDIR)mgaspan.o \
+		$(MESADRVMGABUILDDIR)mgastate.o \
+		$(MESADRVMGABUILDDIR)mgatex.o \
+		$(MESADRVMGABUILDDIR)mga_texcombine.o \
+		$(MESADRVMGABUILDDIR)mgatexmem.o \
+		$(MESADRVMGABUILDDIR)mga_texstate.o \
+		$(MESADRVMGABUILDDIR)mgatris.o \
+		$(MESADRVMGABUILDDIR)mgavb.o \
+		$(MESADRVMGABUILDDIR)mga_xmesa.o
+
+      MGAUOBJS = $(MESADRVMGABUILDDIR)unshared/mgadd.o \
+		$(MESADRVMGABUILDDIR)unshared/mgarender.o \
+		$(MESADRVMGABUILDDIR)unshared/mgaioctl.o \
+		$(MESADRVMGABUILDDIR)unshared/mgapixel.o \
+		$(MESADRVMGABUILDDIR)unshared/mgaspan.o \
+		$(MESADRVMGABUILDDIR)unshared/mgastate.o \
+		$(MESADRVMGABUILDDIR)unshared/mgatex.o \
+		$(MESADRVMGABUILDDIR)unshared/mga_texcombine.o \
+		$(MESADRVMGABUILDDIR)unshared/mgatexmem.o \
+		$(MESADRVMGABUILDDIR)unshared/mga_texstate.o \
+		$(MESADRVMGABUILDDIR)unshared/mgatris.o \
+		$(MESADRVMGABUILDDIR)unshared/mgavb.o \
+		$(MESADRVMGABUILDDIR)unshared/mga_xmesa.o
+
+      MGADOBJS = $(MESADRVMGABUILDDIR)debugger/mgadd.o \
+		$(MESADRVMGABUILDDIR)debugger/mgarender.o \
+		$(MESADRVMGABUILDDIR)debugger/mgaioctl.o \
+		$(MESADRVMGABUILDDIR)debugger/mgapixel.o \
+		$(MESADRVMGABUILDDIR)debugger/mgaspan.o \
+		$(MESADRVMGABUILDDIR)debugger/mgastate.o \
+		$(MESADRVMGABUILDDIR)debugger/mgatex.o \
+		$(MESADRVMGABUILDDIR)debugger/mga_texcombine.o \
+		$(MESADRVMGABUILDDIR)debugger/mgatexmem.o \
+		$(MESADRVMGABUILDDIR)debugger/mga_texstate.o \
+		$(MESADRVMGABUILDDIR)debugger/mgatris.o \
+		$(MESADRVMGABUILDDIR)debugger/mgavb.o \
+		$(MESADRVMGABUILDDIR)debugger/mga_xmesa.o
+
+      MGAPOBJS = $(MESADRVMGABUILDDIR)profiled/mgadd.o \
+		$(MESADRVMGABUILDDIR)profiled/mgarender.o \
+		$(MESADRVMGABUILDDIR)profiled/mgaioctl.o \
+		$(MESADRVMGABUILDDIR)profiled/mgapixel.o \
+		$(MESADRVMGABUILDDIR)profiled/mgaspan.o \
+		$(MESADRVMGABUILDDIR)profiled/mgastate.o \
+		$(MESADRVMGABUILDDIR)profiled/mgatex.o \
+		$(MESADRVMGABUILDDIR)profiled/mga_texcombine.o \
+		$(MESADRVMGABUILDDIR)profiled/mgatexmem.o \
+		$(MESADRVMGABUILDDIR)profiled/mga_texstate.o \
+		$(MESADRVMGABUILDDIR)profiled/mgatris.o \
+		$(MESADRVMGABUILDDIR)profiled/mgavb.o \
+		$(MESADRVMGABUILDDIR)profiled/mga_xmesa.o
+
+#ifdef NeedToLinkMesaSrc
+LinkSourceFile(mgacontext.h, $(MESADRVSRCDIR)/mga)
+LinkSourceFile(mgadd.c, $(MESADRVSRCDIR)/mga)
+LinkSourceFile(mgadd.h, $(MESADRVSRCDIR)/mga)
+LinkSourceFile(mgaioctl.c, $(MESADRVSRCDIR)/mga)
+LinkSourceFile(mgaioctl.h, $(MESADRVSRCDIR)/mga)
+LinkSourceFile(mgapixel.c, $(MESADRVSRCDIR)/mga)
+LinkSourceFile(mgapixel.h, $(MESADRVSRCDIR)/mga)
+LinkSourceFile(mgarender.c, $(MESADRVSRCDIR)/mga)
+LinkSourceFile(mgaregs.h, $(MESADRVSRCDIR)/mga)
+LinkSourceFile(mgaspan.c, $(MESADRVSRCDIR)/mga)
+LinkSourceFile(mgaspan.h, $(MESADRVSRCDIR)/mga)
+LinkSourceFile(mgastate.c, $(MESADRVSRCDIR)/mga)
+LinkSourceFile(mgastate.h, $(MESADRVSRCDIR)/mga)
+LinkSourceFile(mgatex.c, $(MESADRVSRCDIR)/mga)
+LinkSourceFile(mgatex.h, $(MESADRVSRCDIR)/mga)
+LinkSourceFile(mga_texcombine.c, $(MESADRVSRCDIR)/mga)
+LinkSourceFile(mgatexmem.c, $(MESADRVSRCDIR)/mga)
+LinkSourceFile(mga_texstate.c, $(MESADRVSRCDIR)/mga)
+LinkSourceFile(mgatris.c, $(MESADRVSRCDIR)/mga)
+LinkSourceFile(mgatris.h, $(MESADRVSRCDIR)/mga)
+LinkSourceFile(mgavb.c, $(MESADRVSRCDIR)/mga)
+LinkSourceFile(mgavb.h, $(MESADRVSRCDIR)/mga)
+LinkSourceFile(mga_xmesa.c, $(MESADRVSRCDIR)/mga)
+LinkSourceFile(mga_xmesa.h, $(MESADRVSRCDIR)/mga)
+#endif
diff --git a/nx-X11/lib/GL/mesa/drivers/dri/r128/Imakefile b/nx-X11/lib/GL/mesa/drivers/dri/r128/Imakefile
new file mode 100644
index 000000000..d7ad07895
--- /dev/null
+++ b/nx-X11/lib/GL/mesa/drivers/dri/r128/Imakefile
@@ -0,0 +1,77 @@
+XCOMM $XFree86: xc/lib/GL/mesa/src/drv/r128/Imakefile,v 1.19 2002/02/23 00:45:50 dawes Exp $
+
+#include <Threads.tmpl>
+
+#if GlxUseBuiltInDRIDriver
+#define DoNormalLib (NormalLibGlx || SharedLibGlxWithoutPIC)
+#define DoSharedLib (SharedLibGlx && !SharedLibGlxWithoutPIC)
+#define DoExtraLib SharedLibGlx
+#define DoDebugLib DebugLibGlx
+#define DoProfileLib ProfileLibGlx
+#else
+#define DoNormalLib SharedLibGlxWithoutPIC
+#define DoSharedLib !SharedLibGlxWithoutPIC
+#define DoExtrasLib NO
+#define DoDebugLib NO
+#define DoProfileLib NO
+#endif
+
+#define MesaDrvCommonBuildDir ../common/
+#include "../common/Imakefile.inc"
+#include "../../../array_cache/Imakefile.inc"
+#include "../../../main/Imakefile.inc"
+#include "../../../math/Imakefile.inc"
+#include "../../../shader/Imakefile.inc"
+#include "../../../shader/grammar/Imakefile.inc"
+#include "../../../shader/slang/Imakefile.inc"
+#include "../../../shader/slang/library/Imakefile.inc"
+#include "../../../swrast/Imakefile.inc"
+#include "../../../swrast_setup/Imakefile.inc"
+#include "../../../tnl/Imakefile.inc"
+#include "../../../tnl_dd/Imakefile.inc"
+#include "../../../Imakefile.inc"
+#if defined(i386Architecture) && MesaUseX86Asm
+#include "../../../x86/Imakefile.inc"
+#endif
+#ifdef SparcArchitecture
+#include "../../../sparc/Imakefile.inc"
+#endif
+#define NeedToLinkMesaSrc
+#include "Imakefile.inc"
+
+
+      DEFINES = $(ALLOC_DEFINES) $(DRI_DEFINES) $(MESA_ASM_DEFINES)
+     INCLUDES = $(X_INCLUDES) $(MESA_INCLUDES) $(DRI_INCLUDES)
+
+      DRMOBJS = $(GLXLIBSRC)/dri/drm/xf86drm.o \
+		$(GLXLIBSRC)/dri/drm/xf86drmHash.o \
+		$(GLXLIBSRC)/dri/drm/xf86drmRandom.o \
+		$(GLXLIBSRC)/dri/drm/xf86drmSL.o
+
+         SRCS = $(R128SRCS)
+         OBJS = $(DRMOBJS) $(COREMESAOBJS) \
+		$(MESA_ASM_OBJS) $(COMMONOBJS) $(R128OBJS) 
+
+REQUIREDLIBS = MathLibrary $(LDPRELIB) $(GLXLIB) $(XONLYLIB) $(EXPATLIB)
+
+#include <Library.tmpl>
+
+LibraryObjectRule()
+
+SubdirLibraryRule($(R128OBJS))
+NormalLintTarget($(SRCS))
+
+#if !GlxUseBuiltInDRIDriver
+LIBNAME = r128_dri.so
+SharedDriModuleTarget($(LIBNAME),DONE $(OBJS),$(OBJS))
+InstallDynamicModule($(LIBNAME),$(MODULEDIR),dri)
+
+#ifdef GlxSoProf
+SOPROF_LIBNAME = _r128_dri_p
+NormalDepLibraryTarget($(SOPROF_LIBNAME),DONE $(OBJS),$(OBJS))
+InstallLibrary($(SOPROF_LIBNAME),$(MODULEDIR)/dri)
+#endif
+#endif
+
+DependTarget()
+
diff --git a/nx-X11/lib/GL/mesa/drivers/dri/r128/Imakefile.inc b/nx-X11/lib/GL/mesa/drivers/dri/r128/Imakefile.inc
new file mode 100644
index 000000000..35d7761e8
--- /dev/null
+++ b/nx-X11/lib/GL/mesa/drivers/dri/r128/Imakefile.inc
@@ -0,0 +1,123 @@
+XCOMM $XFree86: xc/lib/GL/mesa/src/drv/r128/Imakefile.inc,v 1.3 2001/05/02 15:06:04 dawes Exp $
+
+#ifndef MesaDrvSrcDir
+#define MesaDrvSrcDir $(MESASRCDIR)/src/mesa/drivers/dri
+#endif
+
+MESADRVSRCDIR = MesaDrvSrcDir
+
+#ifndef MesaDrvR128BuildDir
+#define MesaDrvR128BuildDir /**/
+#endif
+MESADRVR128BUILDDIR = MesaDrvR128BuildDir
+
+#if Malloc0ReturnsNull
+ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL
+#endif
+
+#if BuildXF86DRI
+  DRI_DEFINES = GlxDefines -DX_BYTE_ORDER=ByteOrder -DUSE_NEW_INTERFACE -DIN_DRI_DRIVER
+ DRI_INCLUDES = -I$(GLXLIBSRC)/dri \
+		-I$(XINCLUDESRC) \
+		-I$(GLXLIBSRC)/glx \
+		-I$(GLXLIBSRC)/include \
+		-I$(SERVERSRC)/GL/dri \
+		-I$(XF86OSSRC) \
+		-I$(XF86COMSRC) \
+		-I$(DRMSRCDIR)/shared-core \
+		-I$(XF86DRIVERSRC)/ati \
+		-I$(GLXLIBSRC)/dri/drm
+#endif
+
+MESA_INCLUDES = -I$(MESASRCDIR)/src/mesa \
+		-I$(MESASRCDIR)/src/mesa/main \
+		-I$(MESASRCDIR)/src/mesa/glapi \
+		-I$(MESASRCDIR)/src/mesa/shader \
+		-I$(MESASRCDIR)/include \
+		-I$(MESADRVSRCDIR)/common \
+		-I$(MESADRVSRCDIR)/r128
+   X_INCLUDES = -I$(XINCLUDESRC) -I$(EXTINCSRC)
+
+     R128SRCS = $(MESADRVR128BUILDDIR)r128_context.c \
+		$(MESADRVR128BUILDDIR)r128_dd.c \
+		$(MESADRVR128BUILDDIR)r128_ioctl.c \
+		$(MESADRVR128BUILDDIR)r128_lock.c \
+                $(MESADRVR128BUILDDIR)r128_screen.c \
+		$(MESADRVR128BUILDDIR)r128_span.c \
+		$(MESADRVR128BUILDDIR)r128_state.c \
+		$(MESADRVR128BUILDDIR)r128_tex.c \
+		$(MESADRVR128BUILDDIR)r128_texmem.c \
+		$(MESADRVR128BUILDDIR)r128_texstate.c \
+		$(MESADRVR128BUILDDIR)r128_tris.c
+
+     R128OBJS = $(MESADRVR128BUILDDIR)r128_context.o \
+		$(MESADRVR128BUILDDIR)r128_dd.o \
+		$(MESADRVR128BUILDDIR)r128_ioctl.o \
+		$(MESADRVR128BUILDDIR)r128_lock.o \
+                $(MESADRVR128BUILDDIR)r128_screen.o \
+		$(MESADRVR128BUILDDIR)r128_span.o \
+		$(MESADRVR128BUILDDIR)r128_state.o \
+		$(MESADRVR128BUILDDIR)r128_tex.o \
+		$(MESADRVR128BUILDDIR)r128_texmem.o \
+		$(MESADRVR128BUILDDIR)r128_texstate.o \
+		$(MESADRVR128BUILDDIR)r128_tris.o
+
+     R128UOBJS = $(MESADRVR128BUILDDIR)unshared/r128_context.o \
+		$(MESADRVR128BUILDDIR)unshared/r128_dd.o \
+		$(MESADRVR128BUILDDIR)unshared/r128_ioctl.o \
+		$(MESADRVR128BUILDDIR)unshared/r128_lock.o \
+                $(MESADRVR128BUILDDIR)unshared/r128_screen.o \
+		$(MESADRVR128BUILDDIR)unshared/r128_span.o \
+		$(MESADRVR128BUILDDIR)unshared/r128_state.o \
+		$(MESADRVR128BUILDDIR)unshared/r128_tex.o \
+		$(MESADRVR128BUILDDIR)unshared/r128_texmem.o \
+		$(MESADRVR128BUILDDIR)unshared/r128_texstate.o \
+		$(MESADRVR128BUILDDIR)unshared/r128_tris.o
+
+     R128DOBJS = $(MESADRVR128BUILDDIR)debugger/r128_context.o \
+		$(MESADRVR128BUILDDIR)debugger/r128_dd.o \
+		$(MESADRVR128BUILDDIR)debugger/r128_ioctl.o \
+		$(MESADRVR128BUILDDIR)debugger/r128_lock.o \
+                $(MESADRVR128BUILDDIR)debugger/r128_screen.o \
+		$(MESADRVR128BUILDDIR)debugger/r128_span.o \
+		$(MESADRVR128BUILDDIR)debugger/r128_state.o \
+		$(MESADRVR128BUILDDIR)debugger/r128_tex.o \
+		$(MESADRVR128BUILDDIR)debugger/r128_texmem.o \
+		$(MESADRVR128BUILDDIR)debugger/r128_texstate.o \
+		$(MESADRVR128BUILDDIR)debugger/r128_tris.o
+
+     R128POBJS = $(MESADRVR128BUILDDIR)profiled/r128_context.o \
+		$(MESADRVR128BUILDDIR)profiled/r128_dd.o \
+		$(MESADRVR128BUILDDIR)profiled/r128_ioctl.o \
+		$(MESADRVR128BUILDDIR)profiled/r128_lock.o \
+                $(MESADRVR128BUILDDIR)profiled/r128_screen.o \
+		$(MESADRVR128BUILDDIR)profiled/r128_span.o \
+		$(MESADRVR128BUILDDIR)profiled/r128_state.o \
+		$(MESADRVR128BUILDDIR)profiled/r128_tex.o \
+		$(MESADRVR128BUILDDIR)profiled/r128_texmem.o \
+		$(MESADRVR128BUILDDIR)profiled/r128_texstate.o \
+		$(MESADRVR128BUILDDIR)profiled/r128_tris.o
+
+#ifdef NeedToLinkMesaSrc
+LinkSourceFile(r128_context.c, $(MESADRVSRCDIR)/r128)
+LinkSourceFile(r128_context.h, $(MESADRVSRCDIR)/r128)
+LinkSourceFile(r128_dd.c, $(MESADRVSRCDIR)/r128)
+LinkSourceFile(r128_dd.h, $(MESADRVSRCDIR)/r128)
+LinkSourceFile(r128_ioctl.c, $(MESADRVSRCDIR)/r128)
+LinkSourceFile(r128_ioctl.h, $(MESADRVSRCDIR)/r128)
+LinkSourceFile(r128_lock.c, $(MESADRVSRCDIR)/r128)
+LinkSourceFile(r128_lock.h, $(MESADRVSRCDIR)/r128)
+LinkSourceFile(r128_screen.c, $(MESADRVSRCDIR)/r128)
+LinkSourceFile(r128_screen.h, $(MESADRVSRCDIR)/r128)
+LinkSourceFile(r128_span.c, $(MESADRVSRCDIR)/r128)
+LinkSourceFile(r128_span.h, $(MESADRVSRCDIR)/r128)
+LinkSourceFile(r128_state.c, $(MESADRVSRCDIR)/r128)
+LinkSourceFile(r128_state.h, $(MESADRVSRCDIR)/r128)
+LinkSourceFile(r128_tex.c, $(MESADRVSRCDIR)/r128)
+LinkSourceFile(r128_tex.h, $(MESADRVSRCDIR)/r128)
+LinkSourceFile(r128_texmem.c, $(MESADRVSRCDIR)/r128)
+LinkSourceFile(r128_texobj.h, $(MESADRVSRCDIR)/r128)
+LinkSourceFile(r128_texstate.c, $(MESADRVSRCDIR)/r128)
+LinkSourceFile(r128_tris.c, $(MESADRVSRCDIR)/r128)
+LinkSourceFile(r128_tris.h, $(MESADRVSRCDIR)/r128)
+#endif
diff --git a/nx-X11/lib/GL/mesa/drivers/dri/r200/Imakefile b/nx-X11/lib/GL/mesa/drivers/dri/r200/Imakefile
new file mode 100644
index 000000000..5f8bb3846
--- /dev/null
+++ b/nx-X11/lib/GL/mesa/drivers/dri/r200/Imakefile
@@ -0,0 +1,78 @@
+XCOMM $XFree86: xc/lib/GL/mesa/src/drv/r200/Imakefile,v 1.9 2002/02/23 00:45:50 dawes Exp $
+
+#include <Threads.tmpl>
+
+#if GlxUseBuiltInDRIDriver
+#define DoNormalLib (NormalLibGlx || SharedLibGlxWithoutPIC)
+#define DoSharedLib (SharedLibGlx && !SharedLibGlxWithoutPIC)
+#define DoExtraLib SharedLibGlx
+#define DoDebugLib DebugLibGlx
+#define DoProfileLib ProfileLibGlx
+#else
+#define DoNormalLib SharedLibGlxWithoutPIC
+#define DoSharedLib !SharedLibGlxWithoutPIC
+#define DoExtrasLib NO
+#define DoDebugLib NO
+#define DoProfileLib NO
+#endif
+
+#define MesaDrvCommonBuildDir ../common/
+#include "../common/Imakefile.inc"
+#include "../../../array_cache/Imakefile.inc"
+#include "../../../main/Imakefile.inc"
+#include "../../../math/Imakefile.inc"
+#include "../../../shader/Imakefile.inc"
+#include "../../../shader/grammar/Imakefile.inc"
+#include "../../../shader/slang/Imakefile.inc"
+#include "../../../shader/slang/library/Imakefile.inc"
+#include "../../../swrast/Imakefile.inc"
+#include "../../../swrast_setup/Imakefile.inc"
+#include "../../../tnl/Imakefile.inc"
+#include "../../../tnl_dd/Imakefile.inc"
+#include "../../../Imakefile.inc"
+#if defined(i386Architecture) && MesaUseX86Asm
+#include "../../../x86/Imakefile.inc"
+#endif
+#ifdef SparcArchitecture
+#include "../../../sparc/Imakefile.inc"
+#endif
+#define NeedToLinkMesaSrc
+#include "Imakefile.inc"
+
+      DEFINES = $(ALLOC_DEFINES) $(DRI_DEFINES) $(MESA_ASM_DEFINES)
+     INCLUDES = $(X_INCLUDES) $(MESA_INCLUDES) $(DRI_INCLUDES)
+
+      DRMOBJS = $(GLXLIBSRC)/dri/drm/xf86drm.o \
+		$(GLXLIBSRC)/dri/drm/xf86drmHash.o \
+		$(GLXLIBSRC)/dri/drm/xf86drmRandom.o \
+		$(GLXLIBSRC)/dri/drm/xf86drmSL.o
+
+         SRCS = $(R200SRCS)
+         OBJS = $(DRMOBJS) $(COREMESAOBJS) \
+		$(MESA_ASM_OBJS) $(COMMONOBJS) $(R200OBJS) 
+
+REQUIREDLIBS = MathLibrary $(LDPRELIB) $(GLXLIB) $(XONLYLIB) $(EXPATLIB)
+
+#include <Library.tmpl>
+
+LibraryObjectRule()
+
+SubdirLibraryRule($(R200OBJS))
+NormalLintTarget($(SRCS))
+
+ObjectFromAsmSource(r200_vtxtmp_x86, NullParameter)
+
+#if !GlxUseBuiltInDRIDriver
+LIBNAME = r200_dri.so
+SharedDriModuleTarget($(LIBNAME),DONE $(OBJS),$(OBJS))
+InstallDynamicModule($(LIBNAME),$(MODULEDIR),dri)
+
+#ifdef GlxSoProf
+SOPROF_LIBNAME = _r200_dri_p
+NormalDepLibraryTarget($(SOPROF_LIBNAME),DONE $(OBJS),$(OBJS))
+InstallLibrary($(SOPROF_LIBNAME),$(MODULEDIR)/dri)
+#endif
+#endif
+
+DependTarget()
+
diff --git a/nx-X11/lib/GL/mesa/drivers/dri/r200/Imakefile.inc b/nx-X11/lib/GL/mesa/drivers/dri/r200/Imakefile.inc
new file mode 100644
index 000000000..fa635e4ba
--- /dev/null
+++ b/nx-X11/lib/GL/mesa/drivers/dri/r200/Imakefile.inc
@@ -0,0 +1,200 @@
+XCOMM $XFree86: xc/lib/GL/mesa/src/drv/r200/Imakefile.inc,v 1.2 2001/05/02 15:06:04 dawes Exp $
+
+#ifndef MesaDrvSrcDir
+#define MesaDrvSrcDir $(MESASRCDIR)/src/mesa/drivers/dri
+#endif
+
+MESADRVSRCDIR = MesaDrvSrcDir
+
+#ifndef MesaDrvR200BuildDir
+#define MesaDrvR200BuildDir /**/
+#endif
+MESADRVR200BUILDDIR = MesaDrvR200BuildDir
+
+#if Malloc0ReturnsNull
+ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL
+#endif
+
+#if BuildXF86DRI
+  DRI_DEFINES = GlxDefines -DX_BYTE_ORDER=ByteOrder -DUSE_NEW_INTERFACE -DIN_DRI_DRIVER
+ DRI_INCLUDES = -I$(GLXLIBSRC)/dri \
+		-I$(XINCLUDESRC) \
+		-I$(GLXLIBSRC)/glx \
+		-I$(GLXLIBSRC)/include \
+		-I$(SERVERSRC)/GL/dri \
+		-I$(XF86COMSRC) \
+		-I$(XF86OSSRC) \
+		-I$(DRMSRCDIR)/shared-core \
+		-I$(XF86DRIVERSRC)/ati \
+		-I$(GLXLIBSRC)/dri/drm
+#endif
+
+MESA_INCLUDES = -I$(MESASRCDIR)/src/mesa \
+		-I$(MESASRCDIR)/src/mesa/main \
+		-I$(MESASRCDIR)/src/mesa/glapi \
+		-I$(MESASRCDIR)/src/mesa/shader \
+		-I$(MESASRCDIR)/include \
+		-I$(MESADRVSRCDIR)/common \
+		-I$(MESADRVSRCDIR)/r200 \
+                -I$(MESADRVSRCDIR)/radeon/server
+   X_INCLUDES = -I$(XINCLUDESRC) -I$(EXTINCSRC)
+
+   R200SRCS = $(MESADRVR200BUILDDIR)r200_context.c \
+		$(MESADRVR200BUILDDIR)r200_sanity.c \
+		$(MESADRVR200BUILDDIR)r200_state.c \
+		$(MESADRVR200BUILDDIR)r200_state_init.c \
+		$(MESADRVR200BUILDDIR)r200_swtcl.c \
+		$(MESADRVR200BUILDDIR)r200_cmdbuf.c \
+		$(MESADRVR200BUILDDIR)r200_ioctl.c \
+		$(MESADRVR200BUILDDIR)r200_lock.c \
+		$(MESADRVR200BUILDDIR)r200_maos.c \
+		$(MESADRVR200BUILDDIR)r200_pixel.c \
+	        $(MESADRVR200BUILDDIR)r200_screen.c \
+		$(MESADRVR200BUILDDIR)r200_span.c \
+		$(MESADRVR200BUILDDIR)r200_tcl.c \
+		$(MESADRVR200BUILDDIR)r200_tex.c \
+		$(MESADRVR200BUILDDIR)r200_texmem.c \
+		$(MESADRVR200BUILDDIR)r200_texstate.c \
+		$(MESADRVR200BUILDDIR)r200_vtxfmt.c \
+		$(MESADRVR200BUILDDIR)r200_vtxfmt_x86.c \
+		$(MESADRVR200BUILDDIR)r200_vtxtmp_x86.S \
+		$(MESADRVR200BUILDDIR)r200_vtxfmt_sse.c \
+		$(MESADRVR200BUILDDIR)r200_vtxfmt_c.c
+
+   R200OBJS = $(MESADRVR200BUILDDIR)r200_context.o \
+		$(MESADRVR200BUILDDIR)r200_sanity.o \
+		$(MESADRVR200BUILDDIR)r200_state.o \
+		$(MESADRVR200BUILDDIR)r200_state_init.o \
+		$(MESADRVR200BUILDDIR)r200_swtcl.o \
+		$(MESADRVR200BUILDDIR)r200_cmdbuf.o \
+		$(MESADRVR200BUILDDIR)r200_ioctl.o \
+		$(MESADRVR200BUILDDIR)r200_lock.o \
+		$(MESADRVR200BUILDDIR)r200_maos.o \
+		$(MESADRVR200BUILDDIR)r200_pixel.o \
+	        $(MESADRVR200BUILDDIR)r200_screen.o \
+		$(MESADRVR200BUILDDIR)r200_span.o \
+		$(MESADRVR200BUILDDIR)r200_tcl.o \
+		$(MESADRVR200BUILDDIR)r200_tex.o \
+		$(MESADRVR200BUILDDIR)r200_texmem.o \
+		$(MESADRVR200BUILDDIR)r200_texstate.o \
+		$(MESADRVR200BUILDDIR)r200_vtxfmt.o \
+		$(MESADRVR200BUILDDIR)r200_vtxfmt_c.o
+
+#ifdef i386Architecture
+   R200OBJS +=	$(MESADRVR200BUILDDIR)r200_vtxfmt_x86.o \
+		$(MESADRVR200BUILDDIR)r200_vtxtmp_x86.o \
+		$(MESADRVR200BUILDDIR)r200_vtxfmt_sse.o 
+#endif
+
+   R200UOBJS = $(MESADRVR200BUILDDIR)unshared/r200_context.o \
+		$(MESADRVR200BUILDDIR)unshared/r200_sanity.o \
+		$(MESADRVR200BUILDDIR)unshared/r200_cmdbuf.o \
+		$(MESADRVR200BUILDDIR)unshared/r200_ioctl.o \
+		$(MESADRVR200BUILDDIR)unshared/r200_lock.o \
+		$(MESADRVR200BUILDDIR)unshared/r200_maos.o \
+		$(MESADRVR200BUILDDIR)unshared/r200_pixel.o \
+	        $(MESADRVR200BUILDDIR)unshared/r200_screen.o \
+		$(MESADRVR200BUILDDIR)unshared/r200_span.o \
+		$(MESADRVR200BUILDDIR)unshared/r200_state.o \
+		$(MESADRVR200BUILDDIR)unshared/r200_state_init.o \
+		$(MESADRVR200BUILDDIR)unshared/r200_swtcl.o \
+		$(MESADRVR200BUILDDIR)unshared/r200_tcl.o \
+		$(MESADRVR200BUILDDIR)unshared/r200_tex.o \
+		$(MESADRVR200BUILDDIR)unshared/r200_texmem.o \
+		$(MESADRVR200BUILDDIR)unshared/r200_texstate.o \
+		$(MESADRVR200BUILDDIR)unshared/r200_vtxfmt.o \
+		$(MESADRVR200BUILDDIR)unshared/r200_vtxfmt_c.o
+
+#ifdef i386Architecture
+   R200UOBJS +=	$(MESADRVR200BUILDDIR)unshared/r200_vtxfmt_x86.o \
+		$(MESADRVR200BUILDDIR)unshared/r200_vtxtmp_x86.o \
+		$(MESADRVR200BUILDDIR)unshared/r200_vtxfmt_sse.o 
+#endif
+
+   R200DOBJS = $(MESADRVR200BUILDDIR)debugger/r200_context.o \
+		$(MESADRVR200BUILDDIR)debugger/r200_sanity.o \
+		$(MESADRVR200BUILDDIR)debugger/r200_cmdbuf.o \
+		$(MESADRVR200BUILDDIR)debugger/r200_ioctl.o \
+		$(MESADRVR200BUILDDIR)debugger/r200_lock.o \
+		$(MESADRVR200BUILDDIR)debugger/r200_maos.o \
+		$(MESADRVR200BUILDDIR)debugger/r200_pixel.o \
+	        $(MESADRVR200BUILDDIR)debugger/r200_screen.o \
+		$(MESADRVR200BUILDDIR)debugger/r200_span.o \
+		$(MESADRVR200BUILDDIR)debugger/r200_state.o \
+		$(MESADRVR200BUILDDIR)debugger/r200_state_init.o \
+		$(MESADRVR200BUILDDIR)debugger/r200_swtcl.o \
+		$(MESADRVR200BUILDDIR)debugger/r200_tcl.o \
+		$(MESADRVR200BUILDDIR)debugger/r200_tex.o \
+		$(MESADRVR200BUILDDIR)debugger/r200_texmem.o \
+		$(MESADRVR200BUILDDIR)debugger/r200_texstate.o \
+		$(MESADRVR200BUILDDIR)debugger/r200_vtxfmt.o \
+		$(MESADRVR200BUILDDIR)debugger/r200_vtxfmt_c.o
+
+#ifdef i386Architecture
+   R200DOBJS +=	$(MESADRVR200BUILDDIR)debugger/r200_vtxfmt_x86.o \
+		$(MESADRVR200BUILDDIR)debugger/r200_vtxtmp_x86.o \
+		$(MESADRVR200BUILDDIR)debugger/r200_vtxfmt_sse.o 
+#endif
+
+   R200POBJS = $(MESADRVR200BUILDDIR)profiled/r200_context.o \
+		$(MESADRVR200BUILDDIR)profiled/r200_sanity.o \
+		$(MESADRVR200BUILDDIR)profiled/r200_cmdbuf.o \
+		$(MESADRVR200BUILDDIR)profiled/r200_ioctl.o \
+		$(MESADRVR200BUILDDIR)profiled/r200_lock.o \
+		$(MESADRVR200BUILDDIR)profiled/r200_maos.o \
+		$(MESADRVR200BUILDDIR)profiled/r200_pixel.o \
+	        $(MESADRVR200BUILDDIR)profiled/r200_screen.o \
+		$(MESADRVR200BUILDDIR)profiled/r200_span.o \
+		$(MESADRVR200BUILDDIR)profiled/r200_state.o \
+		$(MESADRVR200BUILDDIR)profiled/r200_state_init.o \
+		$(MESADRVR200BUILDDIR)profiled/r200_swtcl.o \
+		$(MESADRVR200BUILDDIR)profiled/r200_tcl.o \
+		$(MESADRVR200BUILDDIR)profiled/r200_tex.o \
+		$(MESADRVR200BUILDDIR)profiled/r200_texmem.o \
+		$(MESADRVR200BUILDDIR)profiled/r200_texstate.o \
+		$(MESADRVR200BUILDDIR)profiled/r200_vtxfmt.o \
+		$(MESADRVR200BUILDDIR)profiled/r200_vtxfmt_c.o
+
+#ifdef i386Architecture
+   R200POBJS +=	$(MESADRVR200BUILDDIR)profiled/r200_vtxfmt_x86.o \
+		$(MESADRVR200BUILDDIR)profiled/r200_vtxtmp_x86.o \
+		$(MESADRVR200BUILDDIR)profiled/r200_vtxfmt_sse.o 
+#endif
+
+#ifdef NeedToLinkMesaSrc
+LinkSourceFile(r200_context.c, $(MESADRVSRCDIR)/r200)
+LinkSourceFile(r200_context.h, $(MESADRVSRCDIR)/r200)
+LinkSourceFile(r200_cmdbuf.c, $(MESADRVSRCDIR)/r200)
+LinkSourceFile(r200_ioctl.c, $(MESADRVSRCDIR)/r200)
+LinkSourceFile(r200_ioctl.h, $(MESADRVSRCDIR)/r200)
+LinkSourceFile(r200_lock.c, $(MESADRVSRCDIR)/r200)
+LinkSourceFile(r200_lock.h, $(MESADRVSRCDIR)/r200)
+LinkSourceFile(r200_maos.c, $(MESADRVSRCDIR)/r200)
+LinkSourceFile(r200_maos.h, $(MESADRVSRCDIR)/r200)
+LinkSourceFile(r200_pixel.c, $(MESADRVSRCDIR)/r200)
+LinkSourceFile(r200_pixel.h, $(MESADRVSRCDIR)/r200)
+LinkSourceFile(r200_reg.h, $(MESADRVSRCDIR)/r200)
+LinkSourceFile(r200_screen.c, $(MESADRVSRCDIR)/r200)
+LinkSourceFile(r200_screen.h, $(MESADRVSRCDIR)/r200)
+LinkSourceFile(r200_span.c, $(MESADRVSRCDIR)/r200)
+LinkSourceFile(r200_span.h, $(MESADRVSRCDIR)/r200)
+LinkSourceFile(r200_sanity.c, $(MESADRVSRCDIR)/r200)
+LinkSourceFile(r200_sanity.h, $(MESADRVSRCDIR)/r200)
+LinkSourceFile(r200_state.c, $(MESADRVSRCDIR)/r200)
+LinkSourceFile(r200_state.h, $(MESADRVSRCDIR)/r200)
+LinkSourceFile(r200_state_init.c, $(MESADRVSRCDIR)/r200)
+LinkSourceFile(r200_swtcl.c, $(MESADRVSRCDIR)/r200)
+LinkSourceFile(r200_swtcl.h, $(MESADRVSRCDIR)/r200)
+LinkSourceFile(r200_tcl.c, $(MESADRVSRCDIR)/r200)
+LinkSourceFile(r200_tcl.h, $(MESADRVSRCDIR)/r200)
+LinkSourceFile(r200_tex.c, $(MESADRVSRCDIR)/r200)
+LinkSourceFile(r200_tex.h, $(MESADRVSRCDIR)/r200)
+LinkSourceFile(r200_texmem.c, $(MESADRVSRCDIR)/r200)
+LinkSourceFile(r200_texstate.c, $(MESADRVSRCDIR)/r200)
+LinkSourceFile(r200_vtxfmt.c, $(MESADRVSRCDIR)/r200)
+LinkSourceFile(r200_vtxfmt.h, $(MESADRVSRCDIR)/r200)
+LinkSourceFile(r200_vtxfmt_c.c, $(MESADRVSRCDIR)/r200)
+LinkSourceFile(r200_vtxfmt_x86.c, $(MESADRVSRCDIR)/r200)
+LinkSourceFile(r200_vtxtmp_x86.S, $(MESADRVSRCDIR)/r200)
+LinkSourceFile(r200_vtxfmt_sse.c, $(MESADRVSRCDIR)/r200)
+#endif
diff --git a/nx-X11/lib/GL/mesa/drivers/dri/radeon/Imakefile b/nx-X11/lib/GL/mesa/drivers/dri/radeon/Imakefile
new file mode 100644
index 000000000..69d28b248
--- /dev/null
+++ b/nx-X11/lib/GL/mesa/drivers/dri/radeon/Imakefile
@@ -0,0 +1,78 @@
+XCOMM $XFree86: xc/lib/GL/mesa/src/drv/radeon/Imakefile,v 1.9 2002/02/23 00:45:50 dawes Exp $
+
+#include <Threads.tmpl>
+
+#if GlxUseBuiltInDRIDriver
+#define DoNormalLib (NormalLibGlx || SharedLibGlxWithoutPIC)
+#define DoSharedLib (SharedLibGlx && !SharedLibGlxWithoutPIC)
+#define DoExtraLib SharedLibGlx
+#define DoDebugLib DebugLibGlx
+#define DoProfileLib ProfileLibGlx
+#else
+#define DoNormalLib SharedLibGlxWithoutPIC
+#define DoSharedLib !SharedLibGlxWithoutPIC
+#define DoExtrasLib NO
+#define DoDebugLib NO
+#define DoProfileLib NO
+#endif
+
+#define MesaDrvCommonBuildDir ../common/
+#include "../common/Imakefile.inc"
+#include "../../../array_cache/Imakefile.inc"
+#include "../../../main/Imakefile.inc"
+#include "../../../math/Imakefile.inc"
+#include "../../../shader/Imakefile.inc"
+#include "../../../shader/grammar/Imakefile.inc"
+#include "../../../shader/slang/Imakefile.inc"
+#include "../../../shader/slang/library/Imakefile.inc"
+#include "../../../swrast/Imakefile.inc"
+#include "../../../swrast_setup/Imakefile.inc"
+#include "../../../tnl/Imakefile.inc"
+#include "../../../tnl_dd/Imakefile.inc"
+#include "../../../Imakefile.inc"
+#if defined(i386Architecture) && MesaUseX86Asm
+#include "../../../x86/Imakefile.inc"
+#endif
+#ifdef SparcArchitecture
+#include "../../../sparc/Imakefile.inc"
+#endif
+#define NeedToLinkMesaSrc
+#include "Imakefile.inc"
+
+      DEFINES = $(ALLOC_DEFINES) $(DRI_DEFINES) $(MESA_ASM_DEFINES)
+     INCLUDES = $(X_INCLUDES) $(MESA_INCLUDES) $(DRI_INCLUDES)
+
+      DRMOBJS = $(GLXLIBSRC)/dri/drm/xf86drm.o \
+		$(GLXLIBSRC)/dri/drm/xf86drmHash.o \
+		$(GLXLIBSRC)/dri/drm/xf86drmRandom.o \
+		$(GLXLIBSRC)/dri/drm/xf86drmSL.o
+
+         SRCS = $(RADEONSRCS)
+         OBJS = $(DRMOBJS) $(COREMESAOBJS) \
+		$(MESA_ASM_OBJS) $(COMMONOBJS) $(RADEONOBJS)
+
+REQUIREDLIBS = MathLibrary $(LDPRELIB) $(GLXLIB) $(XONLYLIB) $(EXPATLIB)
+
+#include <Library.tmpl>
+
+LibraryObjectRule()
+
+SubdirLibraryRule($(RADEONOBJS))
+NormalLintTarget($(SRCS))
+
+ObjectFromAsmSource(radeon_vtxtmp_x86, NullParameter)
+
+#if !GlxUseBuiltInDRIDriver
+LIBNAME = radeon_dri.so
+SharedDriModuleTarget($(LIBNAME),DONE $(OBJS),$(OBJS))
+InstallDynamicModule($(LIBNAME),$(MODULEDIR),dri)
+
+#ifdef GlxSoProf
+SOPROF_LIBNAME = _radeon_dri_p
+NormalDepLibraryTarget($(SOPROF_LIBNAME),DONE $(OBJS),$(OBJS))
+InstallLibrary($(SOPROF_LIBNAME),$(MODULEDIR)/dri)
+#endif
+#endif
+
+DependTarget()
+
diff --git a/nx-X11/lib/GL/mesa/drivers/dri/radeon/Imakefile.inc b/nx-X11/lib/GL/mesa/drivers/dri/radeon/Imakefile.inc
new file mode 100644
index 000000000..9c95c5463
--- /dev/null
+++ b/nx-X11/lib/GL/mesa/drivers/dri/radeon/Imakefile.inc
@@ -0,0 +1,193 @@
+XCOMM $XFree86: xc/lib/GL/mesa/src/drv/radeon/Imakefile.inc,v 1.3 2002/02/22 21:45:00 dawes Exp $
+
+#ifndef MesaDrvSrcDir
+#define MesaDrvSrcDir $(MESASRCDIR)/src/mesa/drivers/dri
+#endif
+
+MESADRVSRCDIR = MesaDrvSrcDir
+
+#ifndef MesaDrvRadeonBuildDir
+#define MesaDrvRadeonBuildDir /**/
+#endif
+MESADRVRADEONBUILDDIR = MesaDrvRadeonBuildDir
+
+#if Malloc0ReturnsNull
+ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL
+#endif
+
+#if BuildXF86DRI
+  DRI_DEFINES = GlxDefines -DX_BYTE_ORDER=ByteOrder -DUSE_NEW_INTERFACE -DIN_DRI_DRIVER
+ DRI_INCLUDES = -I$(GLXLIBSRC)/dri \
+		-I$(XINCLUDESRC) \
+		-I$(GLXLIBSRC)/glx \
+		-I$(GLXLIBSRC)/include \
+		-I$(SERVERSRC)/GL/dri \
+		-I$(XF86OSSRC) \
+		-I$(XF86COMSRC) \
+		-I$(DRMSRCDIR)/shared-core \
+		-I$(XF86DRIVERSRC)/ati \
+		-I$(GLXLIBSRC)/dri/drm
+#endif
+
+MESA_INCLUDES = -I$(MESASRCDIR)/src/mesa \
+		-I$(MESASRCDIR)/src/mesa/main \
+		-I$(MESASRCDIR)/src/mesa/glapi \
+		-I$(MESASRCDIR)/src/mesa/shader \
+		-I$(MESASRCDIR)/include \
+		-I$(MESADRVSRCDIR)/common \
+		-I$(MESADRVSRCDIR)/radeon \
+                -I$(MESADRVSRCDIR)/radeon/server
+   X_INCLUDES = -I$(XINCLUDESRC) -I$(EXTINCSRC)
+
+   RADEONSRCS = $(MESADRVRADEONBUILDDIR)radeon_context.c \
+		$(MESADRVRADEONBUILDDIR)radeon_compat.c \
+		$(MESADRVRADEONBUILDDIR)radeon_ioctl.c \
+		$(MESADRVRADEONBUILDDIR)radeon_lock.c \
+		$(MESADRVRADEONBUILDDIR)radeon_maos.c \
+	        $(MESADRVRADEONBUILDDIR)radeon_sanity.c \
+	        $(MESADRVRADEONBUILDDIR)radeon_screen.c \
+		$(MESADRVRADEONBUILDDIR)radeon_span.c \
+		$(MESADRVRADEONBUILDDIR)radeon_state.c \
+		$(MESADRVRADEONBUILDDIR)radeon_state_init.c \
+		$(MESADRVRADEONBUILDDIR)radeon_swtcl.c \
+		$(MESADRVRADEONBUILDDIR)radeon_tcl.c \
+		$(MESADRVRADEONBUILDDIR)radeon_tex.c \
+		$(MESADRVRADEONBUILDDIR)radeon_texmem.c \
+		$(MESADRVRADEONBUILDDIR)radeon_texstate.c \
+		$(MESADRVRADEONBUILDDIR)radeon_vtxfmt.c \
+		$(MESADRVRADEONBUILDDIR)radeon_vtxfmt_x86.c \
+		$(MESADRVRADEONBUILDDIR)radeon_vtxtmp_x86.S \
+		$(MESADRVRADEONBUILDDIR)radeon_vtxfmt_sse.c \
+		$(MESADRVRADEONBUILDDIR)radeon_vtxfmt_c.c
+
+   RADEONOBJS = $(MESADRVRADEONBUILDDIR)radeon_context.o \
+		$(MESADRVRADEONBUILDDIR)radeon_compat.o \
+		$(MESADRVRADEONBUILDDIR)radeon_ioctl.o \
+		$(MESADRVRADEONBUILDDIR)radeon_lock.o \
+		$(MESADRVRADEONBUILDDIR)radeon_maos.o \
+	        $(MESADRVRADEONBUILDDIR)radeon_sanity.o \
+	        $(MESADRVRADEONBUILDDIR)radeon_screen.o \
+		$(MESADRVRADEONBUILDDIR)radeon_span.o \
+		$(MESADRVRADEONBUILDDIR)radeon_state.o \
+		$(MESADRVRADEONBUILDDIR)radeon_state_init.o \
+		$(MESADRVRADEONBUILDDIR)radeon_swtcl.o \
+		$(MESADRVRADEONBUILDDIR)radeon_tcl.o \
+		$(MESADRVRADEONBUILDDIR)radeon_tex.o \
+		$(MESADRVRADEONBUILDDIR)radeon_texmem.o \
+		$(MESADRVRADEONBUILDDIR)radeon_texstate.o \
+		$(MESADRVRADEONBUILDDIR)radeon_vtxfmt.o \
+		$(MESADRVRADEONBUILDDIR)radeon_vtxfmt_c.o
+
+#ifdef i386Architecture
+   RADEONOBJS += $(MESADRVRADEONBUILDDIR)radeon_vtxfmt_x86.o \
+		$(MESADRVRADEONBUILDDIR)radeon_vtxtmp_x86.o \
+		$(MESADRVRADEONBUILDDIR)radeon_vtxfmt_sse.o 
+#endif
+
+   RADEONUOBJS = $(MESADRVRADEONBUILDDIR)unshared/radeon_context.o \
+		$(MESADRVRADEONBUILDDIR)unshared/radeon_compat.o \
+		$(MESADRVRADEONBUILDDIR)unshared/radeon_ioctl.o \
+		$(MESADRVRADEONBUILDDIR)unshared/radeon_lock.o \
+		$(MESADRVRADEONBUILDDIR)unshared/radeon_maos.o \
+	        $(MESADRVRADEONBUILDDIR)unshared/radeon_sanity.o \
+	        $(MESADRVRADEONBUILDDIR)unshared/radeon_screen.o \
+		$(MESADRVRADEONBUILDDIR)unshared/radeon_span.o \
+		$(MESADRVRADEONBUILDDIR)unshared/radeon_state.o \
+		$(MESADRVRADEONBUILDDIR)unshared/radeon_state_init.o \
+		$(MESADRVRADEONBUILDDIR)unshared/radeon_swtcl.o \
+		$(MESADRVRADEONBUILDDIR)unshared/radeon_tcl.o \
+		$(MESADRVRADEONBUILDDIR)unshared/radeon_tex.o \
+		$(MESADRVRADEONBUILDDIR)unshared/radeon_texmem.o \
+		$(MESADRVRADEONBUILDDIR)unshared/radeon_texstate.o \
+		$(MESADRVRADEONBUILDDIR)unshared/radeon_vtxfmt.o \
+		$(MESADRVRADEONBUILDDIR)unshared/radeon_vtxfmt_c.o
+
+#ifdef i386Architecture
+   RADEONUOBJS += $(MESADRVRADEONBUILDDIR)unshared/radeon_vtxfmt_x86.o \
+		$(MESADRVRADEONBUILDDIR)unshared/radeon_vtxtmp_x86.o \
+		$(MESADRVRADEONBUILDDIR)unshared/radeon_vtxfmt_sse.o 
+#endif
+
+   RADEONDOBJS = $(MESADRVRADEONBUILDDIR)debugger/radeon_context.o \
+		$(MESADRVRADEONBUILDDIR)debugger/radeon_compat.o \
+		$(MESADRVRADEONBUILDDIR)debugger/radeon_ioctl.o \
+		$(MESADRVRADEONBUILDDIR)debugger/radeon_lock.o \
+		$(MESADRVRADEONBUILDDIR)debugger/radeon_maos.o \
+	        $(MESADRVRADEONBUILDDIR)debugger/radeon_sanity.o \
+	        $(MESADRVRADEONBUILDDIR)debugger/radeon_screen.o \
+		$(MESADRVRADEONBUILDDIR)debugger/radeon_span.o \
+		$(MESADRVRADEONBUILDDIR)debugger/radeon_state.o \
+		$(MESADRVRADEONBUILDDIR)debugger/radeon_state_init.o \
+		$(MESADRVRADEONBUILDDIR)debugger/radeon_swtcl.o \
+		$(MESADRVRADEONBUILDDIR)debugger/radeon_tcl.o \
+		$(MESADRVRADEONBUILDDIR)debugger/radeon_tex.o \
+		$(MESADRVRADEONBUILDDIR)debugger/radeon_texmem.o \
+		$(MESADRVRADEONBUILDDIR)debugger/radeon_texstate.o \
+		$(MESADRVRADEONBUILDDIR)debugger/radeon_vtxfmt.o \
+		$(MESADRVRADEONBUILDDIR)debugger/radeon_vtxfmt_c.o
+
+#ifdef i386Architecture
+   RADEONDOBJS += $(MESADRVRADEONBUILDDIR)debugger/radeon_vtxfmt_x86.o \
+		$(MESADRVRADEONBUILDDIR)debugger/radeon_vtxtmp_x86.o \
+		$(MESADRVRADEONBUILDDIR)debugger/radeon_vtxfmt_sse.o 
+#endif
+
+   RADEONPOBJS = $(MESADRVRADEONBUILDDIR)profiled/radeon_context.o \
+		$(MESADRVRADEONBUILDDIR)profiled/radeon_compat.o \
+		$(MESADRVRADEONBUILDDIR)profiled/radeon_ioctl.o \
+		$(MESADRVRADEONBUILDDIR)profiled/radeon_lock.o \
+		$(MESADRVRADEONBUILDDIR)profiled/radeon_maos.o \
+	        $(MESADRVRADEONBUILDDIR)profiled/radeon_sanity.o \
+	        $(MESADRVRADEONBUILDDIR)profiled/radeon_screen.o \
+		$(MESADRVRADEONBUILDDIR)profiled/radeon_span.o \
+		$(MESADRVRADEONBUILDDIR)profiled/radeon_state.o \
+		$(MESADRVRADEONBUILDDIR)profiled/radeon_state_init.o \
+		$(MESADRVRADEONBUILDDIR)profiled/radeon_swtcl.o \
+		$(MESADRVRADEONBUILDDIR)profiled/radeon_tcl.o \
+		$(MESADRVRADEONBUILDDIR)profiled/radeon_tex.o \
+		$(MESADRVRADEONBUILDDIR)profiled/radeon_texmem.o \
+		$(MESADRVRADEONBUILDDIR)profiled/radeon_texstate.o \
+		$(MESADRVRADEONBUILDDIR)profiled/radeon_vtxfmt.o \
+		$(MESADRVRADEONBUILDDIR)profiled/radeon_vtxfmt_c.o
+
+#ifdef i386Architecture
+   RADEONPOBJS += $(MESADRVRADEONBUILDDIR)profiled/radeon_vtxfmt_x86.o \
+		$(MESADRVRADEONBUILDDIR)profiled/radeon_vtxtmp_x86.o \
+		$(MESADRVRADEONBUILDDIR)profiled/radeon_vtxfmt_sse.o 
+#endif
+
+#ifdef NeedToLinkMesaSrc
+LinkSourceFile(radeon_context.c, $(MESADRVSRCDIR)/radeon)
+LinkSourceFile(radeon_context.h, $(MESADRVSRCDIR)/radeon)
+LinkSourceFile(radeon_compat.c, $(MESADRVSRCDIR)/radeon)
+LinkSourceFile(radeon_ioctl.c, $(MESADRVSRCDIR)/radeon)
+LinkSourceFile(radeon_ioctl.h, $(MESADRVSRCDIR)/radeon)
+LinkSourceFile(radeon_lock.c, $(MESADRVSRCDIR)/radeon)
+LinkSourceFile(radeon_lock.h, $(MESADRVSRCDIR)/radeon)
+LinkSourceFile(radeon_maos.c, $(MESADRVSRCDIR)/radeon)
+LinkSourceFile(radeon_maos.h, $(MESADRVSRCDIR)/radeon)
+LinkSourceFile(radeon_maos_vbtmp.h, $(MESADRVSRCDIR)/radeon)
+LinkSourceFile(radeon_sanity.c, $(MESADRVSRCDIR)/radeon)
+LinkSourceFile(radeon_sanity.h, $(MESADRVSRCDIR)/radeon)
+LinkSourceFile(radeon_screen.c, $(MESADRVSRCDIR)/radeon)
+LinkSourceFile(radeon_screen.h, $(MESADRVSRCDIR)/radeon)
+LinkSourceFile(radeon_span.c, $(MESADRVSRCDIR)/radeon)
+LinkSourceFile(radeon_span.h, $(MESADRVSRCDIR)/radeon)
+LinkSourceFile(radeon_state.c, $(MESADRVSRCDIR)/radeon)
+LinkSourceFile(radeon_state.h, $(MESADRVSRCDIR)/radeon)
+LinkSourceFile(radeon_state_init.c, $(MESADRVSRCDIR)/radeon)
+LinkSourceFile(radeon_swtcl.c, $(MESADRVSRCDIR)/radeon)
+LinkSourceFile(radeon_swtcl.h, $(MESADRVSRCDIR)/radeon)
+LinkSourceFile(radeon_tcl.c, $(MESADRVSRCDIR)/radeon)
+LinkSourceFile(radeon_tcl.h, $(MESADRVSRCDIR)/radeon)
+LinkSourceFile(radeon_tex.c, $(MESADRVSRCDIR)/radeon)
+LinkSourceFile(radeon_tex.h, $(MESADRVSRCDIR)/radeon)
+LinkSourceFile(radeon_texmem.c, $(MESADRVSRCDIR)/radeon)
+LinkSourceFile(radeon_texstate.c, $(MESADRVSRCDIR)/radeon)
+LinkSourceFile(radeon_vtxfmt.c, $(MESADRVSRCDIR)/radeon)
+LinkSourceFile(radeon_vtxfmt.h, $(MESADRVSRCDIR)/radeon)
+LinkSourceFile(radeon_vtxfmt_c.c, $(MESADRVSRCDIR)/radeon)
+LinkSourceFile(radeon_vtxfmt_x86.c, $(MESADRVSRCDIR)/radeon)
+LinkSourceFile(radeon_vtxtmp_x86.S, $(MESADRVSRCDIR)/radeon)
+LinkSourceFile(radeon_vtxfmt_sse.c, $(MESADRVSRCDIR)/radeon)
+#endif
diff --git a/nx-X11/lib/GL/mesa/drivers/dri/savage/Imakefile b/nx-X11/lib/GL/mesa/drivers/dri/savage/Imakefile
new file mode 100644
index 000000000..8a8c8338b
--- /dev/null
+++ b/nx-X11/lib/GL/mesa/drivers/dri/savage/Imakefile
@@ -0,0 +1,78 @@
+XCOMM $XFree86$
+
+#include <Threads.tmpl>
+
+#if GlxUseBuiltInDRIDriver
+#define DoNormalLib (NormalLibGlx || SharedLibGlxWithoutPIC)
+#define DoSharedLib (SharedLibGlx && !SharedLibGlxWithoutPIC)
+#define DoExtraLib SharedLibGlx
+#define DoDebugLib DebugLibGlx
+#define DoProfileLib ProfileLibGlx
+#else
+#define DoNormalLib SharedLibGlxWithoutPIC
+#define DoSharedLib !SharedLibGlxWithoutPIC
+#define DoExtrasLib NO
+#define DoDebugLib NO
+#define DoProfileLib NO
+#endif
+
+#define MesaDrvCommonBuildDir ../common/
+#include "../common/Imakefile.inc"
+#include "../../../array_cache/Imakefile.inc"
+#include "../../../main/Imakefile.inc"
+#include "../../../math/Imakefile.inc"
+#include "../../../shader/Imakefile.inc"
+#include "../../../shader/grammar/Imakefile.inc"
+#include "../../../shader/slang/Imakefile.inc"
+#include "../../../shader/slang/library/Imakefile.inc"
+#include "../../../swrast/Imakefile.inc"
+#include "../../../swrast_setup/Imakefile.inc"
+#include "../../../tnl/Imakefile.inc"
+#include "../../../tnl_dd/Imakefile.inc"
+#include "../../../Imakefile.inc"
+#if defined(i386Architecture) && MesaUseX86Asm
+#include "../../../x86/Imakefile.inc"
+#endif
+#ifdef SparcArchitecture
+#include "../../../sparc/Imakefile.inc"
+#endif
+#define NeedToLinkMesaSrc
+#include "Imakefile.inc"
+
+
+
+      DEFINES = $(ALLOC_DEFINES) $(DRI_DEFINES) $(MESA_ASM_DEFINES)
+     INCLUDES = $(X_INCLUDES) $(MESA_INCLUDES) $(DRI_INCLUDES)
+
+      DRMOBJS = $(GLXLIBSRC)/dri/drm/xf86drm.o \
+		$(GLXLIBSRC)/dri/drm/xf86drmHash.o \
+		$(GLXLIBSRC)/dri/drm/xf86drmRandom.o \
+		$(GLXLIBSRC)/dri/drm/xf86drmSL.o
+
+         SRCS = $(SAVAGESRCS)
+         OBJS = $(DRMOBJS) $(COREMESAOBJS) \
+		$(MESA_ASM_OBJS) $(COMMONOBJS) $(SAVAGEOBJS) 
+
+REQUIREDLIBS = MathLibrary $(LDPRELIB) $(GLXLIB) $(XONLYLIB) $(EXPATLIB)
+
+#include <Library.tmpl>
+
+LibraryObjectRule()
+
+SubdirLibraryRule($(SAVAGEOBJS))
+NormalLintTarget($(SRCS))
+
+#if !GlxUseBuiltInDRIDriver
+LIBNAME = savage_dri.so
+SharedDriModuleTarget($(LIBNAME),DONE $(OBJS),$(OBJS))
+InstallDynamicModule($(LIBNAME),$(MODULEDIR),dri)
+
+#ifdef GlxSoProf
+SOPROF_LIBNAME = _savage_dri_p
+NormalDepLibraryTarget($(SOPROF_LIBNAME),DONE $(OBJS),$(OBJS))
+InstallLibrary($(SOPROF_LIBNAME),$(MODULEDIR)/dri)
+#endif
+#endif
+
+DependTarget()
+
diff --git a/nx-X11/lib/GL/mesa/drivers/dri/savage/Imakefile.inc b/nx-X11/lib/GL/mesa/drivers/dri/savage/Imakefile.inc
new file mode 100644
index 000000000..4548f3d29
--- /dev/null
+++ b/nx-X11/lib/GL/mesa/drivers/dri/savage/Imakefile.inc
@@ -0,0 +1,105 @@
+XCOMM $XFree86: xc/lib/GL/mesa/src/drv/mga/Imakefile.inc,v 1.2 2001/05/02 15:06:03 dawes Exp $
+
+#ifndef MesaDrvSrcDir
+#define MesaDrvSrcDir $(MESASRCDIR)/src/mesa/src/drv
+#endif
+
+MESADRVSRCDIR = MesaDrvSrcDir
+
+#ifndef MesaDrvSavageBuildDir
+#define MesaDrvSavageBuildDir /**/
+#endif
+MESADRVSAVAGEBUILDDIR = MesaDrvSavageBuildDir
+
+#if Malloc0ReturnsNull
+ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL
+#endif
+
+#if BuildXF86DRI
+  DRI_DEFINES = GlxDefines -DX_BYTE_ORDER=ByteOrder -DIN_DRI_DRIVER
+ DRI_INCLUDES = -I$(GLXLIBSRC)/dri \
+		-I$(XINCLUDESRC) \
+		-I$(GLXLIBSRC)/glx \
+		-I$(GLXLIBSRC)/include \
+		-I$(SERVERSRC)/GL/dri \
+		-I$(XF86COMSRC) \
+		-I$(XF86OSSRC) \
+		-I$(DRMSRCDIR)/shared-core \
+		-I$(XF86DRIVERSRC)/savage \
+		-I$(GLXLIBSRC)/dri/drm
+#endif
+
+MESA_INCLUDES = -I$(MESASRCDIR)/src/mesa \
+		-I$(MESASRCDIR)/src/mesa/main \
+		-I$(MESASRCDIR)/src/mesa/glapi \
+		-I$(MESASRCDIR)/src/mesa/shader \
+		-I$(MESASRCDIR)/include \
+		-I$(MESADRVSRCDIR)/common \
+		-I$(MESADRVSRCDIR)/savage
+   X_INCLUDES = -I$(XINCLUDESRC) -I$(EXTINCSRC)
+
+   SAVAGESRCS = $(MESADRVMGABUILDDIR)savagedd.c \
+		$(MESADRVMGABUILDDIR)savageioctl.c \
+		$(MESADRVMGABUILDDIR)savagerender.c \
+		$(MESADRVMGABUILDDIR)savagespan.c \
+		$(MESADRVMGABUILDDIR)savagestate.c \
+		$(MESADRVMGABUILDDIR)savagetex.c \
+		$(MESADRVMGABUILDDIR)savagetris.c \
+		$(MESADRVMGABUILDDIR)savage_xmesa.c
+
+   SAVAGEOBJS = $(MESADRVMGABUILDDIR)savagedd.o \
+		$(MESADRVMGABUILDDIR)savageioctl.o \
+		$(MESADRVMGABUILDDIR)savagerender.o \
+		$(MESADRVMGABUILDDIR)savagespan.o \
+		$(MESADRVMGABUILDDIR)savagestate.o \
+		$(MESADRVMGABUILDDIR)savagetex.o \
+		$(MESADRVMGABUILDDIR)savagetris.o \
+		$(MESADRVMGABUILDDIR)savage_xmesa.o
+
+  SAVAGEUOBJS = $(MESADRVMGABUILDDIR)unshared/savagedd.o \
+		$(MESADRVMGABUILDDIR)unshared/savageioctl.o \
+		$(MESADRVMGABUILDDIR)unshared/savagerender.o \
+		$(MESADRVMGABUILDDIR)unshared/savagespan.o \
+		$(MESADRVMGABUILDDIR)unshared/savagestate.o \
+		$(MESADRVMGABUILDDIR)unshared/savagetex.o \
+		$(MESADRVMGABUILDDIR)unshared/savagetris.o \
+		$(MESADRVMGABUILDDIR)unshared/savage_xmesa.o
+
+  SAVAGEDOBJS = $(MESADRVMGABUILDDIR)debugger/savagedd.o \
+		$(MESADRVMGABUILDDIR)debugger/savageioctl.o \
+		$(MESADRVMGABUILDDIR)debugger/savagerender.o \
+		$(MESADRVMGABUILDDIR)debugger/savagespan.o \
+		$(MESADRVMGABUILDDIR)debugger/savagestate.o \
+		$(MESADRVMGABUILDDIR)debugger/savagetex.o \
+		$(MESADRVMGABUILDDIR)debugger/savagetris.o \
+		$(MESADRVMGABUILDDIR)debugger/savage_xmesa.o
+
+  SAVAGEPOBJS = $(MESADRVMGABUILDDIR)profiled/savagedd.o \
+		$(MESADRVMGABUILDDIR)profiled/savageioctl.o \
+		$(MESADRVMGABUILDDIR)profiled/savagerender.o \
+		$(MESADRVMGABUILDDIR)profiled/savagespan.o \
+		$(MESADRVMGABUILDDIR)profiled/savagestate.o \
+		$(MESADRVMGABUILDDIR)profiled/savagetex.o \
+		$(MESADRVMGABUILDDIR)profiled/savagetris.o \
+		$(MESADRVMGABUILDDIR)profiled/savage_xmesa.o
+
+#ifdef NeedToLinkMesaSrc
+LinkSourceFile(savage_3d_reg.h, $(MESADRVSRCDIR)/savage)
+LinkSourceFile(savage_bci.h, $(MESADRVSRCDIR)/savage)
+LinkSourceFile(savagecontext.h, $(MESADRVSRCDIR)/savage)
+LinkSourceFile(savagedd.c, $(MESADRVSRCDIR)/savage)
+LinkSourceFile(savagedd.h, $(MESADRVSRCDIR)/savage)
+LinkSourceFile(savage_init.h, $(MESADRVSRCDIR)/savage)
+LinkSourceFile(savageioctl.c, $(MESADRVSRCDIR)/savage)
+LinkSourceFile(savageioctl.h, $(MESADRVSRCDIR)/savage)
+LinkSourceFile(savagerender.c, $(MESADRVSRCDIR)/savage)
+LinkSourceFile(savagespan.c, $(MESADRVSRCDIR)/savage)
+LinkSourceFile(savagespan.h, $(MESADRVSRCDIR)/savage)
+LinkSourceFile(savagestate.c, $(MESADRVSRCDIR)/savage)
+LinkSourceFile(savagestate.h, $(MESADRVSRCDIR)/savage)
+LinkSourceFile(savagetex.c, $(MESADRVSRCDIR)/savage)
+LinkSourceFile(savagetex.h, $(MESADRVSRCDIR)/savage)
+LinkSourceFile(savagetris.c, $(MESADRVSRCDIR)/savage)
+LinkSourceFile(savagetris.h, $(MESADRVSRCDIR)/savage)
+LinkSourceFile(savage_xmesa.c, $(MESADRVSRCDIR)/savage)
+#endif
diff --git a/nx-X11/lib/GL/mesa/drivers/dri/sis/Imakefile b/nx-X11/lib/GL/mesa/drivers/dri/sis/Imakefile
new file mode 100644
index 000000000..c06601de1
--- /dev/null
+++ b/nx-X11/lib/GL/mesa/drivers/dri/sis/Imakefile
@@ -0,0 +1,80 @@
+XCOMM $XFree86: xc/lib/GL/mesa/src/drv/sis/Imakefile,v 1.22 2002/11/25 14:04:52 eich Exp $
+
+#include <Threads.tmpl>
+
+#if GlxUseBuiltInDRIDriver
+#define DoNormalLib (NormalLibGlx || SharedLibGlxWithoutPIC)
+#define DoSharedLib (SharedLibGlx && !SharedLibGlxWithoutPIC)
+#define DoExtraLib SharedLibGlx
+#define DoDebugLib DebugLibGlx
+#define DoProfileLib ProfileLibGlx
+#else
+#define DoNormalLib SharedLibGlxWithoutPIC
+#define DoSharedLib !SharedLibGlxWithoutPIC
+#define DoExtrasLib NO
+#define DoDebugLib NO
+#define DoProfileLib NO
+#endif
+
+#define MesaDrvCommonBuildDir ../common/
+#include "../common/Imakefile.inc"
+#include "../../../array_cache/Imakefile.inc"
+#include "../../../main/Imakefile.inc"
+#include "../../../math/Imakefile.inc"
+#include "../../../shader/Imakefile.inc"
+#include "../../../shader/grammar/Imakefile.inc"
+#include "../../../shader/slang/Imakefile.inc"
+#include "../../../shader/slang/library/Imakefile.inc"
+#include "../../../swrast/Imakefile.inc"
+#include "../../../swrast_setup/Imakefile.inc"
+#include "../../../tnl/Imakefile.inc"
+#include "../../../tnl_dd/Imakefile.inc"
+#include "../../../Imakefile.inc"
+#if defined(i386Architecture) && MesaUseX86Asm
+#include "../../../x86/Imakefile.inc"
+#endif
+#ifdef SparcArchitecture
+#include "../../../sparc/Imakefile.inc"
+#endif
+#define NeedToLinkMesaSrc
+#include "Imakefile.inc"
+
+XCOMM DEBUG_DEFINES = -DDEBUG_LOCKING
+XCOMM DEBUG_DEFINES = -DSIS_DEBUG
+
+      DEFINES = $(ALLOC_DEFINES) $(DRI_DEFINES) $(MESA_ASM_DEFINES) \
+		$(DEBUG_DEFINES)
+     INCLUDES = $(X_INCLUDES) $(MESA_INCLUDES) $(DRI_INCLUDES)
+
+      DRMOBJS = $(GLXLIBSRC)/dri/drm/xf86drm.o \
+		$(GLXLIBSRC)/dri/drm/xf86drmHash.o \
+		$(GLXLIBSRC)/dri/drm/xf86drmRandom.o \
+		$(GLXLIBSRC)/dri/drm/xf86drmSL.o
+
+         SRCS = $(SISSRCS)
+         OBJS = $(DRMOBJS) $(COREMESAOBJS) \
+		$(MESA_ASM_OBJS) $(COMMONOBJS) $(SISOBJS) 
+
+REQUIREDLIBS = MathLibrary $(LDPRELIB) $(GLXLIB) $(XONLYLIB) $(EXPATLIB)
+
+#include <Library.tmpl>
+
+LibraryObjectRule()
+
+SubdirLibraryRule($(SISOBJS))
+NormalLintTarget($(SRCS))
+
+#if !GlxUseBuiltInDRIDriver
+LIBNAME = sis_dri.so
+SharedDriModuleTarget($(LIBNAME),DONE $(OBJS),$(OBJS))
+InstallDynamicModule($(LIBNAME),$(MODULEDIR),dri)
+
+#ifdef GlxSoProf
+SOPROF_LIBNAME = _sis_dri_p
+NormalDepLibraryTarget($(SOPROF_LIBNAME),DONE $(OBJS),$(OBJS))
+InstallLibrary($(SOPROF_LIBNAME),$(MODULEDIR)/dri)
+#endif
+#endif
+
+DependTarget()
+
diff --git a/nx-X11/lib/GL/mesa/drivers/dri/sis/Imakefile.inc b/nx-X11/lib/GL/mesa/drivers/dri/sis/Imakefile.inc
new file mode 100644
index 000000000..8aa776f08
--- /dev/null
+++ b/nx-X11/lib/GL/mesa/drivers/dri/sis/Imakefile.inc
@@ -0,0 +1,156 @@
+XCOMM $XFree86: xc/lib/GL/mesa/src/drv/sis/Imakefile.inc,v 1.1 2001/03/23 19:18:43 dawes Exp $
+
+#ifndef MesaDrvSrcDir
+#define MesaDrvSrcDir $(MESASRCDIR)/src/mesa/drivers/dri
+#endif
+
+MESADRVSRCDIR = MesaDrvSrcDir
+
+#ifndef MesaDrvSisBuildDir
+#define MesaDrvSisBuildDir /**/
+#endif
+MESADRVSISBUILDDIR = MesaDrvSisBuildDir
+
+#if Malloc0ReturnsNull
+ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL
+#endif
+
+#if BuildXF86DRI
+  DRI_DEFINES = GlxDefines $(SIS_DEFINES) -DX_BYTE_ORDER=$(X_BYTE_ORDER) -DIN_DRI_DRIVER
+ DRI_INCLUDES = -I$(GLXLIBSRC)/dri \
+		-I$(XINCLUDESRC) \
+		-I$(GLXLIBSRC)/glx \
+		-I$(GLXLIBSRC)/include \
+		-I$(SERVERSRC)/GL/dri \
+		-I$(XF86OSSRC) \
+		-I$(DRMSRCDIR)/shared-core \
+		-I$(XF86DRIVERSRC)/sis \
+		-I$(GLXLIBSRC)/dri/drm
+#endif
+
+MESA_INCLUDES = -I$(MESASRCDIR)/src/mesa \
+		-I$(MESASRCDIR)/src/mesa/main \
+		-I$(MESASRCDIR)/src/mesa/glapi \
+		-I$(MESASRCDIR)/src/mesa/shader \
+		-I$(MESASRCDIR)/include \
+		-I$(MESADRVSRCDIR)/common \
+		-I$(MESADRVSRCDIR)/sis
+   X_INCLUDES = -I$(XINCLUDESRC) -I$(EXTINCSRC)
+
+#if 0
+ DEBUG_SRC = $(MESADRVSISBUILDDIR)sis_debug.c
+ DEBUG_OBJ = $(MESADRVSISBUILDDIR)sis_debug.o
+ DEBUG_UOBJ = $(MESADRVSISBUILDDIR)unshared/sis_debug.o
+ DEBUG_DOBJ = $(MESADRVSISBUILDDIR)debugger/sis_debug.o
+ DEBUG_POBJ = $(MESADRVSISBUILDDIR)profiled/sis_debug.o
+ DEBUG_DEFINES += -DSIS_DUMP
+#ifdef NeedToLinkMesaSrc
+LinkSourceFile(sis_debug.c, $(MESADRVSRCDIR)/sis)
+#endif
+#endif
+
+      SISSRCS = $(MESADRVSISBUILDDIR)sis_alloc.c \
+		$(MESADRVSISBUILDDIR)sis_dd.c \
+		$(MESADRVSISBUILDDIR)sis_lock.c \
+		$(MESADRVSISBUILDDIR)sis_context.c \
+		$(MESADRVSISBUILDDIR)sis_fog.c \
+		$(MESADRVSISBUILDDIR)sis_clear.c \
+		$(MESADRVSISBUILDDIR)sis_screen.c \
+		$(MESADRVSISBUILDDIR)sis_state.c \
+		$(MESADRVSISBUILDDIR)sis_stencil.c \
+		$(MESADRVSISBUILDDIR)sis_span.c \
+		$(MESADRVSISBUILDDIR)sis_tex.c \
+		$(MESADRVSISBUILDDIR)sis_texstate.c \
+		$(MESADRVSISBUILDDIR)sis_tris.c \
+		$(DEBUG_SRC)
+
+      SISOBJS = $(MESADRVSISBUILDDIR)sis_alloc.o \
+		$(MESADRVSISBUILDDIR)sis_dd.o \
+		$(MESADRVSISBUILDDIR)sis_lock.o \
+		$(MESADRVSISBUILDDIR)sis_context.o \
+		$(MESADRVSISBUILDDIR)sis_fog.o \
+		$(MESADRVSISBUILDDIR)sis_clear.o \
+		$(MESADRVSISBUILDDIR)sis_screen.o \
+		$(MESADRVSISBUILDDIR)sis_state.o \
+		$(MESADRVSISBUILDDIR)sis_stencil.o \
+		$(MESADRVSISBUILDDIR)sis_span.o \
+		$(MESADRVSISBUILDDIR)sis_tex.o \
+		$(MESADRVSISBUILDDIR)sis_texstate.o \
+		$(MESADRVSISBUILDDIR)sis_tris.o \
+		$(DEBUG_OBJ)
+
+      SISUOBJS = $(MESADRVSISBUILDDIR)unshared/sis_alloc.o \
+		$(MESADRVSISBUILDDIR)unshared/sis_dd.o \
+		$(MESADRVSISBUILDDIR)unshared/sis_lock.o \
+		$(MESADRVSISBUILDDIR)unshared/sis_context.o \
+		$(MESADRVSISBUILDDIR)unshared/sis_fog.o \
+		$(MESADRVSISBUILDDIR)unshared/sis_clear.o \
+		$(MESADRVSISBUILDDIR)unshared/sis_screen.o \
+		$(MESADRVSISBUILDDIR)unshared/sis_state.o \
+		$(MESADRVSISBUILDDIR)unshared/sis_stencil.o \
+		$(MESADRVSISBUILDDIR)unshared/sis_span.o \
+		$(MESADRVSISBUILDDIR)unshared/sis_tex.o \
+		$(MESADRVSISBUILDDIR)unshared/sis_texstate.o \
+		$(MESADRVSISBUILDDIR)unshared/sis_tris.o \
+		$(DEBUG_UOBJ)
+
+      SISDOBJS = $(MESADRVSISBUILDDIR)debugger/sis_alloc.o \
+		$(MESADRVSISBUILDDIR)debugger/sis_dd.o \
+		$(MESADRVSISBUILDDIR)debugger/sis_lock.o \
+		$(MESADRVSISBUILDDIR)debugger/sis_context.o \
+		$(MESADRVSISBUILDDIR)debugger/sis_fog.o \
+		$(MESADRVSISBUILDDIR)debugger/sis_clear.o \
+		$(MESADRVSISBUILDDIR)debugger/sis_screen.o \
+		$(MESADRVSISBUILDDIR)debugger/sis_state.o \
+		$(MESADRVSISBUILDDIR)debugger/sis_stencil.o \
+		$(MESADRVSISBUILDDIR)debugger/sis_span.o \
+		$(MESADRVSISBUILDDIR)debugger/sis_tex.o \
+		$(MESADRVSISBUILDDIR)debugger/sis_texstate.o \
+		$(MESADRVSISBUILDDIR)debugger/sis_tris.o \
+		$(DEBUG_DOBJ)
+
+      SISPOBJS = $(MESADRVSISBUILDDIR)profiled/sis_alloc.o \
+		$(MESADRVSISBUILDDIR)profiled/sis_dd.o \
+		$(MESADRVSISBUILDDIR)profiled/sis_lock.o \
+		$(MESADRVSISBUILDDIR)profiled/sis_context.o \
+		$(MESADRVSISBUILDDIR)profiled/sis_fog.o \
+		$(MESADRVSISBUILDDIR)profiled/sis_clear.o \
+		$(MESADRVSISBUILDDIR)profiled/sis_screen.o \
+		$(MESADRVSISBUILDDIR)profiled/sis_state.o \
+		$(MESADRVSISBUILDDIR)profiled/sis_stencil.o \
+		$(MESADRVSISBUILDDIR)profiled/sis_span.o \
+		$(MESADRVSISBUILDDIR)profiled/sis_tex.o \
+		$(MESADRVSISBUILDDIR)profiled/sis_texstate.o \
+		$(MESADRVSISBUILDDIR)profiled/sis_tris.o \
+		$(DEBUG_POBJ)
+
+#ifdef NeedToLinkMesaSrc
+LinkSourceFile(sis_alloc.c, $(MESADRVSRCDIR)/sis)
+LinkSourceFile(sis_alloc.h, $(MESADRVSRCDIR)/sis)
+LinkSourceFile(sis_common2.h, $(MESADRVSRCDIR)/sis)
+LinkSourceFile(sis_context.h, $(MESADRVSRCDIR)/sis)
+LinkSourceFile(sis_dd.c, $(MESADRVSRCDIR)/sis)
+LinkSourceFile(sis_dd.h, $(MESADRVSRCDIR)/sis)
+LinkSourceFile(sis_debug.c, $(MESADRVSRCDIR)/sis)
+LinkSourceFile(sis_debug.h, $(MESADRVSRCDIR)/sis)
+LinkSourceFile(sis_lock.c, $(MESADRVSRCDIR)/sis)
+LinkSourceFile(sis_lock.h, $(MESADRVSRCDIR)/sis)
+LinkSourceFile(sis_context.c, $(MESADRVSRCDIR)/sis)
+LinkSourceFile(sis_fog.c, $(MESADRVSRCDIR)/sis)
+LinkSourceFile(sis_clear.c, $(MESADRVSRCDIR)/sis)
+LinkSourceFile(sis_reg.h, $(MESADRVSRCDIR)/sis)
+LinkSourceFile(sis_screen.c, $(MESADRVSRCDIR)/sis)
+LinkSourceFile(sis_screen.h, $(MESADRVSRCDIR)/sis)
+LinkSourceFile(sis_state.c, $(MESADRVSRCDIR)/sis)
+LinkSourceFile(sis_state.h, $(MESADRVSRCDIR)/sis)
+LinkSourceFile(sis_stencil.c, $(MESADRVSRCDIR)/sis)
+LinkSourceFile(sis_stencil.h, $(MESADRVSRCDIR)/sis)
+LinkSourceFile(sis_span.c, $(MESADRVSRCDIR)/sis)
+LinkSourceFile(sis_span.h, $(MESADRVSRCDIR)/sis)
+LinkSourceFile(sis_tex.c, $(MESADRVSRCDIR)/sis)
+LinkSourceFile(sis_tex.h, $(MESADRVSRCDIR)/sis)
+LinkSourceFile(sis_texstate.c, $(MESADRVSRCDIR)/sis)
+LinkSourceFile(sis_tris.c, $(MESADRVSRCDIR)/sis)
+LinkSourceFile(sis_tris.h, $(MESADRVSRCDIR)/sis)
+LinkSourceFile(sis_tritmp.h, $(MESADRVSRCDIR)/sis)
+#endif
diff --git a/nx-X11/lib/GL/mesa/drivers/dri/tdfx/Imakefile b/nx-X11/lib/GL/mesa/drivers/dri/tdfx/Imakefile
new file mode 100644
index 000000000..2e4c457e2
--- /dev/null
+++ b/nx-X11/lib/GL/mesa/drivers/dri/tdfx/Imakefile
@@ -0,0 +1,76 @@
+XCOMM $XFree86: xc/lib/GL/mesa/src/drv/tdfx/Imakefile,v 1.30 2002/02/23 00:45:51 dawes Exp $
+
+#include <Threads.tmpl>
+
+#if GlxUseBuiltInDRIDriver
+#define DoNormalLib (NormalLibGlx || SharedLibGlxWithoutPIC)
+#define DoSharedLib (SharedLibGlx && !SharedLibGlxWithoutPIC)
+#define DoExtraLib SharedLibGlx
+#define DoDebugLib DebugLibGlx
+#define DoProfileLib ProfileLibGlx
+#else
+#define DoNormalLib SharedLibGlxWithoutPIC
+#define DoSharedLib !SharedLibGlxWithoutPIC
+#define DoExtrasLib NO
+#define DoDebugLib NO
+#define DoProfileLib NO
+#endif
+
+#define MesaDrvCommonBuildDir ../common/
+#include "../common/Imakefile.inc"
+#include "../../../array_cache/Imakefile.inc"
+#include "../../../main/Imakefile.inc"
+#include "../../../math/Imakefile.inc"
+#include "../../../shader/Imakefile.inc"
+#include "../../../shader/grammar/Imakefile.inc"
+#include "../../../shader/slang/Imakefile.inc"
+#include "../../../shader/slang/library/Imakefile.inc"
+#include "../../../swrast/Imakefile.inc"
+#include "../../../swrast_setup/Imakefile.inc"
+#include "../../../tnl/Imakefile.inc"
+#include "../../../tnl_dd/Imakefile.inc"
+#include "../../../Imakefile.inc"
+#if defined(i386Architecture) && MesaUseX86Asm
+#include "../../../x86/Imakefile.inc"
+#endif
+#ifdef SparcArchitecture
+#include "../../../sparc/Imakefile.inc"
+#endif
+#define NeedToLinkMesaSrc
+#include "Imakefile.inc"
+
+      DEFINES = $(ALLOC_DEFINES) $(DRI_DEFINES) $(MESA_ASM_DEFINES)
+     INCLUDES = $(X_INCLUDES) $(MESA_INCLUDES) $(DRI_INCLUDES)
+
+      DRMOBJS = $(GLXLIBSRC)/dri/drm/xf86drm.o \
+		$(GLXLIBSRC)/dri/drm/xf86drmHash.o \
+		$(GLXLIBSRC)/dri/drm/xf86drmRandom.o \
+		$(GLXLIBSRC)/dri/drm/xf86drmSL.o
+
+         SRCS = $(TDFXSRCS)
+         OBJS = $(DRMOBJS) $(COREMESAOBJS) \
+		$(MESA_ASM_OBJS) $(TDFXOBJS) $(COMMONOBJS)
+
+REQUIREDLIBS = MathLibrary $(LDPRELIB) $(GLXLIB) $(XONLYLIB) $(EXPATLIB)
+
+#include <Library.tmpl>
+
+LibraryObjectRule()
+
+SubdirLibraryRule($(TDFXOBJS))
+NormalLintTarget($(SRCS))
+
+#if !GlxUseBuiltInDRIDriver
+LIBNAME = tdfx_dri.so
+SharedDriModuleTarget($(LIBNAME),DONE $(OBJS),$(OBJS))
+InstallDynamicModule($(LIBNAME),$(MODULEDIR),dri)
+
+#ifdef GlxSoProf
+SOPROF_LIBNAME = _tdfx_dri_p
+NormalDepLibraryTarget($(SOPROF_LIBNAME),DONE $(OBJS),$(OBJS))
+InstallLibrary($(SOPROF_LIBNAME),$(MODULEDIR)/dri)
+#endif
+#endif
+
+DependTarget()
+
diff --git a/nx-X11/lib/GL/mesa/drivers/dri/tdfx/Imakefile.inc b/nx-X11/lib/GL/mesa/drivers/dri/tdfx/Imakefile.inc
new file mode 100644
index 000000000..87d31fc31
--- /dev/null
+++ b/nx-X11/lib/GL/mesa/drivers/dri/tdfx/Imakefile.inc
@@ -0,0 +1,140 @@
+XCOMM $XFree86: xc/lib/GL/mesa/src/drv/tdfx/Imakefile.inc,v 1.1 2001/03/23 19:18:44 dawes Exp $
+
+#ifndef MesaDrvSrcDir
+#define MesaDrvSrcDir $(MESASRCDIR)/src/mesa/drivers/dri
+#endif
+
+MESADRVSRCDIR = MesaDrvSrcDir
+
+#ifndef MesaDrvTdfxBuildDir
+#define MesaDrvTdfxBuildDir /**/
+#endif
+MESADRVTDFXBUILDDIR = MesaDrvTdfxBuildDir
+
+#if Malloc0ReturnsNull
+ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL
+#endif
+
+#if BuildXF86DRI
+ DRI_DEFINES = GlxDefines -DX_BYTE_ORDER=ByteOrder -DUSE_NEW_INTERFACE -DIN_DRI_DRIVER
+ DRI_INCLUDES = -I$(GLXLIBSRC)/dri \
+		-I$(XINCLUDESRC) \
+		-I$(GLXLIBSRC)/glx \
+		-I$(GLXLIBSRC)/include \
+		-I$(SERVERSRC)/GL/dri \
+		-I$(XF86OSSRC) \
+		-I$(DRMSRCDIR)/shared-core \
+		-I$(XF86DRIVERSRC)/tdfx \
+		-I$(GLXLIBSRC)/dri/drm
+#endif
+
+MESA_INCLUDES = -I$(MESASRCDIR)/src/mesa \
+		-I$(MESASRCDIR)/src/mesa/main \
+		-I$(MESASRCDIR)/src/mesa/glapi \
+		-I$(MESASRCDIR)/src/mesa/shader \
+		-I$(MESASRCDIR)/include \
+		-I$(MESADRVSRCDIR)/common \
+		-I$(MESADRVSRCDIR)/tdfx
+   X_INCLUDES = -I$(XINCLUDESRC) -I$(EXTINCSRC)
+
+     TDFXSRCS = $(MESADRVTDFXBUILDDIR)tdfx_context.c \
+		$(MESADRVTDFXBUILDDIR)tdfx_dd.c \
+		$(MESADRVTDFXBUILDDIR)tdfx_lock.c \
+		$(MESADRVTDFXBUILDDIR)tdfx_pixels.c \
+		$(MESADRVTDFXBUILDDIR)tdfx_render.c \
+		$(MESADRVTDFXBUILDDIR)tdfx_screen.c \
+		$(MESADRVTDFXBUILDDIR)tdfx_span.c \
+		$(MESADRVTDFXBUILDDIR)tdfx_state.c \
+		$(MESADRVTDFXBUILDDIR)tdfx_tex.c \
+		$(MESADRVTDFXBUILDDIR)tdfx_texman.c \
+		$(MESADRVTDFXBUILDDIR)tdfx_texstate.c \
+		$(MESADRVTDFXBUILDDIR)tdfx_tris.c \
+		$(MESADRVTDFXBUILDDIR)tdfx_vb.c
+
+     TDFXOBJS = $(MESADRVTDFXBUILDDIR)tdfx_context.o \
+		$(MESADRVTDFXBUILDDIR)tdfx_dd.o \
+		$(MESADRVTDFXBUILDDIR)tdfx_lock.o \
+		$(MESADRVTDFXBUILDDIR)tdfx_pixels.o \
+		$(MESADRVTDFXBUILDDIR)tdfx_render.o \
+		$(MESADRVTDFXBUILDDIR)tdfx_screen.o \
+		$(MESADRVTDFXBUILDDIR)tdfx_span.o \
+		$(MESADRVTDFXBUILDDIR)tdfx_state.o \
+		$(MESADRVTDFXBUILDDIR)tdfx_tex.o \
+		$(MESADRVTDFXBUILDDIR)tdfx_texman.o \
+		$(MESADRVTDFXBUILDDIR)tdfx_texstate.o \
+		$(MESADRVTDFXBUILDDIR)tdfx_tris.o \
+		$(MESADRVTDFXBUILDDIR)tdfx_vb.o
+
+     TDFXUOBJS = $(MESADRVTDFXBUILDDIR)unshared/tdfx_context.o \
+		$(MESADRVTDFXBUILDDIR)unshared/tdfx_dd.o \
+		$(MESADRVTDFXBUILDDIR)unshared/tdfx_lock.o \
+		$(MESADRVTDFXBUILDDIR)unshared/tdfx_pixels.o \
+		$(MESADRVTDFXBUILDDIR)unshared/tdfx_render.o \
+		$(MESADRVTDFXBUILDDIR)unshared/tdfx_screen.o \
+		$(MESADRVTDFXBUILDDIR)unshared/tdfx_span.o \
+		$(MESADRVTDFXBUILDDIR)unshared/tdfx_state.o \
+		$(MESADRVTDFXBUILDDIR)unshared/tdfx_tex.o \
+		$(MESADRVTDFXBUILDDIR)unshared/tdfx_texman.o \
+		$(MESADRVTDFXBUILDDIR)unshared/tdfx_texstate.o \
+		$(MESADRVTDFXBUILDDIR)unshared/tdfx_tris.o \
+		$(MESADRVTDFXBUILDDIR)unshared/tdfx_vb.o
+
+     TDFXDOBJS = $(MESADRVTDFXBUILDDIR)debugger/tdfx_context.o \
+		$(MESADRVTDFXBUILDDIR)debugger/tdfx_dd.o \
+		$(MESADRVTDFXBUILDDIR)debugger/tdfx_lock.o \
+		$(MESADRVTDFXBUILDDIR)debugger/tdfx_pixels.o \
+		$(MESADRVTDFXBUILDDIR)debugger/tdfx_render.o \
+		$(MESADRVTDFXBUILDDIR)debugger/tdfx_screen.o \
+		$(MESADRVTDFXBUILDDIR)debugger/tdfx_span.o \
+		$(MESADRVTDFXBUILDDIR)debugger/tdfx_state.o \
+		$(MESADRVTDFXBUILDDIR)debugger/tdfx_tex.o \
+		$(MESADRVTDFXBUILDDIR)debugger/tdfx_texman.o \
+		$(MESADRVTDFXBUILDDIR)debugger/tdfx_texstate.o \
+		$(MESADRVTDFXBUILDDIR)debugger/tdfx_tris.o \
+		$(MESADRVTDFXBUILDDIR)debugger/tdfx_vb.o
+
+     TDFXPOBJS = $(MESADRVTDFXBUILDDIR)profiled/tdfx_context.o \
+		$(MESADRVTDFXBUILDDIR)profiled/tdfx_dd.o \
+		$(MESADRVTDFXBUILDDIR)profiled/tdfx_lock.o \
+		$(MESADRVTDFXBUILDDIR)profiled/tdfx_pixels.o \
+		$(MESADRVTDFXBUILDDIR)profiled/tdfx_render.o \
+		$(MESADRVTDFXBUILDDIR)profiled/tdfx_screen.o \
+		$(MESADRVTDFXBUILDDIR)profiled/tdfx_span.o \
+		$(MESADRVTDFXBUILDDIR)profiled/tdfx_state.o \
+		$(MESADRVTDFXBUILDDIR)profiled/tdfx_tex.o \
+		$(MESADRVTDFXBUILDDIR)profiled/tdfx_texman.o \
+		$(MESADRVTDFXBUILDDIR)profiled/tdfx_texstate.o \
+		$(MESADRVTDFXBUILDDIR)profiled/tdfx_tris.o \
+		$(MESADRVTDFXBUILDDIR)profiled/tdfx_vb.o
+
+#ifdef NeedToLinkMesaSrc
+LinkSourceFile(dri_glide.h, $(MESADRVSRCDIR)/tdfx)
+LinkSourceFile(tdfx_context.c, $(MESADRVSRCDIR)/tdfx)
+LinkSourceFile(tdfx_context.h, $(MESADRVSRCDIR)/tdfx)
+LinkSourceFile(tdfx_dd.c, $(MESADRVSRCDIR)/tdfx)
+LinkSourceFile(tdfx_dd.h, $(MESADRVSRCDIR)/tdfx)
+LinkSourceFile(tdfx_glide.h, $(MESADRVSRCDIR)/tdfx)
+LinkSourceFile(tdfx_lock.c, $(MESADRVSRCDIR)/tdfx)
+LinkSourceFile(tdfx_lock.h, $(MESADRVSRCDIR)/tdfx)
+LinkSourceFile(tdfx_pixels.c, $(MESADRVSRCDIR)/tdfx)
+LinkSourceFile(tdfx_pixels.h, $(MESADRVSRCDIR)/tdfx)
+LinkSourceFile(tdfx_render.c, $(MESADRVSRCDIR)/tdfx)
+LinkSourceFile(tdfx_render.h, $(MESADRVSRCDIR)/tdfx)
+LinkSourceFile(tdfx_screen.c, $(MESADRVSRCDIR)/tdfx)
+LinkSourceFile(tdfx_screen.h, $(MESADRVSRCDIR)/tdfx)
+LinkSourceFile(tdfx_span.c, $(MESADRVSRCDIR)/tdfx)
+LinkSourceFile(tdfx_span.h, $(MESADRVSRCDIR)/tdfx)
+LinkSourceFile(tdfx_state.c, $(MESADRVSRCDIR)/tdfx)
+LinkSourceFile(tdfx_state.h, $(MESADRVSRCDIR)/tdfx)
+LinkSourceFile(tdfx_tex.c, $(MESADRVSRCDIR)/tdfx)
+LinkSourceFile(tdfx_tex.h, $(MESADRVSRCDIR)/tdfx)
+LinkSourceFile(tdfx_texman.c, $(MESADRVSRCDIR)/tdfx)
+LinkSourceFile(tdfx_texman.h, $(MESADRVSRCDIR)/tdfx)
+LinkSourceFile(tdfx_texstate.c, $(MESADRVSRCDIR)/tdfx)
+LinkSourceFile(tdfx_texstate.h, $(MESADRVSRCDIR)/tdfx)
+LinkSourceFile(tdfx_tris.c, $(MESADRVSRCDIR)/tdfx)
+LinkSourceFile(tdfx_tris.h, $(MESADRVSRCDIR)/tdfx)
+LinkSourceFile(tdfx_vb.c, $(MESADRVSRCDIR)/tdfx)
+LinkSourceFile(tdfx_vb.h, $(MESADRVSRCDIR)/tdfx)
+LinkSourceFile(tdfx_vbtmp.h, $(MESADRVSRCDIR)/tdfx)
+#endif
diff --git a/nx-X11/lib/GL/mesa/drivers/dri/unichrome/Imakefile b/nx-X11/lib/GL/mesa/drivers/dri/unichrome/Imakefile
new file mode 100644
index 000000000..273e2ca6f
--- /dev/null
+++ b/nx-X11/lib/GL/mesa/drivers/dri/unichrome/Imakefile
@@ -0,0 +1,80 @@
+XCOMM $XFree86: xc/lib/GL/mesa/src/drv/via/Imakefile,v 1.22 2002/11/25 14:04:52 eich Exp $
+
+#include <Threads.tmpl>
+
+#if GlxUseBuiltInDRIDriver
+#define DoNormalLib (NormalLibGlx || SharedLibGlxWithoutPIC)
+#define DoSharedLib (SharedLibGlx && !SharedLibGlxWithoutPIC)
+#define DoExtraLib SharedLibGlx
+#define DoDebugLib DebugLibGlx
+#define DoProfileLib ProfileLibGlx
+#else
+#define DoNormalLib SharedLibGlxWithoutPIC
+#define DoSharedLib !SharedLibGlxWithoutPIC
+#define DoExtrasLib NO
+#define DoDebugLib NO
+#define DoProfileLib NO
+#endif
+
+#define MesaDrvCommonBuildDir ../common/
+#include "../common/Imakefile.inc"
+#include "../../../array_cache/Imakefile.inc"
+#include "../../../main/Imakefile.inc"
+#include "../../../math/Imakefile.inc"
+#include "../../../shader/Imakefile.inc"
+#include "../../../shader/grammar/Imakefile.inc"
+#include "../../../shader/slang/Imakefile.inc"
+#include "../../../shader/slang/library/Imakefile.inc"
+#include "../../../swrast/Imakefile.inc"
+#include "../../../swrast_setup/Imakefile.inc"
+#include "../../../tnl/Imakefile.inc"
+#include "../../../tnl_dd/Imakefile.inc"
+#include "../../../Imakefile.inc"
+#if defined(i386Architecture) && MesaUseX86Asm
+#include "../../../x86/Imakefile.inc"
+#endif
+#ifdef SparcArchitecture
+#include "../../../sparc/Imakefile.inc"
+#endif
+#define NeedToLinkMesaSrc
+#include "Imakefile.inc"
+
+XCOMM DEBUG_DEFINES = -DDEBUG_LOCKING
+XCOMM DEBUG_DEFINES = -DVIA_DEBUG
+
+      DEFINES = $(ALLOC_DEFINES) $(DRI_DEFINES) $(MESA_ASM_DEFINES) \
+		$(DEBUG_DEFINES)
+     INCLUDES = $(X_INCLUDES) $(MESA_INCLUDES) $(DRI_INCLUDES)
+
+      DRMOBJS = $(GLXLIBSRC)/dri/drm/xf86drm.o \
+		$(GLXLIBSRC)/dri/drm/xf86drmHash.o \
+		$(GLXLIBSRC)/dri/drm/xf86drmRandom.o \
+		$(GLXLIBSRC)/dri/drm/xf86drmSL.o
+
+         SRCS = $(VIASRCS)
+         OBJS = $(DRMOBJS) $(COREMESAOBJS) \
+		$(MESA_ASM_OBJS) $(COMMONOBJS) $(VIAOBJS) 
+
+REQUIREDLIBS = MathLibrary $(LDPRELIB) $(GLXLIB) $(XONLYLIB) $(EXPATLIB)
+
+#include <Library.tmpl>
+
+LibraryObjectRule()
+
+SubdirLibraryRule($(VIAOBJS))
+NormalLintTarget($(SRCS))
+
+#if !GlxUseBuiltInDRIDriver
+LIBNAME = unichrome_dri.so
+SharedDriModuleTarget($(LIBNAME),DONE $(OBJS),$(OBJS))
+InstallDynamicModule($(LIBNAME),$(MODULEDIR),dri)
+
+#ifdef GlxSoProf
+SOPROF_LIBNAME = _unichrome_dri_p
+NormalDepLibraryTarget($(SOPROF_LIBNAME),DONE $(OBJS),$(OBJS))
+InstallLibrary($(SOPROF_LIBNAME),$(MODULEDIR)/dri)
+#endif
+#endif
+
+DependTarget()
+
diff --git a/nx-X11/lib/GL/mesa/drivers/dri/unichrome/Imakefile.inc b/nx-X11/lib/GL/mesa/drivers/dri/unichrome/Imakefile.inc
new file mode 100644
index 000000000..02916ee93
--- /dev/null
+++ b/nx-X11/lib/GL/mesa/drivers/dri/unichrome/Imakefile.inc
@@ -0,0 +1,123 @@
+XCOMM $XFree86: xc/lib/GL/mesa/src/drv/via/Imakefile.inc,v 1.1 2001/03/23 19:18:43 dawes Exp $
+
+#ifndef MesaDrvSrcDir
+#define MesaDrvSrcDir $(MESASRCDIR)/src/mesa/drivers/dri
+#endif
+
+MESADRVSRCDIR = MesaDrvSrcDir
+
+#ifndef MesaDrvViaBuildDir
+#define MesaDrvViaBuildDir /**/
+#endif
+MESADRVVIABUILDDIR = MesaDrvViaBuildDir
+
+#if Malloc0ReturnsNull
+ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL
+#endif
+
+#if BuildXF86DRI
+  DRI_DEFINES = GlxDefines $(VIA_DEFINES) -DX_BYTE_ORDER=$(X_BYTE_ORDER) -DIN_DRI_DRIVER
+ DRI_INCLUDES = -I$(GLXLIBSRC)/dri \
+		-I$(XINCLUDESRC) \
+		-I$(GLXLIBSRC)/glx \
+		-I$(GLXLIBSRC)/include \
+		-I$(SERVERSRC)/GL/dri \
+		-I$(XF86COMSRC) \
+		-I$(XF86OSSRC) \
+		-I$(DRMSRCDIR)/shared-core \
+		-I$(XF86DRIVERSRC)/via \
+		-I$(GLXLIBSRC)/dri/drm
+#endif
+
+MESA_INCLUDES = -I$(MESASRCDIR)/src/mesa \
+		-I$(MESASRCDIR)/src/mesa/main \
+		-I$(MESASRCDIR)/src/mesa/glapi \
+		-I$(MESASRCDIR)/src/mesa/shader \
+		-I$(MESASRCDIR)/include \
+		-I$(MESADRVSRCDIR)/common \
+		-I$(MESADRVSRCDIR)/unichrome
+   X_INCLUDES = -I$(XINCLUDESRC) -I$(EXTINCSRC)
+
+
+      VIASRCS = $(MESADRVVIABUILDDIR)via_context.c \
+		$(MESADRVVIABUILDDIR)via_fb.c \
+		$(MESADRVVIABUILDDIR)via_ioctl.c \
+		$(MESADRVVIABUILDDIR)via_memcpy.c \
+		$(MESADRVVIABUILDDIR)via_render.c \
+		$(MESADRVVIABUILDDIR)via_screen.c \
+		$(MESADRVVIABUILDDIR)via_span.c \
+		$(MESADRVVIABUILDDIR)via_state.c \
+		$(MESADRVVIABUILDDIR)via_tex.c \
+		$(MESADRVVIABUILDDIR)via_texcombine.c \
+		$(MESADRVVIABUILDDIR)via_tris.c
+
+      VIAOBJS =$(MESADRVVIABUILDDIR)via_context.o \
+		$(MESADRVVIABUILDDIR)via_fb.o \
+		$(MESADRVVIABUILDDIR)via_ioctl.o \
+		$(MESADRVVIABUILDDIR)via_memcpy.o \
+		$(MESADRVVIABUILDDIR)via_render.o \
+		$(MESADRVVIABUILDDIR)via_screen.o \
+		$(MESADRVVIABUILDDIR)via_span.o \
+		$(MESADRVVIABUILDDIR)via_state.o \
+		$(MESADRVVIABUILDDIR)via_tex.o \
+		$(MESADRVVIABUILDDIR)via_texcombine.o \
+		$(MESADRVVIABUILDDIR)via_tris.o
+
+      VIAUOBJS =$(MESADRVVIABUILDDIR)/unshared/via_context.o \
+		$(MESADRVVIABUILDDIR)/unshared/via_fb.o \
+		$(MESADRVVIABUILDDIR)/unshared/via_ioctl.o \
+		$(MESADRVVIABUILDDIR)/unshared/via_memcpy.o \
+		$(MESADRVVIABUILDDIR)/unshared/via_render.o \
+		$(MESADRVVIABUILDDIR)/unshared/via_screen.o \
+		$(MESADRVVIABUILDDIR)/unshared/via_span.o \
+		$(MESADRVVIABUILDDIR)/unshared/via_state.o \
+		$(MESADRVVIABUILDDIR)/unshared/via_tex.o \
+		$(MESADRVVIABUILDDIR)/unshared/via_texcombine.o \
+		$(MESADRVVIABUILDDIR)/unshared/via_tris.o
+
+      VIADOBJS =$(MESADRVVIABUILDDIR)/debugger/via_context.o \
+		$(MESADRVVIABUILDDIR)/debugger/via_fb.o \
+		$(MESADRVVIABUILDDIR)/debugger/via_ioctl.o \
+		$(MESADRVVIABUILDDIR)/debugger/via_memcpy.o \
+		$(MESADRVVIABUILDDIR)/debugger/via_render.o \
+		$(MESADRVVIABUILDDIR)/debugger/via_screen.o \
+		$(MESADRVVIABUILDDIR)/debugger/via_span.o \
+		$(MESADRVVIABUILDDIR)/debugger/via_state.o \
+		$(MESADRVVIABUILDDIR)/debugger/via_tex.o \
+		$(MESADRVVIABUILDDIR)/debugger/via_texcombine.o \
+		$(MESADRVVIABUILDDIR)/debugger/via_tris.o
+
+      VIAPOBJS =$(MESADRVVIABUILDDIR)/profiled/via_context.o \
+		$(MESADRVVIABUILDDIR)/profiled/via_fb.o \
+		$(MESADRVVIABUILDDIR)/profiled/via_ioctl.o \
+		$(MESADRVVIABUILDDIR)/profiled/via_memcpy.o \
+		$(MESADRVVIABUILDDIR)/profiled/via_render.o \
+		$(MESADRVVIABUILDDIR)/profiled/via_screen.o \
+		$(MESADRVVIABUILDDIR)/profiled/via_span.o \
+		$(MESADRVVIABUILDDIR)/profiled/via_state.o \
+		$(MESADRVVIABUILDDIR)/profiled/via_tex.o \
+		$(MESADRVVIABUILDDIR)/profiled/via_texcombine.o \
+		$(MESADRVVIABUILDDIR)/profiled/via_tris.o
+
+#ifdef NeedToLinkMesaSrc
+LinkSourceFile(via_3d_reg.h, $(MESADRVSRCDIR)/unichrome)
+LinkSourceFile(via_context.c, $(MESADRVSRCDIR)/unichrome)
+LinkSourceFile(via_context.h, $(MESADRVSRCDIR)/unichrome)
+LinkSourceFile(via_fb.c, $(MESADRVSRCDIR)/unichrome)
+LinkSourceFile(via_fb.h, $(MESADRVSRCDIR)/unichrome)
+LinkSourceFile(via_ioctl.c, $(MESADRVSRCDIR)/unichrome)
+LinkSourceFile(via_ioctl.h, $(MESADRVSRCDIR)/unichrome)
+LinkSourceFile(via_memcpy.c, $(MESADRVSRCDIR)/unichrome)
+LinkSourceFile(via_render.c, $(MESADRVSRCDIR)/unichrome)
+LinkSourceFile(via_screen.c, $(MESADRVSRCDIR)/unichrome)
+LinkSourceFile(via_screen.h, $(MESADRVSRCDIR)/unichrome)
+LinkSourceFile(via_span.c, $(MESADRVSRCDIR)/unichrome)
+LinkSourceFile(via_span.h, $(MESADRVSRCDIR)/unichrome)
+LinkSourceFile(via_state.c, $(MESADRVSRCDIR)/unichrome)
+LinkSourceFile(via_state.h, $(MESADRVSRCDIR)/unichrome)
+LinkSourceFile(via_tex.c, $(MESADRVSRCDIR)/unichrome)
+LinkSourceFile(via_texcombine.c, $(MESADRVSRCDIR)/unichrome)
+LinkSourceFile(via_tex.h, $(MESADRVSRCDIR)/unichrome)
+LinkSourceFile(via_tris.c, $(MESADRVSRCDIR)/unichrome)
+LinkSourceFile(via_tris.h, $(MESADRVSRCDIR)/unichrome)
+#endif
diff --git a/nx-X11/lib/GL/mesa/drivers/dri/via/Imakefile b/nx-X11/lib/GL/mesa/drivers/dri/via/Imakefile
new file mode 100644
index 000000000..f92da2401
--- /dev/null
+++ b/nx-X11/lib/GL/mesa/drivers/dri/via/Imakefile
@@ -0,0 +1,80 @@
+XCOMM $XFree86: xc/lib/GL/mesa/src/drv/via/Imakefile,v 1.22 2002/11/25 14:04:52 eich Exp $
+
+#include <Threads.tmpl>
+
+#if GlxUseBuiltInDRIDriver
+#define DoNormalLib (NormalLibGlx || SharedLibGlxWithoutPIC)
+#define DoSharedLib (SharedLibGlx && !SharedLibGlxWithoutPIC)
+#define DoExtraLib SharedLibGlx
+#define DoDebugLib DebugLibGlx
+#define DoProfileLib ProfileLibGlx
+#else
+#define DoNormalLib SharedLibGlxWithoutPIC
+#define DoSharedLib !SharedLibGlxWithoutPIC
+#define DoExtrasLib NO
+#define DoDebugLib NO
+#define DoProfileLib NO
+#endif
+
+#define MesaDrvCommonBuildDir ../common/
+#include "../common/Imakefile.inc"
+#include "../../../array_cache/Imakefile.inc"
+#include "../../../main/Imakefile.inc"
+#include "../../../math/Imakefile.inc"
+#include "../../../shader/Imakefile.inc"
+#include "../../../shader/grammar/Imakefile.inc"
+#include "../../../shader/slang/Imakefile.inc"
+#include "../../../shader/slang/library/Imakefile.inc"
+#include "../../../swrast/Imakefile.inc"
+#include "../../../swrast_setup/Imakefile.inc"
+#include "../../../tnl/Imakefile.inc"
+#include "../../../tnl_dd/Imakefile.inc"
+#include "../../../Imakefile.inc"
+#if defined(i386Architecture) && MesaUseX86Asm
+#include "../../../x86/Imakefile.inc"
+#endif
+#ifdef SparcArchitecture
+#include "../../../sparc/Imakefile.inc"
+#endif
+#define NeedToLinkMesaSrc
+#include "Imakefile.inc"
+
+XCOMM DEBUG_DEFINES = -DDEBUG_LOCKING
+XCOMM DEBUG_DEFINES = -DVIA_DEBUG
+
+      DEFINES = $(ALLOC_DEFINES) $(DRI_DEFINES) $(MESA_ASM_DEFINES) \
+		$(DEBUG_DEFINES)
+     INCLUDES = $(X_INCLUDES) $(MESA_INCLUDES) $(DRI_INCLUDES)
+
+      DRMOBJS = $(GLXLIBSRC)/dri/drm/xf86drm.o \
+		$(GLXLIBSRC)/dri/drm/xf86drmHash.o \
+		$(GLXLIBSRC)/dri/drm/xf86drmRandom.o \
+		$(GLXLIBSRC)/dri/drm/xf86drmSL.o
+
+         SRCS = $(VIASRCS)
+         OBJS = $(DRMOBJS) $(COREMESAOBJS) \
+		$(MESA_ASM_OBJS) $(COMMONOBJS) $(VIAOBJS) 
+
+REQUIREDLIBS = MathLibrary $(LDPRELIB) $(GLXLIB) $(XONLYLIB) $(EXPATLIB)
+
+#include <Library.tmpl>
+
+LibraryObjectRule()
+
+SubdirLibraryRule($(VIAOBJS))
+NormalLintTarget($(SRCS))
+
+#if !GlxUseBuiltInDRIDriver
+LIBNAME = via_dri.so
+SharedDriModuleTarget($(LIBNAME),DONE $(OBJS),$(OBJS))
+InstallDynamicModule($(LIBNAME),$(MODULEDIR),dri)
+
+#ifdef GlxSoProf
+SOPROF_LIBNAME = _via_dri_p
+NormalDepLibraryTarget($(SOPROF_LIBNAME),DONE $(OBJS),$(OBJS))
+InstallLibrary($(SOPROF_LIBNAME),$(MODULEDIR)/dri)
+#endif
+#endif
+
+DependTarget()
+
diff --git a/nx-X11/lib/GL/mesa/drivers/dri/via/Imakefile.inc b/nx-X11/lib/GL/mesa/drivers/dri/via/Imakefile.inc
new file mode 100644
index 000000000..9cfe68a75
--- /dev/null
+++ b/nx-X11/lib/GL/mesa/drivers/dri/via/Imakefile.inc
@@ -0,0 +1,158 @@
+XCOMM $XFree86: xc/lib/GL/mesa/src/drv/via/Imakefile.inc,v 1.1 2001/03/23 19:18:43 dawes Exp $
+
+#ifndef MesaDrvSrcDir
+#define MesaDrvSrcDir $(MESASRCDIR)/src/mesa/drivers/dri
+#endif
+
+MESADRVSRCDIR = MesaDrvSrcDir
+
+#ifndef MesaDrvViaBuildDir
+#define MesaDrvViaBuildDir /**/
+#endif
+MESADRVVIABUILDDIR = MesaDrvViaBuildDir
+
+#if Malloc0ReturnsNull
+ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL
+#endif
+
+#if BuildXF86DRI
+  DRI_DEFINES = GlxDefines $(VIA_DEFINES) -DX_BYTE_ORDER=$(X_BYTE_ORDER) -DIN_DRI_DRIVER
+ DRI_INCLUDES = -I$(GLXLIBSRC)/dri \
+		-I$(XINCLUDESRC) \
+		-I$(GLXLIBSRC)/glx \
+		-I$(GLXLIBSRC)/include \
+		-I$(SERVERSRC)/GL/dri \
+		-I$(XF86OSSRC) \
+		-I$(DRMSRCDIR)/shared-core \
+		-I$(XF86DRIVERSRC)/via \
+		-I$(GLXLIBSRC)/dri/drm
+#endif
+
+MESA_INCLUDES = -I$(MESASRCDIR)/src/mesa \
+		-I$(MESASRCDIR)/src/mesa/main \
+		-I$(MESASRCDIR)/src/mesa/glapi \
+		-I$(MESASRCDIR)/src/mesa/shader \
+		-I$(MESASRCDIR)/include \
+		-I$(MESADRVSRCDIR)/common \
+		-I$(MESADRVSRCDIR)/unichrome
+   X_INCLUDES = -I$(XINCLUDESRC) -I$(EXTINCSRC)
+
+#if 0
+ DEBUG_SRC = $(MESADRVVIABUILDDIR)via_debug.c
+ DEBUG_OBJ = $(MESADRVVIABUILDDIR)via_debug.o
+ DEBUG_UOBJ = $(MESADRVVIABUILDDIR)unshared/via_debug.o
+ DEBUG_DOBJ = $(MESADRVVIABUILDDIR)debugger/via_debug.o
+ DEBUG_POBJ = $(MESADRVVIABUILDDIR)profiled/via_debug.o
+ DEBUG_DEFINES += -DVIA_DUMP
+#ifdef NeedToLinkMesaSrc
+LinkSourceFile(via_debug.c, $(MESADRVSRCDIR)/unichrome)
+#endif
+#endif
+
+      VIASRCS = $(MESADRVVIABUILDDIR)via_context.c \
+		$(MESADRVVIABUILDDIR)via_fb.c \
+		$(MESADRVVIABUILDDIR)via_ioctl.c \
+		$(MESADRVVIABUILDDIR)via_render.c \
+		$(MESADRVVIABUILDDIR)via_screen.c \
+		$(MESADRVVIABUILDDIR)via_span.c \
+		$(MESADRVVIABUILDDIR)via_state.c \
+		$(MESADRVVIABUILDDIR)via_tex.c \
+		$(MESADRVVIABUILDDIR)via_texmem.c \
+		$(MESADRVVIABUILDDIR)via_texstate.c \
+		$(MESADRVVIABUILDDIR)via_tris.c \
+		$(MESADRVVIABUILDDIR)via_vb.c \
+		$(MESADRVVIABUILDDIR)xf86drmVIA.c \
+		$(DEBUG_SRC)
+
+      VIAOBJS =$(MESADRVVIABUILDDIR)via_context.o \
+		$(MESADRVVIABUILDDIR)via_fb.o \
+		$(MESADRVVIABUILDDIR)via_ioctl.o \
+		$(MESADRVVIABUILDDIR)via_render.o \
+		$(MESADRVVIABUILDDIR)via_screen.o \
+		$(MESADRVVIABUILDDIR)via_span.o \
+		$(MESADRVVIABUILDDIR)via_state.o \
+		$(MESADRVVIABUILDDIR)via_tex.o \
+		$(MESADRVVIABUILDDIR)via_texmem.o \
+		$(MESADRVVIABUILDDIR)via_texstate.o \
+		$(MESADRVVIABUILDDIR)via_tris.o \
+		$(MESADRVVIABUILDDIR)via_vb.o \
+		$(MESADRVVIABUILDDIR)xf86drmVIA.o \
+		$(DEBUG_OBJ)
+
+
+      VIAUOBJS =$(MESADRVVIABUILDDIR)/unshared/via_context.o \
+		$(MESADRVVIABUILDDIR)/unshared/via_fb.o \
+		$(MESADRVVIABUILDDIR)/unshared/via_ioctl.o \
+		$(MESADRVVIABUILDDIR)/unshared/via_render.o \
+		$(MESADRVVIABUILDDIR)/unshared/via_screen.o \
+		$(MESADRVVIABUILDDIR)/unshared/via_span.o \
+		$(MESADRVVIABUILDDIR)/unshared/via_state.o \
+		$(MESADRVVIABUILDDIR)/unshared/via_tex.o \
+		$(MESADRVVIABUILDDIR)/unshared/via_texmem.o \
+		$(MESADRVVIABUILDDIR)/unshared/via_texstate.o \
+		$(MESADRVVIABUILDDIR)/unshared/via_tris.o \
+		$(MESADRVVIABUILDDIR)/unshared/via_vb.o \
+		$(MESADRVVIABUILDDIR)/unshared/xf86drmVIA.o \
+		$(DEBUG_UOBJ)
+
+      VIADOBJS =$(MESADRVVIABUILDDIR)/debugger/via_context.o \
+		$(MESADRVVIABUILDDIR)/debugger/via_fb.o \
+		$(MESADRVVIABUILDDIR)/debugger/via_ioctl.o \
+		$(MESADRVVIABUILDDIR)/debugger/via_render.o \
+		$(MESADRVVIABUILDDIR)/debugger/via_screen.o \
+		$(MESADRVVIABUILDDIR)/debugger/via_span.o \
+		$(MESADRVVIABUILDDIR)/debugger/via_state.o \
+		$(MESADRVVIABUILDDIR)/debugger/via_tex.o \
+		$(MESADRVVIABUILDDIR)/debugger/via_texmem.o \
+		$(MESADRVVIABUILDDIR)/debugger/via_texstate.o \
+		$(MESADRVVIABUILDDIR)/debugger/via_tris.o \
+		$(MESADRVVIABUILDDIR)/debugger/via_vb.o \
+		$(MESADRVVIABUILDDIR)/debugger/xf86drmVIA.o \
+		$(DEBUG_DOBJ)
+
+      VIAPOBJS =$(MESADRVVIABUILDDIR)/profiled/via_context.o \
+		$(MESADRVVIABUILDDIR)/profiled/via_fb.o \
+		$(MESADRVVIABUILDDIR)/profiled/via_ioctl.o \
+		$(MESADRVVIABUILDDIR)/profiled/via_render.o \
+		$(MESADRVVIABUILDDIR)/profiled/via_screen.o \
+		$(MESADRVVIABUILDDIR)/profiled/via_span.o \
+		$(MESADRVVIABUILDDIR)/profiled/via_state.o \
+		$(MESADRVVIABUILDDIR)/profiled/via_tex.o \
+		$(MESADRVVIABUILDDIR)/profiled/via_texmem.o \
+		$(MESADRVVIABUILDDIR)/profiled/via_texstate.o \
+		$(MESADRVVIABUILDDIR)/profiled/via_tris.o \
+		$(MESADRVVIABUILDDIR)/profiled/via_vb.o \
+		$(MESADRVVIABUILDDIR)/profiled/xf86drmVIA.o \
+		$(DEBUG_POBJ)
+
+#ifdef NeedToLinkMesaSrc
+LinkSourceFile(via_3d_reg.h, $(MESADRVSRCDIR)/unichrome)
+LinkSourceFile(via_context.c, $(MESADRVSRCDIR)/unichrome)
+LinkSourceFile(via_dd_tritmp.h, $(MESADRVSRCDIR)/unichrome)
+LinkSourceFile(via_dd_vbtmp.h, $(MESADRVSRCDIR)/unichrome)
+LinkSourceFile(via_dmatmp.h, $(MESADRVSRCDIR)/unichrome)
+LinkSourceFile(via_dri.h, $(MESADRVSRCDIR)/unichrome)
+LinkSourceFile(via_fb.c, $(MESADRVSRCDIR)/unichrome)
+LinkSourceFile(via_fb.h, $(MESADRVSRCDIR)/unichrome)
+LinkSourceFile(via_ioctl.c, $(MESADRVSRCDIR)/unichrome)
+LinkSourceFile(via_ioctl.h, $(MESADRVSRCDIR)/unichrome)
+LinkSourceFile(via_render.c, $(MESADRVSRCDIR)/unichrome)
+LinkSourceFile(via_screen.c, $(MESADRVSRCDIR)/unichrome)
+LinkSourceFile(via_screen.h, $(MESADRVSRCDIR)/unichrome)
+LinkSourceFile(via_span.c, $(MESADRVSRCDIR)/unichrome)
+LinkSourceFile(via_span.h, $(MESADRVSRCDIR)/unichrome)
+LinkSourceFile(via_state.c, $(MESADRVSRCDIR)/unichrome)
+LinkSourceFile(via_state.h, $(MESADRVSRCDIR)/unichrome)
+LinkSourceFile(via_tex.c, $(MESADRVSRCDIR)/unichrome)
+LinkSourceFile(via_tex.h, $(MESADRVSRCDIR)/unichrome)
+LinkSourceFile(via_texmem.c, $(MESADRVSRCDIR)/unichrome)
+LinkSourceFile(via_texstate.c, $(MESADRVSRCDIR)/unichrome)
+LinkSourceFile(via_tris.c, $(MESADRVSRCDIR)/unichrome)
+LinkSourceFile(via_tris.h, $(MESADRVSRCDIR)/unichrome)
+LinkSourceFile(via_vb.c, $(MESADRVSRCDIR)/unichrome)
+LinkSourceFile(via_vb_cliptmp.h, $(MESADRVSRCDIR)/unichrome)
+LinkSourceFile(via_vb.h, $(MESADRVSRCDIR)/unichrome)
+LinkSourceFile(via_vb_rendertmp.h, $(MESADRVSRCDIR)/unichrome)
+LinkSourceFile(xf86drmVIA.c, $(MESADRVSRCDIR)/unichrome)
+LinkSourceFile(xf86drmVIA.h, $(MESADRVSRCDIR)/unichrome)
+#endif
diff --git a/nx-X11/lib/GL/mesa/drivers/osmesa/Imakefile b/nx-X11/lib/GL/mesa/drivers/osmesa/Imakefile
new file mode 100644
index 000000000..014945699
--- /dev/null
+++ b/nx-X11/lib/GL/mesa/drivers/osmesa/Imakefile
@@ -0,0 +1,111 @@
+XCOMM $XFree86: xc/lib/GL/mesa/src/OSmesa/Imakefile,v 1.16 2002/11/25 14:04:50 eich Exp $
+
+#include <Threads.tmpl>
+
+#define DoNormalLib (NormalLibGlx || SharedLibGlxWithoutPIC)
+#define DoSharedLib (SharedLibGlx && !SharedLibGlxWithoutPIC)
+#define DoExtraLib SharedLibGlx
+#define DoDebugLib DebugLibGlx
+#define DoProfileLib ProfileLibGlx
+
+/* Large PIC tables needed for Solaris SPARC builds */
+#if (defined(SunArchitecture) && defined(SparcArchitecture))
+# define LargePICTable YES
+#endif
+
+#include "../../array_cache/Imakefile.inc"
+#include "../../math/Imakefile.inc"
+#include "../../main/Imakefile.inc"
+#include "../../shader/Imakefile.inc"
+#include "../../shader/grammar/Imakefile.inc"
+#include "../../shader/slang/Imakefile.inc"
+#include "../../swrast/Imakefile.inc"
+#include "../../swrast_setup/Imakefile.inc"
+#include "../../tnl/Imakefile.inc"
+#include "../../tnl_dd/Imakefile.inc"
+#include "../../Imakefile.inc"
+#if defined(i386Architecture) && !SystemV4 && MesaUseX86Asm
+#include "../../x86/Imakefile.inc"
+#endif
+#ifdef SparcArchitecture
+#include "../../sparc/Imakefile.inc"
+#endif
+
+LinkSourceFile(osmesa.c, $(MESASRCDIR)/src/mesa/drivers/osmesa)
+LinkSourceFile(driverfuncs.c, $(MESASRCDIR)/src/mesa/drivers/common)
+LinkSourceFile(driverfuncs.h, $(MESASRCDIR)/src/mesa/drivers/common)
+
+#if Malloc0ReturnsNull
+ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL
+#endif
+
+MESA_INCLUDES = -I$(MESASRCDIR)/src/mesa \
+		-I$(MESASRCDIR)/src/mesa/glapi \
+		-I$(MESASRCDIR)/src/mesa/shader \
+		-I$(MESASRCDIR)/src/mesa/main \
+		-I$(MESASRCDIR)/include 
+
+      DEFINES = $(ALLOC_DEFINES) $(DRI_DEFINES)
+     INCLUDES = -I$(XINCLUDESRC) -I$(EXTINCSRC) $(MESA_INCLUDES) \
+		$(DRI_INCLUDES) -I$(GLXLIBSRC)/include
+
+     MESAOBJS = $(COREMESAOBJS) $(MESA_ASM_OBJS)
+    MESAUOBJS = $(COREMESAUOBJS) $(MESA_ASM_UOBJS)
+    MESADOBJS = $(COREMESADOBJS) $(MESA_ASM_DOBJS)
+    MESAPOBJS = $(COREMESAPOBJS) $(MESA_ASM_POBJS)
+
+         SRCS = osmesa.c driverfuncs.c
+         OBJS = osmesa.o driverfuncs.o $(MESAOBJS)
+#if DoSharedLib
+        UOBJS = unshared/osmesa.o unshared/driverfuncs.o $(MESAUOBJS)
+#else
+        UOBJS = $(OBJS)
+#endif
+        DOBJS = debugger/osmesa.o debugger/driverfuncs.o $(MESADOBJS)
+        POBJS = profiled/osmesa.o profiled/driverfuncs.o $(MESAPOBJS)
+
+#if LocalThreads
+  THREADOBJS = $(THREADS_LIBS)
+#endif
+
+#if !GlxUseBuiltInDRIDriver
+# ifdef SharedOSMesaReqs
+ REQUIREDLIBS = SharedOSMesaReqs
+# else
+ REQUIREDLIBS = MathLibrary $(LDPRELIB) $(XLIB) $(GLXLIB)
+# endif
+#endif
+
+#include <Library.tmpl>
+
+LibraryObjectRule()
+
+SubdirLibraryRule($(OBJS))
+NormalLintTarget($(SRCS))
+
+LIBNAME = OSMesa
+SOREV = 4.0
+
+
+#if DoNormalLib
+NormalLibraryTarget($(LIBNAME), $(UOBJS))
+InstallLibrary($(LIBNAME),$(USRLIBDIR))
+#endif
+
+#if SharedLibGlx
+SharedLibraryTarget($(LIBNAME),$(SOREV), $(OBJS), ., .)
+InstallSharedLibrary($(LIBNAME),$(SOREV),$(SHLIBDIR))
+#endif
+
+#if DoDebugLib
+DebuggedLibraryTarget($(LIBNAME),$(DOBJS))
+InstallLibrary($(LIBNAME_d,$(USRLIBDIR))
+#endif
+
+#if DoProfileLib
+ProfiledLibraryTarget($(LIBNAME), $(POBJS))
+InstallLibrary($(LIBNAME)_p,$(USRLIBDIR))
+#endif
+
+DependTarget()
+
diff --git a/nx-X11/lib/GL/mesa/drivers/osmesa/OSMesa-def.cpp b/nx-X11/lib/GL/mesa/drivers/osmesa/OSMesa-def.cpp
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/nx-X11/lib/GL/mesa/drivers/osmesa/OSMesa-def.cpp
diff --git a/nx-X11/lib/GL/mesa/drivers/x11/Imakefile b/nx-X11/lib/GL/mesa/drivers/x11/Imakefile
new file mode 100644
index 000000000..ab9a91970
--- /dev/null
+++ b/nx-X11/lib/GL/mesa/drivers/x11/Imakefile
@@ -0,0 +1,70 @@
+XCOMM $XFree86: xc/lib/GL/mesa/src/X/Imakefile,v 1.12tsi Exp $
+
+#include <Threads.tmpl>
+
+/*
+ * Need both shared and unshared Mesa objects in the following cases:
+ *   GlxDriverUsesMesa
+ *   GlxBuiltInXMesa
+ *   BuildOSMesaLib
+ *
+ * In other cases, only the shared version is needed to link in to loadable
+ * driver modules.
+ */
+
+#if BuildOSMesaLib || (BuildXF86DRI && (GlxDriverUsesMesa || GlxBuiltInXMesa))
+#define DoNormalLib (NormalLibGlx || SharedLibGlxWithoutPIC)
+#define DoSharedLib (SharedLibGlx && !SharedLibGlxWithoutPIC)
+#define DoExtraLib SharedLibGlx
+#define DoDebugLib DebugLibGlx
+#define DoProfileLib ProfileLibGlx
+#else
+#define DoNormalLib SharedLibGlxWithoutPIC
+#define DoSharedLib !SharedLibGlxWithoutPIC
+#define DoExtraLib NO
+#define DoDebugLib NO
+#define DoProfileLib NO
+#endif
+
+
+#define MesaXBuildDir /**/
+#define NeedToLinkMesaSrc
+#include "Imakefile.inc"
+
+#if Malloc0ReturnsNull
+ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL
+#endif
+
+#if BuildXF86DRI
+  DRI_DEFINES = GlxDefines
+ DRI_INCLUDES = -I../../../dri -I../../../glx -I../../dri -I.. \
+		-I$(INCLUDESRC)/GL -I$(XF86OSSRC) -I$(SERVERSRC)/GL/dri
+#endif
+
+MESA_INCLUDES = -I$(MESASRCDIR)/src \
+		-I$(MESASRCDIR)/src/X \
+		-I$(MESASRCDIR)/include \
+		-I../../../include -I$(XINCLUDESRC)
+
+     INCLUDES = $(MESA_INCLUDES) $(DRI_INCLUDES)
+
+#ifdef UseCompaqMathLibrary
+      MATHDEF = -DCCPML
+#endif
+
+#if BuildXF86DRI && GlxBuiltInXMesa
+  XMESA_DEFINES = -DGLX_BUILT_IN_XMESA
+#endif
+
+         SRCS = $(XMESA_SRCS)
+         OBJS = $(XMESA_OBJS)
+      DEFINES = $(ALLOC_DEFINES) $(DRI_DEFINES) $(MATHDEF) $(XMESA_DEFINES)
+
+#include <Library.tmpl>
+
+LibraryObjectRule()
+
+SubdirLibraryRule($(XMESA_OBJS))
+NormalLintTarget($(XMESA_SRCS))
+
+DependTarget()
diff --git a/nx-X11/lib/GL/mesa/drivers/x11/Imakefile.inc b/nx-X11/lib/GL/mesa/drivers/x11/Imakefile.inc
new file mode 100644
index 000000000..d62800e7d
--- /dev/null
+++ b/nx-X11/lib/GL/mesa/drivers/x11/Imakefile.inc
@@ -0,0 +1,104 @@
+XCOMM $XFree86: xc/lib/GL/mesa/src/X/Imakefile.inc,v 1.3tsi Exp $
+
+#ifndef MesaXBuildDir
+#define MesaXBuildDir $(GLXLIBSRC)/src/mesa/drivers/x11/
+#endif
+
+MESAXBUILDDIR = MesaXBuildDir
+
+#ifndef MesaInXServer
+XMESA_GLX_SRCS = $(MESAXBUILDDIR)fakeglx.c \
+		 $(MESAXBUILDDIR)glxapi.c \
+		 $(MESAXBUILDDIR)realglx.c \
+		 $(MESAXBUILDDIR)xfonts.c
+#endif
+
+   XMESA_SRCS = $(XMESA_GLX_SRCS) \
+		$(MESAXBUILDDIR)xm_api.c \
+                $(MESAXBUILDDIR)xm_buffer.c \
+		$(MESAXBUILDDIR)xm_dd.c \
+		$(MESAXBUILDDIR)xm_line.c \
+		$(MESAXBUILDDIR)xm_span.c \
+		$(MESAXBUILDDIR)xm_tri.c
+
+#ifdef NeedToLinkMesaSrc
+#ifndef MesaInXServer
+LinkSourceFile(fakeglx.c, $(MESASRCDIR)/src/mesa/drivers/x11)
+LinkSourceFile(glxapi.c, $(MESASRCDIR)/src/mesa/drivers/x11)
+LinkSourceFile(glxapi.h, $(MESASRCDIR)/src/mesa/drivers/x11)
+LinkSourceFile(realglx.c, $(MESASRCDIR)/src/mesa/drivers/x11)
+LinkSourceFile(xfonts.c, $(MESASRCDIR)/src/mesa/drivers/x11)
+#endif
+LinkSourceFile(xm_api.c, $(MESASRCDIR)/src/mesa/drivers/x11)
+LinkSourceFile(xm_buffer.c, $(MESASRCDIR)/src/mesa/drivers/x11)
+LinkSourceFile(xm_dd.c, $(MESASRCDIR)/src/mesa/drivers/x11)
+LinkSourceFile(xm_line.c, $(MESASRCDIR)/src/mesa/drivers/x11)
+LinkSourceFile(xm_span.c, $(MESASRCDIR)/src/mesa/drivers/x11)
+LinkSourceFile(xm_tri.c, $(MESASRCDIR)/src/mesa/drivers/x11)
+#endif
+
+#ifndef MesaInXServer
+XMESA_GLX_OBJS = $(MESAXBUILDDIR)fakeglx.o \
+		 $(MESAXBUILDDIR)glxapi.o \
+		 $(MESAXBUILDDIR)realglx.o \
+		 $(MESAXBUILDDIR)xfonts.o
+#endif
+
+   XMESA_OBJS = $(XMESA_GLX_OBJS) \
+		$(MESAXBUILDDIR)xm_api.o \
+                $(MESAXBUILDDIR)xm_buffer.o \
+		$(MESAXBUILDDIR)xm_dd.o \
+		$(MESAXBUILDDIR)xm_line.o \
+		$(MESAXBUILDDIR)xm_span.o \
+		$(MESAXBUILDDIR)xm_tri.o
+
+#if defined(DoSharedLib) && DoSharedLib
+#ifndef MesaInXServer
+XMESA_GLX_UOBJS = $(MESAXBUILDDIR)unshared/fakeglx.o \
+		  $(MESAXBUILDDIR)unshared/glxapi.o \
+		  $(MESAXBUILDDIR)unshared/realglx.o \
+		  $(MESAXBUILDDIR)unshared/xfonts.o
+#endif
+
+  XMESA_UOBJS = $(XMESA_GLX_UOBJS) \
+		$(MESAXBUILDDIR)unshared/xm_api.o \
+                $(MESAXBUILDDIR)unshared/xm_buffer.o \
+		$(MESAXBUILDDIR)unshared/xm_dd.o \
+		$(MESAXBUILDDIR)unshared/xm_line.o \
+		$(MESAXBUILDDIR)unshared/xm_span.o \
+		$(MESAXBUILDDIR)unshared/xm_tri.o
+#else
+XMESA_GLX_UOBJS = $(XMESA_GLX_OBJS)
+  XMESA_UOBJS = $(XMESA_OBJS)
+#endif
+
+#ifndef MesaInXServer
+XMESA_GLX_DOBJS = $(MESAXBUILDDIR)debugger/fakeglx.o \
+		  $(MESAXBUILDDIR)debugger/glxapi.o \
+		  $(MESAXBUILDDIR)debugger/realglx.o \
+		  $(MESAXBUILDDIR)debugger/xfonts.o
+#endif
+
+  XMESA_DOBJS = $(XMESA_GLX_DOBJS) \
+		$(MESAXBUILDDIR)debugger/xm_api.o \
+                $(MESAXBUILDDIR)debugger/xm_buffer.o \
+		$(MESAXBUILDDIR)debugger/xm_dd.o \
+		$(MESAXBUILDDIR)debugger/xm_line.o \
+		$(MESAXBUILDDIR)debugger/xm_span.o \
+		$(MESAXBUILDDIR)debugger/xm_tri.o
+
+#ifndef MesaInXServer
+XMESA_GLX_POBJS = $(MESAXBUILDDIR)profiled/fakeglx.o \
+		  $(MESAXBUILDDIR)profiled/glxapi.o \
+		  $(MESAXBUILDDIR)profiled/realglx.o \
+		  $(MESAXBUILDDIR)profiled/xfonts.o
+#endif
+
+  XMESA_POBJS = $(XMESA_GLX_POBJS) \
+		$(MESAXBUILDDIR)profiled/xm_api.o \
+                $(MESAXBUILDDIR)profiled/xm_buffer.o \
+		$(MESAXBUILDDIR)profiled/xm_dd.o \
+		$(MESAXBUILDDIR)profiled/xm_line.o \
+		$(MESAXBUILDDIR)profiled/xm_span.o \
+		$(MESAXBUILDDIR)profiled/xm_tri.o
+
diff --git a/nx-X11/lib/GL/mesa/main/Imakefile b/nx-X11/lib/GL/mesa/main/Imakefile
new file mode 100644
index 000000000..3093cedd1
--- /dev/null
+++ b/nx-X11/lib/GL/mesa/main/Imakefile
@@ -0,0 +1,66 @@
+XCOMM $XdotOrg: xc/lib/GL/mesa/main/Imakefile,v 1.3 2005/12/20 22:30:49 alanc Exp $
+XCOMM $XFree86: xc/lib/GL/mesa/src/Imakefile,v 1.30tsi Exp $
+
+#include <Threads.tmpl>
+
+/*
+ * Need both shared and unshared Mesa objects in the following cases:
+ *   GlxDriverUsesMesa
+ *   GlxBuiltInXMesa
+ *   BuildOSMesaLib
+ *
+ * In other cases, only the shared version is needed to link in to loadable
+ * driver modules.
+ */
+
+#if BuildOSMesaLib || (BuildXF86DRI && (GlxDriverUsesMesa || GlxBuiltInXMesa))
+#define DoNormalLib (NormalLibGlx || SharedLibGlxWithoutPIC)
+#define DoSharedLib (SharedLibGlx && !SharedLibGlxWithoutPIC)
+#define DoExtraLib SharedLibGlx
+#define DoDebugLib DebugLibGlx
+#define DoProfileLib ProfileLibGlx
+#else
+#define DoNormalLib SharedLibGlxWithoutPIC
+#define DoSharedLib !SharedLibGlxWithoutPIC
+#define DoExtraLib NO
+#define DoDebugLib NO
+#define DoProfileLib NO
+#endif
+
+/* Large PIC tables needed for Solaris/SPARC builds */
+#if defined(SunArchitecture) && defined(SparcArchitecture) && defined(LargePositionIndependentCFlags)
+# define LargePICTable YES
+#endif
+
+#if Malloc0ReturnsNull
+ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL
+#endif
+
+#define MesaBuildDir /**/
+#define NeedToLinkMesaSrc
+#include "Imakefile.inc"
+
+#ifdef UseCompaqMathLibrary
+ MATH_DEFINES = -DCCPML
+#endif
+
+      DEFINES = $(ALLOC_DEFINES) GlxDefines -DIN_DRI_DRIVER \
+		$(MESA_ASM_DEFINES) $(MATH_DEFINES)
+     INCLUDES = /*-I$(INCLUDESRC) -I$(EXTINCSRC) */ -I$(XINCLUDESRC) \
+		-I$(MESASRCDIR)/src/mesa/glapi \
+		-I$(MESASRCDIR)/src/mesa/math \
+		-I$(MESASRCDIR)/src/mesa/shader \
+		-I$(MESASRCDIR)/src/mesa/main \
+		-I$(MESASRCDIR)/src/mesa -I$(GLXLIBSRC)/dri \
+		-I$(MESASRCDIR)/include -I$(GLXLIBSRC)/include
+         SRCS = $(COREMESABASESRCS)
+         OBJS = $(COREMESABASEOBJS)
+
+#include <Library.tmpl>
+
+LibraryObjectRule()
+
+SubdirLibraryRule($(OBJS))
+NormalLintTarget($(SRCS))
+
+DependTarget()
diff --git a/nx-X11/lib/GL/mesa/main/Imakefile.inc b/nx-X11/lib/GL/mesa/main/Imakefile.inc
new file mode 100644
index 000000000..5deaf1038
--- /dev/null
+++ b/nx-X11/lib/GL/mesa/main/Imakefile.inc
@@ -0,0 +1,484 @@
+XCOMM $XFree86: xc/lib/GL/mesa/src/Imakefile.inc,v 1.7tsi Exp $
+
+#ifndef MesaBuildDir
+#define MesaBuildDir $(GLXLIBSRC)/mesa/main/
+#endif
+
+MESABUILDDIR = MesaBuildDir
+
+#ifdef NeedAllMesaSrc
+ DISPATCHSRCS = $(MESABUILDDIR)dispatch.c
+    GLAPISRCS = $(MESABUILDDIR)glapi.c
+ GLTHREADSRCS = $(MESABUILDDIR)glthread.c
+#endif
+
+MESA_CORE_INCLUDES = -I$(MESASRCDIR)/src/array_cache \
+                -I$(MESASRCDIR)/src/math -I$(MESASRCDIR)/src/shader \
+                -I$(MESASRCDIR)/src/swrast -I$(MESASRCDIR)/src/swrast_setup \
+                -I$(MESASRCDIR)/src/tnl -I$(MESASRCDIR)/src/tnl_dd
+
+COREMESABASESRCS = \
+		$(MESABUILDDIR)api_arrayelt.c \
+		$(MESABUILDDIR)api_loopback.c \
+		$(MESABUILDDIR)api_noop.c \
+		$(MESABUILDDIR)api_validate.c \
+		$(MESABUILDDIR)accum.c \
+		$(MESABUILDDIR)attrib.c \
+		$(MESABUILDDIR)blend.c \
+		$(MESABUILDDIR)bufferobj.c \
+		$(MESABUILDDIR)buffers.c \
+		$(MESABUILDDIR)clip.c \
+		$(MESABUILDDIR)colortab.c \
+		$(MESABUILDDIR)context.c \
+		$(MESABUILDDIR)convolve.c \
+		$(MESABUILDDIR)debug.c \
+		$(MESABUILDDIR)depth.c \
+		$(MESABUILDDIR)dlist.c \
+		$(MESABUILDDIR)drawpix.c \
+		$(MESABUILDDIR)enable.c \
+		$(MESABUILDDIR)enums.c \
+		$(MESABUILDDIR)eval.c \
+		$(MESABUILDDIR)execmem.c \
+		$(MESABUILDDIR)extensions.c \
+		$(MESABUILDDIR)feedback.c \
+                $(MESABUILDDIR)fbobject.c \
+		$(MESABUILDDIR)fog.c \
+                $(MESABUILDDIR)framebuffer.c \
+		$(MESABUILDDIR)get.c \
+                $(MESABUILDDIR)getstring.c \
+		$(MESABUILDDIR)hash.c \
+		$(MESABUILDDIR)hint.c \
+		$(MESABUILDDIR)histogram.c \
+		$(MESABUILDDIR)image.c \
+		$(MESABUILDDIR)imports.c \
+		$(MESABUILDDIR)light.c \
+		$(MESABUILDDIR)lines.c \
+		$(MESABUILDDIR)matrix.c \
+		$(MESABUILDDIR)mm.c \
+		$(MESABUILDDIR)occlude.c \
+		$(MESABUILDDIR)pixel.c \
+		$(MESABUILDDIR)points.c \
+		$(MESABUILDDIR)polygon.c \
+		$(MESABUILDDIR)rastpos.c \
+                $(MESABUILDDIR)renderbuffer.c \
+		$(MESABUILDDIR)state.c \
+		$(MESABUILDDIR)stencil.c \
+		$(MESABUILDDIR)texcompress.c \
+		$(MESABUILDDIR)texcompress_fxt1.c \
+		$(MESABUILDDIR)texcompress_s3tc.c \
+                $(MESABUILDDIR)texenvprogram.c \
+		$(MESABUILDDIR)texformat.c \
+		$(MESABUILDDIR)teximage.c \
+		$(MESABUILDDIR)texobj.c \
+                $(MESABUILDDIR)texrender.c \
+		$(MESABUILDDIR)texstate.c \
+		$(MESABUILDDIR)texstore.c \
+		$(MESABUILDDIR)varray.c \
+		$(MESABUILDDIR)vtxfmt.c
+
+#ifdef NeedToLinkMesaSrc
+LinkSourceFile(api_arrayelt.c, $(MESASRCDIR)/src/mesa/main)
+LinkSourceFile(api_arrayelt.h, $(MESASRCDIR)/src/mesa/main)
+LinkSourceFile(api_eval.h, $(MESASRCDIR)/src/mesa/main)
+LinkSourceFile(api_loopback.c, $(MESASRCDIR)/src/mesa/main)
+LinkSourceFile(api_loopback.h, $(MESASRCDIR)/src/mesa/main)
+LinkSourceFile(api_noop.c, $(MESASRCDIR)/src/mesa/main)
+LinkSourceFile(api_noop.h, $(MESASRCDIR)/src/mesa/main)
+LinkSourceFile(api_validate.c, $(MESASRCDIR)/src/mesa/main)
+LinkSourceFile(api_validate.h, $(MESASRCDIR)/src/mesa/main)
+LinkSourceFile(accum.c, $(MESASRCDIR)/src/mesa/main)
+LinkSourceFile(accum.h, $(MESASRCDIR)/src/mesa/main)
+LinkSourceFile(attrib.c, $(MESASRCDIR)/src/mesa/main)
+LinkSourceFile(attrib.h, $(MESASRCDIR)/src/mesa/main)
+LinkSourceFile(blend.c, $(MESASRCDIR)/src/mesa/main)
+LinkSourceFile(blend.h, $(MESASRCDIR)/src/mesa/main)
+LinkSourceFile(bufferobj.c, $(MESASRCDIR)/src/mesa/main)
+LinkSourceFile(bufferobj.h, $(MESASRCDIR)/src/mesa/main)
+LinkSourceFile(buffers.c, $(MESASRCDIR)/src/mesa/main)
+LinkSourceFile(buffers.h, $(MESASRCDIR)/src/mesa/main)
+LinkSourceFile(clip.c, $(MESASRCDIR)/src/mesa/main)
+LinkSourceFile(clip.h, $(MESASRCDIR)/src/mesa/main)
+LinkSourceFile(colormac.h, $(MESASRCDIR)/src/mesa/main)
+LinkSourceFile(colortab.c, $(MESASRCDIR)/src/mesa/main)
+LinkSourceFile(colortab.h, $(MESASRCDIR)/src/mesa/main)
+LinkSourceFile(config.h, $(MESASRCDIR)/src/mesa/main)
+LinkSourceFile(context.c, $(MESASRCDIR)/src/mesa/main)
+LinkSourceFile(context.h, $(MESASRCDIR)/src/mesa/main)
+LinkSourceFile(convolve.c, $(MESASRCDIR)/src/mesa/main)
+LinkSourceFile(convolve.h, $(MESASRCDIR)/src/mesa/main)
+LinkSourceFile(dd.h, $(MESASRCDIR)/src/mesa/main)
+LinkSourceFile(debug.c, $(MESASRCDIR)/src/mesa/main)
+LinkSourceFile(debug.h, $(MESASRCDIR)/src/mesa/main)
+LinkSourceFile(depth.c, $(MESASRCDIR)/src/mesa/main)
+LinkSourceFile(depth.h, $(MESASRCDIR)/src/mesa/main)
+#ifdef NeedAllMesaSrc
+LinkSourceFile(dispatch.c, $(MESASRCDIR)/src/mesa/main)
+#endif
+LinkSourceFile(dlist.c, $(MESASRCDIR)/src/mesa/main)
+LinkSourceFile(dlist.h, $(MESASRCDIR)/src/mesa/main)
+LinkSourceFile(drawpix.c, $(MESASRCDIR)/src/mesa/main)
+LinkSourceFile(drawpix.h, $(MESASRCDIR)/src/mesa/main)
+LinkSourceFile(enable.c, $(MESASRCDIR)/src/mesa/main)
+LinkSourceFile(enable.h, $(MESASRCDIR)/src/mesa/main)
+LinkSourceFile(enums.c, $(MESASRCDIR)/src/mesa/main)
+LinkSourceFile(enums.h, $(MESASRCDIR)/src/mesa/main)
+LinkSourceFile(eval.c, $(MESASRCDIR)/src/mesa/main)
+LinkSourceFile(eval.h, $(MESASRCDIR)/src/mesa/main)
+LinkSourceFile(execmem.c, $(MESASRCDIR)/src/mesa/main)
+LinkSourceFile(extensions.c, $(MESASRCDIR)/src/mesa/main)
+LinkSourceFile(extensions.h, $(MESASRCDIR)/src/mesa/main)
+LinkSourceFile(fbobject.c, $(MESASRCDIR)/src/mesa/main)
+LinkSourceFile(fbobject.h, $(MESASRCDIR)/src/mesa/main)
+LinkSourceFile(feedback.c, $(MESASRCDIR)/src/mesa/main)
+LinkSourceFile(feedback.h, $(MESASRCDIR)/src/mesa/main)
+LinkSourceFile(fog.c, $(MESASRCDIR)/src/mesa/main)
+LinkSourceFile(fog.h, $(MESASRCDIR)/src/mesa/main)
+LinkSourceFile(framebuffer.c, $(MESASRCDIR)/src/mesa/main)
+LinkSourceFile(framebuffer.h, $(MESASRCDIR)/src/mesa/main)
+LinkSourceFile(get.c, $(MESASRCDIR)/src/mesa/main)
+LinkSourceFile(get.h, $(MESASRCDIR)/src/mesa/main)
+LinkSourceFile(getstring.c, $(MESASRCDIR)/src/mesa/main)
+#ifdef NeedAllMesaSrc
+LinkSourceFile(glapi.c, $(MESASRCDIR)/src/mesa/glapi)
+LinkSourceFile(glthread.c, $(MESASRCDIR)/src/mesa/glapi)
+#endif
+LinkSourceFile(glheader.h, $(MESASRCDIR)/src/mesa/main)
+LinkSourceFile(hash.c, $(MESASRCDIR)/src/mesa/main)
+LinkSourceFile(hash.h, $(MESASRCDIR)/src/mesa/main)
+LinkSourceFile(hint.c, $(MESASRCDIR)/src/mesa/main)
+LinkSourceFile(hint.h, $(MESASRCDIR)/src/mesa/main)
+LinkSourceFile(histogram.c, $(MESASRCDIR)/src/mesa/main)
+LinkSourceFile(histogram.h, $(MESASRCDIR)/src/mesa/main)
+LinkSourceFile(image.c, $(MESASRCDIR)/src/mesa/main)
+LinkSourceFile(image.h, $(MESASRCDIR)/src/mesa/main)
+LinkSourceFile(imports.c, $(MESASRCDIR)/src/mesa/main)
+LinkSourceFile(imports.h, $(MESASRCDIR)/src/mesa/main)
+LinkSourceFile(light.c, $(MESASRCDIR)/src/mesa/main)
+LinkSourceFile(light.h, $(MESASRCDIR)/src/mesa/main)
+LinkSourceFile(lines.c, $(MESASRCDIR)/src/mesa/main)
+LinkSourceFile(lines.h, $(MESASRCDIR)/src/mesa/main)
+LinkSourceFile(macros.h, $(MESASRCDIR)/src/mesa/main)
+LinkSourceFile(matrix.c, $(MESASRCDIR)/src/mesa/main)
+LinkSourceFile(matrix.h, $(MESASRCDIR)/src/mesa/main)
+LinkSourceFile(mm.c, $(MESASRCDIR)/src/mesa/main)
+LinkSourceFile(mm.h, $(MESASRCDIR)/src/mesa/main)
+LinkSourceFile(mtypes.h, $(MESASRCDIR)/src/mesa/main)
+LinkSourceFile(occlude.c, $(MESASRCDIR)/src/mesa/main)
+LinkSourceFile(occlude.h, $(MESASRCDIR)/src/mesa/main)
+LinkSourceFile(pixel.c, $(MESASRCDIR)/src/mesa/main)
+LinkSourceFile(pixel.h, $(MESASRCDIR)/src/mesa/main)
+LinkSourceFile(points.c, $(MESASRCDIR)/src/mesa/main)
+LinkSourceFile(points.h, $(MESASRCDIR)/src/mesa/main)
+LinkSourceFile(polygon.c, $(MESASRCDIR)/src/mesa/main)
+LinkSourceFile(polygon.h, $(MESASRCDIR)/src/mesa/main)
+LinkSourceFile(rastpos.c, $(MESASRCDIR)/src/mesa/main)
+LinkSourceFile(rastpos.h, $(MESASRCDIR)/src/mesa/main)
+LinkSourceFile(renderbuffer.c, $(MESASRCDIR)/src/mesa/main)
+LinkSourceFile(renderbuffer.h, $(MESASRCDIR)/src/mesa/main)
+LinkSourceFile(simple_list.h, $(MESASRCDIR)/src/mesa/main)
+LinkSourceFile(state.c, $(MESASRCDIR)/src/mesa/main)
+LinkSourceFile(state.h, $(MESASRCDIR)/src/mesa/main)
+LinkSourceFile(stencil.c, $(MESASRCDIR)/src/mesa/main)
+LinkSourceFile(stencil.h, $(MESASRCDIR)/src/mesa/main)
+LinkSourceFile(texcompress.c, $(MESASRCDIR)/src/mesa/main)
+LinkSourceFile(texcompress_fxt1.c, $(MESASRCDIR)/src/mesa/main)
+LinkSourceFile(texcompress_s3tc.c, $(MESASRCDIR)/src/mesa/main)
+LinkSourceFile(texcompress.h, $(MESASRCDIR)/src/mesa/main)
+LinkSourceFile(texenvprogram.c, $(MESASRCDIR)/src/mesa/main)
+LinkSourceFile(texenvprogram.h, $(MESASRCDIR)/src/mesa/main)
+LinkSourceFile(texformat.c, $(MESASRCDIR)/src/mesa/main)
+LinkSourceFile(texformat.h, $(MESASRCDIR)/src/mesa/main)
+LinkSourceFile(texformat_tmp.h, $(MESASRCDIR)/src/mesa/main)
+LinkSourceFile(teximage.c, $(MESASRCDIR)/src/mesa/main)
+LinkSourceFile(teximage.h, $(MESASRCDIR)/src/mesa/main)
+LinkSourceFile(texobj.c, $(MESASRCDIR)/src/mesa/main)
+LinkSourceFile(texobj.h, $(MESASRCDIR)/src/mesa/main)
+LinkSourceFile(texrender.c, $(MESASRCDIR)/src/mesa/main)
+LinkSourceFile(texrender.h, $(MESASRCDIR)/src/mesa/main)
+LinkSourceFile(texstate.c, $(MESASRCDIR)/src/mesa/main)
+LinkSourceFile(texstate.h, $(MESASRCDIR)/src/mesa/main)
+LinkSourceFile(texstore.c, $(MESASRCDIR)/src/mesa/main)
+LinkSourceFile(texstore.h, $(MESASRCDIR)/src/mesa/main)
+LinkSourceFile(varray.c, $(MESASRCDIR)/src/mesa/main)
+LinkSourceFile(varray.h, $(MESASRCDIR)/src/mesa/main)
+LinkSourceFile(version.h, $(MESASRCDIR)/src/mesa/main)
+LinkSourceFile(vtxfmt.c, $(MESASRCDIR)/src/mesa/main)
+LinkSourceFile(vtxfmt.h, $(MESASRCDIR)/src/mesa/main)
+LinkSourceFile(vtxfmt_tmp.h, $(MESASRCDIR)/src/mesa/main)
+#endif
+
+#ifdef NeedAllMesaSrc
+ DISPATCHOBJS = $(MESABUILDDIR)dispatch.o
+    GLAPIOBJS = $(MESABUILDDIR)glapi.o
+ GLTHREADOBJS = $(MESABUILDDIR)glthread.o
+#endif
+
+COREMESABASEOBJS = \
+		$(DISPATCHOBJS) \
+		$(GLAPIOBJS) \
+		$(GLTHREADOBJS) \
+		$(MESABUILDDIR)api_arrayelt.o \
+		$(MESABUILDDIR)api_loopback.o \
+		$(MESABUILDDIR)api_noop.o \
+		$(MESABUILDDIR)api_validate.o \
+		$(MESABUILDDIR)accum.o \
+		$(MESABUILDDIR)attrib.o \
+		$(MESABUILDDIR)blend.o \
+		$(MESABUILDDIR)bufferobj.o \
+		$(MESABUILDDIR)buffers.o \
+		$(MESABUILDDIR)clip.o \
+		$(MESABUILDDIR)colortab.o \
+		$(MESABUILDDIR)context.o \
+		$(MESABUILDDIR)convolve.o \
+		$(MESABUILDDIR)debug.o \
+		$(MESABUILDDIR)depth.o \
+		$(MESABUILDDIR)dlist.o \
+		$(MESABUILDDIR)drawpix.o \
+		$(MESABUILDDIR)enable.o \
+		$(MESABUILDDIR)enums.o \
+		$(MESABUILDDIR)eval.o \
+		$(MESABUILDDIR)execmem.o \
+		$(MESABUILDDIR)extensions.o \
+                $(MESABUILDDIR)fbobject.o \
+		$(MESABUILDDIR)feedback.o \
+		$(MESABUILDDIR)fog.o \
+                $(MESABUILDDIR)framebuffer.o \
+		$(MESABUILDDIR)get.o \
+                $(MESABUILDDIR)getstring.o \
+		$(MESABUILDDIR)hash.o \
+		$(MESABUILDDIR)hint.o \
+		$(MESABUILDDIR)histogram.o \
+		$(MESABUILDDIR)image.o \
+		$(MESABUILDDIR)imports.o \
+		$(MESABUILDDIR)light.o \
+		$(MESABUILDDIR)lines.o \
+		$(MESABUILDDIR)matrix.o \
+		$(MESABUILDDIR)mm.o \
+		$(MESABUILDDIR)occlude.o \
+		$(MESABUILDDIR)pixel.o \
+		$(MESABUILDDIR)points.o \
+		$(MESABUILDDIR)polygon.o \
+		$(MESABUILDDIR)rastpos.o \
+                $(MESABUILDDIR)renderbuffer.o \
+		$(MESABUILDDIR)state.o \
+		$(MESABUILDDIR)stencil.o \
+		$(MESABUILDDIR)texcompress.o \
+		$(MESABUILDDIR)texcompress_fxt1.o \
+		$(MESABUILDDIR)texcompress_s3tc.o \
+                $(MESABUILDDIR)texenvprogram.o \
+		$(MESABUILDDIR)texformat.o \
+		$(MESABUILDDIR)teximage.o \
+                $(MESABUILDDIR)texrender.o \
+		$(MESABUILDDIR)texobj.o \
+		$(MESABUILDDIR)texstate.o \
+		$(MESABUILDDIR)texstore.o \
+		$(MESABUILDDIR)varray.o \
+		$(MESABUILDDIR)vtxfmt.o
+
+#ifdef NeedAllMesaSrc
+ DISPATCHUOBJS = $(MESABUILDDIR)unshared/dispatch.o
+    GLAPIUOBJS = $(MESABUILDDIR)unshared/glapi.o
+ GLTHREADUOBJS = $(MESABUILDDIR)unshared/glthread.o
+#endif
+
+#if defined(DoSharedLib) && DoSharedLib
+COREMESABASEUOBJS = \
+		$(DISPATCHUOBJS) \
+		$(GLAPIUOBJS) \
+		$(GLTHREADUOBJS) \
+		$(MESABUILDDIR)unshared/api_arrayelt.o \
+		$(MESABUILDDIR)unshared/api_loopback.o \
+		$(MESABUILDDIR)unshared/api_noop.o \
+		$(MESABUILDDIR)unshared/api_validate.o \
+		$(MESABUILDDIR)unshared/accum.o \
+		$(MESABUILDDIR)unshared/attrib.o \
+		$(MESABUILDDIR)unshared/blend.o \
+		$(MESABUILDDIR)unshared/bufferobj.o \
+		$(MESABUILDDIR)unshared/buffers.o \
+		$(MESABUILDDIR)unshared/clip.o \
+		$(MESABUILDDIR)unshared/colortab.o \
+		$(MESABUILDDIR)unshared/context.o \
+		$(MESABUILDDIR)unshared/convolve.o \
+		$(MESABUILDDIR)unshared/debug.o \
+		$(MESABUILDDIR)unshared/depth.o \
+		$(MESABUILDDIR)unshared/dlist.o \
+		$(MESABUILDDIR)unshared/drawpix.o \
+		$(MESABUILDDIR)unshared/enable.o \
+		$(MESABUILDDIR)unshared/enums.o \
+		$(MESABUILDDIR)unshared/eval.o \
+		$(MESABUILDDIR)unshared/execmem.o \
+		$(MESABUILDDIR)unshared/extensions.o \
+                $(MESABUILDDIR)unshared/fbobject.o \
+		$(MESABUILDDIR)unshared/feedback.o \
+		$(MESABUILDDIR)unshared/fog.o \
+                $(MESABUILDDIR)unshared/framebuffer.o \
+		$(MESABUILDDIR)unshared/get.o \
+                $(MESABUILDDIR)unshared/getstring.o \
+		$(MESABUILDDIR)unshared/hash.o \
+		$(MESABUILDDIR)unshared/hint.o \
+		$(MESABUILDDIR)unshared/histogram.o \
+		$(MESABUILDDIR)unshared/image.o \
+		$(MESABUILDDIR)unshared/imports.o \
+		$(MESABUILDDIR)unshared/light.o \
+		$(MESABUILDDIR)unshared/lines.o \
+		$(MESABUILDDIR)unshared/matrix.o \
+		$(MESABUILDDIR)unshared/mm.o \
+		$(MESABUILDDIR)unshared/occlude.o \
+		$(MESABUILDDIR)unshared/pixel.o \
+		$(MESABUILDDIR)unshared/points.o \
+		$(MESABUILDDIR)unshared/polygon.o \
+		$(MESABUILDDIR)unshared/rastpos.o \
+                $(MESABUILDDIR)unshared/renderbuffer.o \
+		$(MESABUILDDIR)unshared/state.o \
+		$(MESABUILDDIR)unshared/stencil.o \
+		$(MESABUILDDIR)unshared/texcompress.o \
+		$(MESABUILDDIR)unshared/texcompress_fxt1.o \
+		$(MESABUILDDIR)unshared/texcompress_s3tc.o \
+                $(MESABUILDDIR)unshared/texenvprogram.o \
+		$(MESABUILDDIR)unshared/texformat.o \
+		$(MESABUILDDIR)unshared/teximage.o \
+		$(MESABUILDDIR)unshared/texobj.o \
+                $(MESABUILDDIR)unshared/texrender.o \
+		$(MESABUILDDIR)unshared/texstate.o \
+		$(MESABUILDDIR)unshared/texstore.o \
+		$(MESABUILDDIR)unshared/varray.o \
+		$(MESABUILDDIR)unshared/vtxfmt.o
+#else
+COREMESABASEUOBJS = $(COREMESABASEOBJS)
+#endif
+
+#ifdef NeedAllMesaSrc
+ DISPATCHDOBJS = $(MESABUILDDIR)debugger/dispatch.o
+    GLAPIDOBJS = $(MESABUILDDIR)debugger/glapi.o
+ GLTHREADDOBJS = $(MESABUILDDIR)debugger/glthread.o
+#endif
+
+COREMESABASEDOBJS = \
+		$(DISPATCHDOBJS) \
+		$(GLAPIDOBJS) \
+		$(GLTHREADDOBJS) \
+		$(MESABUILDDIR)debugger/api_arrayelt.o \
+		$(MESABUILDDIR)debugger/api_loopback.o \
+		$(MESABUILDDIR)debugger/api_noop.o \
+		$(MESABUILDDIR)debugger/api_validate.o \
+		$(MESABUILDDIR)debugger/accum.o \
+		$(MESABUILDDIR)debugger/attrib.o \
+		$(MESABUILDDIR)debugger/blend.o \
+		$(MESABUILDDIR)debugger/bufferobj.o \
+		$(MESABUILDDIR)debugger/buffers.o \
+		$(MESABUILDDIR)debugger/clip.o \
+		$(MESABUILDDIR)debugger/colortab.o \
+		$(MESABUILDDIR)debugger/context.o \
+		$(MESABUILDDIR)debugger/convolve.o \
+		$(MESABUILDDIR)debugger/debug.o \
+		$(MESABUILDDIR)debugger/depth.o \
+		$(MESABUILDDIR)debugger/dlist.o \
+		$(MESABUILDDIR)debugger/drawpix.o \
+		$(MESABUILDDIR)debugger/enable.o \
+		$(MESABUILDDIR)debugger/enums.o \
+		$(MESABUILDDIR)debugger/eval.o \
+		$(MESABUILDDIR)debugger/execmem.o \
+		$(MESABUILDDIR)debugger/extensions.o \
+                $(MESABUILDDIR)debugger/fbobject.o \
+		$(MESABUILDDIR)debugger/feedback.o \
+		$(MESABUILDDIR)debugger/fog.o \
+                $(MESABUILDDIR)debugger/framebuffer.o \
+		$(MESABUILDDIR)debugger/get.o \
+                $(MESABUILDDIR)debugger/getstring.o \
+		$(MESABUILDDIR)debugger/hash.o \
+		$(MESABUILDDIR)debugger/hint.o \
+		$(MESABUILDDIR)debugger/histogram.o \
+		$(MESABUILDDIR)debugger/image.o \
+		$(MESABUILDDIR)debugger/imports.o \
+		$(MESABUILDDIR)debugger/light.o \
+		$(MESABUILDDIR)debugger/lines.o \
+		$(MESABUILDDIR)debugger/matrix.o \
+		$(MESABUILDDIR)debugger/mm.o \
+		$(MESABUILDDIR)debugger/occlude.o \
+		$(MESABUILDDIR)debugger/pixel.o \
+		$(MESABUILDDIR)debugger/points.o \
+		$(MESABUILDDIR)debugger/polygon.o \
+		$(MESABUILDDIR)debugger/rastpos.o \
+                $(MESABUILDDIR)debugger/renderbuffer.o \
+		$(MESABUILDDIR)debugger/state.o \
+		$(MESABUILDDIR)debugger/stencil.o \
+		$(MESABUILDDIR)debugger/texcompress.o \
+		$(MESABUILDDIR)debugger/texcompress_fxt1.o \
+		$(MESABUILDDIR)debugger/texcompress_s3tc.o \
+                $(MESABUILDDIR)debugger/texenvprogram.o \
+		$(MESABUILDDIR)debugger/texformat.o \
+		$(MESABUILDDIR)debugger/teximage.o \
+		$(MESABUILDDIR)debugger/texobj.o \
+                $(MESABUILDDIR)debugger/texrender.o \
+		$(MESABUILDDIR)debugger/texstate.o \
+		$(MESABUILDDIR)debugger/texstore.o \
+		$(MESABUILDDIR)debugger/varray.o \
+		$(MESABUILDDIR)debugger/vtxfmt.o
+
+#ifdef NeedAllMesaSrc
+ DISPATCHPOBJS = $(MESABUILDDIR)profiled/dispatch.o
+    GLAPIPOBJS = $(MESABUILDDIR)profiled/glapi.o
+ GLTHREADPOBJS = $(MESABUILDDIR)profiled/glthread.o
+#endif
+
+COREMESABASEPOBJS = \
+		$(DISPATCHPOBJS) \
+		$(GLAPIPOBJS) \
+		$(GLTHREADPOBJS) \
+		$(MESABUILDDIR)profiled/api_arrayelt.o \
+		$(MESABUILDDIR)profiled/api_loopback.o \
+		$(MESABUILDDIR)profiled/api_noop.o \
+		$(MESABUILDDIR)profiled/api_validate.o \
+		$(MESABUILDDIR)profiled/accum.o \
+		$(MESABUILDDIR)profiled/attrib.o \
+		$(MESABUILDDIR)profiled/blend.o \
+		$(MESABUILDDIR)profiled/bufferobj.o \
+		$(MESABUILDDIR)profiled/buffers.o \
+		$(MESABUILDDIR)profiled/clip.o \
+		$(MESABUILDDIR)profiled/colortab.o \
+		$(MESABUILDDIR)profiled/context.o \
+		$(MESABUILDDIR)profiled/convolve.o \
+		$(MESABUILDDIR)profiled/debug.o \
+		$(MESABUILDDIR)profiled/depth.o \
+		$(MESABUILDDIR)profiled/dlist.o \
+		$(MESABUILDDIR)profiled/drawpix.o \
+		$(MESABUILDDIR)profiled/enable.o \
+		$(MESABUILDDIR)profiled/enums.o \
+		$(MESABUILDDIR)profiled/eval.o \
+		$(MESABUILDDIR)profiled/execmem.o \
+		$(MESABUILDDIR)profiled/extensions.o \
+                $(MESABUILDDIR)profiled/fbobject.o \
+		$(MESABUILDDIR)profiled/feedback.o \
+		$(MESABUILDDIR)profiled/fog.o \
+                $(MESABUILDDIR)profiled/framebuffer.o \
+		$(MESABUILDDIR)profiled/get.o \
+                $(MESABUILDDIR)profiled/getstring.o \
+		$(MESABUILDDIR)profiled/hash.o \
+		$(MESABUILDDIR)profiled/hint.o \
+		$(MESABUILDDIR)profiled/histogram.o \
+		$(MESABUILDDIR)profiled/image.o \
+		$(MESABUILDDIR)profiled/imports.o \
+		$(MESABUILDDIR)profiled/light.o \
+		$(MESABUILDDIR)profiled/lines.o \
+		$(MESABUILDDIR)profiled/matrix.o \
+		$(MESABUILDDIR)profiled/mm.o \
+		$(MESABUILDDIR)profiled/occlude.o \
+		$(MESABUILDDIR)profiled/pixel.o \
+		$(MESABUILDDIR)profiled/points.o \
+		$(MESABUILDDIR)profiled/polygon.o \
+		$(MESABUILDDIR)profiled/rastpos.o \
+                $(MESABUILDDIR)profiled/renderbuffer.o \
+		$(MESABUILDDIR)profiled/state.o \
+		$(MESABUILDDIR)profiled/stencil.o \
+		$(MESABUILDDIR)profiled/texcompress.o \
+		$(MESABUILDDIR)profiled/texcompress_fxt1.o \
+		$(MESABUILDDIR)profiled/texcompress_s3tc.o \
+                $(MESABUILDDIR)profiled/texenvprogram.o \
+		$(MESABUILDDIR)profiled/texformat.o \
+		$(MESABUILDDIR)profiled/teximage.o \
+		$(MESABUILDDIR)profiled/texobj.o \
+                $(MESABUILDDIR)profiled/texrender.o \
+		$(MESABUILDDIR)profiled/texstate.o \
+		$(MESABUILDDIR)profiled/texstore.o \
+		$(MESABUILDDIR)profiled/varray.o \
+		$(MESABUILDDIR)profiled/vtxfmt.o
diff --git a/nx-X11/lib/GL/mesa/math/Imakefile b/nx-X11/lib/GL/mesa/math/Imakefile
new file mode 100644
index 000000000..ab00ae76f
--- /dev/null
+++ b/nx-X11/lib/GL/mesa/math/Imakefile
@@ -0,0 +1,98 @@
+XCOMM $XFree86: xc/lib/GL/mesa/src/math/Imakefile,v 1.8 2002/11/25 12:58:55 tsi Exp $
+
+#include <Threads.tmpl>
+
+/*
+ * Need both shared and unshared Mesa objects in the following cases:
+ *   GlxDriverUsesMesa
+ *   GlxBuiltInXMesa
+ *   BuildOSMesaLib
+ *
+ * In other cases, only the shared version is needed to link in to loadable
+ * driver modules.
+ */
+
+#if BuildOSMesaLib || (BuildXF86DRI && (GlxDriverUsesMesa || GlxBuiltInXMesa))
+#define DoNormalLib (NormalLibGlx || SharedLibGlxWithoutPIC)
+#define DoSharedLib (SharedLibGlx && !SharedLibGlxWithoutPIC)
+#define DoExtraLib SharedLibGlx
+#define DoDebugLib DebugLibGlx
+#define DoProfileLib ProfileLibGlx
+#else
+#define DoNormalLib SharedLibGlxWithoutPIC
+#define DoSharedLib !SharedLibGlxWithoutPIC
+#define DoExtraLib NO
+#define DoDebugLib NO
+#define DoProfileLib NO
+#endif
+
+/* Large PIC tables needed for Solaris SPARC builds */
+#if (defined(SunArchitecture) && defined(SparcArchitecture))
+# define LargePICTable YES
+#endif
+
+
+#define MesaMathBuildDir /**/
+#define NeedToLinkMesaSrc
+#include "Imakefile.inc"
+
+
+#if Malloc0ReturnsNull
+ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL
+#endif
+
+#if BuildXF86DRI
+  DRI_DEFINES = GlxDefines -DIN_DRI_DRIVER
+ DRI_INCLUDES = -I../../../dri -I../../../glx -I../../dri -I.. \
+		-I$(INCLUDESRC)/GL -I$(XF86OSSRC) -I$(SERVERSRC)/GL/dri
+#endif
+
+#if defined(i386Architecture) && MesaUseX86Asm
+      ASM_DIR = x86
+     ASM_SRCS =
+     ASM_OBJS =
+#if MesaUseMMX
+     MMX_DEFS = -DUSE_MMX_ASM
+#endif
+#if MesaUse3DNow
+   3DNOW_DEFS = -DUSE_3DNOW_ASM
+#endif
+#if MesaUseSSE
+     SSE_DEFS = -DUSE_SSE_ASM
+#endif
+     ASM_DEFS = -DUSE_X86_ASM $(MMX_DEFS) $(3DNOW_DEFS) $(SSE_DEFS)
+#endif
+
+#ifdef SparcArchitecture
+      ASM_DIR = sparc
+     ASM_SRCS =
+     ASM_OBJS =
+     ASM_DEFS = -DUSE_SPARC_ASM
+#endif
+
+#ifdef UseCompaqMathLibrary
+      MATHDEF = -DCCPML
+#endif
+
+MESA_INCLUDES = -I$(MESASRCDIR)/src/mesa/main \
+		-I$(MESASRCDIR)/src/mesa/math \
+		-I$(MESASRCDIR)/src/mesa/glapi \
+		-I$(MESASRCDIR)/src/mesa \
+		-I$(MESASRCDIR)/src/mesa/$(ASM_DIR) \
+		-I$(MESASRCDIR)/include \
+		-I../../../include -I$(XINCLUDESRC)
+
+      DEFINES = $(ALLOC_DEFINES) $(DRI_DEFINES) $(ASM_DEFS) $(MATHDEF)
+     INCLUDES = $(MESA_INCLUDES) $(DRI_INCLUDES)
+         SRCS = $(MESA_MATH_SRCS)
+         OBJS = $(MESA_MATH_OBJS)
+
+
+#include <Library.tmpl>
+
+LibraryObjectRule()
+
+SubdirLibraryRule($(OBJS))
+NormalLintTarget($(SRCS))
+
+DependTarget()
diff --git a/nx-X11/lib/GL/mesa/math/Imakefile.inc b/nx-X11/lib/GL/mesa/math/Imakefile.inc
new file mode 100644
index 000000000..cd1dcc427
--- /dev/null
+++ b/nx-X11/lib/GL/mesa/math/Imakefile.inc
@@ -0,0 +1,82 @@
+XCOMM $XFree86: xc/lib/GL/mesa/src/math/Imakefile.inc,v 1.1tsi Exp $
+
+#ifndef MesaMathBuildDir
+#define MesaMathBuildDir $(GLXLIBSRC)/mesa/math/
+#endif
+
+MESAMATHBUILDDIR = MesaMathBuildDir
+
+  MESA_MATH_SRCS = $(MESAMATHBUILDDIR)m_debug_clip.c \
+		   $(MESAMATHBUILDDIR)m_debug_norm.c \
+		   $(MESAMATHBUILDDIR)m_debug_xform.c \
+		   $(MESAMATHBUILDDIR)m_eval.c \
+		   $(MESAMATHBUILDDIR)m_matrix.c \
+		   $(MESAMATHBUILDDIR)m_translate.c \
+		   $(MESAMATHBUILDDIR)m_vector.c \
+		   $(MESAMATHBUILDDIR)m_xform.c
+
+#ifdef NeedToLinkMesaSrc
+LinkSourceFile(mathmod.h, $(MESASRCDIR)/src/mesa/math)
+LinkSourceFile(m_clip_tmp.h, $(MESASRCDIR)/src/mesa/math)
+LinkSourceFile(m_copy_tmp.h, $(MESASRCDIR)/src/mesa/math)
+LinkSourceFile(m_debug_clip.c, $(MESASRCDIR)/src/mesa/math)
+LinkSourceFile(m_debug.h, $(MESASRCDIR)/src/mesa/math)
+LinkSourceFile(m_debug_util.h, $(MESASRCDIR)/src/mesa/math)
+LinkSourceFile(m_debug_norm.c, $(MESASRCDIR)/src/mesa/math)
+LinkSourceFile(m_debug_xform.c, $(MESASRCDIR)/src/mesa/math)
+LinkSourceFile(m_dotprod_tmp.h, $(MESASRCDIR)/src/mesa/math)
+LinkSourceFile(m_eval.c, $(MESASRCDIR)/src/mesa/math)
+LinkSourceFile(m_eval.h, $(MESASRCDIR)/src/mesa/math)
+LinkSourceFile(m_matrix.c, $(MESASRCDIR)/src/mesa/math)
+LinkSourceFile(m_matrix.h, $(MESASRCDIR)/src/mesa/math)
+LinkSourceFile(m_norm_tmp.h, $(MESASRCDIR)/src/mesa/math)
+LinkSourceFile(m_translate.c, $(MESASRCDIR)/src/mesa/math)
+LinkSourceFile(m_translate.h, $(MESASRCDIR)/src/mesa/math)
+LinkSourceFile(m_trans_tmp.h, $(MESASRCDIR)/src/mesa/math)
+LinkSourceFile(m_vector.c, $(MESASRCDIR)/src/mesa/math)
+LinkSourceFile(m_vector.h, $(MESASRCDIR)/src/mesa/math)
+LinkSourceFile(m_xform.c, $(MESASRCDIR)/src/mesa/math)
+LinkSourceFile(m_xform.h, $(MESASRCDIR)/src/mesa/math)
+LinkSourceFile(m_xform_tmp.h, $(MESASRCDIR)/src/mesa/math)
+#endif
+
+  MESA_MATH_OBJS = $(MESAMATHBUILDDIR)m_debug_clip.o \
+		   $(MESAMATHBUILDDIR)m_debug_norm.o \
+		   $(MESAMATHBUILDDIR)m_debug_xform.o \
+		   $(MESAMATHBUILDDIR)m_eval.o \
+		   $(MESAMATHBUILDDIR)m_matrix.o \
+		   $(MESAMATHBUILDDIR)m_translate.o \
+		   $(MESAMATHBUILDDIR)m_vector.o \
+		   $(MESAMATHBUILDDIR)m_xform.o
+
+#if defined(DoSharedLib) && DoSharedLib
+ MESA_MATH_UOBJS = $(MESAMATHBUILDDIR)unshared/m_debug_clip.o \
+		   $(MESAMATHBUILDDIR)unshared/m_debug_norm.o \
+		   $(MESAMATHBUILDDIR)unshared/m_debug_xform.o \
+		   $(MESAMATHBUILDDIR)unshared/m_eval.o \
+		   $(MESAMATHBUILDDIR)unshared/m_matrix.o \
+		   $(MESAMATHBUILDDIR)unshared/m_translate.o \
+		   $(MESAMATHBUILDDIR)unshared/m_vector.o \
+		   $(MESAMATHBUILDDIR)unshared/m_xform.o
+#else
+ MATH_MESA_UOBJS = $(MESA_MATH_OBJS)
+#endif
+
+ MESA_MATH_DOBJS = $(MESAMATHBUILDDIR)debugger/m_debug_clip.o \
+		   $(MESAMATHBUILDDIR)debugger/m_debug_norm.o \
+		   $(MESAMATHBUILDDIR)debugger/m_debug_xform.o \
+		   $(MESAMATHBUILDDIR)debugger/m_eval.o \
+		   $(MESAMATHBUILDDIR)debugger/m_matrix.o \
+		   $(MESAMATHBUILDDIR)debugger/m_translate.o \
+		   $(MESAMATHBUILDDIR)debugger/m_vector.o \
+		   $(MESAMATHBUILDDIR)debugger/m_xform.o
+
+ MESA_MATH_POBJS = $(MESAMATHBUILDDIR)profiled/m_debug_clip.o \
+		   $(MESAMATHBUILDDIR)profiled/m_debug_norm.o \
+		   $(MESAMATHBUILDDIR)profiled/m_debug_xform.o \
+		   $(MESAMATHBUILDDIR)profiled/m_eval.o \
+		   $(MESAMATHBUILDDIR)profiled/m_matrix.o \
+		   $(MESAMATHBUILDDIR)profiled/m_translate.o \
+		   $(MESAMATHBUILDDIR)profiled/m_vector.o \
+		   $(MESAMATHBUILDDIR)profiled/m_xform.o
+
diff --git a/nx-X11/lib/GL/mesa/shader/Imakefile b/nx-X11/lib/GL/mesa/shader/Imakefile
new file mode 100644
index 000000000..d46834740
--- /dev/null
+++ b/nx-X11/lib/GL/mesa/shader/Imakefile
@@ -0,0 +1,107 @@
+XCOMM $XFree86$
+
+#include <Threads.tmpl>
+
+/*
+ * Need both shared and unshared Mesa objects in the following cases:
+ *   GlxDriverUsesMesa
+ *   GlxBuiltInXMesa
+ *   BuildOSMesaLib
+ *
+ * In other cases, only the shared version is needed to link in to loadable
+ * driver modules.
+ */
+
+#if BuildOSMesaLib || (BuildXF86DRI && (GlxDriverUsesMesa || GlxBuiltInXMesa))
+#define DoNormalLib (NormalLibGlx || SharedLibGlxWithoutPIC)
+#define DoSharedLib (SharedLibGlx && !SharedLibGlxWithoutPIC)
+#define DoExtraLib SharedLibGlx
+#define DoDebugLib DebugLibGlx
+#define DoProfileLib ProfileLibGlx
+#else
+#define DoNormalLib SharedLibGlxWithoutPIC
+#define DoSharedLib !SharedLibGlxWithoutPIC
+#define DoExtraLib NO
+#define DoDebugLib NO
+#define DoProfileLib NO
+#endif
+
+/* Large PIC tables needed for Solaris SPARC builds */
+#if (defined(SunArchitecture) && defined(SparcArchitecture))
+# define LargePICTable YES
+#endif
+
+#define MesaShaderBuildDir /**/
+#define NeedToLinkMesaSrc
+#include "Imakefile.inc"
+
+
+#if Malloc0ReturnsNull
+ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL
+#endif
+
+#if BuildXF86DRI
+  DRI_DEFINES = GlxDefines -DIN_DRI_DRIVER
+ DRI_INCLUDES = -I../../../dri -I../../../glx -I../../dri -I.. \
+		-I$(INCLUDESRC)/GL -I$(XF86OSSRC) -I$(SERVERSRC)/GL/dri
+#endif
+
+#if defined(i386Architecture) && MesaUseX86Asm
+      ASM_DIR = x86
+     ASM_SRCS =
+     ASM_OBJS =
+#if MesaUseMMX
+     MMX_DEFS = -DUSE_MMX_ASM
+#endif
+#if MesaUse3DNow
+   3DNOW_DEFS = -DUSE_3DNOW_ASM
+#endif
+#if MesaUseSSE
+     SSE_DEFS = -DUSE_SSE_ASM
+#endif
+     ASM_DEFS = -DUSE_X86_ASM $(MMX_DEFS) $(3DNOW_DEFS) $(SSE_DEFS)
+#endif
+
+#ifdef SparcArchitecture
+      ASM_DIR = sparc
+     ASM_SRCS =
+     ASM_OBJS =
+     ASM_DEFS = -DUSE_SPARC_ASM
+#endif
+
+#ifdef UseCompaqMathLibrary
+      MATHDEF = -DCCPML
+#endif
+
+MESA_INCLUDES = -I$(MESASRCDIR)/src/mesa/main \
+		-I$(MESASRCDIR)/src/mesa/math \
+		-I$(MESASRCDIR)/src/mesa/glapi \
+                -I$(MESASRCDIR)/src/mesa/shader/grammar \
+                -I$(MESASRCDIR)/src/mesa/shader/slang \
+		-I$(MESASRCDIR)/src/mesa \
+		-I$(MESASRCDIR)/src/mesa/$(ASM_DIR) \
+		-I$(MESASRCDIR)/include \
+		-I../../../include -I$(XINCLUDESRC)
+
+      DEFINES = $(ALLOC_DEFINES) $(DRI_DEFINES) $(ASM_DEFS) $(MATHDEF)
+     INCLUDES = $(MESA_INCLUDES) $(DRI_INCLUDES)
+         SRCS = $(MESA_SHADER_SRCS)
+         OBJS = $(MESA_SHADER_OBJS)
+
+
+#include <Library.tmpl>
+
+LibraryObjectRule()
+
+SubdirLibraryRule($(OBJS))
+NormalLintTarget($(SRCS))
+
+#define IHaveSubdirs
+#define PassCDebugFlags
+
+SUBDIRS = grammar slang
+
+MakeSubdirs($(SUBDIRS))
+DependSubdirs($(SUBDIRS))
+
+DependTarget()
diff --git a/nx-X11/lib/GL/mesa/shader/Imakefile.inc b/nx-X11/lib/GL/mesa/shader/Imakefile.inc
new file mode 100644
index 000000000..7d0032e56
--- /dev/null
+++ b/nx-X11/lib/GL/mesa/shader/Imakefile.inc
@@ -0,0 +1,106 @@
+XCOMM $XFree86:$
+
+#ifndef MesaShaderBuildDir
+#define MesaShaderBuildDir $(GLXLIBSRC)/mesa/shader/
+#endif
+
+MESASHADERBUILDDIR = MesaShaderBuildDir
+
+  MESA_SHADER_SRCS =	$(MESASHADERBUILDDIR)arbprogparse.c \
+			$(MESASHADERBUILDDIR)arbprogram.c \
+			$(MESASHADERBUILDDIR)arbfragparse.c \
+			$(MESASHADERBUILDDIR)arbvertparse.c \
+                        $(MESASHADERBUILDDIR)atifragshader.c \
+			$(MESASHADERBUILDDIR)nvprogram.c \
+			$(MESASHADERBUILDDIR)nvfragparse.c \
+			$(MESASHADERBUILDDIR)nvvertexec.c \
+			$(MESASHADERBUILDDIR)nvvertparse.c \
+			$(MESASHADERBUILDDIR)program.c \
+                        $(MESASHADERBUILDDIR)shaderobjects.c \
+                        $(MESASHADERBUILDDIR)shaderobjects_3dlabs.c
+
+#ifdef NeedToLinkMesaSrc
+LinkSourceFile(arbprogparse.c, $(MESASRCDIR)/src/mesa/shader)
+LinkSourceFile(arbprogram.c, $(MESASRCDIR)/src/mesa/shader)
+LinkSourceFile(arbfragparse.c, $(MESASRCDIR)/src/mesa/shader)
+LinkSourceFile(arbvertparse.c, $(MESASRCDIR)/src/mesa/shader)
+LinkSourceFile(arbfragparse.h, $(MESASRCDIR)/src/mesa/shader)
+LinkSourceFile(arbprogparse.h, $(MESASRCDIR)/src/mesa/shader)
+LinkSourceFile(arbprogram.h, $(MESASRCDIR)/src/mesa/shader)
+LinkSourceFile(arbprogram_syn.h, $(MESASRCDIR)/src/mesa/shader)
+LinkSourceFile(arbvertparse.h, $(MESASRCDIR)/src/mesa/shader)
+LinkSourceFile(atifragshader.c, $(MESASRCDIR)/src/mesa/shader)
+LinkSourceFile(atifragshader.h, $(MESASRCDIR)/src/mesa/shader)
+LinkSourceFile(nvfragparse.h, $(MESASRCDIR)/src/mesa/shader)
+LinkSourceFile(nvfragprog.h, $(MESASRCDIR)/src/mesa/shader)
+LinkSourceFile(nvprogram.c, $(MESASRCDIR)/src/mesa/shader)
+LinkSourceFile(nvprogram.h, $(MESASRCDIR)/src/mesa/shader)
+LinkSourceFile(nvfragparse.c, $(MESASRCDIR)/src/mesa/shader)
+LinkSourceFile(nvvertexec.c, $(MESASRCDIR)/src/mesa/shader)
+LinkSourceFile(nvvertexec.h, $(MESASRCDIR)/src/mesa/shader)
+LinkSourceFile(nvvertparse.c, $(MESASRCDIR)/src/mesa/shader)
+LinkSourceFile(nvvertparse.h, $(MESASRCDIR)/src/mesa/shader)
+LinkSourceFile(nvvertprog.h, $(MESASRCDIR)/src/mesa/shader)
+LinkSourceFile(program.c, $(MESASRCDIR)/src/mesa/shader)
+LinkSourceFile(program.h, $(MESASRCDIR)/src/mesa/shader)
+LinkSourceFile(shaderobjects.c, $(MESASRCDIR)/src/mesa/shader)
+LinkSourceFile(shaderobjects.h, $(MESASRCDIR)/src/mesa/shader)
+LinkSourceFile(shaderobjects_3dlabs.c, $(MESASRCDIR)/src/mesa/shader)
+LinkSourceFile(shaderobjects_3dlabs.h, $(MESASRCDIR)/src/mesa/shader)
+#endif
+
+  MESA_SHADER_OBJS =	$(MESASHADERBUILDDIR)arbprogparse.o \
+			$(MESASHADERBUILDDIR)arbprogram.o \
+			$(MESASHADERBUILDDIR)arbfragparse.o \
+			$(MESASHADERBUILDDIR)arbvertparse.o \
+                        $(MESASHADERBUILDDIR)atifragshader.o \
+			$(MESASHADERBUILDDIR)nvprogram.o \
+			$(MESASHADERBUILDDIR)nvfragparse.o \
+			$(MESASHADERBUILDDIR)nvvertexec.o \
+			$(MESASHADERBUILDDIR)nvvertparse.o \
+			$(MESASHADERBUILDDIR)program.o \
+                        $(MESASHADERBUILDDIR)shaderobjects.o \
+                        $(MESASHADERBUILDDIR)shaderobjects_3dlabs.o
+
+#if defined(DoSharedLib) && DoSharedLib
+  MESA_SHADER_UOBJS =	$(MESASHADERBUILDDIR)unshared/arbprogparse.o \
+			$(MESASHADERBUILDDIR)unshared/arbprogram.o \
+			$(MESASHADERBUILDDIR)unshared/arbfragparse.o \
+			$(MESASHADERBUILDDIR)unshared/arbvertparse.o \
+                        $(MESASHADERBUILDDIR)unshared/atifragshader.o \
+			$(MESASHADERBUILDDIR)unshared/nvprogram.o \
+			$(MESASHADERBUILDDIR)unshared/nvfragparse.o \
+			$(MESASHADERBUILDDIR)unshared/nvvertexec.o \
+			$(MESASHADERBUILDDIR)unshared/nvvertparse.o \
+			$(MESASHADERBUILDDIR)unshared/program.o \
+                        $(MESASHADERBUILDDIR)unshared/shaderobjects.o \
+                        $(MESASHADERBUILDDIR)unshared/shaderobjects_3dlabs.o
+#else
+ MESA_SHADER_UOBJS = $(MESA_SHADER_OBJS)
+#endif
+
+  MESA_SHADER_DOBJS =	$(MESASHADERBUILDDIR)debugger/arbprogparse.o \
+			$(MESASHADERBUILDDIR)debugger/arbprogram.o \
+			$(MESASHADERBUILDDIR)debugger/arbfragparse.o \
+			$(MESASHADERBUILDDIR)debugger/arbvertparse.o \
+                        $(MESASHADERBUILDDIR)debugger/atifragshader.o \
+			$(MESASHADERBUILDDIR)debugger/nvprogram.o \
+			$(MESASHADERBUILDDIR)debugger/nvfragparse.o \
+			$(MESASHADERBUILDDIR)debugger/nvvertexec.o \
+			$(MESASHADERBUILDDIR)debugger/nvvertparse.o \
+			$(MESASHADERBUILDDIR)debugger/program.o \
+                        $(MESASHADERBUILDDIR)debugger/shaderobjects.o \
+                        $(MESASHADERBUILDDIR)debugger/shaderobjects_3dlabs.o
+
+  MESA_SHADER_POBJS =	$(MESASHADERBUILDDIR)profiled/arbprogparse.o \
+			$(MESASHADERBUILDDIR)profiled/arbprogram.o \
+			$(MESASHADERBUILDDIR)profiled/arbfragparse.o \
+			$(MESASHADERBUILDDIR)profiled/arbvertparse.o \
+                        $(MESASHADERBUILDDIR)profiled/atifragshader.o \
+			$(MESASHADERBUILDDIR)profiled/nvprogram.o \
+			$(MESASHADERBUILDDIR)profiled/nvfragparse.o \
+			$(MESASHADERBUILDDIR)profiled/nvvertexec.o \
+			$(MESASHADERBUILDDIR)profiled/nvvertparse.o \
+			$(MESASHADERBUILDDIR)profiled/program.o \
+                        $(MESASHADERBUILDDIR)profiled/shaderobjects.o \
+                        $(MESASHADERBUILDDIR)profiled/shaderobjects_3dlabs.o
diff --git a/nx-X11/lib/GL/mesa/shader/grammar/Imakefile b/nx-X11/lib/GL/mesa/shader/grammar/Imakefile
new file mode 100644
index 000000000..bbdec9764
--- /dev/null
+++ b/nx-X11/lib/GL/mesa/shader/grammar/Imakefile
@@ -0,0 +1,98 @@
+XCOMM $XFree86$
+
+#include <Threads.tmpl>
+
+/*
+ * Need both shared and unshared Mesa objects in the following cases:
+ *   GlxDriverUsesMesa
+ *   GlxBuiltInXMesa
+ *   BuildOSMesaLib
+ *
+ * In other cases, only the shared version is needed to link in to loadable
+ * driver modules.
+ */
+
+#if BuildOSMesaLib || (BuildXF86DRI && (GlxDriverUsesMesa || GlxBuiltInXMesa))
+#define DoNormalLib (NormalLibGlx || SharedLibGlxWithoutPIC)
+#define DoSharedLib (SharedLibGlx && !SharedLibGlxWithoutPIC)
+#define DoExtraLib SharedLibGlx
+#define DoDebugLib DebugLibGlx
+#define DoProfileLib ProfileLibGlx
+#else
+#define DoNormalLib SharedLibGlxWithoutPIC
+#define DoSharedLib !SharedLibGlxWithoutPIC
+#define DoExtraLib NO
+#define DoDebugLib NO
+#define DoProfileLib NO
+#endif
+
+/* Large PIC tables needed for Solaris SPARC builds */
+#if (defined(SunArchitecture) && defined(SparcArchitecture))
+# define LargePICTable YES
+#endif
+
+#define MesaGrammarBuildDir /**/
+#define NeedToLinkMesaSrc
+#include "Imakefile.inc"
+
+
+#if Malloc0ReturnsNull
+ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL
+#endif
+
+#if BuildXF86DRI
+  DRI_DEFINES = GlxDefines -DIN_DRI_DRIVER
+ DRI_INCLUDES = -I../../../dri -I../../../glx -I../../dri -I.. \
+		-I$(INCLUDESRC)/GL -I$(XF86OSSRC) -I$(SERVERSRC)/GL/dri
+#endif
+
+#if defined(i386Architecture) && MesaUseX86Asm
+      ASM_DIR = x86
+     ASM_SRCS =
+     ASM_OBJS =
+#if MesaUseMMX
+     MMX_DEFS = -DUSE_MMX_ASM
+#endif
+#if MesaUse3DNow
+   3DNOW_DEFS = -DUSE_3DNOW_ASM
+#endif
+#if MesaUseSSE
+     SSE_DEFS = -DUSE_SSE_ASM
+#endif
+     ASM_DEFS = -DUSE_X86_ASM $(MMX_DEFS) $(3DNOW_DEFS) $(SSE_DEFS)
+#endif
+
+#ifdef SparcArchitecture
+      ASM_DIR = sparc
+     ASM_SRCS =
+     ASM_OBJS =
+     ASM_DEFS = -DUSE_SPARC_ASM
+#endif
+
+#ifdef UseCompaqMathLibrary
+      MATHDEF = -DCCPML
+#endif
+
+MESA_INCLUDES = -I$(MESASRCDIR)/src/mesa/main \
+		-I$(MESASRCDIR)/src/mesa/math \
+		-I$(MESASRCDIR)/src/mesa/glapi \
+                -I$(MESASRCDIR)/src/mesa/shader/grammar \
+		-I$(MESASRCDIR)/src/mesa \
+		-I$(MESASRCDIR)/src/mesa/$(ASM_DIR) \
+		-I$(MESASRCDIR)/include \
+		-I../../../include -I$(XINCLUDESRC)
+
+      DEFINES = $(ALLOC_DEFINES) $(DRI_DEFINES) $(ASM_DEFS) $(MATHDEF)
+     INCLUDES = $(MESA_INCLUDES) $(DRI_INCLUDES)
+         SRCS = $(MESA_GRAMMAR_SRCS)
+         OBJS = $(MESA_GRAMMAR_OBJS)
+
+
+#include <Library.tmpl>
+
+LibraryObjectRule()
+
+SubdirLibraryRule($(OBJS))
+NormalLintTarget($(SRCS))
+
+DependTarget()
diff --git a/nx-X11/lib/GL/mesa/shader/grammar/Imakefile.inc b/nx-X11/lib/GL/mesa/shader/grammar/Imakefile.inc
new file mode 100644
index 000000000..b2e885f89
--- /dev/null
+++ b/nx-X11/lib/GL/mesa/shader/grammar/Imakefile.inc
@@ -0,0 +1,29 @@
+XCOMM $XFree86$
+
+#ifndef MesaGrammarBuildDir
+#define MesaGrammarBuildDir $(GLXLIBSRC)/mesa/shader/grammar/
+#endif
+
+MESAGRAMMARBUILDDIR=MesaGrammarBuildDir
+
+  MESA_GRAMMAR_SRCS =	$(MESAGRAMMARBUILDDIR)grammar_mesa.c
+
+#ifdef NeedToLinkMesaSrc
+LinkSourceFile(grammar.c, $(MESASRCDIR)/src/mesa/shader/grammar)
+LinkSourceFile(grammar.h, $(MESASRCDIR)/src/mesa/shader/grammar)
+LinkSourceFile(grammar_syn.h, $(MESASRCDIR)/src/mesa/shader/grammar)
+LinkSourceFile(grammar_mesa.c, $(MESASRCDIR)/src/mesa/shader/grammar)
+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_POBJS = $(MESAGRAMMARBUILDDIR)profiled/grammar_mesa.o
diff --git a/nx-X11/lib/GL/mesa/shader/slang/Imakefile b/nx-X11/lib/GL/mesa/shader/slang/Imakefile
new file mode 100644
index 000000000..096a8ea63
--- /dev/null
+++ b/nx-X11/lib/GL/mesa/shader/slang/Imakefile
@@ -0,0 +1,108 @@
+XCOMM $XFree86$
+
+#include <Threads.tmpl>
+
+/*
+ * Need both shared and unshared Mesa objects in the following cases:
+ *   GlxDriverUsesMesa
+ *   GlxBuiltInXMesa
+ *   BuildOSMesaLib
+ *
+ * In other cases, only the shared version is needed to link in to loadable
+ * driver modules.
+ */
+
+#if BuildOSMesaLib || (BuildXF86DRI && (GlxDriverUsesMesa || GlxBuiltInXMesa))
+#define DoNormalLib (NormalLibGlx || SharedLibGlxWithoutPIC)
+#define DoSharedLib (SharedLibGlx && !SharedLibGlxWithoutPIC)
+#define DoExtraLib SharedLibGlx
+#define DoDebugLib DebugLibGlx
+#define DoProfileLib ProfileLibGlx
+#else
+#define DoNormalLib SharedLibGlxWithoutPIC
+#define DoSharedLib !SharedLibGlxWithoutPIC
+#define DoExtraLib NO
+#define DoDebugLib NO
+#define DoProfileLib NO
+#endif
+
+/* Large PIC tables needed for Solaris SPARC builds */
+#if (defined(SunArchitecture) && defined(SparcArchitecture))
+# define LargePICTable YES
+#endif
+
+#define MesaSlangBuildDir /**/
+#define NeedToLinkMesaSrc
+#include "Imakefile.inc"
+
+
+#if Malloc0ReturnsNull
+ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL
+#endif
+
+#if BuildXF86DRI
+  DRI_DEFINES = GlxDefines -DIN_DRI_DRIVER
+ DRI_INCLUDES = -I../../../dri -I../../../glx -I../../dri -I.. \
+		-I$(INCLUDESRC)/GL -I$(XF86OSSRC) -I$(SERVERSRC)/GL/dri
+#endif
+
+#if defined(i386Architecture) && MesaUseX86Asm
+      ASM_DIR = x86
+     ASM_SRCS =
+     ASM_OBJS =
+#if MesaUseMMX
+     MMX_DEFS = -DUSE_MMX_ASM
+#endif
+#if MesaUse3DNow
+   3DNOW_DEFS = -DUSE_3DNOW_ASM
+#endif
+#if MesaUseSSE
+     SSE_DEFS = -DUSE_SSE_ASM
+#endif
+     ASM_DEFS = -DUSE_X86_ASM $(MMX_DEFS) $(3DNOW_DEFS) $(SSE_DEFS)
+#endif
+
+#ifdef SparcArchitecture
+      ASM_DIR = sparc
+     ASM_SRCS =
+     ASM_OBJS =
+     ASM_DEFS = -DUSE_SPARC_ASM
+#endif
+
+#ifdef UseCompaqMathLibrary
+      MATHDEF = -DCCPML
+#endif
+
+MESA_INCLUDES = -I$(MESASRCDIR)/src/mesa/main \
+		-I$(MESASRCDIR)/src/mesa/math \
+		-I$(MESASRCDIR)/src/mesa/glapi \
+                -I$(MESASRCDIR)/src/mesa/shader/grammar \
+                -I$(MESASRCDIR)/src/mesa/shader/slang \
+                -I$(MESASRCDIR)/src/mesa/shader/slang/library \
+		-I$(MESASRCDIR)/src/mesa \
+		-I$(MESASRCDIR)/src/mesa/$(ASM_DIR) \
+		-I$(MESASRCDIR)/include \
+		-I../../../include -I$(XINCLUDESRC)
+
+      DEFINES = $(ALLOC_DEFINES) $(DRI_DEFINES) $(ASM_DEFS) $(MATHDEF)
+     INCLUDES = $(MESA_INCLUDES) $(DRI_INCLUDES)
+         SRCS = $(MESA_SLANG_SRCS)
+         OBJS = $(MESA_SLANG_OBJS)
+
+
+#include <Library.tmpl>
+
+#define IHaveSubdirs
+#define PassCDebugFlags
+
+SUBDIRS = library
+
+MakeSubdirs($(SUBDIRS))
+DependSubdirs($(SUBDIRS))
+
+LibraryObjectRule()
+
+SubdirLibraryRule($(OBJS))
+NormalLintTarget($(SRCS))
+
+DependTarget()
diff --git a/nx-X11/lib/GL/mesa/shader/slang/Imakefile.inc b/nx-X11/lib/GL/mesa/shader/slang/Imakefile.inc
new file mode 100644
index 000000000..d824ca797
--- /dev/null
+++ b/nx-X11/lib/GL/mesa/shader/slang/Imakefile.inc
@@ -0,0 +1,90 @@
+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
+
+#ifdef NeedToLinkMesaSrc
+LinkSourceFile(slang_assemble_assignment.c, $(MESASRCDIR)/src/mesa/shader/slang)
+LinkSourceFile(slang_assemble_assignment.h, $(MESASRCDIR)/src/mesa/shader/slang)
+LinkSourceFile(slang_assemble.c, $(MESASRCDIR)/src/mesa/shader/slang)
+LinkSourceFile(slang_assemble.h, $(MESASRCDIR)/src/mesa/shader/slang)
+LinkSourceFile(slang_assemble_conditional.c, $(MESASRCDIR)/src/mesa/shader/slang)
+LinkSourceFile(slang_assemble_conditional.h, $(MESASRCDIR)/src/mesa/shader/slang)
+LinkSourceFile(slang_assemble_constructor.c, $(MESASRCDIR)/src/mesa/shader/slang)
+LinkSourceFile(slang_assemble_constructor.h, $(MESASRCDIR)/src/mesa/shader/slang)
+LinkSourceFile(slang_assemble_typeinfo.c, $(MESASRCDIR)/src/mesa/shader/slang)
+LinkSourceFile(slang_assemble_typeinfo.h, $(MESASRCDIR)/src/mesa/shader/slang)
+LinkSourceFile(slang_compile.c, $(MESASRCDIR)/src/mesa/shader/slang)
+LinkSourceFile(slang_compile.h, $(MESASRCDIR)/src/mesa/shader/slang)
+LinkSourceFile(slang_execute.c, $(MESASRCDIR)/src/mesa/shader/slang)
+LinkSourceFile(slang_execute.h, $(MESASRCDIR)/src/mesa/shader/slang)
+LinkSourceFile(slang_preprocess.c, $(MESASRCDIR)/src/mesa/shader/slang)
+LinkSourceFile(slang_preprocess.h, $(MESASRCDIR)/src/mesa/shader/slang)
+LinkSourceFile(slang_storage.c, $(MESASRCDIR)/src/mesa/shader/slang)
+LinkSourceFile(slang_storage.h, $(MESASRCDIR)/src/mesa/shader/slang)
+LinkSourceFile(slang_utility.c, $(MESASRCDIR)/src/mesa/shader/slang)
+LinkSourceFile(slang_utility.h, $(MESASRCDIR)/src/mesa/shader/slang)
+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)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
diff --git a/nx-X11/lib/GL/mesa/shader/slang/library/Imakefile b/nx-X11/lib/GL/mesa/shader/slang/library/Imakefile
new file mode 100644
index 000000000..de32171ae
--- /dev/null
+++ b/nx-X11/lib/GL/mesa/shader/slang/library/Imakefile
@@ -0,0 +1,97 @@
+XCOMM $XFree86$
+
+#include <Threads.tmpl>
+
+/*
+ * Need both shared and unshared Mesa objects in the following cases:
+ *   GlxDriverUsesMesa
+ *   GlxBuiltInXMesa
+ *   BuildOSMesaLib
+ *
+ * In other cases, only the shared version is needed to link in to loadable
+ * driver modules.
+ */
+
+#if BuildOSMesaLib || (BuildXF86DRI && (GlxDriverUsesMesa || GlxBuiltInXMesa))
+#define DoNormalLib (NormalLibGlx || SharedLibGlxWithoutPIC)
+#define DoSharedLib (SharedLibGlx && !SharedLibGlxWithoutPIC)
+#define DoExtraLib SharedLibGlx
+#define DoDebugLib DebugLibGlx
+#define DoProfileLib ProfileLibGlx
+#else
+#define DoNormalLib SharedLibGlxWithoutPIC
+#define DoSharedLib !SharedLibGlxWithoutPIC
+#define DoExtraLib NO
+#define DoDebugLib NO
+#define DoProfileLib NO
+#endif
+
+/* Large PIC tables needed for Solaris SPARC builds */
+#if (defined(SunArchitecture) && defined(SparcArchitecture))
+# define LargePICTable YES
+#endif
+
+#define MesaShaderBuildDir /**/
+#define NeedToLinkMesaSrc
+#include "Imakefile.inc"
+
+
+#if Malloc0ReturnsNull
+ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL
+#endif
+
+#if BuildXF86DRI
+  DRI_DEFINES = GlxDefines -DIN_DRI_DRIVER
+ DRI_INCLUDES = -I../../../dri -I../../../glx -I../../dri -I.. \
+		-I$(INCLUDESRC)/GL -I$(XF86OSSRC) -I$(SERVERSRC)/GL/dri
+#endif
+
+#if defined(i386Architecture) && MesaUseX86Asm
+      ASM_DIR = x86
+     ASM_SRCS =
+     ASM_OBJS =
+#if MesaUseMMX
+     MMX_DEFS = -DUSE_MMX_ASM
+#endif
+#if MesaUse3DNow
+   3DNOW_DEFS = -DUSE_3DNOW_ASM
+#endif
+#if MesaUseSSE
+     SSE_DEFS = -DUSE_SSE_ASM
+#endif
+     ASM_DEFS = -DUSE_X86_ASM $(MMX_DEFS) $(3DNOW_DEFS) $(SSE_DEFS)
+#endif
+
+#ifdef SparcArchitecture
+      ASM_DIR = sparc
+     ASM_SRCS =
+     ASM_OBJS =
+     ASM_DEFS = -DUSE_SPARC_ASM
+#endif
+
+#ifdef UseCompaqMathLibrary
+      MATHDEF = -DCCPML
+#endif
+
+MESA_INCLUDES = -I$(MESASRCDIR)/src/mesa/main \
+		-I$(MESASRCDIR)/src/mesa/math \
+		-I$(MESASRCDIR)/src/mesa/glapi \
+                -I$(MESASRCDIR)/src/mesa/shader/slang \
+                -I$(MESASRCDIR)/src/mesa/shader/slang/library \
+		-I$(MESASRCDIR)/src/mesa \
+		-I$(MESASRCDIR)/src/mesa/$(ASM_DIR) \
+		-I$(MESASRCDIR)/include \
+		-I../../../include -I$(XINCLUDESRC)
+
+      DEFINES = $(ALLOC_DEFINES) $(DRI_DEFINES) $(ASM_DEFS) $(MATHDEF)
+     INCLUDES = $(MESA_INCLUDES) $(DRI_INCLUDES)
+         SRCS = $(MESA_SLANG_SRCS)
+         OBJS = $(MESA_SLANG_OBJS)
+
+
+#include <Library.tmpl>
+
+SubdirLibraryRule($(OBJS))
+NormalLintTarget($(SRCS))
+
+DependTarget()
diff --git a/nx-X11/lib/GL/mesa/shader/slang/library/Imakefile.inc b/nx-X11/lib/GL/mesa/shader/slang/library/Imakefile.inc
new file mode 100644
index 000000000..3489b7a28
--- /dev/null
+++ b/nx-X11/lib/GL/mesa/shader/slang/library/Imakefile.inc
@@ -0,0 +1,14 @@
+XCOMM $XFree86:$
+
+#ifdef NeedToLinkMesaSrc
+LinkSourceFile(slang_common_builtin_gc_bin.h, $(MESASRCDIR)/src/mesa/shader/slang/library)
+LinkSourceFile(slang_common_builtin_gc.h, $(MESASRCDIR)/src/mesa/shader/slang/library)
+LinkSourceFile(slang_core_gc_bin.h, $(MESASRCDIR)/src/mesa/shader/slang/library)
+LinkSourceFile(slang_core_gc.h, $(MESASRCDIR)/src/mesa/shader/slang/library)
+LinkSourceFile(slang_fragment_builtin_gc_bin.h, $(MESASRCDIR)/src/mesa/shader/slang/library)
+LinkSourceFile(slang_fragment_builtin_gc.h, $(MESASRCDIR)/src/mesa/shader/slang/library)
+LinkSourceFile(slang_shader_syn.h, $(MESASRCDIR)/src/mesa/shader/slang/library)
+LinkSourceFile(slang_version_syn.h, $(MESASRCDIR)/src/mesa/shader/slang/library)
+LinkSourceFile(slang_vertex_builtin_gc_bin.h, $(MESASRCDIR)/src/mesa/shader/slang/library)
+LinkSourceFile(slang_vertex_builtin_gc.h, $(MESASRCDIR)/src/mesa/shader/slang/library)
+#endif
diff --git a/nx-X11/lib/GL/mesa/sparc/Imakefile b/nx-X11/lib/GL/mesa/sparc/Imakefile
new file mode 100644
index 000000000..8cd9c9f8b
--- /dev/null
+++ b/nx-X11/lib/GL/mesa/sparc/Imakefile
@@ -0,0 +1,68 @@
+XCOMM $XFree86: xc/lib/GL/mesa/src/SPARC/Imakefile,v 1.3 2002/11/22 22:55:58 tsi Exp $
+XCOMM $XdotOrg: xc/lib/GL/mesa/sparc/Imakefile,v 1.3 2004/11/13 04:39:16 gisburn Exp $
+
+/*
+ * Need both shared and unshared Mesa objects in the following cases:
+ *   GlxDriverUsesMesa
+ *   GlxBuiltInXMesa
+ *   BuildOSMesaLib
+ *
+ * In other cases, only the shared version is needed to link in to loadable
+ * driver modules.
+ */
+
+#if BuildOSMesaLib || (BuildXF86DRI && (GlxDriverUsesMesa || GlxBuiltInXMesa))
+#define DoNormalLib (NormalLibGlx || SharedLibGlxWithoutPIC)
+#define DoSharedLib (SharedLibGlx && !SharedLibGlxWithoutPIC)
+#define DoExtraLib SharedLibGlx
+#define DoDebugLib DebugLibGlx
+#define DoProfileLib ProfileLibGlx
+#else
+#define DoNormalLib SharedLibGlxWithoutPIC
+#define DoSharedLib !SharedLibGlxWithoutPIC
+#define DoExtraLib NO
+#define DoDebugLib NO
+#define DoProfileLib NO
+#endif
+
+/* Large PIC tables needed for Solaris SPARC builds */
+#if (defined(SunArchitecture) && defined(SparcArchitecture))
+# define LargePICTable YES
+#endif
+
+#if Malloc0ReturnsNull
+ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL
+#endif
+
+#define MesaSPARCBuildDir /**/
+#define NeedToLinkMesaSrc
+#include "Imakefile.inc"
+
+      DEFINES = $(ALLOC_DEFINES) GlxDefines $(MESA_ASM_DEFINES)
+     INCLUDES = -I$(INCLUDESRC) -I$(EXTINCSRC) -I$(MESASRCDIR)/src \
+		-I$(MESASRCDIR)/src/SPARC \
+		-I../../../include \
+                -I$(MESASRCDIR)/include \
+                -I$(GLXLIBSRC)/include \
+                -I$(MESASRCDIR)/src/mesa \
+                -I$(MESASRCDIR)/src/mesa/main \
+                -I$(MESASRCDIR)/src/mesa/sparc \
+                -I$(MESASRCDIR)/src/mesa/glapi
+
+         SRCS = $(MESA_ASM_SRCS)
+         OBJS = $(MESA_ASM_OBJS)
+
+#include <Library.tmpl>
+
+LibraryObjectRule()
+
+STD_CPP_DEFINES = StandardDefines $(PROJECT_DEFINES)
+
+SubdirLibraryRule($(OBJS))
+NormalLintTarget($(SRCS))
+
+ObjectFromAsmSource(xform, NullParameter)
+ObjectFromAsmSource(clip, NullParameter)
+ObjectFromAsmSource(norm, NullParameter)
+
+DependTarget()
diff --git a/nx-X11/lib/GL/mesa/sparc/Imakefile.inc b/nx-X11/lib/GL/mesa/sparc/Imakefile.inc
new file mode 100644
index 000000000..6bd006749
--- /dev/null
+++ b/nx-X11/lib/GL/mesa/sparc/Imakefile.inc
@@ -0,0 +1,58 @@
+XCOMM $XFree86: xc/lib/GL/mesa/src/SPARC/Imakefile.inc,v 1.2 2002/11/14 21:01:16 tsi Exp $
+
+#ifndef MesaSPARCBuildDir
+#define MesaSPARCBuildDir $(GLXLIBSRC)/mesa/sparc/
+#endif
+
+MESASPARCBUILDDIR = MesaSPARCBuildDir
+
+MESA_SPARC_SRCS = $(MESASPARCBUILDDIR)sparc.c \
+		  $(MESASPARCBUILDDIR)xform.S \
+		  $(MESASPARCBUILDDIR)clip.S
+
+#ifdef NeedToLinkMesaSrc
+/* If $(MESASRCDIR)/src/mesa/sparc isn't in the INCLUDES, it should be. */
+LinkSourceFile(sparc.c, $(MESASRCDIR)/src/mesa/sparc)
+LinkSourceFile(xform.S, $(MESASRCDIR)/src/mesa/sparc)
+LinkSourceFile(clip.S, $(MESASRCDIR)/src/mesa/sparc)
+LinkSourceFile(norm.S, $(MESASRCDIR)/src/mesa/sparc)
+#endif
+
+MESA_SPARC_OBJS = $(MESASPARCBUILDDIR)sparc.o \
+		  $(MESASPARCBUILDDIR)xform.o \
+		  $(MESASPARCBUILDDIR)clip.o \
+		  $(MESASPARCBUILDDIR)norm.o
+
+#if defined(DoSharedLib) && DoSharedLib
+MESA_SPARC_UOBJS = $(MESASPARCBUILDDIR)unshared/sparc.o \
+		   $(MESASPARCBUILDDIR)xform.o \
+		   $(MESASPARCBUILDDIR)clip.o \
+		   $(MESASPARCBUILDDIR)norm.o
+#else
+MESA_SPARC_UOBJS = $(MESA_SPARC_OBJS)
+#endif
+
+MESA_SPARC_DOBJS = $(MESASPARCBUILDDIR)debugger/sparc.o \
+		   $(MESASPARCBUILDDIR)xform.o \
+		   $(MESASPARCBUILDDIR)clip.o \
+		   $(MESASPARCBUILDDIR)norm.o
+
+MESA_SPARC_POBJS = $(MESAX86BUILDDIR)profiled/sparc.o \
+		   $(MESAX86BUILDDIR)xform.o \
+		   $(MESAX86BUILDDIR)clip.o \
+		   $(MESAX86BUILDDIR)norm.o
+
+MESA_SPARC_DEFS = -DUSE_SPARC_ASM
+
+MESA_ASM_SRCS = $(MESA_SPARC_SRCS)
+
+MESA_ASM_OBJS = $(MESA_SPARC_OBJS)
+
+MESA_ASM_UOBJS = $(MESA_SPARC_UOBJS)
+
+MESA_ASM_DOBJS = $(MESA_SPARC_DOBJS)
+
+MESA_ASM_POBJS = $(MESA_SPARC_POBJS)
+
+MESA_ASM_DEFINES = $(MESA_SPARC_DEFS)
+
diff --git a/nx-X11/lib/GL/mesa/swrast/Imakefile b/nx-X11/lib/GL/mesa/swrast/Imakefile
new file mode 100644
index 000000000..105615b82
--- /dev/null
+++ b/nx-X11/lib/GL/mesa/swrast/Imakefile
@@ -0,0 +1,100 @@
+XCOMM $XFree86: xc/lib/GL/mesa/src/swrast/Imakefile,v 1.8 2002/11/25 12:58:55 tsi Exp $
+
+#include <Threads.tmpl>
+
+/*
+ * Need both shared and unshared Mesa objects in the following cases:
+ *   GlxDriverUsesMesa
+ *   GlxBuiltInXMesa
+ *   BuildOSMesaLib
+ *
+ * In other cases, only the shared version is needed to link in to loadable
+ * driver modules.
+ */
+
+#if BuildOSMesaLib || (BuildXF86DRI && (GlxDriverUsesMesa || GlxBuiltInXMesa))
+#define DoNormalLib (NormalLibGlx || SharedLibGlxWithoutPIC)
+#define DoSharedLib (SharedLibGlx && !SharedLibGlxWithoutPIC)
+#define DoExtraLib SharedLibGlx
+#define DoDebugLib DebugLibGlx
+#define DoProfileLib ProfileLibGlx
+#else
+#define DoNormalLib SharedLibGlxWithoutPIC
+#define DoSharedLib !SharedLibGlxWithoutPIC
+#define DoExtraLib NO
+#define DoDebugLib NO
+#define DoProfileLib NO
+#endif
+
+/* Large PIC tables needed for Solaris SPARC builds */
+#if (defined(SunArchitecture) && defined(SparcArchitecture))
+# define LargePICTable YES
+#endif
+
+#define MesaSwrastBuildDir /**/
+#define NeedToLinkMesaSrc
+#include "Imakefile.inc"
+
+
+#if Malloc0ReturnsNull
+ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL
+#endif
+
+#if BuildXF86DRI
+  DRI_DEFINES = GlxDefines -DIN_DRI_DRIVER
+ DRI_INCLUDES = -I../../../dri -I../../../glx -I../../dri -I../../../include \
+		-I$(INCLUDESRC)/GL -I$(XF86OSSRC) -I$(SERVERSRC)/GL/dri
+#endif
+
+#if defined(i386Architecture) && MesaUseX86Asm
+      ASM_DIR = x86
+     ASM_SRCS =
+     ASM_OBJS =
+#if MesaUseMMX
+     MMX_DEFS = -DUSE_MMX_ASM
+#endif
+#if MesaUse3DNow
+   3DNOW_DEFS = -DUSE_3DNOW_ASM
+#endif
+#if MesaUseSSE
+     SSE_DEFS = -DUSE_SSE_ASM
+#endif
+     ASM_DEFS = -DUSE_X86_ASM $(MMX_DEFS) $(3DNOW_DEFS) $(SSE_DEFS)
+#endif
+
+#ifdef SparcArchitecture
+      ASM_DIR = sparc 
+     ASM_SRCS =
+     ASM_OBJS =
+     ASM_DEFS = -DUSE_SPARC_ASM
+#endif
+
+#ifdef UseCompaqMathLibrary
+      MATHDEF = -DCCPML
+#endif
+
+MESA_INCLUDES = -I$(MESASRCDIR)/src/mesa \
+		-I$(MESASRCDIR)/src/mesa/main \
+		-I$(MESASRCDIR)/src/mesa/array_cache \
+		-I$(MESASRCDIR)/src/mesa/math \
+		-I$(MESASRCDIR)/src/mesa/glapi \
+		-I$(MESASRCDIR)/src/mesa/swrast \
+		-I$(MESASRCDIR)/src/mesa/shader \
+		-I$(MESASRCDIR)/src/mesa/$(ASM_DIR) \
+		-I$(MESASRCDIR)/include \
+		-I../../../include -I$(XINCLUDESRC)
+
+      DEFINES = $(ALLOC_DEFINES) $(DRI_DEFINES) $(ASM_DEFS) $(MATHDEF)
+     INCLUDES = $(MESA_INCLUDES) $(DRI_INCLUDES)
+         SRCS = $(MESA_SWRAST_SRCS)
+         OBJS = $(MESA_SWRAST_OBJS)
+
+
+#include <Library.tmpl>
+
+LibraryObjectRule()
+
+SubdirLibraryRule($(OBJS))
+NormalLintTarget($(SRCS))
+
+DependTarget()
diff --git a/nx-X11/lib/GL/mesa/swrast/Imakefile.inc b/nx-X11/lib/GL/mesa/swrast/Imakefile.inc
new file mode 100644
index 000000000..683b8f0a7
--- /dev/null
+++ b/nx-X11/lib/GL/mesa/swrast/Imakefile.inc
@@ -0,0 +1,218 @@
+XCOMM $XFree86: xc/lib/GL/mesa/src/swrast/Imakefile.inc,v 1.1tsi Exp $
+
+#ifndef MesaSwrastBuildDir
+#define MesaSwrastBuildDir $(GLXLIBSRC)/mesa/swrast/
+#endif
+
+MESASWRASTBUILDDIR = MesaSwrastBuildDir
+
+  MESA_SWRAST_SRCS = $(MESASWRASTBUILDDIR)s_aaline.c \
+		     $(MESASWRASTBUILDDIR)s_aatriangle.c \
+		     $(MESASWRASTBUILDDIR)s_accum.c \
+		     $(MESASWRASTBUILDDIR)s_alpha.c \
+                     $(MESASWRASTBUILDDIR)s_atifragshader.c \
+		     $(MESASWRASTBUILDDIR)s_bitmap.c \
+		     $(MESASWRASTBUILDDIR)s_blend.c \
+		     $(MESASWRASTBUILDDIR)s_buffers.c \
+		     $(MESASWRASTBUILDDIR)s_context.c \
+		     $(MESASWRASTBUILDDIR)s_copypix.c \
+		     $(MESASWRASTBUILDDIR)s_depth.c \
+		     $(MESASWRASTBUILDDIR)s_drawpix.c \
+		     $(MESASWRASTBUILDDIR)s_feedback.c \
+		     $(MESASWRASTBUILDDIR)s_fog.c \
+		     $(MESASWRASTBUILDDIR)s_imaging.c \
+		     $(MESASWRASTBUILDDIR)s_lines.c \
+		     $(MESASWRASTBUILDDIR)s_logic.c \
+		     $(MESASWRASTBUILDDIR)s_masking.c \
+		     $(MESASWRASTBUILDDIR)s_nvfragprog.c \
+		     $(MESASWRASTBUILDDIR)s_pixeltex.c \
+		     $(MESASWRASTBUILDDIR)s_points.c \
+		     $(MESASWRASTBUILDDIR)s_readpix.c \
+		     $(MESASWRASTBUILDDIR)s_span.c \
+		     $(MESASWRASTBUILDDIR)s_stencil.c \
+		     $(MESASWRASTBUILDDIR)s_texstore.c \
+		     $(MESASWRASTBUILDDIR)s_texture.c \
+		     $(MESASWRASTBUILDDIR)s_triangle.c \
+		     $(MESASWRASTBUILDDIR)s_zoom.c
+
+#ifdef NeedToLinkMesaSrc
+LinkSourceFile(s_aaline.c, $(MESASRCDIR)/src/mesa/swrast)
+LinkSourceFile(s_aaline.h, $(MESASRCDIR)/src/mesa/swrast)
+LinkSourceFile(s_aalinetemp.h, $(MESASRCDIR)/src/mesa/swrast)
+LinkSourceFile(s_aatriangle.c, $(MESASRCDIR)/src/mesa/swrast)
+LinkSourceFile(s_aatriangle.h, $(MESASRCDIR)/src/mesa/swrast)
+LinkSourceFile(s_aatritemp.h, $(MESASRCDIR)/src/mesa/swrast)
+LinkSourceFile(s_accum.c, $(MESASRCDIR)/src/mesa/swrast)
+LinkSourceFile(s_accum.h, $(MESASRCDIR)/src/mesa/swrast)
+LinkSourceFile(s_alpha.c, $(MESASRCDIR)/src/mesa/swrast)
+LinkSourceFile(s_alpha.h, $(MESASRCDIR)/src/mesa/swrast)
+LinkSourceFile(s_atifragshader.c, $(MESASRCDIR)/src/mesa/swrast)
+LinkSourceFile(s_atifragshader.h, $(MESASRCDIR)/src/mesa/swrast)
+LinkSourceFile(s_bitmap.c, $(MESASRCDIR)/src/mesa/swrast)
+LinkSourceFile(s_blend.c, $(MESASRCDIR)/src/mesa/swrast)
+LinkSourceFile(s_blend.h, $(MESASRCDIR)/src/mesa/swrast)
+LinkSourceFile(s_buffers.c, $(MESASRCDIR)/src/mesa/swrast)
+LinkSourceFile(s_context.c, $(MESASRCDIR)/src/mesa/swrast)
+LinkSourceFile(s_context.h, $(MESASRCDIR)/src/mesa/swrast)
+LinkSourceFile(s_copypix.c, $(MESASRCDIR)/src/mesa/swrast)
+LinkSourceFile(s_depth.c, $(MESASRCDIR)/src/mesa/swrast)
+LinkSourceFile(s_depth.h, $(MESASRCDIR)/src/mesa/swrast)
+LinkSourceFile(s_drawpix.c, $(MESASRCDIR)/src/mesa/swrast)
+LinkSourceFile(s_drawpix.h, $(MESASRCDIR)/src/mesa/swrast)
+LinkSourceFile(s_feedback.c, $(MESASRCDIR)/src/mesa/swrast)
+LinkSourceFile(s_feedback.h, $(MESASRCDIR)/src/mesa/swrast)
+LinkSourceFile(s_fog.c, $(MESASRCDIR)/src/mesa/swrast)
+LinkSourceFile(s_fog.h, $(MESASRCDIR)/src/mesa/swrast)
+LinkSourceFile(s_imaging.c, $(MESASRCDIR)/src/mesa/swrast)
+LinkSourceFile(s_lines.c, $(MESASRCDIR)/src/mesa/swrast)
+LinkSourceFile(s_lines.h, $(MESASRCDIR)/src/mesa/swrast)
+LinkSourceFile(s_linetemp.h, $(MESASRCDIR)/src/mesa/swrast)
+LinkSourceFile(s_logic.c, $(MESASRCDIR)/src/mesa/swrast)
+LinkSourceFile(s_logic.h, $(MESASRCDIR)/src/mesa/swrast)
+LinkSourceFile(s_masking.c, $(MESASRCDIR)/src/mesa/swrast)
+LinkSourceFile(s_masking.h, $(MESASRCDIR)/src/mesa/swrast)
+LinkSourceFile(s_nvfragprog.c, $(MESASRCDIR)/src/mesa/swrast)
+LinkSourceFile(s_nvfragprog.h, $(MESASRCDIR)/src/mesa/swrast)
+LinkSourceFile(s_pixeltex.c, $(MESASRCDIR)/src/mesa/swrast)
+LinkSourceFile(s_pixeltex.h, $(MESASRCDIR)/src/mesa/swrast)
+LinkSourceFile(s_points.c, $(MESASRCDIR)/src/mesa/swrast)
+LinkSourceFile(s_points.h, $(MESASRCDIR)/src/mesa/swrast)
+LinkSourceFile(s_pointtemp.h, $(MESASRCDIR)/src/mesa/swrast)
+LinkSourceFile(s_readpix.c, $(MESASRCDIR)/src/mesa/swrast)
+LinkSourceFile(s_span.c, $(MESASRCDIR)/src/mesa/swrast)
+LinkSourceFile(s_span.h, $(MESASRCDIR)/src/mesa/swrast)
+LinkSourceFile(s_spantemp.h, $(MESASRCDIR)/src/mesa/swrast)
+LinkSourceFile(s_stencil.c, $(MESASRCDIR)/src/mesa/swrast)
+LinkSourceFile(s_stencil.h, $(MESASRCDIR)/src/mesa/swrast)
+LinkSourceFile(s_texstore.c, $(MESASRCDIR)/src/mesa/swrast)
+LinkSourceFile(s_texture.c, $(MESASRCDIR)/src/mesa/swrast)
+LinkSourceFile(s_texture.h, $(MESASRCDIR)/src/mesa/swrast)
+LinkSourceFile(s_triangle.c, $(MESASRCDIR)/src/mesa/swrast)
+LinkSourceFile(s_triangle.h, $(MESASRCDIR)/src/mesa/swrast)
+LinkSourceFile(s_trispan.h, $(MESASRCDIR)/src/mesa/swrast)
+LinkSourceFile(s_tritemp.h, $(MESASRCDIR)/src/mesa/swrast)
+LinkSourceFile(s_zoom.c, $(MESASRCDIR)/src/mesa/swrast)
+LinkSourceFile(s_zoom.h, $(MESASRCDIR)/src/mesa/swrast)
+LinkSourceFile(swrast.h, $(MESASRCDIR)/src/mesa/swrast)
+#endif
+
+  MESA_SWRAST_OBJS = $(MESASWRASTBUILDDIR)s_aaline.o \
+		     $(MESASWRASTBUILDDIR)s_aatriangle.o \
+		     $(MESASWRASTBUILDDIR)s_accum.o \
+		     $(MESASWRASTBUILDDIR)s_alpha.o \
+                     $(MESASWRASTBUILDDIR)s_atifragshader.o \
+		     $(MESASWRASTBUILDDIR)s_bitmap.o \
+		     $(MESASWRASTBUILDDIR)s_blend.o \
+		     $(MESASWRASTBUILDDIR)s_buffers.o \
+		     $(MESASWRASTBUILDDIR)s_context.o \
+		     $(MESASWRASTBUILDDIR)s_copypix.o \
+		     $(MESASWRASTBUILDDIR)s_depth.o \
+		     $(MESASWRASTBUILDDIR)s_drawpix.o \
+		     $(MESASWRASTBUILDDIR)s_feedback.o \
+		     $(MESASWRASTBUILDDIR)s_fog.o \
+		     $(MESASWRASTBUILDDIR)s_imaging.o \
+		     $(MESASWRASTBUILDDIR)s_lines.o \
+		     $(MESASWRASTBUILDDIR)s_logic.o \
+		     $(MESASWRASTBUILDDIR)s_masking.o \
+		     $(MESASWRASTBUILDDIR)s_nvfragprog.o \
+		     $(MESASWRASTBUILDDIR)s_pixeltex.o \
+		     $(MESASWRASTBUILDDIR)s_points.o \
+		     $(MESASWRASTBUILDDIR)s_readpix.o \
+		     $(MESASWRASTBUILDDIR)s_span.o \
+		     $(MESASWRASTBUILDDIR)s_stencil.o \
+		     $(MESASWRASTBUILDDIR)s_texstore.o \
+		     $(MESASWRASTBUILDDIR)s_texture.o \
+		     $(MESASWRASTBUILDDIR)s_triangle.o \
+		     $(MESASWRASTBUILDDIR)s_zoom.o
+
+#if defined(DoSharedLib) && DoSharedLib
+ MESA_SWRAST_UOBJS = $(MESASWRASTBUILDDIR)unshared/s_aaline.o \
+		     $(MESASWRASTBUILDDIR)unshared/s_aatriangle.o \
+		     $(MESASWRASTBUILDDIR)unshared/s_accum.o \
+		     $(MESASWRASTBUILDDIR)unshared/s_alpha.o \
+                     $(MESASWRASTBUILDDIR)unshared/s_atifragshader.o \
+		     $(MESASWRASTBUILDDIR)unshared/s_bitmap.o \
+		     $(MESASWRASTBUILDDIR)unshared/s_blend.o \
+		     $(MESASWRASTBUILDDIR)unshared/s_buffers.o \
+		     $(MESASWRASTBUILDDIR)unshared/s_context.o \
+		     $(MESASWRASTBUILDDIR)unshared/s_copypix.o \
+		     $(MESASWRASTBUILDDIR)unshared/s_depth.o \
+		     $(MESASWRASTBUILDDIR)unshared/s_drawpix.o \
+		     $(MESASWRASTBUILDDIR)unshared/s_feedback.o \
+		     $(MESASWRASTBUILDDIR)unshared/s_fog.o \
+		     $(MESASWRASTBUILDDIR)unshared/s_imaging.o \
+		     $(MESASWRASTBUILDDIR)unshared/s_lines.o \
+		     $(MESASWRASTBUILDDIR)unshared/s_logic.o \
+		     $(MESASWRASTBUILDDIR)unshared/s_masking.o \
+		     $(MESASWRASTBUILDDIR)unshared/s_nvfragprog.o \
+		     $(MESASWRASTBUILDDIR)unshared/s_pixeltex.o \
+		     $(MESASWRASTBUILDDIR)unshared/s_points.o \
+		     $(MESASWRASTBUILDDIR)unshared/s_readpix.o \
+		     $(MESASWRASTBUILDDIR)unshared/s_span.o \
+		     $(MESASWRASTBUILDDIR)unshared/s_stencil.o \
+		     $(MESASWRASTBUILDDIR)unshared/s_texstore.o \
+		     $(MESASWRASTBUILDDIR)unshared/s_texture.o \
+		     $(MESASWRASTBUILDDIR)unshared/s_triangle.o \
+		     $(MESASWRASTBUILDDIR)unshared/s_zoom.o
+#else
+ MESA_SWRAST_UOBJS = $(MESA_SWRAST_OBJS)
+#endif
+
+ MESA_SWRAST_DOBJS = $(MESASWRASTBUILDDIR)debugger/s_aaline.o \
+		     $(MESASWRASTBUILDDIR)debugger/s_aatriangle.o \
+		     $(MESASWRASTBUILDDIR)debugger/s_accum.o \
+		     $(MESASWRASTBUILDDIR)debugger/s_alpha.o \
+                     $(MESASWRASTBUILDDIR)debugger/s_atifragshader.o \
+		     $(MESASWRASTBUILDDIR)debugger/s_bitmap.o \
+		     $(MESASWRASTBUILDDIR)debugger/s_blend.o \
+		     $(MESASWRASTBUILDDIR)debugger/s_buffers.o \
+		     $(MESASWRASTBUILDDIR)debugger/s_context.o \
+		     $(MESASWRASTBUILDDIR)debugger/s_copypix.o \
+		     $(MESASWRASTBUILDDIR)debugger/s_depth.o \
+		     $(MESASWRASTBUILDDIR)debugger/s_drawpix.o \
+		     $(MESASWRASTBUILDDIR)debugger/s_feedback.o \
+		     $(MESASWRASTBUILDDIR)debugger/s_fog.o \
+		     $(MESASWRASTBUILDDIR)debugger/s_imaging.o \
+		     $(MESASWRASTBUILDDIR)debugger/s_lines.o \
+		     $(MESASWRASTBUILDDIR)debugger/s_logic.o \
+		     $(MESASWRASTBUILDDIR)debugger/s_masking.o \
+		     $(MESASWRASTBUILDDIR)debugger/s_nvfragprog.o \
+		     $(MESASWRASTBUILDDIR)debugger/s_pixeltex.o \
+		     $(MESASWRASTBUILDDIR)debugger/s_points.o \
+		     $(MESASWRASTBUILDDIR)debugger/s_readpix.o \
+		     $(MESASWRASTBUILDDIR)debugger/s_span.o \
+		     $(MESASWRASTBUILDDIR)debugger/s_stencil.o \
+		     $(MESASWRASTBUILDDIR)debugger/s_texstore.o \
+		     $(MESASWRASTBUILDDIR)debugger/s_texture.o \
+		     $(MESASWRASTBUILDDIR)debugger/s_triangle.o \
+		     $(MESASWRASTBUILDDIR)debugger/s_zoom.o
+
+ MESA_SWRAST_POBJS = $(MESASWRASTBUILDDIR)profiled/s_aaline.o \
+		     $(MESASWRASTBUILDDIR)profiled/s_aatriangle.o \
+		     $(MESASWRASTBUILDDIR)profiled/s_accum.o \
+		     $(MESASWRASTBUILDDIR)profiled/s_alpha.o \
+                     $(MESASWRASTBUILDDIR)profiled/s_atifragshader.o \
+		     $(MESASWRASTBUILDDIR)profiled/s_bitmap.o \
+		     $(MESASWRASTBUILDDIR)profiled/s_blend.o \
+		     $(MESASWRASTBUILDDIR)profiled/s_buffers.o \
+		     $(MESASWRASTBUILDDIR)profiled/s_context.o \
+		     $(MESASWRASTBUILDDIR)profiled/s_copypix.o \
+		     $(MESASWRASTBUILDDIR)profiled/s_depth.o \
+		     $(MESASWRASTBUILDDIR)profiled/s_drawpix.o \
+		     $(MESASWRASTBUILDDIR)profiled/s_feedback.o \
+		     $(MESASWRASTBUILDDIR)profiled/s_fog.o \
+		     $(MESASWRASTBUILDDIR)profiled/s_imaging.o \
+		     $(MESASWRASTBUILDDIR)profiled/s_lines.o \
+		     $(MESASWRASTBUILDDIR)profiled/s_logic.o \
+		     $(MESASWRASTBUILDDIR)profiled/s_masking.o \
+		     $(MESASWRASTBUILDDIR)profiled/s_nvfragprog.o \
+		     $(MESASWRASTBUILDDIR)profiled/s_pixeltex.o \
+		     $(MESASWRASTBUILDDIR)profiled/s_points.o \
+		     $(MESASWRASTBUILDDIR)profiled/s_readpix.o \
+		     $(MESASWRASTBUILDDIR)profiled/s_span.o \
+		     $(MESASWRASTBUILDDIR)profiled/s_stencil.o \
+		     $(MESASWRASTBUILDDIR)profiled/s_texstore.o \
+		     $(MESASWRASTBUILDDIR)profiled/s_texture.o \
+		     $(MESASWRASTBUILDDIR)profiled/s_triangle.o \
+		     $(MESASWRASTBUILDDIR)profiled/s_zoom.o
+
diff --git a/nx-X11/lib/GL/mesa/swrast_setup/Imakefile b/nx-X11/lib/GL/mesa/swrast_setup/Imakefile
new file mode 100644
index 000000000..58766149d
--- /dev/null
+++ b/nx-X11/lib/GL/mesa/swrast_setup/Imakefile
@@ -0,0 +1,99 @@
+XCOMM $XFree86: xc/lib/GL/mesa/src/swrast_setup/Imakefile,v 1.8 2002/11/25 12:58:55 tsi Exp $
+
+#include <Threads.tmpl>
+
+/*
+ * Need both shared and unshared Mesa objects in the following cases:
+ *   GlxDriverUsesMesa
+ *   GlxBuiltInXMesa
+ *   BuildOSMesaLib
+ *
+ * In other cases, only the shared version is needed to link in to loadable
+ * driver modules.
+ */
+
+#if BuildOSMesaLib || (BuildXF86DRI && (GlxDriverUsesMesa || GlxBuiltInXMesa))
+#define DoNormalLib (NormalLibGlx || SharedLibGlxWithoutPIC)
+#define DoSharedLib (SharedLibGlx && !SharedLibGlxWithoutPIC)
+#define DoExtraLib SharedLibGlx
+#define DoDebugLib DebugLibGlx
+#define DoProfileLib ProfileLibGlx
+#else
+#define DoNormalLib SharedLibGlxWithoutPIC
+#define DoSharedLib !SharedLibGlxWithoutPIC
+#define DoExtraLib NO
+#define DoDebugLib NO
+#define DoProfileLib NO
+#endif
+
+/* Large PIC tables needed for Solaris SPARC builds */
+#if (defined(SunArchitecture) && defined(SparcArchitecture))
+# define LargePICTable YES
+#endif
+
+
+#define MesaSwrastSetupBuildDir /**/
+#define NeedToLinkMesaSrc
+#include "Imakefile.inc"
+
+#if Malloc0ReturnsNull
+ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL
+#endif
+
+#if BuildXF86DRI
+  DRI_DEFINES = GlxDefines -DIN_DRI_DRIVER
+ DRI_INCLUDES = -I../../../dri -I../../../glx -I../../dri -I../../../include \
+		-I$(INCLUDESRC)/GL -I$(XF86OSSRC) -I$(SERVERSRC)/GL/dri
+#endif
+
+#if defined(i386Architecture) && MesaUseX86Asm
+      ASM_DIR = x86
+     ASM_SRCS =
+     ASM_OBJS =
+#if MesaUseMMX
+     MMX_DEFS = -DUSE_MMX_ASM
+#endif
+#if MesaUse3DNow
+   3DNOW_DEFS = -DUSE_3DNOW_ASM
+#endif
+#if MesaUseSSE
+     SSE_DEFS = -DUSE_SSE_ASM
+#endif
+     ASM_DEFS = -DUSE_X86_ASM $(MMX_DEFS) $(3DNOW_DEFS) $(SSE_DEFS)
+#endif
+
+#ifdef SparcArchitecture
+      ASM_DIR = sparc
+     ASM_SRCS =
+     ASM_OBJS =
+     ASM_DEFS = -DUSE_SPARC_ASM
+#endif
+
+#ifdef UseCompaqMathLibrary
+      MATHDEF = -DCCPML
+#endif
+
+MESA_INCLUDES = -I$(MESASRCDIR)/src/mesa \
+		-I$(MESASRCDIR)/src/mesa/$(ASM_DIR) \
+		-I$(MESASRCDIR)/src/mesa/math \
+		-I$(MESASRCDIR)/src/mesa/main \
+		-I$(MESASRCDIR)/src/mesa/glapi \
+		-I$(MESASRCDIR)/src/mesa/swrast_setup \
+		-I$(MESASRCDIR)/src/mesa/tnl \
+		-I$(MESASRCDIR)/include \
+		-I../../../include -I$(XINCLUDESRC)
+
+      DEFINES = $(ALLOC_DEFINES) $(DRI_DEFINES) $(ASM_DEFS) $(MATHDEF)
+     INCLUDES = $(MESA_INCLUDES) $(DRI_INCLUDES)
+         SRCS = $(MESA_SWR_SETUP_SRCS)
+         OBJS = $(MESA_SWR_SETUP_OBJS)
+
+
+#include <Library.tmpl>
+
+LibraryObjectRule()
+
+SubdirLibraryRule($(OBJS))
+NormalLintTarget($(SRCS))
+
+DependTarget()
diff --git a/nx-X11/lib/GL/mesa/swrast_setup/Imakefile.inc b/nx-X11/lib/GL/mesa/swrast_setup/Imakefile.inc
new file mode 100644
index 000000000..8d32aedb3
--- /dev/null
+++ b/nx-X11/lib/GL/mesa/swrast_setup/Imakefile.inc
@@ -0,0 +1,36 @@
+XCOMM $XFree86: xc/lib/GL/mesa/src/swrast_setup/Imakefile.inc,v 1.1tsi Exp $
+
+#ifndef MesaSwrastSetupBuildDir
+#define MesaSwrastSetupBuildDir $(GLXLIBSRC)/mesa/swrast_setup/
+#endif
+
+MESASWRSETUPDIR = MesaSwrastSetupBuildDir
+
+ MESA_SWR_SETUP_SRCS = $(MESASWRSETUPDIR)ss_context.c \
+		       $(MESASWRSETUPDIR)ss_triangle.c 
+
+#ifdef NeedToLinkMesaSrc
+LinkSourceFile(ss_context.c, $(MESASRCDIR)/src/mesa/swrast_setup)
+LinkSourceFile(ss_context.h, $(MESASRCDIR)/src/mesa/swrast_setup)
+LinkSourceFile(ss_triangle.c, $(MESASRCDIR)/src/mesa/swrast_setup)
+LinkSourceFile(ss_triangle.h, $(MESASRCDIR)/src/mesa/swrast_setup)
+LinkSourceFile(ss_tritmp.h, $(MESASRCDIR)/src/mesa/swrast_setup)
+LinkSourceFile(swrast_setup.h, $(MESASRCDIR)/src/mesa/swrast_setup)
+#endif
+
+ MESA_SWR_SETUP_OBJS = $(MESASWRSETUPDIR)ss_context.o \
+		       $(MESASWRSETUPDIR)ss_triangle.o 
+
+#if defined(DoSharedLib) && DoSharedLib
+MESA_SWR_SETUP_UOBJS = $(MESASWRSETUPDIR)unshared/ss_context.o \
+		       $(MESASWRSETUPDIR)unshared/ss_triangle.o 
+#else
+MESA_SWR_SETUP_UOBJS = $(MESA_SWR_SETUP_OBJS)
+#endif
+
+MESA_SWR_SETUP_DOBJS = $(MESASWRSETUPDIR)debugger/ss_context.o \
+		       $(MESASWRSETUPDIR)debugger/ss_triangle.o 
+
+MESA_SWR_SETUP_POBJS = $(MESASWRSETUPDIR)profiled/ss_context.o \
+		       $(MESASWRSETUPDIR)profiled/ss_triangle.o 
+
diff --git a/nx-X11/lib/GL/mesa/tnl/Imakefile b/nx-X11/lib/GL/mesa/tnl/Imakefile
new file mode 100644
index 000000000..99ec7525c
--- /dev/null
+++ b/nx-X11/lib/GL/mesa/tnl/Imakefile
@@ -0,0 +1,101 @@
+XCOMM $XFree86: xc/lib/GL/mesa/src/tnl/Imakefile,v 1.8 2002/11/25 12:58:55 tsi Exp $
+
+#include <Threads.tmpl>
+
+/*
+ * Need both shared and unshared Mesa objects in the following cases:
+ *   GlxDriverUsesMesa
+ *   GlxBuiltInXMesa
+ *   BuildOSMesaLib
+ *
+ * In other cases, only the shared version is needed to link in to loadable
+ * driver modules.
+ */
+
+#if BuildOSMesaLib || (BuildXF86DRI && (GlxDriverUsesMesa || GlxBuiltInXMesa))
+#define DoNormalLib (NormalLibGlx || SharedLibGlxWithoutPIC)
+#define DoSharedLib (SharedLibGlx && !SharedLibGlxWithoutPIC)
+#define DoExtraLib SharedLibGlx
+#define DoDebugLib DebugLibGlx
+#define DoProfileLib ProfileLibGlx
+#else
+#define DoNormalLib SharedLibGlxWithoutPIC
+#define DoSharedLib !SharedLibGlxWithoutPIC
+#define DoExtraLib NO
+#define DoDebugLib NO
+#define DoProfileLib NO
+#endif
+
+/* Large PIC tables needed for Solaris SPARC builds */
+#if (defined(SunArchitecture) && defined(SparcArchitecture))
+# define LargePICTable YES
+#endif
+
+#define MesaTnlBuildDir /**/
+#define NeedToLinkMesaSrc
+#include "Imakefile.inc"
+
+
+#if Malloc0ReturnsNull
+ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL
+#endif
+
+#if BuildXF86DRI
+  DRI_DEFINES = GlxDefines -DIN_DRI_DRIVER
+ DRI_INCLUDES = -I../../../dri -I../../../glx -I../../dri -I../../../include \
+		-I$(INCLUDESRC)/GL -I$(XF86OSSRC) -I$(SERVERSRC)/GL/dri
+#endif
+
+#if defined(i386Architecture) && MesaUseX86Asm
+      ASM_DIR = x86
+     ASM_SRCS =
+     ASM_OBJS =
+#if MesaUseMMX
+     MMX_DEFS = -DUSE_MMX_ASM
+#endif
+#if MesaUse3DNow
+   3DNOW_DEFS = -DUSE_3DNOW_ASM
+#endif
+#if MesaUseSSE
+     SSE_DEFS = -DUSE_SSE_ASM
+#endif
+     ASM_DEFS = -DUSE_X86_ASM $(MMX_DEFS) $(3DNOW_DEFS) $(SSE_DEFS)
+#endif
+
+#ifdef SparcArchitecture
+      ASM_DIR = sparc
+     ASM_SRCS =
+     ASM_OBJS =
+     ASM_DEFS = -DUSE_SPARC_ASM
+#endif
+
+#ifdef UseCompaqMathLibrary
+      MATHDEF = -DCCPML
+#endif
+
+MESA_INCLUDES = -I$(MESASRCDIR)/src/mesa \
+		-I$(MESASRCDIR)/src/mesa/$(ASM_DIR) \
+		-I$(MESASRCDIR)/src/mesa/array_cache \
+		-I$(MESASRCDIR)/src/mesa/math \
+		-I$(MESASRCDIR)/src/mesa/main \
+		-I$(MESASRCDIR)/src/mesa/glapi \
+		-I$(MESASRCDIR)/src/mesa/swrast_setup \
+		-I$(MESASRCDIR)/src/mesa/shader \
+		-I$(MESASRCDIR)/src/mesa/tnl \
+		-I$(MESASRCDIR)/include \
+		-I../../../include -I$(XINCLUDESRC)
+
+      DEFINES = $(ALLOC_DEFINES) $(DRI_DEFINES) $(ASM_DEFS) $(MATHDEF)
+     INCLUDES = $(MESA_INCLUDES) $(DRI_INCLUDES)
+         SRCS = $(MESA_TNL_SRCS)
+         OBJS = $(MESA_TNL_OBJS)
+
+
+#include <Library.tmpl>
+
+LibraryObjectRule()
+
+SubdirLibraryRule($(OBJS))
+NormalLintTarget($(SRCS))
+
+DependTarget()
diff --git a/nx-X11/lib/GL/mesa/tnl/Imakefile.inc b/nx-X11/lib/GL/mesa/tnl/Imakefile.inc
new file mode 100644
index 000000000..a294a6fbf
--- /dev/null
+++ b/nx-X11/lib/GL/mesa/tnl/Imakefile.inc
@@ -0,0 +1,225 @@
+XCOMM $XFree86: xc/lib/GL/mesa/src/tnl/Imakefile.inc,v 1.1tsi Exp $
+
+#ifndef MesaTnlBuildDir
+#define MesaTnlBuildDir $(GLXLIBSRC)/mesa/tnl/
+#endif
+
+MESATNLBUILDDIR = MesaTnlBuildDir
+
+  MESA_TNL_SRCS = $(MESATNLBUILDDIR)t_array_api.c \
+		  $(MESATNLBUILDDIR)t_array_import.c \
+		  $(MESATNLBUILDDIR)t_context.c \
+		  $(MESATNLBUILDDIR)t_pipeline.c \
+		  $(MESATNLBUILDDIR)t_save_api.c \
+		  $(MESATNLBUILDDIR)t_save_loopback.c \
+		  $(MESATNLBUILDDIR)t_save_playback.c \
+                  $(MESATNLBUILDDIR)t_vb_arbprogram.c \
+                  $(MESATNLBUILDDIR)t_vb_arbprogram_sse.c \
+		  $(MESATNLBUILDDIR)t_vb_fog.c \
+		  $(MESATNLBUILDDIR)t_vb_cull.c \
+		  $(MESATNLBUILDDIR)t_vb_light.c \
+		  $(MESATNLBUILDDIR)t_vb_normals.c \
+		  $(MESATNLBUILDDIR)t_vb_points.c \
+		  $(MESATNLBUILDDIR)t_vb_program.c \
+		  $(MESATNLBUILDDIR)t_vb_render.c \
+		  $(MESATNLBUILDDIR)t_vb_texgen.c \
+		  $(MESATNLBUILDDIR)t_vb_texmat.c \
+		  $(MESATNLBUILDDIR)t_vb_vertex.c \
+		  $(MESATNLBUILDDIR)t_vertex.c \
+                  $(MESATNLBUILDDIR)t_vertex_generic.c \
+                  $(MESATNLBUILDDIR)t_vertex_sse.c \
+                  $(MESATNLBUILDDIR)t_vp_build.c \
+		  $(MESATNLBUILDDIR)t_vtx_api.c \
+		  $(MESATNLBUILDDIR)t_vtx_eval.c \
+		  $(MESATNLBUILDDIR)t_vtx_exec.c \
+		  $(MESATNLBUILDDIR)t_vtx_generic.c
+
+#if defined(i386Architecture) && MesaUseX86Asm
+  MESA_TNL_SRCS += MesaTnlAsmSrcs $(MESATNLBUILDDIR)t_vtx_x86.c \
+		  $(MESATNLBUILDDIR)t_vtx_x86_gcc.S
+#endif
+
+#ifdef NeedToLinkMesaSrc
+LinkSourceFile(t_array_api.c, $(MESASRCDIR)/src/mesa/tnl)
+LinkSourceFile(t_array_api.h, $(MESASRCDIR)/src/mesa/tnl)
+LinkSourceFile(t_array_import.c, $(MESASRCDIR)/src/mesa/tnl)
+LinkSourceFile(t_array_import.h, $(MESASRCDIR)/src/mesa/tnl)
+LinkSourceFile(t_context.c, $(MESASRCDIR)/src/mesa/tnl)
+LinkSourceFile(t_context.h, $(MESASRCDIR)/src/mesa/tnl)
+LinkSourceFile(tnl.h, $(MESASRCDIR)/src/mesa/tnl)
+LinkSourceFile(t_pipeline.c, $(MESASRCDIR)/src/mesa/tnl)
+LinkSourceFile(t_pipeline.h, $(MESASRCDIR)/src/mesa/tnl)
+LinkSourceFile(t_save_api.c, $(MESASRCDIR)/src/mesa/tnl)
+LinkSourceFile(t_save_api.h, $(MESASRCDIR)/src/mesa/tnl)
+LinkSourceFile(t_save_loopback.c, $(MESASRCDIR)/src/mesa/tnl)
+LinkSourceFile(t_save_playback.c, $(MESASRCDIR)/src/mesa/tnl)
+LinkSourceFile(t_vb_arbprogram.c, $(MESASRCDIR)/src/mesa/tnl)
+LinkSourceFile(t_vb_arbprogram.h, $(MESASRCDIR)/src/mesa/tnl)
+LinkSourceFile(t_vb_arbprogram_sse.c, $(MESASRCDIR)/src/mesa/tnl)
+LinkSourceFile(t_vb_cliptmp.h, $(MESASRCDIR)/src/mesa/tnl)
+LinkSourceFile(t_vb_fog.c, $(MESASRCDIR)/src/mesa/tnl)
+LinkSourceFile(t_vb_cull.c, $(MESASRCDIR)/src/mesa/tnl)
+LinkSourceFile(t_vb_light.c, $(MESASRCDIR)/src/mesa/tnl)
+LinkSourceFile(t_vb_lighttmp.h, $(MESASRCDIR)/src/mesa/tnl)
+LinkSourceFile(t_vb_normals.c, $(MESASRCDIR)/src/mesa/tnl)
+LinkSourceFile(t_vb_points.c, $(MESASRCDIR)/src/mesa/tnl)
+LinkSourceFile(t_vb_program.c, $(MESASRCDIR)/src/mesa/tnl)
+LinkSourceFile(t_vb_render.c, $(MESASRCDIR)/src/mesa/tnl)
+LinkSourceFile(t_vb_rendertmp.h, $(MESASRCDIR)/src/mesa/tnl)
+LinkSourceFile(t_vb_texgen.c, $(MESASRCDIR)/src/mesa/tnl)
+LinkSourceFile(t_vb_texmat.c, $(MESASRCDIR)/src/mesa/tnl)
+LinkSourceFile(t_vb_vertex.c, $(MESASRCDIR)/src/mesa/tnl)
+LinkSourceFile(t_vertex.c, $(MESASRCDIR)/src/mesa/tnl)
+LinkSourceFile(t_vertex.h, $(MESASRCDIR)/src/mesa/tnl)
+LinkSourceFile(t_vertex_generic.c, $(MESASRCDIR)/src/mesa/tnl)
+LinkSourceFile(t_vertex_sse.c, $(MESASRCDIR)/src/mesa/tnl)
+LinkSourceFile(t_vp_build.c, $(MESASRCDIR)/src/mesa/tnl)
+LinkSourceFile(t_vp_build.h, $(MESASRCDIR)/src/mesa/tnl)
+LinkSourceFile(t_vtx_api.c, $(MESASRCDIR)/src/mesa/tnl)
+LinkSourceFile(t_vtx_api.h, $(MESASRCDIR)/src/mesa/tnl)
+LinkSourceFile(t_vtx_eval.c, $(MESASRCDIR)/src/mesa/tnl)
+LinkSourceFile(t_vtx_exec.c, $(MESASRCDIR)/src/mesa/tnl)
+LinkSourceFile(t_vtx_generic.c, $(MESASRCDIR)/src/mesa/tnl)
+#if defined(i386Architecture) && MesaUseX86Asm
+LinkSourceFile(t_vtx_x86.c, $(MESASRCDIR)/src/mesa/tnl)
+LinkSourceFile(t_vtx_x86_gcc.S, $(MESASRCDIR)/src/mesa/tnl)
+#endif
+#endif
+
+  MESA_TNL_OBJS = $(MESATNLBUILDDIR)t_array_api.o \
+                  $(MESATNLBUILDDIR)t_array_import.o \
+                  $(MESATNLBUILDDIR)t_context.o \
+                  $(MESATNLBUILDDIR)t_pipeline.o \
+                  $(MESATNLBUILDDIR)t_save_api.o \
+                  $(MESATNLBUILDDIR)t_save_loopback.o \
+                  $(MESATNLBUILDDIR)t_save_playback.o \
+                  $(MESATNLBUILDDIR)t_vb_arbprogram.o \
+                  $(MESATNLBUILDDIR)t_vb_arbprogram_sse.o \
+                  $(MESATNLBUILDDIR)t_vb_fog.o \
+                  $(MESATNLBUILDDIR)t_vb_cull.o \
+                  $(MESATNLBUILDDIR)t_vb_light.o \
+                  $(MESATNLBUILDDIR)t_vb_normals.o \
+                  $(MESATNLBUILDDIR)t_vb_points.o \
+                  $(MESATNLBUILDDIR)t_vb_program.o \
+                  $(MESATNLBUILDDIR)t_vb_render.o \
+                  $(MESATNLBUILDDIR)t_vb_texgen.o \
+                  $(MESATNLBUILDDIR)t_vb_texmat.o \
+                  $(MESATNLBUILDDIR)t_vb_vertex.o \
+                  $(MESATNLBUILDDIR)t_vertex.o \
+                  $(MESATNLBUILDDIR)t_vertex_generic.o \
+                  $(MESATNLBUILDDIR)t_vertex_sse.o \
+                  $(MESATNLBUILDDIR)t_vp_build.o \
+                  $(MESATNLBUILDDIR)t_vtx_api.o \
+                  $(MESATNLBUILDDIR)t_vtx_eval.o \
+                  $(MESATNLBUILDDIR)t_vtx_exec.o \
+                  $(MESATNLBUILDDIR)t_vtx_generic.o
+
+#if defined(i386Architecture) && MesaUseX86Asm
+  MESA_TNL_OBJS += $(MESATNLBUILDDIR)t_vtx_x86.o \
+		  $(MESATNLBUILDDIR)t_vtx_x86_gcc.o
+#endif
+
+#if defined(DoSharedLib) && DoSharedLib
+ MESA_TNL_UOBJS = $(MESATNLBUILDDIR)unshared/t_array_api.o \
+		  $(MESATNLBUILDDIR)unshared/t_array_import.o \
+		  $(MESATNLBUILDDIR)unshared/t_context.o \
+		  $(MESATNLBUILDDIR)unshared/t_pipeline.o \
+		  $(MESATNLBUILDDIR)unshared/t_save_api.o \
+		  $(MESATNLBUILDDIR)unshared/t_save_loopback.o \
+		  $(MESATNLBUILDDIR)unshared/t_save_playback.o \
+                  $(MESATNLBUILDDIR)unshared/t_vb_arbprogram.o \
+                  $(MESATNLBUILDDIR)unshared/t_vb_arbprogram_sse.o \
+		  $(MESATNLBUILDDIR)unshared/t_vb_fog.o \
+		  $(MESATNLBUILDDIR)unshared/t_vb_cull.o \
+		  $(MESATNLBUILDDIR)unshared/t_vb_light.o \
+		  $(MESATNLBUILDDIR)unshared/t_vb_normals.o \
+		  $(MESATNLBUILDDIR)unshared/t_vb_points.o \
+		  $(MESATNLBUILDDIR)unshared/t_vb_program.o \
+		  $(MESATNLBUILDDIR)unshared/t_vb_render.o \
+		  $(MESATNLBUILDDIR)unshared/t_vb_texgen.o \
+		  $(MESATNLBUILDDIR)unshared/t_vb_texmat.o \
+		  $(MESATNLBUILDDIR)unshared/t_vb_vertex.o \
+		  $(MESATNLBUILDDIR)unshared/t_vertex.o \
+                  $(MESATNLBUILDDIR)unshared/t_vertex_generic.o \
+                  $(MESATNLBUILDDIR)unshared/t_vertex_sse.o \
+                  $(MESATNLBUILDDIR)unshared/t_vp_build.o \
+		  $(MESATNLBUILDDIR)unshared/t_vtx_api.o \
+		  $(MESATNLBUILDDIR)unshared/t_vtx_eval.o \
+		  $(MESATNLBUILDDIR)unshared/t_vtx_exec.o \
+		  $(MESATNLBUILDDIR)unshared/t_vtx_generic.o
+
+#if defined(i386Architecture) && MesaUseX86Asm
+ MESA_TNL_UOBJS += $(MESATNLBUILDDIR)unshared/t_vtx_x86.o \
+		  $(MESATNLBUILDDIR)t_vtx_x86_gcc.o
+#endif
+
+#else
+ MESA_TNL_UOBJS = $(MESA_TNL_OBJS)
+#endif
+
+ MESA_TNL_DOBJS = $(MESATNLBUILDDIR)debugger/t_array_api.o \
+		  $(MESATNLBUILDDIR)debugger/t_array_import.o \
+		  $(MESATNLBUILDDIR)debugger/t_context.o \
+		  $(MESATNLBUILDDIR)debugger/t_pipeline.o \
+		  $(MESATNLBUILDDIR)debugger/t_save_api.o \
+		  $(MESATNLBUILDDIR)debugger/t_save_loopback.o \
+		  $(MESATNLBUILDDIR)debugger/t_save_playback.o \
+                  $(MESATNLBUILDDIR)debugger/t_vb_arbprogram.o \
+                  $(MESATNLBUILDDIR)debugger/t_vb_arbprogram_sse.o \
+		  $(MESATNLBUILDDIR)debugger/t_vb_fog.o \
+		  $(MESATNLBUILDDIR)debugger/t_vb_cull.o \
+		  $(MESATNLBUILDDIR)debugger/t_vb_light.o \
+		  $(MESATNLBUILDDIR)debugger/t_vb_normals.o \
+		  $(MESATNLBUILDDIR)debugger/t_vb_points.o \
+		  $(MESATNLBUILDDIR)debugger/t_vb_program.o \
+		  $(MESATNLBUILDDIR)debugger/t_vb_render.o \
+		  $(MESATNLBUILDDIR)debugger/t_vb_texgen.o \
+		  $(MESATNLBUILDDIR)debugger/t_vb_texmat.o \
+		  $(MESATNLBUILDDIR)debugger/t_vb_vertex.o \
+		  $(MESATNLBUILDDIR)debugger/t_vertex.o \
+                  $(MESATNLBUILDDIR)debugger/t_vertex_generic.o \
+                  $(MESATNLBUILDDIR)debugger/t_vertex_sse.o \
+                  $(MESATNLBUILDDIR)debugger/t_vp_build.o \
+		  $(MESATNLBUILDDIR)debugger/t_vtx_api.o \
+		  $(MESATNLBUILDDIR)debugger/t_vtx_eval.o \
+		  $(MESATNLBUILDDIR)debugger/t_vtx_exec.o \
+		  $(MESATNLBUILDDIR)debugger/t_vtx_generic.o
+
+#if defined(i386Architecture) && MesaUseX86Asm
+ MESA_TNL_DOBJS += $(MESATNLBUILDDIR)debugger/t_vtx_x86.o \
+		  $(MESATNLBUILDDIR)debugger/t_vtx_x86_gcc.o
+#endif
+
+ MESA_TNL_POBJS = $(MESATNLBUILDDIR)profiled/t_array_api.o \
+		  $(MESATNLBUILDDIR)profiled/t_array_import.o \
+		  $(MESATNLBUILDDIR)profiled/t_context.o \
+		  $(MESATNLBUILDDIR)profiled/t_pipeline.o \
+		  $(MESATNLBUILDDIR)profiled/t_save_api.o \
+		  $(MESATNLBUILDDIR)profiled/t_save_loopback.o \
+		  $(MESATNLBUILDDIR)profiled/t_save_playback.o \
+                  $(MESATNLBUILDDIR)profiled/t_vb_arbprogram.o \
+                  $(MESATNLBUILDDIR)profiled/t_vb_arbprogram_sse.o \
+		  $(MESATNLBUILDDIR)profiled/t_vb_fog.o \
+		  $(MESATNLBUILDDIR)profiled/t_vb_cull.o \
+		  $(MESATNLBUILDDIR)profiled/t_vb_light.o \
+		  $(MESATNLBUILDDIR)profiled/t_vb_normals.o \
+		  $(MESATNLBUILDDIR)profiled/t_vb_points.o \
+		  $(MESATNLBUILDDIR)profiled/t_vb_program.o \
+		  $(MESATNLBUILDDIR)profiled/t_vb_render.o \
+		  $(MESATNLBUILDDIR)profiled/t_vb_texgen.o \
+		  $(MESATNLBUILDDIR)profiled/t_vb_texmat.o \
+		  $(MESATNLBUILDDIR)profiled/t_vb_vertex.o \
+		  $(MESATNLBUILDDIR)profiled/t_vertex.o \
+                  $(MESATNLBUILDDIR)profiled/t_vertex_generic.o \
+                  $(MESATNLBUILDDIR)profiled/t_vertex_sse.o \
+                  $(MESATNLBUILDDIR)profiled/t_vp_build.o \
+		  $(MESATNLBUILDDIR)profiled/t_vtx_api.o \
+		  $(MESATNLBUILDDIR)profiled/t_vtx_eval.o \
+		  $(MESATNLBUILDDIR)profiled/t_vtx_exec.o \
+		  $(MESATNLBUILDDIR)profiled/t_vtx_generic.o
+
+#if defined(i386Architecture) && MesaUseX86Asm
+ MESA_TNL_POBJS += $(MESATNLBUILDDIR)profiled/t_vtx_x86.o \
+		  $(MESATNLBUILDDIR)profiled/t_vtx_x86_gcc.o
+#endif
+
diff --git a/nx-X11/lib/GL/mesa/tnl_dd/Imakefile b/nx-X11/lib/GL/mesa/tnl_dd/Imakefile
new file mode 100644
index 000000000..93b8c8877
--- /dev/null
+++ b/nx-X11/lib/GL/mesa/tnl_dd/Imakefile
@@ -0,0 +1,63 @@
+XCOMM $XFree86: xc/lib/GL/mesa/src/tnl_dd/Imakefile,v 1.6 2002/11/25 12:58:55 tsi Exp $
+
+#include <Threads.tmpl>
+
+/*
+ * Need both shared and unshared Mesa objects in the following cases:
+ *   GlxDriverUsesMesa
+ *   GlxBuiltInXMesa
+ *   BuildOSMesaLib
+ *
+ * In other cases, only the shared version is needed to link in to loadable
+ * driver modules.
+ */
+
+#if GlxDriverUsesMesa || GlxBuiltInXMesa || BuildOSMesaLib
+#define DoNormalLib (NormalLibGlx || SharedLibGlxWithoutPIC)
+#define DoSharedLib (SharedLibGlx && !SharedLibGlxWithoutPIC)
+#define DoExtraLib SharedLibGlx
+#define DoDebugLib DebugLibGlx
+#define DoProfileLib ProfileLibGlx
+#else
+#define DoNormalLib SharedLibGlxWithoutPIC
+#define DoSharedLib !SharedLibGlxWithoutPIC
+#define DoExtraLib NO
+#define DoDebugLib NO
+#define DoProfileLib NO
+#endif
+
+/* Large PIC tables needed for Solaris SPARC builds */
+#if (defined(SunArchitecture) && defined(SparcArchitecture))
+# define LargePICTable YES
+#endif
+
+#define MesaTnlDdBuildDir /**/
+#define NeedToLinkMesaSrc
+#include "Imakefile.inc"
+
+#if Malloc0ReturnsNull
+ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL
+#endif
+
+#if BuildXF86DRI
+  DRI_DEFINES = GlxDefines -DIN_DRI_DRIVER
+ DRI_INCLUDES = -I../../../dri -I../../../glx -I../../dri -I../../../include \
+		-I$(XINCLUDESRC) -I$(INCLUDESRC)/GL \
+		-I$(XF86OSSRC) -I$(SERVERSRC)/GL/dri
+#endif
+
+MESA_INCLUDES = -I$(MESASRCDIR)/src \
+		-I$(MESASRCDIR)/src/math \
+		-I$(MESASRCDIR)/src/tnl_dd \
+		-I$(MESASRCDIR)/include \
+		-I../../../include
+
+     INCLUDES = $(MESA_INCLUDES) $(DRI_INCLUDES)
+
+      DEFINES = $(ALLOC_DEFINES) $(DRI_DEFINES) $(ASM_DEFS) $(MATHDEF)
+
+#include <Library.tmpl>
+
+LibraryObjectRule()
+
+DependTarget()
diff --git a/nx-X11/lib/GL/mesa/tnl_dd/Imakefile.inc b/nx-X11/lib/GL/mesa/tnl_dd/Imakefile.inc
new file mode 100644
index 000000000..8d5d3da2d
--- /dev/null
+++ b/nx-X11/lib/GL/mesa/tnl_dd/Imakefile.inc
@@ -0,0 +1,40 @@
+XCOMM $XFree86: xc/lib/GL/mesa/src/tnl_dd/Imakefile.inc,v 1.1tsi Exp $
+
+#ifndef MesaTnlDdBuildDir
+#define MesaTnlDdBuildDir $(GLXLIBSRC)/mesa/tnl_dd/
+#endif
+
+MESATNLDDBUILDDIR = MesaTnlDdBuildDir
+
+ MESA_TNL_DD_SRCS = $(MESATNLDDBUILDDIR)t_dd.c \
+		    $(MESATNLDDBUILDDIR)t_dd_vb.c
+
+#ifdef NeedToLinkMesaSrc
+LinkSourceFile(t_dd.c, $(MESASRCDIR)/src/mesa/tnl_dd)
+LinkSourceFile(t_dd_vb.c, $(MESASRCDIR)/src/mesa/tnl_dd)
+LinkSourceFile(t_dd_dmatmp2.h, $(MESASRCDIR)/src/mesa/tnl_dd)
+LinkSourceFile(t_dd_dmatmp.h, $(MESASRCDIR)/src/mesa/tnl_dd)
+LinkSourceFile(t_dd_rendertmp.h, $(MESASRCDIR)/src/mesa/tnl_dd)
+LinkSourceFile(t_dd_triemit.h, $(MESASRCDIR)/src/mesa/tnl_dd)
+LinkSourceFile(t_dd_tritmp.h, $(MESASRCDIR)/src/mesa/tnl_dd)
+LinkSourceFile(t_dd_unfilled.h, $(MESASRCDIR)/src/mesa/tnl_dd)
+LinkSourceFile(t_dd_vbtmp.h, $(MESASRCDIR)/src/mesa/tnl_dd)
+LinkSourceFile(t_dd_vertex.h, $(MESASRCDIR)/src/mesa/tnl_dd)
+#endif
+
+ MESA_TNL_DD_OBJS = $(MESATNLDDBUILDDIR)t_dd.o \
+		    $(MESATNLDDBUILDDIR)t_dd_vb.o
+
+#if defined(DoSharedLib) && DoSharedLib
+MESA_TNL_DD_UOBJS = $(MESATNLDDBUILDDIR)unshared/t_dd.o \
+		    $(MESATNLDDBUILDDIR)unshared/t_dd_vb.o
+#else
+MESA_TNL_DD_UOBJS = $(MESA_TNL_DD_OBJS)
+#endif
+
+MESA_TNL_DD_DOBJS = $(MESATNLDDBUILDDIR)debugger/t_dd.o \
+		    $(MESATNLDDBUILDDIR)debugger/t_dd_vb.o
+
+MESA_TNL_DD_POBJS = $(MESATNLDDBUILDDIR)profiled/t_dd.o \
+		    $(MESATNLDDBUILDDIR)profiled/t_dd_vb.o
+
diff --git a/nx-X11/lib/GL/mesa/x86/Imakefile b/nx-X11/lib/GL/mesa/x86/Imakefile
new file mode 100644
index 000000000..543c05143
--- /dev/null
+++ b/nx-X11/lib/GL/mesa/x86/Imakefile
@@ -0,0 +1,108 @@
+XCOMM $XFree86: xc/lib/GL/mesa/src/X86/Imakefile,v 1.23 2002/07/14 17:08:16 alanh Exp $
+
+/*
+ * Need both shared and unshared Mesa objects in the following cases:
+ *   GlxDriverUsesMesa
+ *   GlxBuiltInXMesa
+ *   BuildOSMesaLib
+ *
+ * In other cases, only the shared version is needed to link in to loadable
+ * driver modules.
+ */
+
+#if GlxDriverUsesMesa || GlxBuiltInXMesa || BuildOSMesaLib
+#define DoNormalLib (NormalLibGlx || SharedLibGlxWithoutPIC)
+#define DoSharedLib (SharedLibGlx && !SharedLibGlxWithoutPIC)
+#define DoExtraLib SharedLibGlx
+#define DoDebugLib DebugLibGlx
+#define DoProfileLib ProfileLibGlx
+#else
+#define DoNormalLib SharedLibGlxWithoutPIC
+#define DoSharedLib !SharedLibGlxWithoutPIC
+#define DoExtraLib NO
+#define DoDebugLib NO
+#define DoProfileLib NO
+#endif
+
+
+#if Malloc0ReturnsNull
+ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL
+#endif
+
+#define MesaX86BuildDir /**/
+#define NeedToLinkMesaSrc
+#include "Imakefile.inc"
+
+      DEFINES = $(ALLOC_DEFINES) GlxDefines -DIN_DRI_DRIVER $(MESA_ASM_DEFINES)
+     INCLUDES = /*-I$(INCLUDESRC) -I$(EXTINCSRC)*/ -I$(MESASRCDIR)/src/mesa \
+		-I$(MESASRCDIR)/include \
+		-I$(GLXLIBSRC)/include \
+		-I$(MESASRCDIR)/src/mesa/main \
+		-I$(MESASRCDIR)/src/mesa/x86 \
+		-I$(MESASRCDIR)/src/mesa/glapi
+
+         SRCS = $(MESA_ASM_SRCS) gen_matypes.c
+         OBJS = $(MESA_ASM_OBJS)
+
+#include <Library.tmpl>
+
+LibraryObjectRule()
+
+STD_CPP_DEFINES = StandardDefines $(PROJECT_DEFINES)
+
+SubdirLibraryRule($(OBJS))
+NormalLintTarget($(SRCS))
+
+ObjectFromAsmSource(common_x86_asm, NullParameter)
+ObjectFromAsmSource(read_rgba_span_x86, NullParameter)
+ObjectFromAsmSource(x86_cliptest, NullParameter)
+ObjectFromAsmSource(x86_xform2, NullParameter)
+ObjectFromAsmSource(x86_xform3, NullParameter)
+ObjectFromAsmSource(x86_xform4, NullParameter)
+
+#if MesaUseMMX
+ObjectFromAsmSource(mmx_blend, NullParameter)
+#endif
+
+#if MesaUse3DNow
+ObjectFromAsmSource(3dnow_normal, NullParameter)
+ObjectFromAsmSource(3dnow_xform1, NullParameter)
+ObjectFromAsmSource(3dnow_xform2, NullParameter)
+ObjectFromAsmSource(3dnow_xform3, NullParameter)
+ObjectFromAsmSource(3dnow_xform4, NullParameter)
+#endif
+
+#if MesaUseSSE
+ObjectFromAsmSource(sse_normal, NullParameter)
+ObjectFromAsmSource(sse_xform1, NullParameter)
+ObjectFromAsmSource(sse_xform2, NullParameter)
+ObjectFromAsmSource(sse_xform3, NullParameter)
+ObjectFromAsmSource(sse_xform4, NullParameter)
+#endif
+
+LinkSourceFile(gen_matypes.c, $(MESASRCDIR)/src/mesa/x86)
+
+#if CrossCompiling
+HOST_CFLAGS=$(TOP_INCLUDES) $(INCLUDES) $(BOOTSTRAPCFLAGS) \
+	$(CROSSCOMPILEDEFINES) $(CROSSCOMPILEBOOTSTRAPDEFINES)
+#else
+HOST_CFLAGS=$(CFLAGS)
+#endif
+
+MATYPES = ./gen_matypes
+
+matypes.h: gen_matypes.c
+	RemoveFiles($@ HostProgramTargetName(gen_matypes))
+	-HostLinkRule(HostProgramTargetName(gen_matypes),$(HOST_CFLAGS) $(LOCAL_LDFLAGS),gen_matypes.c,$(LDLIBS))
+	RunProgram(MATYPES,> matypes_h)
+	$(MV) matypes_h $@
+	RemoveFiles(HostProgramTargetName(gen_matypes))
+
+includes:: matypes.h
+
+depend:: matypes.h
+
+clean::
+	RemoveFiles(matypes.h HostProgramTargetName(gen_matypes))
+
+DependTarget()
diff --git a/nx-X11/lib/GL/mesa/x86/Imakefile.inc b/nx-X11/lib/GL/mesa/x86/Imakefile.inc
new file mode 100644
index 000000000..b21c6f659
--- /dev/null
+++ b/nx-X11/lib/GL/mesa/x86/Imakefile.inc
@@ -0,0 +1,217 @@
+XCOMM $XFree86: xc/lib/GL/mesa/src/X86/Imakefile.inc,v 1.5 2002/11/14 21:01:16 tsi Exp $
+
+#ifndef MesaX86BuildDir
+#define MesaX86BuildDir $(GLXLIBSRC)/mesa/x86/
+#endif
+
+MESAX86BUILDDIR = MesaX86BuildDir
+
+MESA_X86_SRCS = $(MESAX86BUILDDIR)common_x86.c \
+		$(MESAX86BUILDDIR)common_x86_asm.S \
+		$(MESAX86BUILDDIR)glapi_x86.S \
+                $(MESAX86BUILDDIR)read_rgba_span_x86.S \
+		$(MESAX86BUILDDIR)x86.c \
+		$(MESAX86BUILDDIR)x86_cliptest.S \
+		$(MESAX86BUILDDIR)x86_xform2.S \
+		$(MESAX86BUILDDIR)x86_xform3.S \
+		$(MESAX86BUILDDIR)x86_xform4.S \
+                $(MESAX86BUILDDIR)x86sse.c
+
+#ifdef NeedToLinkMesaSrc
+LinkSourceFile(common_x86.c, $(MESASRCDIR)/src/mesa/x86)
+LinkSourceFile(common_x86_asm.S, $(MESASRCDIR)/src/mesa/x86)
+LinkSourceFile(glapi_x86.S, $(MESASRCDIR)/src/mesa/x86)
+LinkSourceFile(read_rgba_span_x86.S, $(MESASRCDIR)/src/mesa/x86)
+LinkSourceFile(read_rgba_span_x86.h, $(MESASRCDIR)/src/mesa/x86)
+LinkSourceFile(x86.c, $(MESASRCDIR)/src/mesa/x86)
+LinkSourceFile(x86_cliptest.S, $(MESASRCDIR)/src/mesa/x86)
+LinkSourceFile(x86_xform2.S, $(MESASRCDIR)/src/mesa/x86)
+LinkSourceFile(x86_xform3.S, $(MESASRCDIR)/src/mesa/x86)
+LinkSourceFile(x86_xform4.S, $(MESASRCDIR)/src/mesa/x86)
+LinkSourceFile(x86sse.c, $(MESASRCDIR)/src/mesa/x86/rtasm)
+LinkSourceFile(x86sse.h, $(MESASRCDIR)/src/mesa/x86/rtasm)
+#endif
+
+MESA_X86_OBJS = $(MESAX86BUILDDIR)common_x86.o \
+		$(MESAX86BUILDDIR)common_x86_asm.o \
+                $(MESAX86BUILDDIR)read_rgba_span_x86.o \
+		$(MESAX86BUILDDIR)x86.o \
+		$(MESAX86BUILDDIR)x86_cliptest.o \
+		$(MESAX86BUILDDIR)x86_xform2.o \
+		$(MESAX86BUILDDIR)x86_xform3.o \
+		$(MESAX86BUILDDIR)x86_xform4.o \
+                $(MESAX86BUILDDIR)x86sse.o
+
+#if defined(DoSharedLib) && DoSharedLib
+MESA_X86_UOBJS = $(MESAX86BUILDDIR)unshared/common_x86.o \
+		$(MESAX86BUILDDIR)common_x86_asm.o \
+                $(MESAX86BUILDDIR)read_rgba_span_x86.o \
+		$(MESAX86BUILDDIR)unshared/x86.o \
+		$(MESAX86BUILDDIR)x86_cliptest.o \
+		$(MESAX86BUILDDIR)x86_xform2.o \
+		$(MESAX86BUILDDIR)x86_xform3.o \
+		$(MESAX86BUILDDIR)x86_xform4.o \
+                $(MESAX86BUILDDIR)x86sse.o
+#else
+MESA_X86_UOBJS = $(MESA_X86_OBJS)
+#endif
+
+MESA_X86_DOBJS = $(MESAX86BUILDDIR)debugger/common_x86.o \
+		$(MESAX86BUILDDIR)common_x86_asm.o \
+                $(MESAX86BUILDDIR)read_rgba_span_x86.o \
+		$(MESAX86BUILDDIR)debugger/x86.o \
+		$(MESAX86BUILDDIR)x86_cliptest.o \
+		$(MESAX86BUILDDIR)x86_xform2.o \
+		$(MESAX86BUILDDIR)x86_xform3.o \
+		$(MESAX86BUILDDIR)x86_xform4.o \
+                $(MESAX86BUILDDIR)x86sse.o
+
+MESA_X86_POBJS = $(MESAX86BUILDDIR)profiled/common_x86.o \
+		$(MESAX86BUILDDIR)common_x86_asm.o \
+                $(MESAX86BUILDDIR)read_rgba_span_x86.o \
+		$(MESAX86BUILDDIR)profiled/x86.o \
+		$(MESAX86BUILDDIR)x86_cliptest.o \
+		$(MESAX86BUILDDIR)x86_xform2.o \
+		$(MESAX86BUILDDIR)x86_xform3.o \
+		$(MESAX86BUILDDIR)x86_xform4.o \
+                $(MESAX86BUILDDIR)x86sse.o
+
+MESA_X86_DEFS = -DUSE_X86_ASM
+
+
+#if MesaUseMMX
+MESA_MMX_SRCS = $(MESAX86BUILDDIR)mmx_blend.S
+
+#ifdef NeedToLinkMesaSrc
+LinkSourceFile(mmx_blend.S, $(MESASRCDIR)/src/mesa/x86)
+#endif
+
+MESA_MMX_OBJS = $(MESAX86BUILDDIR)mmx_blend.o
+
+MESA_MMX_UOBJS = $(MESA_MMX_OBJS)
+MESA_MMX_DOBJS = $(MESA_MMX_OBJS)
+MESA_MMX_POBJS = $(MESA_MMX_OBJS)
+
+MESA_MMX_DEFS = -DUSE_MMX_ASM
+#endif
+
+#if MesaUse3DNow
+MESA_3DNOW_SRCS = $(MESAX86BUILDDIR)3dnow.c \
+		$(MESAX86BUILDDIR)3dnow_normal.S \
+		$(MESAX86BUILDDIR)3dnow_xform1.S \
+		$(MESAX86BUILDDIR)3dnow_xform2.S \
+		$(MESAX86BUILDDIR)3dnow_xform3.S \
+		$(MESAX86BUILDDIR)3dnow_xform4.S
+
+#ifdef NeedToLinkMesaSrc
+LinkSourceFile(3dnow.c, $(MESASRCDIR)/src/mesa/x86)
+LinkSourceFile(3dnow_normal.S, $(MESASRCDIR)/src/mesa/x86)
+LinkSourceFile(3dnow_xform1.S, $(MESASRCDIR)/src/mesa/x86)
+LinkSourceFile(3dnow_xform2.S, $(MESASRCDIR)/src/mesa/x86)
+LinkSourceFile(3dnow_xform3.S, $(MESASRCDIR)/src/mesa/x86)
+LinkSourceFile(3dnow_xform4.S, $(MESASRCDIR)/src/mesa/x86)
+#endif
+MESA_3DNOW_OBJS = $(MESAX86BUILDDIR)3dnow.o \
+		$(MESAX86BUILDDIR)3dnow_normal.o \
+		$(MESAX86BUILDDIR)3dnow_xform1.o \
+		$(MESAX86BUILDDIR)3dnow_xform2.o \
+		$(MESAX86BUILDDIR)3dnow_xform3.o \
+		$(MESAX86BUILDDIR)3dnow_xform4.o
+
+#if defined(DoSharedLib) && DoSharedLib
+MESA_3DNOW_UOBJS = $(MESAX86BUILDDIR)unshared/3dnow.o \
+		$(MESAX86BUILDDIR)3dnow_normal.o \
+		$(MESAX86BUILDDIR)3dnow_xform1.o \
+		$(MESAX86BUILDDIR)3dnow_xform2.o \
+		$(MESAX86BUILDDIR)3dnow_xform3.o \
+		$(MESAX86BUILDDIR)3dnow_xform4.o
+#else
+MESA_3DNOW_UOBJS = $(MESA_3DNOW_OBJS)
+#endif
+
+MESA_3DNOW_DOBJS = $(MESAX86BUILDDIR)debugger/3dnow.o \
+		$(MESAX86BUILDDIR)3dnow_normal.o \
+		$(MESAX86BUILDDIR)3dnow_xform1.o \
+		$(MESAX86BUILDDIR)3dnow_xform2.o \
+		$(MESAX86BUILDDIR)3dnow_xform3.o \
+		$(MESAX86BUILDDIR)3dnow_xform4.o
+
+MESA_3DNOW_POBJS = $(MESAX86BUILDDIR)profiled/3dnow.o \
+		$(MESAX86BUILDDIR)3dnow_normal.o \
+		$(MESAX86BUILDDIR)3dnow_xform1.o \
+		$(MESAX86BUILDDIR)3dnow_xform2.o \
+		$(MESAX86BUILDDIR)3dnow_xform3.o \
+		$(MESAX86BUILDDIR)3dnow_xform4.o
+
+MESA_3DNOW_DEFS = -DUSE_3DNOW_ASM
+#endif
+
+#if MesaUseSSE
+MESA_SSE_SRCS = $(MESAX86BUILDDIR)sse.c \
+		$(MESAX86BUILDDIR)sse_normal.S \
+		$(MESAX86BUILDDIR)sse_xform1.S \
+		$(MESAX86BUILDDIR)sse_xform2.S \
+		$(MESAX86BUILDDIR)sse_xform3.S \
+		$(MESAX86BUILDDIR)sse_xform4.S
+
+#ifdef NeedToLinkMesaSrc
+LinkSourceFile(sse.c, $(MESASRCDIR)/src/mesa/x86)
+LinkSourceFile(sse_normal.S, $(MESASRCDIR)/src/mesa/x86)
+LinkSourceFile(sse_xform1.S, $(MESASRCDIR)/src/mesa/x86)
+LinkSourceFile(sse_xform2.S, $(MESASRCDIR)/src/mesa/x86)
+LinkSourceFile(sse_xform3.S, $(MESASRCDIR)/src/mesa/x86)
+LinkSourceFile(sse_xform4.S, $(MESASRCDIR)/src/mesa/x86)
+#endif
+
+MESA_SSE_OBJS = $(MESAX86BUILDDIR)sse.o \
+		$(MESAX86BUILDDIR)sse_normal.o \
+		$(MESAX86BUILDDIR)sse_xform1.o \
+		$(MESAX86BUILDDIR)sse_xform2.o \
+		$(MESAX86BUILDDIR)sse_xform3.o \
+		$(MESAX86BUILDDIR)sse_xform4.o
+
+#if defined(DoSharedLib) && DoSharedLib
+MESA_SSE_UOBJS = $(MESAX86BUILDDIR)unshared/sse.o \
+		$(MESAX86BUILDDIR)sse_normal.o \
+		$(MESAX86BUILDDIR)sse_xform1.o \
+		$(MESAX86BUILDDIR)sse_xform2.o \
+		$(MESAX86BUILDDIR)sse_xform3.o \
+		$(MESAX86BUILDDIR)sse_xform4.o
+#else
+MESA_SSE_UOBJS = $(MESA_SSE_OBJS)
+#endif
+
+MESA_SSE_DOBJS = $(MESAX86BUILDDIR)debugger/sse.o \
+		$(MESAX86BUILDDIR)sse_normal.o \
+		$(MESAX86BUILDDIR)sse_xform1.o \
+		$(MESAX86BUILDDIR)sse_xform2.o \
+		$(MESAX86BUILDDIR)sse_xform3.o \
+		$(MESAX86BUILDDIR)sse_xform4.o
+
+MESA_SSE_POBJS = $(MESAX86BUILDDIR)profiled/sse.o \
+		$(MESAX86BUILDDIR)sse_normal.o \
+		$(MESAX86BUILDDIR)sse_xform1.o \
+		$(MESAX86BUILDDIR)sse_xform2.o \
+		$(MESAX86BUILDDIR)sse_xform3.o \
+		$(MESAX86BUILDDIR)sse_xform4.o
+
+MESA_SSE_DEFS = -DUSE_SSE_ASM
+#endif
+
+MESA_ASM_SRCS = $(MESA_X86_SRCS) $(MESA_MMX_SRCS) $(MESA_3DNOW_SRCS) \
+		$(MESA_SSE_SRCS)
+
+MESA_ASM_OBJS = $(MESA_X86_OBJS) $(MESA_MMX_OBJS) $(MESA_3DNOW_OBJS) \
+		$(MESA_SSE_OBJS)
+
+MESA_ASM_UOBJS = $(MESA_X86_UOBJS) $(MESA_MMX_UOBJS) $(MESA_3DNOW_UOBJS) \
+		$(MESA_SSE_UOBJS)
+
+MESA_ASM_DOBJS = $(MESA_X86_DOBJS) $(MESA_MMX_DOBJS) $(MESA_3DNOW_DOBJS) \
+		$(MESA_SSE_DOBJS)
+
+MESA_ASM_POBJS = $(MESA_X86_POBJS) $(MESA_MMX_POBJS) $(MESA_3DNOW_POBJS) \
+		$(MESA_SSE_POBJS)
+
+MESA_ASM_DEFINES = $(MESA_X86_DEFS) $(MESA_MMX_DEFS) $(MESA_3DNOW_DEFS) $(MESA_SSE_DEFS)
+
author	Reinhard Tartler <siretart@tauware.de>	2011-10-10 17:43:39 +0200
committer	Reinhard Tartler <siretart@tauware.de>	2011-10-10 17:43:39 +0200
commit	f4092abdf94af6a99aff944d6264bc1284e8bdd4 (patch)
tree	2ac1c9cc16ceb93edb2c4382c088dac5aeafdf0f /nx-X11/lib/GL/mesa
parent	a840692edc9c6d19cd7c057f68e39c7d95eb767d (diff)
download	nx-libs-f4092abdf94af6a99aff944d6264bc1284e8bdd4.tar.gz nx-libs-f4092abdf94af6a99aff944d6264bc1284e8bdd4.tar.bz2 nx-libs-f4092abdf94af6a99aff944d6264bc1284e8bdd4.zip