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

31 files changed, 3271 insertions, 0 deletions

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