Merge branch 'sunweaver-pr/libglx-cleanup' into arctica-3.6.x

Attributes GH PR #40: https://github.com/ArcticaProject/nx-libs/pull/40

Merge branch 'sunweaver-pr/libglx-cleanup' into arctica-3.6.x
51b60ea7 · Mihai Moldovan · 5a64974c · 5cd80d27 · 51b60ea7 · 51b60ea7
Unverified Commit 51b60ea7 authored Jun 16, 2015 by Mihai Moldovan
73 changed files
--- a/nx-X11/config/cf/X11.tmpl
+++ b/nx-X11/config/cf/X11.tmpl
@@ -289,23 +289,10 @@ XORGRELSTRING = XorgManVersionString
 #endif
 #ifndef BuildGlxExt
 #define BuildGlxExt		NO
-#else
-#if     BuildGlxExt && !defined(XFree86Version) && !defined(XorgVersion)
-#undef  BuildXF86DRI
-#undef  BuildXF86DRIDriverSupport
-#define BuildXF86DRI			NO
-#define BuildXF86DRIDriverSupport	NO
-#endif
-#endif
-#ifndef BuildGLXLibrary
-#define BuildGLXLibrary		(BuildGlxExt && !BuildServersOnly)
 #endif
 #ifndef BuildOSMesaLib
 #define BuildOSMesaLib		BuildGlxExt
 #endif
-#ifndef BuildXDriInfo
-#define BuildXDriInfo		(BuildGLXLibrary && !BuildServersOnly)
-#endif
 #ifndef BuildXF86RushExt
 #define BuildXF86RushExt	NO
 #endif
@@ -1547,52 +1534,6 @@ ProjectUnsharedLibReferences(XONLY,NX_X11,$(XLIBSRC),XBuildLibDir)
 #define ProfileLibXcomposite	NO
 #endif

-#if BuildGLXLibrary
-#ifndef SharedLibGlx
-#define SharedLibGlx		HasSharedLibraries
-#endif
-#ifndef NormalLibGlx
-#define NormalLibGlx		(!SharedLibX11 | ForceNormalLib)
-#endif
-#ifndef DebugLibGlx
-#define DebugLibGlx		NO
-#endif
-#ifndef ProfileLibGlx
-#define ProfileLibGlx		NO
-#endif
-#ifndef BuildLibGlxWithoutPIC
-#define BuildLibGlxWithoutPIC	NO
-#endif
-#if BuildLibGlxWithoutPIC && SharedLibGlx
-#define SharedLibGlxWithoutPIC	YES
-#else
-#define SharedLibGlxWithoutPIC	NO
-#endif
-#ifndef LinkGLToUsrLib
-#define LinkGLToUsrLib		NO
-#endif
-#if NothingOutsideProjectRoot
-#undef LinkGLToUsrLib
-#define LinkGLToUsrLib		NO
-#endif
-#ifndef LinkGLToUsrInclude
-#define LinkGLToUsrInclude	NO
-#endif
-#if NothingOutsideProjectRoot
-#undef LinkGLToUsrInclude
-#define LinkGLToUsrInclude	NO
-#endif
-#else
-#undef  SharedLibGlx
-#define SharedLibGlx		NO
-#undef  NormalLibGlx
-#define NormalLibGlx		NO
-#undef  DebugLibGlx
-#define DebugLibGlx		NO
-#undef  ProfileLibGlx
-#define ProfileLibGlx		NO
-#endif
-
 #ifndef SharedLibXext
 #define SharedLibXext HasSharedLibraries
 #endif
@@ -1669,16 +1610,6 @@ SharedLibReferences(XINERAMA,NX_Xinerama,$(XINERAMALIBSRC),SOXINERAMAREV,SharedX
 ProjectUnsharedLibReferences(XINERAMA,NX_Xinerama,$(XINERAMALIBSRC),XBuildLibDir)
 #endif

-    GLXLIBSRC = $(LIBSRC)/GL
-#if SharedLibGlx
-#ifndef SharedGlxRev
-#define SharedGlxRev 1.2
-#endif
-SharedLibReferences(GLX,NX_GL,$(GLXLIBSRC),SOGLREV,SharedGlxRev)
-#else
-ProjectUnsharedLibReferences(GLX,NX_GL,$(GLXLIBSRC),XBuildLibDir)
-#endif
-
    XRENDERLIBSRC = $(LIBSRC)/Xrender
 #if SharedLibXrender
 #ifndef SharedXrenderRev

--- a/nx-X11/config/cf/host.def
+++ b/nx-X11/config/cf/host.def
@@ -165,11 +165,6 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $
 				wacom void magictouch aiptek
 */

-/* To enable building of development DRI drivers (insecure, or not
- * useful on the chosen architecture, uncomment this define.
-#define BuildDevelDRIDrivers YES
- */
-
 /*
 * To use the deprecated, old keyboard driver, uncomment this.  But
 * even better, make the new keyboard driver (hw/xfree86/input/keyboard)

--- a/nx-X11/config/cf/linux.cf
+++ b/nx-X11/config/cf/linux.cf
@@ -107,12 +107,8 @@ XCOMM binutils:	(LinuxBinUtilsMajorVersion)
 /* the relative symlink created by this rule causes problems for us */
 # endif /* !defined(NothingOutsideProjectRoot) || !NothingOutsideProjectRoot */
 # define SharedLibXdmGreet	NO
-# define LinkGLToUsrInclude	NO
-# define LinkGLToUsrLib		NO
 # define FSUseSyslog		YES

-# define BuildLibGlxWithoutPIC  NO
-
 # define DriverManSuffix       4x
 # define DriverManDir          $(MANSOURCEPATH)4

@@ -325,58 +321,6 @@ XCOMM binutils:	(LinuxBinUtilsMajorVersion)
 # endif
 #endif

-/* The DRM module requires kernel services that appeared in late 2.1.x
-   kernels and are known to be present in 2.2.x kernels. */
-#ifndef BuildXF86DRI
-#  if defined(AlphaArchitecture)
-#    define BuildXF86DRI	YES
-#  elif defined(Arm32Architecture)
-#    define BuildXF86DRI	NO
-#  elif defined(HPArchitecture)
-#    define BuildXF86DRI	YES
-#  elif defined(i386Architecture)
-#    if (defined(__linux__) && (OSMajorVersion > 2 || (OSMajorVersion == 2 && \
-        OSMinorVersion >= 2))) || \
-        defined(__FreeBSD_kernel__)
-#      define BuildXF86DRI	YES
-#    else
-#      define BuildXF86DRI	NO
-#    endif
-#  elif defined(ia64Architecture)
-#    define BuildXF86DRI	YES
-#  elif defined(Mc68020Architecture)
-#    define BuildXF86DRI	NO
-#  elif defined(MipsArchitecture)
-#    define BuildXF86DRI	NO
-#  elif defined(PpcArchitecture)
-#    define BuildXF86DRI	YES
-#  elif defined(Ppc64Architecture)
-#    define BuildXF86DRI	NO
-#  elif defined(s390Architecture) || defined(s390xArchitecture)
-#    define BuildXF86DRI	NO
-#  elif defined(SparcArchitecture)
-#    define BuildXF86DRI	YES
-#  elif defined(SuperHArchitecture)
-#    define BuildXF86DRI	NO
-#  elif defined(AMD64Architecture)
-#    define BuildXF86DRI	YES
-#  else
-#    define BuildXF86DRI	NO
-#  endif
-#endif
-
-/*
- * Build shared libGL and the DRI modules without -fPIC on some architectures.
- * This improves performance.
- */
-#ifndef BuildLibGlxWithoutPIC
-# if BuildXF86DRI
-#  if defined(i386Architecture)
-#   define BuildLibGlxWithoutPIC	YES
-#  endif
-# endif
-#endif
-
 #ifndef HasAgpGart
 #  if defined(i386Architecture) || defined(ia64Architecture) || defined(AMD64Architecture)
     /* The AGPGART header file is included in os-support/linux, which
@@ -1006,14 +950,6 @@ XCOMM binutils:	(LinuxBinUtilsMajorVersion)
 # define StaticLibrary(libpath,libname) -Wl,-Bstatic Concat(-L,libpath) Concat(-l,libname) -Wl,-Bdynamic
 #endif

-#ifndef LinkGLToUsrLib
-# define LinkGLToUsrLib		YES
-#endif
-# ifndef LinkGLToUsrInclude
-# define LinkGLToUsrInclude	YES
-#endif
-
-
 #define HasGnuMake		YES

 #define MakeNamedTargetSubdir(dir,flags,subname)\

--- a/nx-X11/config/cf/lnxLib.tmpl
+++ b/nx-X11/config/cf/lnxLib.tmpl
@@ -12,12 +12,7 @@ XCOMM $XFree86: xc/config/cf/lnxLib.tmpl,v 3.19 2003/10/15 22:47:48 herrb Exp $
 #define SharedXrenderReqs $(LDPRELIB) $(XLIB)
 #define SharedXtstReqs	  $(LDPRELIB) $(XLIB)

-#if GlxUseBuiltInDRIDriver
-#define ExtraSharedGLReqs /**/
-#else
-#define ExtraSharedGLReqs -ldl
-#endif
-#define SharedGLReqs	  $(LDPRELIB) $(XLIB) ExtraSharedGLReqs
+#define SharedGLReqs	  $(LDPRELIB) $(XLIB) -ldl

 #define SharedXineramaReqs	$(LDPRELIB) $(XLIB)
 #define SharedXxf86dgaReqs	$(LDPRELIB) $(XLIB)

--- a/nx-X11/config/cf/xfree86.cf
+++ b/nx-X11/config/cf/xfree86.cf
@@ -346,24 +346,6 @@ XCOMM $Xorg: xfree86.cf,v 1.4 2000/08/17 19:41:49 cpqbld Exp $
 				dummy XF86OSCardDrivers XF86ExtraCardDrivers
 # endif

-/*
- * DRI drivers under development, or drivers included on this platform
- * only for build testing.
- */
-# ifndef DevelDRIDrivers
-#  if XFree86Devel
-#   define DevelDRIDrivers	ffb
-#  else
-#   define DevelDRIDrivers	/**/
-#  endif
-# endif
-
-# ifndef DriDrivers
-#  define DriDrivers		gamma i810 i830 mga r128 radeon r200 \
-				sis tdfx DevelDRIDrivers
-# endif
-#endif
-
 #if defined(AMD64Architecture)
 # ifndef XF86Server
 #  define XF86Server		YES
@@ -446,13 +428,6 @@ XCOMM $Xorg: xfree86.cf,v 1.4 2000/08/17 19:41:49 cpqbld Exp $
 				vga dummy fbdev vesa
 # endif

-/* DRI tdfx driver needs Glide, which is not available for AMD64 */
-# define TdfxDriDriver		/**/
-
-# define DevelDRIDrivers	/**/
-
-# define DriDrivers		gamma i810 mga r128 radeon r200 \
-				TdfxDriDriver DevelDRIDrivers
 #endif /*AMD64Arcitecture*/

 /* SPARC and UltraSPARC drivers */
@@ -555,10 +530,6 @@ XCOMM $Xorg: xfree86.cf,v 1.4 2000/08/17 19:41:49 cpqbld Exp $
 				XF86OSCardDrivers XF86ExtraCardDrivers \
 				DevelDrivers
 # endif
-# ifndef DriDrivers
-#  define DriDrivers		ffb
-# endif
-
 #endif

 /* Sparc64 Drivers */
@@ -653,10 +624,6 @@ XCOMM $Xorg: xfree86.cf,v 1.4 2000/08/17 19:41:49 cpqbld Exp $
 				DevelDrivers \
 				XF86OSCardDrivers XF86ExtraCardDrivers
 # endif
-# define TdfxDriDriver		/**/
-# ifndef DriDrivers
-#  define DriDrivers		/**/
-# endif
 #endif

 /* MIPS drivers */
@@ -833,9 +800,6 @@ XCOMM $Xorg: xfree86.cf,v 1.4 2000/08/17 19:41:49 cpqbld Exp $
 				savage nv cirrus DevelDrivers siliconmotion  \
 				vga XF86OSCardDrivers XF86ExtraCardDrivers
 # endif
-# ifndef DriDrivers
-#  define DriDrivers		gamma tdfx mga r128 radeon r200 /*sis*/
-# endif
 #endif

 /*
@@ -929,9 +893,6 @@ XCOMM $Xorg: xfree86.cf,v 1.4 2000/08/17 19:41:49 cpqbld Exp $
 				DevelDrivers vga \
 				XF86OSCardDrivers XF86ExtraCardDrivers
 # endif
-# ifndef DriDrivers
-#  define DriDrivers		gamma tdfx mga r128 radeon r200
-# endif
 #endif

 /*
@@ -1021,14 +982,6 @@ XCOMM $Xorg: xfree86.cf,v 1.4 2000/08/17 19:41:49 cpqbld Exp $
 				DevelDrivers vga \
 				XF86OSCardDrivers XF86ExtraCardDrivers
 # endif
-# if HasGlide3
-#  define TdfxDriDriver		tdfx
-# else
-#  define TdfxDriDriver		/**/
-# endif
-# ifndef DriDrivers
-#  define DriDrivers		gamma tdfx mga r128 radeon r200
-# endif
 #endif

 /* SuperH drivers */
@@ -1191,14 +1144,6 @@ XCOMM $Xorg: xfree86.cf,v 1.4 2000/08/17 19:41:49 cpqbld Exp $
 				DevelDrivers \
 				XF86OSCardDrivers XF86ExtraCardDrivers
 # endif
-# if HasGlide3
-#  define TdfxDriDriver		
-# else
-#  define TdfxDriDriver		/**/
-# endif
-# ifndef DriDrivers
-#  define DriDrivers		gamma r128
-# endif
 #endif

 /*
@@ -1272,198 +1217,29 @@ IPLAN2P8_DEFS = -DUSE_IPLAN2P8
 #  define BuildGlxExt	YES
 #endif

-#ifndef BuildXF86DRI
-#define BuildXF86DRI	NO
-#endif
-
-#ifndef GlxUseSGISI
-#define GlxUseSGISI	NO
-#endif
-
-#if BuildXF86DRI
-
-#ifndef BuildGLXLibrary
-#  if defined (BuildServersOnly) && BuildServersOnly
-#    define BuildGLXLibrary	NO
-#  else
-#    define BuildGLXLibrary	YES
-#  endif
-#endif
-
-/*
- * One and ONLY one of the GlxBuiltIn* drivers can be defined to be YES.
- * If more than one are defined, the compilation will fail with multiply
- * defined references of GLX and OpenGL functions.
- */
-
-/*
- * The first is a built-in driver that does software rendering client-side
- * and renders to the X server via Xlib.
- */
-
-#  ifndef GlxBuiltInXMesa
-#    define GlxBuiltInXMesa         NO
-#  endif
-
-/*
- * The rest are hardware-specific DRI drivers.
- */
-#  ifndef GlxBuiltInGamma
-#    define GlxBuiltInGamma        NO
-#  endif
-#  ifndef GlxBuiltInTdfx
-#    define GlxBuiltInTdfx         NO
-#  endif
-#  ifndef GlxBuiltInMga
-#    define GlxBuiltInMga          NO
-#  endif
-#  ifndef GlxBuiltInI810
-#    define GlxBuiltInI810         NO
-#  endif
-#  ifndef GlxBuiltInI830
-#    define GlxBuiltInI830         NO
-#  endif
-#  ifndef GlxBuiltInR128
-#    define GlxBuiltInR128         NO
-#  endif
-#  ifndef GlxBuiltInRadeon
-#    define GlxBuiltInRadeon       NO
-#  endif
-#  ifndef GlxBuiltInR200
-#    define GlxBuiltInR200         NO
-#  endif
-#  ifndef GlxBuiltInFfb
-#    define GlxBuiltInFfb          NO
-#  endif
-#  ifndef GlxBuiltInSIS
-#    define GlxBuiltInSIS          NO
-#  endif
-
-#  if GlxBuiltInTdfx || \
-      GlxBuiltInMga || \
-      GlxBuiltInI810 || \
-      GlxBuiltInI830 || \
-      GlxBuiltInR128 || \
-      GlxBuiltInRadeon || \
-      GlxBuiltInR200 || \
-      GlxBuiltInFfb || \
-      GlxBuiltInSIS
-#    define GlxDriverUsesMesa      YES
-#  else
-#    define GlxDriverUsesMesa      NO
-#  endif
-
-#  if GlxBuiltInGamma || \
-      GlxBuiltInTdfx || \
-      GlxBuiltInMga || \
-      GlxBuiltInI810 || \
-      GlxBuiltInI830 || \
-      GlxBuiltInR128 || \
-      GlxBuiltInRadeon || \
-      GlxBuiltInR200 || \
-      GlxBuiltInFfb || \
-      GlxBuiltInSIS
-#    define GlxUseBuiltInDRIDriver YES
-#    define DRIDynLoadDefines /**/
-#  else
-#    define GlxUseBuiltInDRIDriver NO
-#    define DRIDynLoadDefines -DGLX_USE_DLOPEN
-#  endif
-
-#  if GlxUseBuiltInDRIDriver
-#    undef DriDrivers
-#    if GlxBuiltInGamma
-#      define DriDrivers gamma
-#    endif
-#    if GlxBuiltInTdfx
-#      define DriDrivers tdfx
-#    endif
-#    if GlxBuiltInMga
-#      define DriDrivers mga
-#    endif
-#    if GlxBuiltInI810
-#      define DriDrivers i810
-#    endif
-#    if GlxBuiltInI830
-#      define DriDrivers i830
-#    endif
-#    if GlxBuiltInR128
-#      define DriDrivers r128
-#    endif
-#    if GlxBuiltInRadeon
-#      define DriDrivers radeon
-#    endif
-#    if GlxBuiltInR200
-#      define DriDrivers r200
-#    endif
-#    if GlxBuiltInSIS
-#      define DriDrivers sis
-#    endif
-#    if GlxBuiltInFfb
-#      define DriDrivers ffb
-#    endif
-#  endif
-
-#endif
-
-/*
- * This enables building DRI support into video drivers, which can be done
- * even on platforms that don't have functional DRI support.
- *
- * Defining BuildXF86DRIDriverSupport to YES will not work until we have a
- * separate set of defines set up for building driver-only support for the
- * DRI.
- */
-#ifndef BuildXF86DRIDriverSupport
-# define BuildXF86DRIDriverSupport NO
-#endif
-
 #if BuildGlxExt

-#  if BuildXF86DRI
-#    define DRIDefines -DXF86DRI -DGLX_DIRECT_RENDERING DRIDynLoadDefines
-#  else
-#    define DRIDefines /**/
-#  endif
-#  if defined(GlxUseSGISI) && GlxUseSGISI
-#    define GlxCoreLibDefines -DGLX_USE_SGI_SI
-#  else
-#    define GlxCoreLibDefines -DGLX_USE_MESA
-#  endif
+# define GlxCoreLibDefines -DGLX_USE_MESA

-#  if defined(SparcArchitecture)  \
+# if defined(SparcArchitecture)  \
   || defined (Sparc64Architecture) \
   || defined(ia64Architecture) \
   || defined(s390xArchitecture) \
   || defined(AMD64Architecture)
-#    define GlxArchDefines -D__GLX_ALIGN64
-#  elif defined(AlphaArchitecture)
+#   define GlxArchDefines -D__GLX_ALIGN64
+# elif defined(AlphaArchitecture)
 /* On the Alpha we need to ensure floating point accuracy for 3D */
-#    define GlxArchDefines -D__GLX_ALIGN64 -mieee
-#  elif defined(DarwinArchitecture)
+#   define GlxArchDefines -D__GLX_ALIGN64 -mieee
+# elif defined(DarwinArchitecture)
 /* GLX contains lots of uninitialized globals, which can upset Darwin */
-#    define GlxArchDefines -fno-common
-#  else
-#    define GlxArchDefines /**/
-#  endif
-
-#  ifndef GlxExtraDefines
-#    define GlxExtraDefines DRIDefines GlxCoreLibDefines GlxArchDefines
-#  endif
-
-#else
-
-/* If we are not building GLX, then make sure the DRI is not built */
-#  undef  BuildXF86DRI
-#  define BuildXF86DRI   NO
-#  undef  BuildXF86DRIDriverSupport
-#  define BuildXF86DRIDriverSupport NO
-
-#endif
+#   define GlxArchDefines -fno-common
+# else
+#   define GlxArchDefines /**/
+# endif

-#if !BuildXF86DRI
-# define GlxUseBuiltInDRIDriver NO	/* For libOSmesa */
-#endif
+# ifndef GlxExtraDefines
+#   define GlxExtraDefines GlxCoreLibDefines GlxArchDefines
+# endif

 # ifndef UseX86Emu
 #  define UseX86Emu		YES
@@ -1538,9 +1314,6 @@ IPLAN2P8_DEFS = -DUSE_IPLAN2P8
 #ifndef BuildXF86VidModeLibrary
 # define BuildXF86VidModeLibrary YES
 #endif
-#ifndef BuildGLXLibrary
-# define BuildGLXLibrary	YES
-#endif
 #endif

 /*

--- a/nx-X11/config/cf/xorg.cf
+++ b/nx-X11/config/cf/xorg.cf
@@ -270,13 +270,6 @@ NX_VERSION_CURRENT_STRING  = nxVersionString
 #define HasAgpGart NO
 #endif

-/* Some DRI drivers are disabled because they are either insecure or unusable on
- * this architecture.  This switch allows you to enable building these drivers.
- */
-#ifndef BuildDevelDRIDrivers
-#define BuildDevelDRIDrivers NO
-#endif
-
 /* The glide driver only works for the loadable server at the moment */
 #ifndef HasGlide2
 #define HasGlide2 NO
@@ -399,20 +392,6 @@ NX_VERSION_CURRENT_STRING  = nxVersionString
 				vesa vga \
 				dummy XF86OSCardDrivers XF86ExtraCardDrivers
 # endif
-
-# ifndef DevelDRIDrivers
-#  define DevelDRIDrivers	ffb mach64 unichrome
-# endif
-
-# ifndef DriDrivers
-#  ifndef ia64Architecture
-#   define i386DRIDrivers i810 i915 sis
-#  else
-   /* SiS is 64-bit unclean as of this writing. */
-#   define i386DRIDrivers /**/
-#  endif
-#  define DriDrivers		i386DRIDrivers mga r128 radeon r200 tdfx
-# endif
 #endif /* i386Architecture || ia64Architecture */

 #if defined(AMD64Architecture)
@@ -445,11 +424,6 @@ NX_VERSION_CURRENT_STRING  = nxVersionString
 				vga dummy vesa i810 vmware \
 				XF86OSCardDrivers XF86ExtraCardDrivers DevelDrivers
 # endif
-
-/* SiS is 64-bit unclean as of this writing. */
-# ifndef DriDrivers
-#  define DriDrivers		i915 mga r128 radeon r200 tdfx
-# endif
 #endif /*AMD64Arcitecture*/

 /* SPARC and UltraSPARC drivers */
@@ -500,10 +474,6 @@ NX_VERSION_CURRENT_STRING  = nxVersionString
 				DevelDrivers
 #  endif
 # endif
-# ifndef DriDrivers
-#  define DriDrivers		ffb
-# endif
-
 #endif

 /* Sparc64 Drivers */
@@ -584,13 +554,6 @@ NX_VERSION_CURRENT_STRING  = nxVersionString
 				vga dummy XF86OSCardDrivers \
 				XF86ExtraCardDrivers
 # endif
-/*
- *  Glide is available for Alpha, therefore build tdfx DRM module.
- *  SiS is 64-bit unclean as of this writing. 
- */  
-# ifndef DriDrivers
-#  define DriDrivers		tdfx mga r128 radeon r200
-# endif
 #endif /* AlphaArchitecture */

 /*
@@ -621,10 +584,6 @@ NX_VERSION_CURRENT_STRING  = nxVersionString
 				DevelDrivers vga dummy \
 				XF86OSCardDrivers XF86ExtraCardDrivers
 # endif
-/*  The tdfx driver needs Glide, which is not available for PPC. */
-# ifndef DriDrivers
-#  define DriDrivers		mga r128 radeon r200
-# endif
 #endif  /* PpcArchitecture || Mc68020Architecture */

 /*
@@ -651,9 +610,6 @@ NX_VERSION_CURRENT_STRING  = nxVersionString
 				DevelDrivers vga dummy \
 				XF86OSCardDrivers XF86ExtraCardDrivers
 # endif
-# ifndef DriDrivers
-#  define DriDrivers		mga r128 radeon r200
-# endif
 #endif

 /* SuperH drivers */
@@ -751,10 +707,6 @@ NX_VERSION_CURRENT_STRING  = nxVersionString
 				DevelDrivers \
 				XF86OSCardDrivers XF86ExtraCardDrivers
 # endif
-# define TdfxDriDriver		/**/
-# ifndef DriDrivers
-#  define DriDrivers		r128
-# endif
 #endif /* Ppc64Architecture */

 /*
@@ -828,205 +780,30 @@ IPLAN2P8_DEFS = -DUSE_IPLAN2P8
 #  define BuildGlxExt	YES
 #endif

-#ifndef BuildXF86DRI
-#define BuildXF86DRI	NO
-#endif
-
-#ifndef GlxUseSGISI
-#define GlxUseSGISI	NO
-#endif
-
-#if BuildXF86DRI
-
-#ifndef DriDrivers
-#define DriDrivers /**/
-#endif
-
-#ifndef DevelDRIDrivers
-#define DevelDRIDrivers /**/
-#endif
-
-#ifndef BuildGLXLibrary
-#  if defined (BuildServersOnly) && BuildServersOnly
-#    define BuildGLXLibrary	NO
-#  else
-#    define BuildGLXLibrary	YES
-#  endif
-#endif
-
-/*
- * One and ONLY one of the GlxBuiltIn* drivers can be defined to be YES.
- * If more than one are defined, the compilation will fail with multiply
- * defined references of GLX and OpenGL functions.
- */
-
-/*
- * The first is a built-in driver that does software rendering client-side
- * and renders to the X server via Xlib.
- */
-
-#  ifndef GlxBuiltInXMesa
-#    define GlxBuiltInXMesa         NO
-#  endif
-
-/*
- * The rest are hardware-specific DRI drivers.
- */
-#  ifndef GlxBuiltInGamma
-#    define GlxBuiltInGamma        NO
-#  endif
-#  ifndef GlxBuiltInTdfx
-#    define GlxBuiltInTdfx         NO
-#  endif
-#  ifndef GlxBuiltInMga
-#    define GlxBuiltInMga          NO
-#  endif
-#  ifndef GlxBuiltInI810
-#    define GlxBuiltInI810         NO
-#  endif
-#  ifndef GlxBuiltInI915
-#    define GlxBuiltInI915         NO
-#  endif
-#  ifndef GlxBuiltInR128
-#    define GlxBuiltInR128         NO
-#  endif
-#  ifndef GlxBuiltInRadeon
-#    define GlxBuiltInRadeon       NO
-#  endif
-#  ifndef GlxBuiltInR200
-#    define GlxBuiltInR200         NO
-#  endif
-#  ifndef GlxBuiltInFfb
-#    define GlxBuiltInFfb          NO
-#  endif
-#  ifndef GlxBuiltInSIS
-#    define GlxBuiltInSIS          NO
-#  endif
-
-#  if GlxBuiltInTdfx || \
-      GlxBuiltInMga || \
-      GlxBuiltInI810 || \
-      GlxBuiltInI915 || \
-      GlxBuiltInR128 || \
-      GlxBuiltInRadeon || \
-      GlxBuiltInR200 || \
-      GlxBuiltInFfb || \
-      GlxBuiltInSIS
-#    define GlxDriverUsesMesa      YES
-#  else
-#    define GlxDriverUsesMesa      NO
-#  endif
-
-#  if GlxBuiltInGamma || \
-      GlxBuiltInTdfx || \
-      GlxBuiltInMga || \
-      GlxBuiltInI810 || \
-      GlxBuiltInI915 || \
-      GlxBuiltInR128 || \
-      GlxBuiltInRadeon || \
-      GlxBuiltInR200 || \
-      GlxBuiltInFfb || \
-      GlxBuiltInSIS
-#    define GlxUseBuiltInDRIDriver YES
-#    define DRIDynLoadDefines /**/
-#  else
-#    define GlxUseBuiltInDRIDriver NO
-#    define DRIDynLoadDefines -DGLX_USE_DLOPEN
-#  endif
-
-#  if GlxUseBuiltInDRIDriver
-#    undef DriDrivers
-#    if GlxBuiltInGamma
-#      define DriDrivers gamma
-#    endif
-#    if GlxBuiltInTdfx
-#      define DriDrivers tdfx
-#    endif
-#    if GlxBuiltInMga
-#      define DriDrivers mga
-#    endif
-#    if GlxBuiltInI810
-#      define DriDrivers i810
-#    endif
-#    if GlxBuiltInI915
-#      define DriDrivers i915
-#    endif
-#    if GlxBuiltInR128
-#      define DriDrivers r128
-#    endif
-#    if GlxBuiltInRadeon
-#      define DriDrivers radeon
-#    endif
-#    if GlxBuiltInR200
-#      define DriDrivers r200
-#    endif
-#    if GlxBuiltInSIS
-#      define DriDrivers sis
-#    endif
-#    if GlxBuiltInFfb
-#      define DriDrivers ffb
-#    endif
-#  endif
-
-#endif
-
-/*
- * This enables building DRI support into video drivers, which can be done
- * even on platforms that don't have functional DRI support.
- *
- * Defining BuildXF86DRIDriverSupport to YES will not work until we have a
- * separate set of defines set up for building driver-only support for the
- * DRI.
- */
-#ifndef BuildXF86DRIDriverSupport
-# define BuildXF86DRIDriverSupport NO
-#endif
-
 #if BuildGlxExt

-#  if BuildXF86DRI
-#    define DRIDefines -DXF86DRI -DGLX_DIRECT_RENDERING DRIDynLoadDefines
-#  else
-#    define DRIDefines /**/
-#  endif
-#  if defined(GlxUseSGISI) && GlxUseSGISI
-#    define GlxCoreLibDefines -DGLX_USE_SGI_SI
-#  else
-#    define GlxCoreLibDefines -DGLX_USE_MESA
-#  endif
+# define GlxCoreLibDefines -DGLX_USE_MESA

-#  if defined(SparcArchitecture)  \
+# if defined(SparcArchitecture)  \
   || defined (Sparc64Architecture) \
   || defined(ia64Architecture) \
   || defined(s390xArchitecture) \
   || defined(AMD64Architecture)
-#    define GlxArchDefines -D__GLX_ALIGN64
-#  elif defined(AlphaArchitecture)
+#  define GlxArchDefines -D__GLX_ALIGN64
+# elif defined(AlphaArchitecture)
 /* On the Alpha we need to ensure floating point accuracy for 3D */
-#    define GlxArchDefines -D__GLX_ALIGN64 -mieee
-#  elif defined(DarwinArchitecture)
+#   define GlxArchDefines -D__GLX_ALIGN64 -mieee
+# elif defined(DarwinArchitecture)
 /* GLX contains lots of uninitialized globals, which can upset Darwin */
-#    define GlxArchDefines -fno-common
-#  else
-#    define GlxArchDefines /**/
-#  endif
-
-#  ifndef GlxExtraDefines
-#    define GlxExtraDefines DRIDefines GlxCoreLibDefines GlxArchDefines
-#  endif
-
-#else
-
-/* If we are not building GLX, then make sure the DRI is not built */
-#  undef  BuildXF86DRI
-#  define BuildXF86DRI   NO
-#  undef  BuildXF86DRIDriverSupport
-#  define BuildXF86DRIDriverSupport NO
+#   define GlxArchDefines -fno-common
+# else
+#   define GlxArchDefines /**/
+# endif

-#endif
+# ifndef GlxExtraDefines
+#   define GlxExtraDefines GlxCoreLibDefines GlxArchDefines
+# endif

-#if !BuildXF86DRI
-# define GlxUseBuiltInDRIDriver NO	/* For libOSmesa */
 #endif

 # ifndef UseX86Emu
@@ -1102,9 +879,6 @@ IPLAN2P8_DEFS = -DUSE_IPLAN2P8
 #ifndef BuildXF86VidModeLibrary
 # define BuildXF86VidModeLibrary YES
 #endif
-#ifndef BuildGLXLibrary
-# define BuildGLXLibrary	YES
-#endif
 #endif

 /*
@@ -1572,6 +1346,7 @@ XFREE86JAPANESEDOCDIR = $(DOCDIR)/Japanese
 # define LargePositionIndependentCFlags -fPIC
 #endif

+
 #ifndef XF8_32Wid
 # define XF8_32Wid		NO
 #endif

--- a/nx-X11/config/cf/xorgsite.def
+++ b/nx-X11/config/cf/xorgsite.def
@@ -84,11 +84,6 @@ XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $
 				wacom void magictouch aiptek
 */

-/* To enable building of development DRI drivers (insecure, or not
- * useful on the chosen architecture, uncomment this define.
-#define BuildDevelDRIDrivers YES
- */
-
 /*
 * To use the deprecated, old keyboard driver, uncomment this.  But
 * even better, make the new keyboard driver (hw/xfree86/input/keyboard)

--- a/nx-X11/include/Imakefile
+++ b/nx-X11/include/Imakefile
@@ -10,7 +10,7 @@ NULL =
 #define IHaveSubdirs
 #define PassCDebugFlags /**/

-#if BuildGlxExt || BuildGLXLibrary
+#if BuildGlxExt
 GLXDIR = GL
 #endif


--- a/nx-X11/lib/GL/GL/GL-def.cpp
+++ b/nx-X11/lib/GL/GL/GL-def.cpp
--- a/nx-X11/lib/GL/GL/Imakefile
+++ b/nx-X11/lib/GL/GL/Imakefile
-XCOMM $XFree86: xc/lib/GL/GL/Imakefile,v 1.23 2003/11/17 03:10:41 dawes Exp $
-
-#include <Threads.tmpl>
-
-#define DoNormalLib NormalLibGlx
-#define DoSharedLib SharedLibGlx
-#define DoExtraLib SharedLibGlx
-#define DoDebugLib DebugLibGlx
-#define DoProfileLib ProfileLibGlx
-
-#ifndef ShLibBindGlobals
-#if !HasGcc2 || (GccMajorVersion > 2) || (GccMinorVersion > 7)
-#define ShlibBindGlobals YES
-#endif
-#endif
-
-     LIBNAME = GL
-     SOREV   = $(SOGLREV)
-
-#ifdef SharedGLReqs
-BASEREQUIREDLIBS = SharedGLReqs
-#endif
-
-#include "../mesa/array_cache/Imakefile.inc"
-#include "../mesa/math/Imakefile.inc"
-#include "../mesa/swrast/Imakefile.inc"
-#include "../mesa/swrast_setup/Imakefile.inc"
-#include "../mesa/tnl/Imakefile.inc"
-#include "../mesa/tnl_dd/Imakefile.inc"
-#include "../mesa/Imakefile.inc"
-#ifdef i386Architecture
-#include "../mesa/x86/Imakefile.inc"
-#endif
-#ifdef SparcArchitecture
-#include "../mesa/sparc/Imakefile.inc"
-#endif
-
-
-#if BuildXF86DRI && defined(i386Architecture) && MesaUseX86Asm
-    GLAPI_OBJ = $(GLXLIBSRC)/glx/glapi_x86.o
-#endif
-
-      GLXOBJS = $(GLXLIBSRC)/glx/?*.o
-     GLXUOBJS = $(GLXLIBSRC)/glx/unshared/?*.o $(GLAPI_OBJ)
-     GLXDOBJS = $(GLXLIBSRC)/glx/debugger/?*.o $(GLAPI_OBJ)
-     GLXPOBJS = $(GLXLIBSRC)/glx/profiled/?*.o $(GLAPI_OBJ)
-
-#if BuildXF86DRI
-      DRMOBJS = $(GLXLIBSRC)/dri/drm/?*.o
-     DRMUOBJS = $(GLXLIBSRC)/dri/drm/unshared/?*.o
-     DRMDOBJS = $(GLXLIBSRC)/dri/drm/debugger/?*.o
-     DRMPOBJS = $(GLXLIBSRC)/dri/drm/profiled/?*.o
-
-    MESAOBJS = $(COREMESAOBJS)  $(MESA_ASM_OBJS)
-   MESAUOBJS = $(COREMESAUOBJS) $(MESA_ASM_UOBJS)
-   MESADOBJS = $(COREMESADOBJS) $(MESA_ASM_DOBJS)
-   MESAPOBJS = $(COREMESAPOBJS) $(MESA_ASM_POBJS)
-
-#if GlxUseBuiltInDRIDriver
-#include "../mesa/drivers/dri/common/Imakefile.inc"
-#endif
-
-
-#if GlxUseSGISI
-
-XCOMM nothing
-
-#elif GlxBuiltInGamma
-
-#define MesaDrvGammaBuildDir $(GLXLIBSRC)/mesa/drivers/dri/gamma/
-#include "../mesa/drivers/dri/gamma/Imakefile.inc"
-
-     DRVOBJS = $(GAMMAOBJS)  $(MESAOBJS)
-    DRVUOBJS = $(GAMMAUOBJS) $(MESAUOBJS)
-    DRVDOBJS = $(GAMMADOBJS) $(MESADOBJS)
-    DRVPOBJS = $(GAMMAPOBJS) $(MESAPOBJS)
-
-#elif GlxBuiltInTdfx
-
-#define MesaDrvTdfxBuildDir $(GLXLIBSRC)/mesa/drivers/dri/tdfx/
-#include "../mesa/drivers/dri/tdfx/Imakefile.inc"
-
-     DRVOBJS = $(TDFXOBJS)  $(MESAOBJS)
-    DRVUOBJS = $(TDFXUOBJS) $(MESAUOBJS)
-    DRVDOBJS = $(TDFXDOBJS) $(MESADOBJS)
-    DRVPOBJS = $(TDFXPOBJS) $(MESAPOBJS)
-
-OTHERREQUIREDLIBS = -lglide3 -ldl
-
-#elif GlxBuiltInI810
-
-#define MesaDrvI810BuildDir $(GLXLIBSRC)/mesa/drivers/dri/i810/
-#include "../mesa/drivers/dri/i810/Imakefile.inc"
-
-     DRVOBJS = $(I810OBJS)  $(COMMONOBJS)  $(MESAOBJS)
-    DRVUOBJS = $(I810UOBJS) $(COMMONUOBJS) $(MESAUOBJS)
-    DRVDOBJS = $(I810DOBJS) $(COMMONDOBJS) $(MESADOBJS)
-    DRVPOBJS = $(I810POBJS) $(COMMONPOBJS) $(MESAPOBJS)
-
-#elif GlxBuiltInI915
-#define MesaDrvI915BuildDir $(GLXLIBSRC)/mesa/drivers/dri/i915/
-#include "../mesa/drivers/dri/i915/Imakefile.inc"
-
-     DRVOBJS = $(I915OBJS)  $(COMMONOBJS)  $(MESAOBJS)
-    DRVUOBJS = $(I915UOBJS) $(COMMONUOBJS) $(MESAUOBJS)
-    DRVDOBJS = $(I915DOBJS) $(COMMONDOBJS) $(MESADOBJS)
-    DRVPOBJS = $(I915POBJS) $(COMMONPOBJS) $(MESAPOBJS)
-
-#elif GlxBuiltInMga
-
-#define MesaDrvMgaBuildDir $(GLXLIBSRC)/mesa/drivers/dri/mga/
-#include "../mesa/drivers/dri/mga/Imakefile.inc"
-
-     DRVOBJS = $(MGAOBJS)  $(COMMONOBJS)  $(MESAOBJS)
-    DRVUOBJS = $(MGAUOBJS) $(COMMONUOBJS) $(MESAUOBJS)
-    DRVDOBJS = $(MGADOBJS) $(COMMONDOBJS) $(MESADOBJS)
-    DRVPOBJS = $(MGAPOBJS) $(COMMONPOBJS) $(MESAPOBJS)
-
-#elif GlxBuiltInR128
-
-#define MesaDrvR128BuildDir $(GLXLIBSRC)/mesa/drivers/dri/r128/
-#include "../mesa/drivers/dri/r128/Imakefile.inc"
-
-     DRVOBJS = $(R128OBJS)  $(COMMONOBJS)  $(MESAOBJS)
-    DRVUOBJS = $(R128UOBJS) $(COMMONUOBJS) $(MESAUOBJS)
-    DRVDOBJS = $(R128DOBJS) $(COMMONDOBJS) $(MESADOBJS)
-    DRVPOBJS = $(R128POBJS) $(COMMONPOBJS) $(MESAPOBJS)
-
-#elif GlxBuiltInRadeon
-
-#define MesaDrvRadeonBuildDir $(GLXLIBSRC)/mesa/drivers/dri/radeon/
-#include "../mesa/drivers/dri/radeon/Imakefile.inc"
-
-     DRVOBJS = $(RADEONOBJS)  $(COMMONOBJS)  $(MESAOBJS)
-    DRVUOBJS = $(RADEONUOBJS) $(COMMONUOBJS) $(MESAUOBJS)
-    DRVDOBJS = $(RADEONDOBJS) $(COMMONDOBJS) $(MESADOBJS)
-    DRVPOBJS = $(RADEONPOBJS) $(COMMONPOBJS) $(MESAPOBJS)
-
-#elif GlxBuiltInFfb
-
-#define MesaDrvFfbBuildDir $(GLXLIBSRC)/mesa/drivers/dri/ffb/
-#include "../mesa/drivers/dri/ffb/Imakefile.inc"
-
-     DRVOBJS = $(FFBOBJS)  $(MESAOBJS)
-    DRVUOBJS = $(FFBUOBJS) $(MESAUOBJS)
-    DRVDOBJS = $(FFBDOBJS) $(MESADOBJS)
-    DRVPOBJS = $(FFBPOBJS) $(MESAPOBJS)
-
-#elif GlxBuiltInSIS
-
-#define MesaDrvSisBuildDir $(GLXLIBSRC)/mesa/drivers/dri/sis/
-#include "../mesa/drivers/dri/sis/Imakefile.inc"
-
-     DRVOBJS = $(SISOBJS)  $(MESAOBJS)
-    DRVUOBJS = $(SISUOBJS) $(MESAUOBJS)
-    DRVDOBJS = $(SISDOBJS) $(MESADOBJS)
-    DRVPOBJS = $(SISPOBJS) $(MESAPOBJS)
-
-#elif GlxBuiltInXMesa
-
-#include "../mesa/drivers/x11/Imakefile.inc"
-
-     DRVOBJS = $(MESAOBJS) $(XMESA_OBJS)
-    DRVUOBJS = $(MESAUOBJS) $(XMESA_UOBJS)
-    DRVDOBJS = $(MESADOBJS) $(XMESA_DOBJS)
-    DRVPOBJS = $(MESAPOBJS) $(XMESA_POBJS)
-
-#else
-
-XCOMM No built-in drivers. This is the usual case.
-
-#endif
-
-#endif /* BuildXF86DRI */
-
-#if defined(DarwinArchitecture) && BuildAppleDRI
-   APPLEOBJS = appledri.o dri_dispatch.o dri_driver.o dri_glx.o x-list.o x-hash.o
-     DRIOBJS = $(APPLEOBJS:%.o=$(GLXLIBSRC)/apple/%.o)
-    DRIUOBJS = $(APPLEOBJS:%.o=$(GLXLIBSRC)/apple/unshared/%.o)
-    DRIDOBJS = $(APPLEOBJS:%.o=$(GLXLIBSRC)/apple/debugger/%.o)
-    DRIPOBJS = $(APPLEOBJS:%.o=$(GLXLIBSRC)/apple/profiled/%.o)
-
-NATIVE_GL = /System/Library/Frameworks/OpenGL.framework
-
-OTHERREQUIREDLIBS = \
-	XpluginLibrary $(NATIVE_GL)/Libraries/libGL.dylib -sub_library libGL \
-	-framework ApplicationServices -framework CoreFoundation \
-	-framework OpenGL
-#endif
-
-#if BuildXF86DRI && BuildXF86VidModeExt
-VMODEREQUIREDLIBS = $(LDPRELIBS) $(XXF86VMLIB)
-#endif
-
-/*
- * Note: DRIDIRS is empty for !BuildXF86DRI, and DRVSUBDIRS is empty
- * for no built-in drivers.
- */
-
-REQUIREDLIBS = $(OTHERREQUIREDLIBS) $(VMODEREQUIREDLIBS) $(BASEREQUIREDLIBS)
-
-        OBJS = $(GLXOBJS) $(DRIOBJS) $(DRVOBJS) $(DRMOBJS)
-#if HasSharedLibraries && !SharedLibGlxWithoutPIC
-       UOBJS = $(GLXUOBJS) $(DRIUOBJS) $(DRVUOBJS) $(DRMUOBJS)
-#else
-       UOBJS = $(OBJS)
-#endif
-       DOBJS = $(GLXDOBJS) $(DRIDOBJS) $(DRVDOBJS) $(DRMDOBJS)
-       POBJS = $(GLXPOBJS) $(DRIPOBJS) $(DRVPOBJS) $(DRMPOBJS)
-
-#if LocalThreads
-  THREADOBJS = $(THREADS_LIBS)
-#endif
-
-#include <Library.tmpl>
-
-#undef _LinkBuildLibrary
-#define _LinkBuildLibrary(lib) LinkBuildLibrary(lib)
-
-
-#if NormalLibGlx
-NormalLibraryTarget($(LIBNAME),$(UOBJS))
-InstallLibrary($(LIBNAME),$(USRLIBDIR))
-#endif
-#if SharedLibGlx
-SharedDepLibraryTarget($(LIBNAME),$(SOREV),$(OBJS),$(OBJS) $(THREADOBJS),.,.)
-InstallSharedLibrary($(LIBNAME),$(SOREV),$(SHLIBDIR))
-#if LinkGLToUsrLib && AlternateUsrLibDir
-install::
-	MakeDir($(DESTDIR)$(SYSTEMUSRLIBDIR))
-	$(RM) $(DESTDIR)$(SYSTEMUSRLIBDIR)/lib$(LIBNAME).so
-	$(LN) $(SHLIBDIR)/lib$(LIBNAME).so $(DESTDIR)$(SYSTEMUSRLIBDIR)/lib$(LIBNAME).so || true
-	$(RM) $(DESTDIR)$(SYSTEMUSRLIBDIR)/lib$(LIBNAME).so.1
-	$(LN) $(SHLIBDIR)/lib$(LIBNAME).so.1 $(DESTDIR)$(SYSTEMUSRLIBDIR)/lib$(LIBNAME).so.1 || true
-#endif
-#endif
-#if DebugLibGlx
-DebuggedLibraryTarget($(LIBNAME),$(DOBJS))
-InstallLibrary($(LIBNAME)_d,$(USRLIBDIR))
-#endif
-#if ProfileLibGlx
-ProfiledLibraryTarget($(LIBNAME),$(POBJS))
-InstallLibrary($(LIBNAME)_p,$(USRLIBDIR))
-#endif
--- a/nx-X11/lib/GL/Imakefile
+++ b/nx-X11/lib/GL/Imakefile
-XCOMM $XFree86: xc/lib/GL/Imakefile,v 1.43 2003/06/30 01:45:10 torrey Exp $
-
-XCOMM
-XCOMM Imake tokens which are significant to building libGL:
-XCOMM
-XCOMM BuildGLXLibrary - if defined, build libs in xc/lib/GL and xc/lib/GLw
-XCOMM
-XCOMM BuildXF86DRI - if defined, build libGL with DRI capability
-XCOMM
-XCOMM Only zero or one of the following can be defined at once:
-XCOMM GlxBuiltInGamma - if defined, build gamma_dri.so driver into libGL
-XCOMM GlxBuiltInTdfx - if defined, build tdfx_dri.so driver into libGL
-XCOMM GlxBuiltInMga - if defined, build mga_dri.so driver into libGL
-XCOMM GlxBuiltInI810 - if defined, build i810_dri.so driver into libGL
-XCOMM GlxBuiltInR128 - if defined, build r128_dri.so driver into libGL
-XCOMM GlxBuiltInRadeon - if defined, build radeon_dri.so driver into libGL
-XCOMM GlxBuiltInR200 - if defined, build r200_dri.so driver into libGL
-XCOMM GlxBuiltInFfb - if defined, build ffb_dri.so driver into libGL
-XCOMM GlxBuiltInSIS - if defined, build sis_dri.so driver into libGL
-XCOMM
-XCOMM GlxUseBuiltInDRIDriver - automatically defined if any of the
-XCOMM   GlxBuiltIn[Gamma,Tdfx,Mga,I810,R128,Radeon,R200,Ffb,SIS] tokens is
-XCOMM   defined
-XCOMM
-XCOMM GlxBuiltInXMesa - if defined, build XMesa (Xlib Mesa driver) into libGL
-XCOMM   to enable rendering to displays that lack the GLX extension.
-XCOMM
-XCOMM GlxDriverUsesMesa - will be defined if building a DRI driver into
-XCOMM   libGL and it uses Mesa.
-XCOMM
-XCOMM GlxUseSGISI - if defined, use the SGI OpenGL Sample Implementation
-XCOMM   to build the GLX server extension (not fully implemented yet).
-XCOMM
-XCOMM NormalLibGlx - if defined, build static libGL.a library
-XCOMM
-XCOMM SharedLibGlx - if defined, build dynamic libGL.so library
-XCOMM
-XCOMM DebugLibGlx - if defined, build libGL with debug info
-XCOMM
-XCOMM ProfileLibGlx - if defined, build libGL with profiling info
-XCOMM
-XCOMM SharedGlxRev - dynamic library version, currently defined to be "1.2"
-XCOMM
-XCOMM GlxSoProf - if defined, build dynamic libGL for profiling with soprof
-XCOMM
-XCOMM GlxStubLib - purpose???
-XCOMM
-XCOMM
-XCOMM Server-side tokens:
-XCOMM    BuildGlxExt 
-XCOMM    GlxUseSGISI
-
-NULL =
-
-#include <Threads.tmpl>
-
-#define IHaveSubdirs
-
-#define PassCDebugFlags
-
-LIBGLBUILDDIR = GL
-      GLXDIRS = glx
-
-/*
- * Need to build the Mesa + XMesa source in the following cases:
- *   BuildXF86DRI && defined(DriDrivers)
- *   GlxDriverUsesMesa
- *   GlxBuiltInXMesa
- *   BuildOSMesaLib
- */
-#if BuildOSMesaLib || \
-    (BuildXF86DRI && \
-     (defined(DriDrivers) || GlxDriverUsesMesa || GlxBuiltInXMesa))
-     MESADIRS = mesa
-#endif
-
-/*
- * Only need the OSmesa code in the following case:
- *   BuildOSMesaLib
- */
-#if BuildOSMesaLib
-   OSMESADIRS = mesa/drivers/osmesa
-#endif
-
-/*
- * Need to build the DRI code in the following cases:
- *   BuildXF86DRI
- */
-#if BuildXF86DRI
-      DRIDIRS = dri/drm
-#endif
-
-/*
- * Need to build the DRI drivers in the following cases:
- *   BuildXF86DRI && defined(DriDrivers)
- */
-#if BuildXF86DRI && defined(DriDrivers)
-   DRIVERDIRS = mesa/drivers/dri
-#endif
-
-#if defined(DarwinArchitecture) && BuildAppleDRI
-      DRIDIRS = apple
-#endif
-
-/*
- * The build order depends on whether the drivers are loaded into libGL or
- * built-in to libGL.  In the former case, libGL needs to be built before
- * the drivers, and in the latter case, it needs to be built after the driver.
- */
-#if BuildXF86DRI && GlxUseBuiltInDRIDriver
-SUBDIRS = \
-	$(MESADIRS) \
-	$(DRIDIRS) \
-	$(DRIVERDIRS) \
-	$(GLXDIRS) \
-	$(LIBGLBUILDDIR) \
-	$(OSMESADIRS) \
-	$(NULL)
-#else
-SUBDIRS = \
-	$(MESADIRS) \
-	$(GLXDIRS) \
-	$(DRIDIRS) \
-	$(LIBGLBUILDDIR) \
-	$(OSMESADIRS) \
-	$(DRIVERDIRS) \
-	$(NULL)
-#endif
-
-MakeSubdirs($(SUBDIRS))
-
-DependSubdirs($(SUBDIRS))
-
--- a/nx-X11/lib/GL/glx/Imakefile
+++ b/nx-X11/lib/GL/glx/Imakefile
-XCOMM $XFree86: xc/lib/GL/glx/Imakefile,v 1.22 2003/11/12 00:10:24 dawes Exp $
-XCOMM The contents of this file are subject to the GLX Public License Version 1.0
-XCOMM (the "License"). You may not use this file except in compliance with the
-XCOMM License. You may obtain a copy of the License at Silicon Graphics, Inc.,
-XCOMM attn: Legal Services, 2011 N. Shoreline Blvd., Mountain View, CA 94043
-XCOMM or at http://www.sgi.com/software/opensource/glx/license.html.
-XCOMM
-XCOMM Software distributed under the License is distributed on an "AS IS"
-XCOMM basis. ALL WARRANTIES ARE DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY
-XCOMM IMPLIED WARRANTIES OF MERCHANTABILITY, OF FITNESS FOR A PARTICULAR
-XCOMM PURPOSE OR OF NON- INFRINGEMENT. See the License for the specific
-XCOMM language governing rights and limitations under the License.
-XCOMM
-XCOMM The Original Software is GLX version 1.2 source code, released February,
-XCOMM 1999. The developer of the Original Software is Silicon Graphics, Inc.
-XCOMM Those portions of the Subject Software created by Silicon Graphics, Inc.
-XCOMM are Copyright (c) 1991-9 Silicon Graphics, Inc. All Rights Reserved.
-
-XCOMM $XdotOrg: xc/lib/GL/glx/Imakefile,v 1.12 2005/08/23 04:03:51 airlied Exp $
-
-#include <Threads.tmpl>
-
-#define DoNormalLib (NormalLibGlx || SharedLibGlxWithoutPIC)
-#define DoSharedLib (SharedLibGlx && !SharedLibGlxWithoutPIC)
-#define DoExtraLib SharedLibGlx
-#define DoDebugLib DebugLibGlx
-#define DoProfileLib ProfileLibGlx
-
-/* Large PIC tables needed for Solaris SPARC builds */
-#if (defined(SunArchitecture) && defined(SparcArchitecture))
-# define LargePICTable YES
-#endif
-
-XCOMM #define IHaveSubdirs
-XCOMM #define PassCDebugFlags 'CDEBUGFLAGS=$(CDEBUGFLAGS)'
-XCOMM 
-XCOMM SUBDIRS = \
-XCOMM 	glu \
-XCOMM 	glw
-
-/* Files from Mesa */
-
-LinkSourceFile(glapi.c, $(MESASRCDIR)/src/mesa/glapi)
-LinkSourceFile(glthread.c, $(MESASRCDIR)/src/mesa/glapi)
-LinkSourceFile(glcontextmodes.c, $(MESASRCDIR)/src/mesa/drivers/dri/common)
-LinkSourceFile(glcontextmodes.h, $(MESASRCDIR)/src/mesa/drivers/dri/common)
-LinkSourceFile(dispatch.c, $(MESASRCDIR)/src/mesa/main)
-
-#ifdef i386Architecture
-LinkSourceFile(glapi_x86.S, $(MESASRCDIR)/src/mesa/x86)
-#endif
-#ifdef SparcArchitecture
-LinkSourceFile(glapi_sparc.S, $(MESASRCDIR)/src/mesa/sparc)
-#endif
-
-LinkSourceFile(XF86dri.c, $(MESASRCDIR)/src/glx/x11)
-LinkSourceFile(clientattrib.c, $(MESASRCDIR)/src/glx/x11)
-LinkSourceFile(compsize.c, $(MESASRCDIR)/src/glx/x11)
-LinkSourceFile(dri_glx.c, $(MESASRCDIR)/src/glx/x11)
-LinkSourceFile(dri_glx.h, $(MESASRCDIR)/src/glx/x11)
-LinkSourceFile(eval.c, $(MESASRCDIR)/src/glx/x11)
-LinkSourceFile(glx_pbuffer.c, $(MESASRCDIR)/src/glx/x11)
-LinkSourceFile(glx_query.c, $(MESASRCDIR)/src/glx/x11)
-LinkSourceFile(glx_texture_compression.c, $(MESASRCDIR)/src/glx/x11)
-LinkSourceFile(glxclient.h, $(MESASRCDIR)/src/glx/x11)
-LinkSourceFile(glxcmds.c, $(MESASRCDIR)/src/glx/x11)
-LinkSourceFile(glxext.c, $(MESASRCDIR)/src/glx/x11)
-LinkSourceFile(glxextensions.c, $(MESASRCDIR)/src/glx/x11)
-LinkSourceFile(glxextensions.h, $(MESASRCDIR)/src/glx/x11)
-LinkSourceFile(indirect.c, $(MESASRCDIR)/src/glx/x11)
-LinkSourceFile(indirect.h, $(MESASRCDIR)/src/glx/x11)
-LinkSourceFile(indirect_init.c, $(MESASRCDIR)/src/glx/x11)
-LinkSourceFile(indirect_init.h, $(MESASRCDIR)/src/glx/x11)
-LinkSourceFile(indirect_size.c, $(MESASRCDIR)/src/glx/x11)
-LinkSourceFile(indirect_size.h, $(MESASRCDIR)/src/glx/x11)
-LinkSourceFile(indirect_transpose_matrix.c, $(MESASRCDIR)/src/glx/x11)
-LinkSourceFile(indirect_va_private.h, $(MESASRCDIR)/src/glx/x11)
-LinkSourceFile(indirect_vertex_array.c, $(MESASRCDIR)/src/glx/x11)
-LinkSourceFile(indirect_vertex_array.h, $(MESASRCDIR)/src/glx/x11)
-LinkSourceFile(indirect_vertex_program.c, $(MESASRCDIR)/src/glx/x11)
-LinkSourceFile(indirect_window_pos.c, $(MESASRCDIR)/src/glx/x11)
-LinkSourceFile(packrender.h, $(MESASRCDIR)/src/glx/x11)
-LinkSourceFile(packsingle.h, $(MESASRCDIR)/src/glx/x11)
-LinkSourceFile(pixel.c, $(MESASRCDIR)/src/glx/x11)
-LinkSourceFile(pixelstore.c, $(MESASRCDIR)/src/glx/x11)
-LinkSourceFile(render2.c, $(MESASRCDIR)/src/glx/x11)
-LinkSourceFile(renderpix.c, $(MESASRCDIR)/src/glx/x11)
-LinkSourceFile(single2.c, $(MESASRCDIR)/src/glx/x11)
-LinkSourceFile(singlepix.c, $(MESASRCDIR)/src/glx/x11)
-LinkSourceFile(vertarr.c, $(MESASRCDIR)/src/glx/x11)
-LinkSourceFile(xf86dri.h, $(MESASRCDIR)/src/glx/x11)
-LinkSourceFile(xf86dristr.h, $(MESASRCDIR)/src/glx/x11)
-LinkSourceFile(xfont.c, $(MESASRCDIR)/src/glx/x11)
-
-/*
- * Maybe some of these could come from
- * xc/extras/ogl-sample/main/glx/lib at some point.
- */
-     GLX_SRCS = \
-		clientattrib.c \
-		compsize.c \
-		dispatch.c \
-		eval.c \
-		glapi.c \
-		glthread.c \
-                glx_pbuffer.c \
-                glx_query.c \
-                glx_texture_compression.c \
-		glxcmds.c \
-		glxext.c \
-		glxextensions.c \
-		glcontextmodes.c \
-                indirect.c \
-		indirect_init.c \
-                indirect_size.c \
-                indirect_transpose_matrix.c \
-                indirect_vertex_array.c \
-                indirect_vertex_program.c \
-                indirect_window_pos.c \
-		pixel.c \
-		pixelstore.c \
-		render2.c \
-		renderpix.c \
-		single2.c \
-		singlepix.c \
-		vertarr.c \
-		xfont.c
-
-     GLX_OBJS = \
-		clientattrib.o \
-		compsize.o \
-		eval.o \
-		dispatch.o \
-		glapi.o \
-		glthread.o \
-                glx_pbuffer.o \
-                glx_query.o \
-                glx_texture_compression.o \
-		glxcmds.o \
-		glxext.o \
-		glxextensions.o \
-		glcontextmodes.o \
-                indirect.o \
-		indirect_init.o \
-                indirect_size.o \
-                indirect_transpose_matrix.o \
-                indirect_vertex_array.o \
-                indirect_vertex_program.o \
-                indirect_window_pos.o \
-		pixel.o \
-		pixelstore.o \
-		render2.o \
-		renderpix.o \
-		single2.o \
-		singlepix.o \
-		vertarr.o \
-		xfont.o
-
-     GLX_DEFS = GlxDefines VidModeExtensionDefines \
-	        -DDEFAULT_DRIVER_DIR=\"$(MODULEDIR)/dri\"
-
-#ifdef i386Architecture
-      ASM_DIR = x86
-#endif
-#ifdef SparcArchitecture
-      ASM_DIR = sparc
-#endif
-
-#if BuildXF86DRI
-     DRI_SRCS = dri_glx.c XF86dri.c
-     DRI_OBJS = dri_glx.o XF86dri.o
-
-     DRI_INCS = -I$(SERVERSRC)/GL/dri
-#if defined(i386Architecture) && MesaUseX86Asm
-     ASM_SRCS = glapi_x86.S
-     ASM_OBJS = glapi_x86.o
-     ASM_DEFS = -DUSE_X86_ASM
-#endif
-#if defined(SparcArchitecture)
-     ASM_SRCS = glapi_sparc.S
-     ASM_OBJS = glapi_sparc.o
-     ASM_DEFS = -DUSE_SPARC_ASM
-#endif
-
-#if GlxBuiltInXMesa
-  XMESA_DEFINES = -DGLX_BUILT_IN_XMESA
-#endif
-#endif
-
-#if defined(DarwinArchitecture) || defined(OS2Architecture) || \
-defined(LynxOSArchitecture)
-ALIAS_DEFINES = -DGLX_ALIAS_UNSUPPORTED
-#endif
-#if defined(DarwinArchitecture) && BuildAppleDRI
-     DRI_SRCS = XF86dri.c
-     DRI_OBJS = XF86dri.o
-
-     DRI_INCS = -I$(SERVERSRC)/GL/dri
-#endif
-
-         SRCS = $(GLX_SRCS) $(ASM_SRCS) $(DRI_SRCS)
-         OBJS = $(GLX_OBJS) $(ASM_OBJS) $(DRI_OBJS)
-      DEFINES = $(GLX_DEFS) $(ASM_DEFS) $(XMESA_DEFINES) $(ALIAS_DEFINES) \
-	        $(THREADS_DEFINES)
-
-     INCLUDES = -I$(XINCLUDESRC) \
-		-I$(MESASRCDIR)/include \
-		-I$(EXTINCSRC) \
-		-I$(GLXLIBSRC)/glx \
-		-I$(MESASRCDIR)/src/mesa/main \
-		-I$(MESASRCDIR)/src/mesa/glapi \
-		-I$(MESASRCDIR)/src/mesa/drivers/x11 \
-		-I$(MESASRCDIR)/src/mesa/$(ASM_DIR) \
-		-I$(XF86OSSRC) \
-		-I$(DRMSRCDIR)/shared-core \
-		$(DRI_INCS)
-
-#include <Library.tmpl>
-
-LibraryObjectRule()
-
-#if BuildXF86DRI && defined(i386Architecture) && MesaUseX86Asm
-ObjectFromAsmSource(glapi_x86, NullParameter)
-#endif
-#if BuildXF86DRI && defined(SparcArchitecture)
-STD_CPP_DEFINES = StandardDefines $(PROJECT_DEFINES)
-ObjectFromAsmSource(glapi_sparc, NullParameter)
-#endif
-
-SubdirLibraryRule($(OBJS))
-NormalLintTarget($(SRCS))
-
-DependTarget()
--- a/nx-X11/lib/GL/mesa/Imakefile
+++ b/nx-X11/lib/GL/mesa/Imakefile
-XCOMM $XFree86: xc/lib/GL/mesa/src/Imakefile,v 1.30tsi Exp $
-
-#include <Threads.tmpl>
-
-/*
- * Need both shared and unshared Mesa objects in the following cases:
- *   GlxDriverUsesMesa
- *   GlxBuiltInXMesa
- *   BuildOSMesaLib
- *
- * In other cases, only the shared version is needed to link in to loadable
- * driver modules.
- */
-
-NULL =
-
-#if BuildOSMesaLib || (BuildXF86DRI && (GlxDriverUsesMesa || GlxBuiltInXMesa))
-#define DoNormalLib (NormalLibGlx || SharedLibGlxWithoutPIC)
-#define DoSharedLib (SharedLibGlx && !SharedLibGlxWithoutPIC)
-#define DoExtraLib SharedLibGlx
-#define DoDebugLib DebugLibGlx
-#define DoProfileLib ProfileLibGlx
-#else
-#define DoNormalLib SharedLibGlxWithoutPIC
-#define DoSharedLib !SharedLibGlxWithoutPIC
-#define DoExtraLib NO
-#define DoDebugLib NO
-#define DoProfileLib NO
-#endif
-
-/* Large PIC tables needed for Solaris SPARC builds */
-#if (defined(SunArchitecture) && defined(SparcArchitecture))
-# define LargePICTable YES
-#endif
-
-#if Malloc0ReturnsNull
-ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL
-#endif
-
-#if defined(i386Architecture) && MesaUseX86Asm
-#define MesaX86BuildDir /**/
-ASM_SUBDIRS = x86
-#endif
-#ifdef SparcArchitecture
-#define MesaSparcBuildDir /**/
-ASM_SUBDIRS = sparc
-#endif
-#define MesaBuildDir /**/
-#define NeedToLinkMesaSrc
-
-#ifdef UseCompaqMathLibrary
- MATH_DEFINES = -DCCPML
-#endif
-
-      DEFINES = $(ALLOC_DEFINES) GlxDefines \
-		$(MESA_ASM_DEFINES) $(MATH_DEFINES)
-     INCLUDES = -I$(INCLUDESRC) -I$(XINCLUDESRC) -I$(EXTINCSRC) \
-		-I$(GLXLIBSRC)/dri \
-		-I$(MESASRCDIR)/include -I$(GLXLIBSRC)/include
-
-#include <Library.tmpl>
-
-LibraryObjectRule()
-
-#define IHaveSubdirs
-#define PassCDebugFlags
-
-SUBDIRS = \
-	$(ASM_SUBDIRS) \
-	array_cache \
-	main \
-	math \
-	swrast \
-	swrast_setup \
-	tnl \
-	tnl_dd \
-	shader \
-	$(NULL)
-
-MakeSubdirs($(SUBDIRS))
-DependSubdirs($(SUBDIRS))
-
-
-DependTarget()
--- a/nx-X11/lib/GL/mesa/array_cache/Imakefile
+++ b/nx-X11/lib/GL/mesa/array_cache/Imakefile
-XCOMM $XFree86: xc/lib/GL/mesa/src/array_cache/Imakefile,v 1.8 2002/11/25 12:58:55 tsi Exp $
-
-#include <Threads.tmpl>
-
-/*
- * Need both shared and unshared Mesa objects in the following cases:
- *   GlxDriverUsesMesa
- *   GlxBuiltInXMesa
- *   BuildOSMesaLib
- *
- * In other cases, only the shared version is needed to link in to loadable
- * driver modules.
- */
-
-#if BuildOSMesaLib || (BuildXF86DRI && (GlxDriverUsesMesa || GlxBuiltInXMesa))
-#define DoNormalLib (NormalLibGlx || SharedLibGlxWithoutPIC)
-#define DoSharedLib (SharedLibGlx && !SharedLibGlxWithoutPIC)
-#define DoExtraLib SharedLibGlx
-#define DoDebugLib DebugLibGlx
-#define DoProfileLib ProfileLibGlx
-#else
-#define DoNormalLib SharedLibGlxWithoutPIC
-#define DoSharedLib !SharedLibGlxWithoutPIC
-#define DoExtraLib NO
-#define DoDebugLib NO
-#define DoProfileLib NO
-#endif
-
-
-#define MesaACBuildDir /**/
-#define NeedToLinkMesaSrc
-#include "Imakefile.inc"
-
-#if Malloc0ReturnsNull
-ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL
-#endif
-
-#if BuildXF86DRI
-  DRI_DEFINES = GlxDefines -DIN_DRI_DRIVER
- DRI_INCLUDES = -I../../../dri -I../../../glx -I../../dri -I../../../include \
-		-I$(INCLUDESRC)/GL -I$(XF86OSSRC) -I$(SERVERSRC)/GL/dri
-#endif
-
-MESA_INCLUDES = -I$(MESASRCDIR)/src/mesa/main \
-		-I$(MESASRCDIR)/src/mesa/array_cache \
-		-I$(MESASRCDIR)/src/mesa/glapi \
-		-I$(MESASRCDIR)/src/mesa/math \
-		-I$(MESASRCDIR)/src/mesa \
-		-I$(MESASRCDIR)/include \
-		-I../../../include -I$(XINCLUDESRC)
-
-     INCLUDES = $(MESA_INCLUDES) $(DRI_INCLUDES)
-         SRCS = $(MESA_AC_SRCS)
-         OBJS = $(MESA_AC_OBJS)
-
-
-#if defined(i386Architecture) && MesaUseX86Asm
-     ASM_SRCS =
-     ASM_OBJS =
-#if MesaUseMMX
-     MMX_DEFS = -DUSE_MMX_ASM
-#endif
-#if MesaUse3DNow
-   3DNOW_DEFS = -DUSE_3DNOW_ASM
-#endif
-#if MesaUseSSE
-     SSE_DEFS = -DUSE_SSE_ASM
-#endif
-     ASM_DEFS = -DUSE_X86_ASM $(MMX_DEFS) $(3DNOW_DEFS) $(SSE_DEFS)
-#endif
-
-#ifdef SparcArchitecture
-     ASM_SRCS =
-     ASM_OBJS =
-     ASM_DEFS = -DUSE_SPARC_ASM
-#endif
-
-#ifdef UseCompaqMathLibrary
-      MATHDEF = -DCCPML
-#endif
-
-      DEFINES = $(ALLOC_DEFINES) $(DRI_DEFINES) $(ASM_DEFS) $(MATHDEF)
-
-#include <Library.tmpl>
-
-LibraryObjectRule()
-
-SubdirLibraryRule($(OBJS))
-NormalLintTarget($(SRCS))
-
-DependTarget()
--- a/nx-X11/lib/GL/mesa/drivers/dri/common/Imakefile
+++ b/nx-X11/lib/GL/mesa/drivers/dri/common/Imakefile
-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)
-
-         SRCS = $(COMMONSRCS)
-         OBJS = $(COMMONOBJS)
- 
-#include <Library.tmpl>
-
-LibraryObjectRule()
-
-SubdirLibraryRule($(OBJS))
-NormalLintTarget($(SRCS))
-
-DependTarget()
--- a/nx-X11/lib/GL/mesa/drivers/dri/common/Imakefile.inc
+++ b/nx-X11/lib/GL/mesa/drivers/dri/common/Imakefile.inc
-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
--- a/nx-X11/lib/GL/mesa/drivers/osmesa/Imakefile
+++ b/nx-X11/lib/GL/mesa/drivers/osmesa/Imakefile
-XCOMM $XFree86: xc/lib/GL/mesa/src/OSmesa/Imakefile,v 1.16 2002/11/25 14:04:50 eich Exp $
-
-#include <Threads.tmpl>
-
-#define DoNormalLib (NormalLibGlx || SharedLibGlxWithoutPIC)
-#define DoSharedLib (SharedLibGlx && !SharedLibGlxWithoutPIC)
-#define DoExtraLib SharedLibGlx
-#define DoDebugLib DebugLibGlx
-#define DoProfileLib ProfileLibGlx
-
-/* Large PIC tables needed for Solaris SPARC builds */
-#if (defined(SunArchitecture) && defined(SparcArchitecture))
-# define LargePICTable YES
-#endif
-
-#include "../../array_cache/Imakefile.inc"
-#include "../../math/Imakefile.inc"
-#include "../../main/Imakefile.inc"
-#include "../../shader/Imakefile.inc"
-#include "../../shader/grammar/Imakefile.inc"
-#include "../../shader/slang/Imakefile.inc"
-#include "../../swrast/Imakefile.inc"
-#include "../../swrast_setup/Imakefile.inc"
-#include "../../tnl/Imakefile.inc"
-#include "../../tnl_dd/Imakefile.inc"
-#include "../../Imakefile.inc"
-#if defined(i386Architecture) && !SystemV4 && MesaUseX86Asm
-#include "../../x86/Imakefile.inc"
-#endif
-#ifdef SparcArchitecture
-#include "../../sparc/Imakefile.inc"
-#endif
-
-LinkSourceFile(osmesa.c, $(MESASRCDIR)/src/mesa/drivers/osmesa)
-LinkSourceFile(driverfuncs.c, $(MESASRCDIR)/src/mesa/drivers/common)
-LinkSourceFile(driverfuncs.h, $(MESASRCDIR)/src/mesa/drivers/common)
-
-#if Malloc0ReturnsNull
-ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL
-#endif
-
-MESA_INCLUDES = -I$(MESASRCDIR)/src/mesa \
-		-I$(MESASRCDIR)/src/mesa/glapi \
-		-I$(MESASRCDIR)/src/mesa/shader \
-		-I$(MESASRCDIR)/src/mesa/main \
-		-I$(MESASRCDIR)/include 
-
-      DEFINES = $(ALLOC_DEFINES) $(DRI_DEFINES)
-     INCLUDES = -I$(XINCLUDESRC) -I$(EXTINCSRC) $(MESA_INCLUDES) \
-		$(DRI_INCLUDES) -I$(GLXLIBSRC)/include
-
-     MESAOBJS = $(COREMESAOBJS) $(MESA_ASM_OBJS)
-    MESAUOBJS = $(COREMESAUOBJS) $(MESA_ASM_UOBJS)
-    MESADOBJS = $(COREMESADOBJS) $(MESA_ASM_DOBJS)
-    MESAPOBJS = $(COREMESAPOBJS) $(MESA_ASM_POBJS)
-
-         SRCS = osmesa.c driverfuncs.c
-         OBJS = osmesa.o driverfuncs.o $(MESAOBJS)
-#if DoSharedLib
-        UOBJS = unshared/osmesa.o unshared/driverfuncs.o $(MESAUOBJS)
-#else
-        UOBJS = $(OBJS)
-#endif
-        DOBJS = debugger/osmesa.o debugger/driverfuncs.o $(MESADOBJS)
-        POBJS = profiled/osmesa.o profiled/driverfuncs.o $(MESAPOBJS)
-
-#if LocalThreads
-  THREADOBJS = $(THREADS_LIBS)
-#endif
-
-#if !GlxUseBuiltInDRIDriver
-# ifdef SharedOSMesaReqs
- REQUIREDLIBS = SharedOSMesaReqs
-# else
- REQUIREDLIBS = MathLibrary $(LDPRELIB) $(XLIB) $(GLXLIB)
-# endif
-#endif
-
-#include <Library.tmpl>
-
-LibraryObjectRule()
-
-SubdirLibraryRule($(OBJS))
-NormalLintTarget($(SRCS))
-
-LIBNAME = OSMesa
-SOREV = 4.0
-
-
-#if DoNormalLib
-NormalLibraryTarget($(LIBNAME), $(UOBJS))
-InstallLibrary($(LIBNAME),$(USRLIBDIR))
-#endif
-
-#if SharedLibGlx
-SharedLibraryTarget($(LIBNAME),$(SOREV), $(OBJS), ., .)
-InstallSharedLibrary($(LIBNAME),$(SOREV),$(SHLIBDIR))
-#endif
-
-#if DoDebugLib
-DebuggedLibraryTarget($(LIBNAME),$(DOBJS))
-InstallLibrary($(LIBNAME_d,$(USRLIBDIR))
-#endif
-
-#if DoProfileLib
-ProfiledLibraryTarget($(LIBNAME), $(POBJS))
-InstallLibrary($(LIBNAME)_p,$(USRLIBDIR))
-#endif
-
-DependTarget()
-
--- a/nx-X11/lib/GL/mesa/drivers/osmesa/OSMesa-def.cpp
+++ b/nx-X11/lib/GL/mesa/drivers/osmesa/OSMesa-def.cpp
--- a/nx-X11/lib/GL/mesa/drivers/x11/Imakefile
+++ b/nx-X11/lib/GL/mesa/drivers/x11/Imakefile
-XCOMM $XFree86: xc/lib/GL/mesa/src/X/Imakefile,v 1.12tsi Exp $
-
-#include <Threads.tmpl>
-
-/*
- * Need both shared and unshared Mesa objects in the following cases:
- *   GlxDriverUsesMesa
- *   GlxBuiltInXMesa
- *   BuildOSMesaLib
- *
- * In other cases, only the shared version is needed to link in to loadable
- * driver modules.
- */
-
-#if BuildOSMesaLib || (BuildXF86DRI && (GlxDriverUsesMesa || GlxBuiltInXMesa))
-#define DoNormalLib (NormalLibGlx || SharedLibGlxWithoutPIC)
-#define DoSharedLib (SharedLibGlx && !SharedLibGlxWithoutPIC)
-#define DoExtraLib SharedLibGlx
-#define DoDebugLib DebugLibGlx
-#define DoProfileLib ProfileLibGlx
-#else
-#define DoNormalLib SharedLibGlxWithoutPIC
-#define DoSharedLib !SharedLibGlxWithoutPIC
-#define DoExtraLib NO
-#define DoDebugLib NO
-#define DoProfileLib NO
-#endif
-
-
-#define MesaXBuildDir /**/
-#define NeedToLinkMesaSrc
-#include "Imakefile.inc"
-
-#if Malloc0ReturnsNull
-ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL
-#endif
-
-#if BuildXF86DRI
-  DRI_DEFINES = GlxDefines
- DRI_INCLUDES = -I../../../dri -I../../../glx -I../../dri -I.. \
-		-I$(INCLUDESRC)/GL -I$(XF86OSSRC) -I$(SERVERSRC)/GL/dri
-#endif
-
-MESA_INCLUDES = -I$(MESASRCDIR)/src \
-		-I$(MESASRCDIR)/src/X \
-		-I$(MESASRCDIR)/include \
-		-I../../../include -I$(XINCLUDESRC)
-
-     INCLUDES = $(MESA_INCLUDES) $(DRI_INCLUDES)
-
-#ifdef UseCompaqMathLibrary
-      MATHDEF = -DCCPML
-#endif
-
-#if BuildXF86DRI && GlxBuiltInXMesa
-  XMESA_DEFINES = -DGLX_BUILT_IN_XMESA
-#endif
-
-         SRCS = $(XMESA_SRCS)
-         OBJS = $(XMESA_OBJS)
-      DEFINES = $(ALLOC_DEFINES) $(DRI_DEFINES) $(MATHDEF) $(XMESA_DEFINES)
-
-#include <Library.tmpl>
-
-LibraryObjectRule()
-
-SubdirLibraryRule($(XMESA_OBJS))
-NormalLintTarget($(XMESA_SRCS))
-
-DependTarget()
--- a/nx-X11/lib/GL/mesa/main/Imakefile
+++ b/nx-X11/lib/GL/mesa/main/Imakefile
-XCOMM $XdotOrg: xc/lib/GL/mesa/main/Imakefile,v 1.3 2005/12/20 22:30:49 alanc Exp $
-XCOMM $XFree86: xc/lib/GL/mesa/src/Imakefile,v 1.30tsi Exp $
-
-#include <Threads.tmpl>
-
-/*
- * Need both shared and unshared Mesa objects in the following cases:
- *   GlxDriverUsesMesa
- *   GlxBuiltInXMesa
- *   BuildOSMesaLib
- *
- * In other cases, only the shared version is needed to link in to loadable
- * driver modules.
- */
-
-#if BuildOSMesaLib || (BuildXF86DRI && (GlxDriverUsesMesa || GlxBuiltInXMesa))
-#define DoNormalLib (NormalLibGlx || SharedLibGlxWithoutPIC)
-#define DoSharedLib (SharedLibGlx && !SharedLibGlxWithoutPIC)
-#define DoExtraLib SharedLibGlx
-#define DoDebugLib DebugLibGlx
-#define DoProfileLib ProfileLibGlx
-#else
-#define DoNormalLib SharedLibGlxWithoutPIC
-#define DoSharedLib !SharedLibGlxWithoutPIC
-#define DoExtraLib NO
-#define DoDebugLib NO
-#define DoProfileLib NO
-#endif
-
-/* Large PIC tables needed for Solaris/SPARC builds */
-#if defined(SunArchitecture) && defined(SparcArchitecture) && defined(LargePositionIndependentCFlags)
-# define LargePICTable YES
-#endif
-
-#if Malloc0ReturnsNull
-ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL
-#endif
-
-#define MesaBuildDir /**/
-#define NeedToLinkMesaSrc
-#include "Imakefile.inc"
-
-#ifdef UseCompaqMathLibrary
- MATH_DEFINES = -DCCPML
-#endif
-
-      DEFINES = $(ALLOC_DEFINES) GlxDefines -DIN_DRI_DRIVER \
-		$(MESA_ASM_DEFINES) $(MATH_DEFINES)
-     INCLUDES = /*-I$(INCLUDESRC) -I$(EXTINCSRC) */ -I$(XINCLUDESRC) \
-		-I$(MESASRCDIR)/src/mesa/glapi \
-		-I$(MESASRCDIR)/src/mesa/math \
-		-I$(MESASRCDIR)/src/mesa/shader \
-		-I$(MESASRCDIR)/src/mesa/main \
-		-I$(MESASRCDIR)/src/mesa -I$(GLXLIBSRC)/dri \
-		-I$(MESASRCDIR)/include -I$(GLXLIBSRC)/include
-         SRCS = $(COREMESABASESRCS)
-         OBJS = $(COREMESABASEOBJS)
-
-#include <Library.tmpl>
-
-LibraryObjectRule()
-
-SubdirLibraryRule($(OBJS))
-NormalLintTarget($(SRCS))
-
-DependTarget()
--- a/nx-X11/lib/GL/mesa/math/Imakefile
+++ b/nx-X11/lib/GL/mesa/math/Imakefile
-XCOMM $XFree86: xc/lib/GL/mesa/src/math/Imakefile,v 1.8 2002/11/25 12:58:55 tsi Exp $
-
-#include <Threads.tmpl>
-
-/*
- * Need both shared and unshared Mesa objects in the following cases:
- *   GlxDriverUsesMesa
- *   GlxBuiltInXMesa
- *   BuildOSMesaLib
- *
- * In other cases, only the shared version is needed to link in to loadable
- * driver modules.
- */
-
-#if BuildOSMesaLib || (BuildXF86DRI && (GlxDriverUsesMesa || GlxBuiltInXMesa))
-#define DoNormalLib (NormalLibGlx || SharedLibGlxWithoutPIC)
-#define DoSharedLib (SharedLibGlx && !SharedLibGlxWithoutPIC)
-#define DoExtraLib SharedLibGlx
-#define DoDebugLib DebugLibGlx
-#define DoProfileLib ProfileLibGlx
-#else
-#define DoNormalLib SharedLibGlxWithoutPIC
-#define DoSharedLib !SharedLibGlxWithoutPIC
-#define DoExtraLib NO
-#define DoDebugLib NO
-#define DoProfileLib NO
-#endif
-
-/* Large PIC tables needed for Solaris SPARC builds */
-#if (defined(SunArchitecture) && defined(SparcArchitecture))
-# define LargePICTable YES
-#endif
-
-
-#define MesaMathBuildDir /**/
-#define NeedToLinkMesaSrc
-#include "Imakefile.inc"
-
-
-#if Malloc0ReturnsNull
-ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL
-#endif
-
-#if BuildXF86DRI
-  DRI_DEFINES = GlxDefines -DIN_DRI_DRIVER
- DRI_INCLUDES = -I../../../dri -I../../../glx -I../../dri -I.. \
-		-I$(INCLUDESRC)/GL -I$(XF86OSSRC) -I$(SERVERSRC)/GL/dri
-#endif
-
-#if defined(i386Architecture) && MesaUseX86Asm
-      ASM_DIR = x86
-     ASM_SRCS =
-     ASM_OBJS =
-#if MesaUseMMX
-     MMX_DEFS = -DUSE_MMX_ASM
-#endif
-#if MesaUse3DNow
-   3DNOW_DEFS = -DUSE_3DNOW_ASM
-#endif
-#if MesaUseSSE
-     SSE_DEFS = -DUSE_SSE_ASM
-#endif
-     ASM_DEFS = -DUSE_X86_ASM $(MMX_DEFS) $(3DNOW_DEFS) $(SSE_DEFS)
-#endif
-
-#ifdef SparcArchitecture
-      ASM_DIR = sparc
-     ASM_SRCS =
-     ASM_OBJS =
-     ASM_DEFS = -DUSE_SPARC_ASM
-#endif
-
-#ifdef UseCompaqMathLibrary
-      MATHDEF = -DCCPML
-#endif
-
-MESA_INCLUDES = -I$(MESASRCDIR)/src/mesa/main \
-		-I$(MESASRCDIR)/src/mesa/math \
-		-I$(MESASRCDIR)/src/mesa/glapi \
-		-I$(MESASRCDIR)/src/mesa \
-		-I$(MESASRCDIR)/src/mesa/$(ASM_DIR) \
-		-I$(MESASRCDIR)/include \
-		-I../../../include -I$(XINCLUDESRC)
-
-      DEFINES = $(ALLOC_DEFINES) $(DRI_DEFINES) $(ASM_DEFS) $(MATHDEF)
-     INCLUDES = $(MESA_INCLUDES) $(DRI_INCLUDES)
-         SRCS = $(MESA_MATH_SRCS)
-         OBJS = $(MESA_MATH_OBJS)
-
-
-#include <Library.tmpl>
-
-LibraryObjectRule()
-
-SubdirLibraryRule($(OBJS))
-NormalLintTarget($(SRCS))
-
-DependTarget()
--- a/nx-X11/lib/GL/mesa/shader/Imakefile
+++ b/nx-X11/lib/GL/mesa/shader/Imakefile
-XCOMM $XFree86$
-
-#include <Threads.tmpl>
-
-/*
- * Need both shared and unshared Mesa objects in the following cases:
- *   GlxDriverUsesMesa
- *   GlxBuiltInXMesa
- *   BuildOSMesaLib
- *
- * In other cases, only the shared version is needed to link in to loadable
- * driver modules.
- */
-
-#if BuildOSMesaLib || (BuildXF86DRI && (GlxDriverUsesMesa || GlxBuiltInXMesa))
-#define DoNormalLib (NormalLibGlx || SharedLibGlxWithoutPIC)
-#define DoSharedLib (SharedLibGlx && !SharedLibGlxWithoutPIC)
-#define DoExtraLib SharedLibGlx
-#define DoDebugLib DebugLibGlx
-#define DoProfileLib ProfileLibGlx
-#else
-#define DoNormalLib SharedLibGlxWithoutPIC
-#define DoSharedLib !SharedLibGlxWithoutPIC
-#define DoExtraLib NO
-#define DoDebugLib NO
-#define DoProfileLib NO
-#endif
-
-/* Large PIC tables needed for Solaris SPARC builds */
-#if (defined(SunArchitecture) && defined(SparcArchitecture))
-# define LargePICTable YES
-#endif
-
-#define MesaShaderBuildDir /**/
-#define NeedToLinkMesaSrc
-#include "Imakefile.inc"
-
-
-#if Malloc0ReturnsNull
-ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL
-#endif
-
-#if BuildXF86DRI
-  DRI_DEFINES = GlxDefines -DIN_DRI_DRIVER
- DRI_INCLUDES = -I../../../dri -I../../../glx -I../../dri -I.. \
-		-I$(INCLUDESRC)/GL -I$(XF86OSSRC) -I$(SERVERSRC)/GL/dri
-#endif
-
-#if defined(i386Architecture) && MesaUseX86Asm
-      ASM_DIR = x86
-     ASM_SRCS =
-     ASM_OBJS =
-#if MesaUseMMX
-     MMX_DEFS = -DUSE_MMX_ASM
-#endif
-#if MesaUse3DNow
-   3DNOW_DEFS = -DUSE_3DNOW_ASM
-#endif
-#if MesaUseSSE
-     SSE_DEFS = -DUSE_SSE_ASM
-#endif
-     ASM_DEFS = -DUSE_X86_ASM $(MMX_DEFS) $(3DNOW_DEFS) $(SSE_DEFS)
-#endif
-
-#ifdef SparcArchitecture
-      ASM_DIR = sparc
-     ASM_SRCS =
-     ASM_OBJS =
-     ASM_DEFS = -DUSE_SPARC_ASM
-#endif
-
-#ifdef UseCompaqMathLibrary
-      MATHDEF = -DCCPML
-#endif
-
-MESA_INCLUDES = -I$(MESASRCDIR)/src/mesa/main \
-		-I$(MESASRCDIR)/src/mesa/math \
-		-I$(MESASRCDIR)/src/mesa/glapi \
-                -I$(MESASRCDIR)/src/mesa/shader/grammar \
-                -I$(MESASRCDIR)/src/mesa/shader/slang \
-		-I$(MESASRCDIR)/src/mesa \
-		-I$(MESASRCDIR)/src/mesa/$(ASM_DIR) \
-		-I$(MESASRCDIR)/include \
-		-I../../../include -I$(XINCLUDESRC)
-
-      DEFINES = $(ALLOC_DEFINES) $(DRI_DEFINES) $(ASM_DEFS) $(MATHDEF)
-     INCLUDES = $(MESA_INCLUDES) $(DRI_INCLUDES)
-         SRCS = $(MESA_SHADER_SRCS)
-         OBJS = $(MESA_SHADER_OBJS)
-
-
-#include <Library.tmpl>
-
-LibraryObjectRule()
-
-SubdirLibraryRule($(OBJS))
-NormalLintTarget($(SRCS))
-
-#define IHaveSubdirs
-#define PassCDebugFlags
-
-SUBDIRS = grammar slang
-
-MakeSubdirs($(SUBDIRS))
-DependSubdirs($(SUBDIRS))
-
-DependTarget()
--- a/nx-X11/lib/GL/mesa/shader/grammar/Imakefile
+++ b/nx-X11/lib/GL/mesa/shader/grammar/Imakefile
-XCOMM $XFree86$
-
-#include <Threads.tmpl>
-
-/*
- * Need both shared and unshared Mesa objects in the following cases:
- *   GlxDriverUsesMesa
- *   GlxBuiltInXMesa
- *   BuildOSMesaLib
- *
- * In other cases, only the shared version is needed to link in to loadable
- * driver modules.
- */
-
-#if BuildOSMesaLib || (BuildXF86DRI && (GlxDriverUsesMesa || GlxBuiltInXMesa))
-#define DoNormalLib (NormalLibGlx || SharedLibGlxWithoutPIC)
-#define DoSharedLib (SharedLibGlx && !SharedLibGlxWithoutPIC)
-#define DoExtraLib SharedLibGlx
-#define DoDebugLib DebugLibGlx
-#define DoProfileLib ProfileLibGlx
-#else
-#define DoNormalLib SharedLibGlxWithoutPIC
-#define DoSharedLib !SharedLibGlxWithoutPIC
-#define DoExtraLib NO
-#define DoDebugLib NO
-#define DoProfileLib NO
-#endif
-
-/* Large PIC tables needed for Solaris SPARC builds */
-#if (defined(SunArchitecture) && defined(SparcArchitecture))
-# define LargePICTable YES
-#endif
-
-#define MesaGrammarBuildDir /**/
-#define NeedToLinkMesaSrc
-#include "Imakefile.inc"
-
-
-#if Malloc0ReturnsNull
-ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL
-#endif
-
-#if BuildXF86DRI
-  DRI_DEFINES = GlxDefines -DIN_DRI_DRIVER
- DRI_INCLUDES = -I../../../dri -I../../../glx -I../../dri -I.. \
-		-I$(INCLUDESRC)/GL -I$(XF86OSSRC) -I$(SERVERSRC)/GL/dri
-#endif
-
-#if defined(i386Architecture) && MesaUseX86Asm
-      ASM_DIR = x86
-     ASM_SRCS =
-     ASM_OBJS =
-#if MesaUseMMX
-     MMX_DEFS = -DUSE_MMX_ASM
-#endif
-#if MesaUse3DNow
-   3DNOW_DEFS = -DUSE_3DNOW_ASM
-#endif
-#if MesaUseSSE
-     SSE_DEFS = -DUSE_SSE_ASM
-#endif
-     ASM_DEFS = -DUSE_X86_ASM $(MMX_DEFS) $(3DNOW_DEFS) $(SSE_DEFS)
-#endif
-
-#ifdef SparcArchitecture
-      ASM_DIR = sparc
-     ASM_SRCS =
-     ASM_OBJS =
-     ASM_DEFS = -DUSE_SPARC_ASM
-#endif
-
-#ifdef UseCompaqMathLibrary
-      MATHDEF = -DCCPML
-#endif
-
-MESA_INCLUDES = -I$(MESASRCDIR)/src/mesa/main \
-		-I$(MESASRCDIR)/src/mesa/math \
-		-I$(MESASRCDIR)/src/mesa/glapi \
-                -I$(MESASRCDIR)/src/mesa/shader/grammar \
-		-I$(MESASRCDIR)/src/mesa \
-		-I$(MESASRCDIR)/src/mesa/$(ASM_DIR) \
-		-I$(MESASRCDIR)/include \
-		-I../../../include -I$(XINCLUDESRC)
-
-      DEFINES = $(ALLOC_DEFINES) $(DRI_DEFINES) $(ASM_DEFS) $(MATHDEF)
-     INCLUDES = $(MESA_INCLUDES) $(DRI_INCLUDES)
-         SRCS = $(MESA_GRAMMAR_SRCS)
-         OBJS = $(MESA_GRAMMAR_OBJS)
-
-
-#include <Library.tmpl>
-
-LibraryObjectRule()
-
-SubdirLibraryRule($(OBJS))
-NormalLintTarget($(SRCS))
-
-DependTarget()
--- a/nx-X11/lib/GL/mesa/shader/slang/Imakefile
+++ b/nx-X11/lib/GL/mesa/shader/slang/Imakefile
-XCOMM $XFree86$
-
-#include <Threads.tmpl>
-
-/*
- * Need both shared and unshared Mesa objects in the following cases:
- *   GlxDriverUsesMesa
- *   GlxBuiltInXMesa
- *   BuildOSMesaLib
- *
- * In other cases, only the shared version is needed to link in to loadable
- * driver modules.
- */
-
-#if BuildOSMesaLib || (BuildXF86DRI && (GlxDriverUsesMesa || GlxBuiltInXMesa))
-#define DoNormalLib (NormalLibGlx || SharedLibGlxWithoutPIC)
-#define DoSharedLib (SharedLibGlx && !SharedLibGlxWithoutPIC)
-#define DoExtraLib SharedLibGlx
-#define DoDebugLib DebugLibGlx
-#define DoProfileLib ProfileLibGlx
-#else
-#define DoNormalLib SharedLibGlxWithoutPIC
-#define DoSharedLib !SharedLibGlxWithoutPIC
-#define DoExtraLib NO
-#define DoDebugLib NO
-#define DoProfileLib NO
-#endif
-
-/* Large PIC tables needed for Solaris SPARC builds */
-#if (defined(SunArchitecture) && defined(SparcArchitecture))
-# define LargePICTable YES
-#endif
-
-#define MesaSlangBuildDir /**/
-#define NeedToLinkMesaSrc
-#include "Imakefile.inc"
-
-
-#if Malloc0ReturnsNull
-ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL
-#endif
-
-#if BuildXF86DRI
-  DRI_DEFINES = GlxDefines -DIN_DRI_DRIVER
- DRI_INCLUDES = -I../../../dri -I../../../glx -I../../dri -I.. \
-		-I$(INCLUDESRC)/GL -I$(XF86OSSRC) -I$(SERVERSRC)/GL/dri
-#endif
-
-#if defined(i386Architecture) && MesaUseX86Asm
-      ASM_DIR = x86
-     ASM_SRCS =
-     ASM_OBJS =
-#if MesaUseMMX
-     MMX_DEFS = -DUSE_MMX_ASM
-#endif
-#if MesaUse3DNow
-   3DNOW_DEFS = -DUSE_3DNOW_ASM
-#endif
-#if MesaUseSSE
-     SSE_DEFS = -DUSE_SSE_ASM
-#endif
-     ASM_DEFS = -DUSE_X86_ASM $(MMX_DEFS) $(3DNOW_DEFS) $(SSE_DEFS)
-#endif
-
-#ifdef SparcArchitecture
-      ASM_DIR = sparc
-     ASM_SRCS =
-     ASM_OBJS =
-     ASM_DEFS = -DUSE_SPARC_ASM
-#endif
-
-#ifdef UseCompaqMathLibrary
-      MATHDEF = -DCCPML
-#endif
-
-MESA_INCLUDES = -I$(MESASRCDIR)/src/mesa/main \
-		-I$(MESASRCDIR)/src/mesa/math \
-		-I$(MESASRCDIR)/src/mesa/glapi \
-                -I$(MESASRCDIR)/src/mesa/shader/grammar \
-                -I$(MESASRCDIR)/src/mesa/shader/slang \
-                -I$(MESASRCDIR)/src/mesa/shader/slang/library \
-		-I$(MESASRCDIR)/src/mesa \
-		-I$(MESASRCDIR)/src/mesa/$(ASM_DIR) \
-		-I$(MESASRCDIR)/include \
-		-I../../../include -I$(XINCLUDESRC)
-
-      DEFINES = $(ALLOC_DEFINES) $(DRI_DEFINES) $(ASM_DEFS) $(MATHDEF)
-     INCLUDES = $(MESA_INCLUDES) $(DRI_INCLUDES)
-         SRCS = $(MESA_SLANG_SRCS)
-         OBJS = $(MESA_SLANG_OBJS)
-
-
-#include <Library.tmpl>
-
-#define IHaveSubdirs
-#define PassCDebugFlags
-
-SUBDIRS = library
-
-MakeSubdirs($(SUBDIRS))
-DependSubdirs($(SUBDIRS))
-
-LibraryObjectRule()
-
-SubdirLibraryRule($(OBJS))
-NormalLintTarget($(SRCS))
-
-DependTarget()
--- a/nx-X11/lib/GL/mesa/shader/slang/library/Imakefile
+++ b/nx-X11/lib/GL/mesa/shader/slang/library/Imakefile
-XCOMM $XFree86$
-
-#include <Threads.tmpl>
-
-/*
- * Need both shared and unshared Mesa objects in the following cases:
- *   GlxDriverUsesMesa
- *   GlxBuiltInXMesa
- *   BuildOSMesaLib
- *
- * In other cases, only the shared version is needed to link in to loadable
- * driver modules.
- */
-
-#if BuildOSMesaLib || (BuildXF86DRI && (GlxDriverUsesMesa || GlxBuiltInXMesa))
-#define DoNormalLib (NormalLibGlx || SharedLibGlxWithoutPIC)
-#define DoSharedLib (SharedLibGlx && !SharedLibGlxWithoutPIC)
-#define DoExtraLib SharedLibGlx
-#define DoDebugLib DebugLibGlx
-#define DoProfileLib ProfileLibGlx
-#else
-#define DoNormalLib SharedLibGlxWithoutPIC
-#define DoSharedLib !SharedLibGlxWithoutPIC
-#define DoExtraLib NO
-#define DoDebugLib NO
-#define DoProfileLib NO
-#endif
-
-/* Large PIC tables needed for Solaris SPARC builds */
-#if (defined(SunArchitecture) && defined(SparcArchitecture))
-# define LargePICTable YES
-#endif
-
-#define MesaShaderBuildDir /**/
-#define NeedToLinkMesaSrc
-#include "Imakefile.inc"
-
-
-#if Malloc0ReturnsNull
-ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL
-#endif
-
-#if BuildXF86DRI
-  DRI_DEFINES = GlxDefines -DIN_DRI_DRIVER
- DRI_INCLUDES = -I../../../dri -I../../../glx -I../../dri -I.. \
-		-I$(INCLUDESRC)/GL -I$(XF86OSSRC) -I$(SERVERSRC)/GL/dri
-#endif
-
-#if defined(i386Architecture) && MesaUseX86Asm
-      ASM_DIR = x86
-     ASM_SRCS =
-     ASM_OBJS =
-#if MesaUseMMX
-     MMX_DEFS = -DUSE_MMX_ASM
-#endif
-#if MesaUse3DNow
-   3DNOW_DEFS = -DUSE_3DNOW_ASM
-#endif
-#if MesaUseSSE
-     SSE_DEFS = -DUSE_SSE_ASM
-#endif
-     ASM_DEFS = -DUSE_X86_ASM $(MMX_DEFS) $(3DNOW_DEFS) $(SSE_DEFS)
-#endif
-
-#ifdef SparcArchitecture
-      ASM_DIR = sparc
-     ASM_SRCS =
-     ASM_OBJS =
-     ASM_DEFS = -DUSE_SPARC_ASM
-#endif
-
-#ifdef UseCompaqMathLibrary
-      MATHDEF = -DCCPML
-#endif
-
-MESA_INCLUDES = -I$(MESASRCDIR)/src/mesa/main \
-		-I$(MESASRCDIR)/src/mesa/math \
-		-I$(MESASRCDIR)/src/mesa/glapi \
-                -I$(MESASRCDIR)/src/mesa/shader/slang \
-                -I$(MESASRCDIR)/src/mesa/shader/slang/library \
-		-I$(MESASRCDIR)/src/mesa \
-		-I$(MESASRCDIR)/src/mesa/$(ASM_DIR) \
-		-I$(MESASRCDIR)/include \
-		-I../../../include -I$(XINCLUDESRC)
-
-      DEFINES = $(ALLOC_DEFINES) $(DRI_DEFINES) $(ASM_DEFS) $(MATHDEF)
-     INCLUDES = $(MESA_INCLUDES) $(DRI_INCLUDES)
-         SRCS = $(MESA_SLANG_SRCS)
-         OBJS = $(MESA_SLANG_OBJS)
-
-
-#include <Library.tmpl>
-
-SubdirLibraryRule($(OBJS))
-NormalLintTarget($(SRCS))
-
-DependTarget()
--- a/nx-X11/lib/GL/mesa/sparc/Imakefile
+++ b/nx-X11/lib/GL/mesa/sparc/Imakefile
-XCOMM $XFree86: xc/lib/GL/mesa/src/SPARC/Imakefile,v 1.3 2002/11/22 22:55:58 tsi Exp $
-XCOMM $XdotOrg: xc/lib/GL/mesa/sparc/Imakefile,v 1.3 2004/11/13 04:39:16 gisburn Exp $
-
-/*
- * Need both shared and unshared Mesa objects in the following cases:
- *   GlxDriverUsesMesa
- *   GlxBuiltInXMesa
- *   BuildOSMesaLib
- *
- * In other cases, only the shared version is needed to link in to loadable
- * driver modules.
- */
-
-#if BuildOSMesaLib || (BuildXF86DRI && (GlxDriverUsesMesa || GlxBuiltInXMesa))
-#define DoNormalLib (NormalLibGlx || SharedLibGlxWithoutPIC)
-#define DoSharedLib (SharedLibGlx && !SharedLibGlxWithoutPIC)
-#define DoExtraLib SharedLibGlx
-#define DoDebugLib DebugLibGlx
-#define DoProfileLib ProfileLibGlx
-#else
-#define DoNormalLib SharedLibGlxWithoutPIC
-#define DoSharedLib !SharedLibGlxWithoutPIC
-#define DoExtraLib NO
-#define DoDebugLib NO
-#define DoProfileLib NO
-#endif
-
-/* Large PIC tables needed for Solaris SPARC builds */
-#if (defined(SunArchitecture) && defined(SparcArchitecture))
-# define LargePICTable YES
-#endif
-
-#if Malloc0ReturnsNull
-ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL
-#endif
-
-#define MesaSPARCBuildDir /**/
-#define NeedToLinkMesaSrc
-#include "Imakefile.inc"
-
-      DEFINES = $(ALLOC_DEFINES) GlxDefines $(MESA_ASM_DEFINES)
-     INCLUDES = -I$(INCLUDESRC) -I$(EXTINCSRC) -I$(MESASRCDIR)/src \
-		-I$(MESASRCDIR)/src/SPARC \
-		-I../../../include \
-                -I$(MESASRCDIR)/include \
-                -I$(GLXLIBSRC)/include \
-                -I$(MESASRCDIR)/src/mesa \
-                -I$(MESASRCDIR)/src/mesa/main \
-                -I$(MESASRCDIR)/src/mesa/sparc \
-                -I$(MESASRCDIR)/src/mesa/glapi
-
-         SRCS = $(MESA_ASM_SRCS)
-         OBJS = $(MESA_ASM_OBJS)
-
-#include <Library.tmpl>
-
-LibraryObjectRule()
-
-STD_CPP_DEFINES = StandardDefines $(PROJECT_DEFINES)
-
-SubdirLibraryRule($(OBJS))
-NormalLintTarget($(SRCS))
-
-ObjectFromAsmSource(xform, NullParameter)
-ObjectFromAsmSource(clip, NullParameter)
-ObjectFromAsmSource(norm, NullParameter)
-
-DependTarget()
--- a/nx-X11/lib/GL/mesa/sparc/Imakefile.inc
+++ b/nx-X11/lib/GL/mesa/sparc/Imakefile.inc
-XCOMM $XFree86: xc/lib/GL/mesa/src/SPARC/Imakefile.inc,v 1.2 2002/11/14 21:01:16 tsi Exp $
-
-#ifndef MesaSPARCBuildDir
-#define MesaSPARCBuildDir $(GLXLIBSRC)/mesa/sparc/
-#endif
-
-MESASPARCBUILDDIR = MesaSPARCBuildDir
-
-MESA_SPARC_SRCS = $(MESASPARCBUILDDIR)sparc.c \
-		  $(MESASPARCBUILDDIR)xform.S \
-		  $(MESASPARCBUILDDIR)clip.S
-
-#ifdef NeedToLinkMesaSrc
-/* If $(MESASRCDIR)/src/mesa/sparc isn't in the INCLUDES, it should be. */
-LinkSourceFile(sparc.c, $(MESASRCDIR)/src/mesa/sparc)
-LinkSourceFile(xform.S, $(MESASRCDIR)/src/mesa/sparc)
-LinkSourceFile(clip.S, $(MESASRCDIR)/src/mesa/sparc)
-LinkSourceFile(norm.S, $(MESASRCDIR)/src/mesa/sparc)
-#endif
-
-MESA_SPARC_OBJS = $(MESASPARCBUILDDIR)sparc.o \
-		  $(MESASPARCBUILDDIR)xform.o \
-		  $(MESASPARCBUILDDIR)clip.o \
-		  $(MESASPARCBUILDDIR)norm.o
-
-#if defined(DoSharedLib) && DoSharedLib
-MESA_SPARC_UOBJS = $(MESASPARCBUILDDIR)unshared/sparc.o \
-		   $(MESASPARCBUILDDIR)xform.o \
-		   $(MESASPARCBUILDDIR)clip.o \
-		   $(MESASPARCBUILDDIR)norm.o
-#else
-MESA_SPARC_UOBJS = $(MESA_SPARC_OBJS)
-#endif
-
-MESA_SPARC_DOBJS = $(MESASPARCBUILDDIR)debugger/sparc.o \
-		   $(MESASPARCBUILDDIR)xform.o \
-		   $(MESASPARCBUILDDIR)clip.o \
-		   $(MESASPARCBUILDDIR)norm.o
-
-MESA_SPARC_POBJS = $(MESAX86BUILDDIR)profiled/sparc.o \
-		   $(MESAX86BUILDDIR)xform.o \
-		   $(MESAX86BUILDDIR)clip.o \
-		   $(MESAX86BUILDDIR)norm.o
-
-MESA_SPARC_DEFS = -DUSE_SPARC_ASM
-
-MESA_ASM_SRCS = $(MESA_SPARC_SRCS)
-
-MESA_ASM_OBJS = $(MESA_SPARC_OBJS)
-
-MESA_ASM_UOBJS = $(MESA_SPARC_UOBJS)
-
-MESA_ASM_DOBJS = $(MESA_SPARC_DOBJS)
-
-MESA_ASM_POBJS = $(MESA_SPARC_POBJS)
-
-MESA_ASM_DEFINES = $(MESA_SPARC_DEFS)
-
--- a/nx-X11/lib/GL/mesa/swrast/Imakefile
+++ b/nx-X11/lib/GL/mesa/swrast/Imakefile
-XCOMM $XFree86: xc/lib/GL/mesa/src/swrast/Imakefile,v 1.8 2002/11/25 12:58:55 tsi Exp $
-
-#include <Threads.tmpl>
-
-/*
- * Need both shared and unshared Mesa objects in the following cases:
- *   GlxDriverUsesMesa
- *   GlxBuiltInXMesa
- *   BuildOSMesaLib
- *
- * In other cases, only the shared version is needed to link in to loadable
- * driver modules.
- */
-
-#if BuildOSMesaLib || (BuildXF86DRI && (GlxDriverUsesMesa || GlxBuiltInXMesa))
-#define DoNormalLib (NormalLibGlx || SharedLibGlxWithoutPIC)
-#define DoSharedLib (SharedLibGlx && !SharedLibGlxWithoutPIC)
-#define DoExtraLib SharedLibGlx
-#define DoDebugLib DebugLibGlx
-#define DoProfileLib ProfileLibGlx
-#else
-#define DoNormalLib SharedLibGlxWithoutPIC
-#define DoSharedLib !SharedLibGlxWithoutPIC
-#define DoExtraLib NO
-#define DoDebugLib NO
-#define DoProfileLib NO
-#endif
-
-/* Large PIC tables needed for Solaris SPARC builds */
-#if (defined(SunArchitecture) && defined(SparcArchitecture))
-# define LargePICTable YES
-#endif
-
-#define MesaSwrastBuildDir /**/
-#define NeedToLinkMesaSrc
-#include "Imakefile.inc"
-
-
-#if Malloc0ReturnsNull
-ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL
-#endif
-
-#if BuildXF86DRI
-  DRI_DEFINES = GlxDefines -DIN_DRI_DRIVER
- DRI_INCLUDES = -I../../../dri -I../../../glx -I../../dri -I../../../include \
-		-I$(INCLUDESRC)/GL -I$(XF86OSSRC) -I$(SERVERSRC)/GL/dri
-#endif
-
-#if defined(i386Architecture) && MesaUseX86Asm
-      ASM_DIR = x86
-     ASM_SRCS =
-     ASM_OBJS =
-#if MesaUseMMX
-     MMX_DEFS = -DUSE_MMX_ASM
-#endif
-#if MesaUse3DNow
-   3DNOW_DEFS = -DUSE_3DNOW_ASM
-#endif
-#if MesaUseSSE
-     SSE_DEFS = -DUSE_SSE_ASM
-#endif
-     ASM_DEFS = -DUSE_X86_ASM $(MMX_DEFS) $(3DNOW_DEFS) $(SSE_DEFS)
-#endif
-
-#ifdef SparcArchitecture
-      ASM_DIR = sparc 
-     ASM_SRCS =
-     ASM_OBJS =
-     ASM_DEFS = -DUSE_SPARC_ASM
-#endif
-
-#ifdef UseCompaqMathLibrary
-      MATHDEF = -DCCPML
-#endif
-
-MESA_INCLUDES = -I$(MESASRCDIR)/src/mesa \
-		-I$(MESASRCDIR)/src/mesa/main \
-		-I$(MESASRCDIR)/src/mesa/array_cache \
-		-I$(MESASRCDIR)/src/mesa/math \
-		-I$(MESASRCDIR)/src/mesa/glapi \
-		-I$(MESASRCDIR)/src/mesa/swrast \
-		-I$(MESASRCDIR)/src/mesa/shader \
-		-I$(MESASRCDIR)/src/mesa/$(ASM_DIR) \
-		-I$(MESASRCDIR)/include \
-		-I../../../include -I$(XINCLUDESRC)
-
-      DEFINES = $(ALLOC_DEFINES) $(DRI_DEFINES) $(ASM_DEFS) $(MATHDEF)
-     INCLUDES = $(MESA_INCLUDES) $(DRI_INCLUDES)
-         SRCS = $(MESA_SWRAST_SRCS)
-         OBJS = $(MESA_SWRAST_OBJS)
-
-
-#include <Library.tmpl>
-
-LibraryObjectRule()
-
-SubdirLibraryRule($(OBJS))
-NormalLintTarget($(SRCS))
-
-DependTarget()
--- a/nx-X11/lib/GL/mesa/swrast_setup/Imakefile
+++ b/nx-X11/lib/GL/mesa/swrast_setup/Imakefile
-XCOMM $XFree86: xc/lib/GL/mesa/src/swrast_setup/Imakefile,v 1.8 2002/11/25 12:58:55 tsi Exp $
-
-#include <Threads.tmpl>
-
-/*
- * Need both shared and unshared Mesa objects in the following cases:
- *   GlxDriverUsesMesa
- *   GlxBuiltInXMesa
- *   BuildOSMesaLib
- *
- * In other cases, only the shared version is needed to link in to loadable
- * driver modules.
- */
-
-#if BuildOSMesaLib || (BuildXF86DRI && (GlxDriverUsesMesa || GlxBuiltInXMesa))
-#define DoNormalLib (NormalLibGlx || SharedLibGlxWithoutPIC)
-#define DoSharedLib (SharedLibGlx && !SharedLibGlxWithoutPIC)
-#define DoExtraLib SharedLibGlx
-#define DoDebugLib DebugLibGlx
-#define DoProfileLib ProfileLibGlx
-#else
-#define DoNormalLib SharedLibGlxWithoutPIC
-#define DoSharedLib !SharedLibGlxWithoutPIC
-#define DoExtraLib NO
-#define DoDebugLib NO
-#define DoProfileLib NO
-#endif
-
-/* Large PIC tables needed for Solaris SPARC builds */
-#if (defined(SunArchitecture) && defined(SparcArchitecture))
-# define LargePICTable YES
-#endif
-
-
-#define MesaSwrastSetupBuildDir /**/
-#define NeedToLinkMesaSrc
-#include "Imakefile.inc"
-
-#if Malloc0ReturnsNull
-ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL
-#endif
-
-#if BuildXF86DRI
-  DRI_DEFINES = GlxDefines -DIN_DRI_DRIVER
- DRI_INCLUDES = -I../../../dri -I../../../glx -I../../dri -I../../../include \
-		-I$(INCLUDESRC)/GL -I$(XF86OSSRC) -I$(SERVERSRC)/GL/dri
-#endif
-
-#if defined(i386Architecture) && MesaUseX86Asm
-      ASM_DIR = x86
-     ASM_SRCS =
-     ASM_OBJS =
-#if MesaUseMMX
-     MMX_DEFS = -DUSE_MMX_ASM
-#endif
-#if MesaUse3DNow
-   3DNOW_DEFS = -DUSE_3DNOW_ASM
-#endif
-#if MesaUseSSE
-     SSE_DEFS = -DUSE_SSE_ASM
-#endif
-     ASM_DEFS = -DUSE_X86_ASM $(MMX_DEFS) $(3DNOW_DEFS) $(SSE_DEFS)
-#endif
-
-#ifdef SparcArchitecture
-      ASM_DIR = sparc
-     ASM_SRCS =
-     ASM_OBJS =
-     ASM_DEFS = -DUSE_SPARC_ASM
-#endif
-
-#ifdef UseCompaqMathLibrary
-      MATHDEF = -DCCPML
-#endif
-
-MESA_INCLUDES = -I$(MESASRCDIR)/src/mesa \
-		-I$(MESASRCDIR)/src/mesa/$(ASM_DIR) \
-		-I$(MESASRCDIR)/src/mesa/math \
-		-I$(MESASRCDIR)/src/mesa/main \
-		-I$(MESASRCDIR)/src/mesa/glapi \
-		-I$(MESASRCDIR)/src/mesa/swrast_setup \
-		-I$(MESASRCDIR)/src/mesa/tnl \
-		-I$(MESASRCDIR)/include \
-		-I../../../include -I$(XINCLUDESRC)
-
-      DEFINES = $(ALLOC_DEFINES) $(DRI_DEFINES) $(ASM_DEFS) $(MATHDEF)
-     INCLUDES = $(MESA_INCLUDES) $(DRI_INCLUDES)
-         SRCS = $(MESA_SWR_SETUP_SRCS)
-         OBJS = $(MESA_SWR_SETUP_OBJS)
-
-
-#include <Library.tmpl>
-
-LibraryObjectRule()
-
-SubdirLibraryRule($(OBJS))
-NormalLintTarget($(SRCS))
-
-DependTarget()
--- a/nx-X11/lib/GL/mesa/tnl/Imakefile
+++ b/nx-X11/lib/GL/mesa/tnl/Imakefile
-XCOMM $XFree86: xc/lib/GL/mesa/src/tnl/Imakefile,v 1.8 2002/11/25 12:58:55 tsi Exp $
-
-#include <Threads.tmpl>
-
-/*
- * Need both shared and unshared Mesa objects in the following cases:
- *   GlxDriverUsesMesa
- *   GlxBuiltInXMesa
- *   BuildOSMesaLib
- *
- * In other cases, only the shared version is needed to link in to loadable
- * driver modules.
- */
-
-#if BuildOSMesaLib || (BuildXF86DRI && (GlxDriverUsesMesa || GlxBuiltInXMesa))
-#define DoNormalLib (NormalLibGlx || SharedLibGlxWithoutPIC)
-#define DoSharedLib (SharedLibGlx && !SharedLibGlxWithoutPIC)
-#define DoExtraLib SharedLibGlx
-#define DoDebugLib DebugLibGlx
-#define DoProfileLib ProfileLibGlx
-#else
-#define DoNormalLib SharedLibGlxWithoutPIC
-#define DoSharedLib !SharedLibGlxWithoutPIC
-#define DoExtraLib NO
-#define DoDebugLib NO
-#define DoProfileLib NO
-#endif
-
-/* Large PIC tables needed for Solaris SPARC builds */
-#if (defined(SunArchitecture) && defined(SparcArchitecture))
-# define LargePICTable YES
-#endif
-
-#define MesaTnlBuildDir /**/
-#define NeedToLinkMesaSrc
-#include "Imakefile.inc"
-
-
-#if Malloc0ReturnsNull
-ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL
-#endif
-
-#if BuildXF86DRI
-  DRI_DEFINES = GlxDefines -DIN_DRI_DRIVER
- DRI_INCLUDES = -I../../../dri -I../../../glx -I../../dri -I../../../include \
-		-I$(INCLUDESRC)/GL -I$(XF86OSSRC) -I$(SERVERSRC)/GL/dri
-#endif
-
-#if defined(i386Architecture) && MesaUseX86Asm
-      ASM_DIR = x86
-     ASM_SRCS =
-     ASM_OBJS =
-#if MesaUseMMX
-     MMX_DEFS = -DUSE_MMX_ASM
-#endif
-#if MesaUse3DNow
-   3DNOW_DEFS = -DUSE_3DNOW_ASM
-#endif
-#if MesaUseSSE
-     SSE_DEFS = -DUSE_SSE_ASM
-#endif
-     ASM_DEFS = -DUSE_X86_ASM $(MMX_DEFS) $(3DNOW_DEFS) $(SSE_DEFS)
-#endif
-
-#ifdef SparcArchitecture
-      ASM_DIR = sparc
-     ASM_SRCS =
-     ASM_OBJS =
-     ASM_DEFS = -DUSE_SPARC_ASM
-#endif
-
-#ifdef UseCompaqMathLibrary
-      MATHDEF = -DCCPML
-#endif
-
-MESA_INCLUDES = -I$(MESASRCDIR)/src/mesa \
-		-I$(MESASRCDIR)/src/mesa/$(ASM_DIR) \
-		-I$(MESASRCDIR)/src/mesa/array_cache \
-		-I$(MESASRCDIR)/src/mesa/math \
-		-I$(MESASRCDIR)/src/mesa/main \
-		-I$(MESASRCDIR)/src/mesa/glapi \
-		-I$(MESASRCDIR)/src/mesa/swrast_setup \
-		-I$(MESASRCDIR)/src/mesa/shader \
-		-I$(MESASRCDIR)/src/mesa/tnl \
-		-I$(MESASRCDIR)/include \
-		-I../../../include -I$(XINCLUDESRC)
-
-      DEFINES = $(ALLOC_DEFINES) $(DRI_DEFINES) $(ASM_DEFS) $(MATHDEF)
-     INCLUDES = $(MESA_INCLUDES) $(DRI_INCLUDES)
-         SRCS = $(MESA_TNL_SRCS)
-         OBJS = $(MESA_TNL_OBJS)
-
-
-#include <Library.tmpl>
-
-LibraryObjectRule()
-
-SubdirLibraryRule($(OBJS))
-NormalLintTarget($(SRCS))
-
-DependTarget()
--- a/nx-X11/lib/GL/mesa/tnl_dd/Imakefile
+++ b/nx-X11/lib/GL/mesa/tnl_dd/Imakefile
-XCOMM $XFree86: xc/lib/GL/mesa/src/tnl_dd/Imakefile,v 1.6 2002/11/25 12:58:55 tsi Exp $
-
-#include <Threads.tmpl>
-
-/*
- * Need both shared and unshared Mesa objects in the following cases:
- *   GlxDriverUsesMesa
- *   GlxBuiltInXMesa
- *   BuildOSMesaLib
- *
- * In other cases, only the shared version is needed to link in to loadable
- * driver modules.
- */
-
-#if GlxDriverUsesMesa || GlxBuiltInXMesa || BuildOSMesaLib
-#define DoNormalLib (NormalLibGlx || SharedLibGlxWithoutPIC)
-#define DoSharedLib (SharedLibGlx && !SharedLibGlxWithoutPIC)
-#define DoExtraLib SharedLibGlx
-#define DoDebugLib DebugLibGlx
-#define DoProfileLib ProfileLibGlx
-#else
-#define DoNormalLib SharedLibGlxWithoutPIC
-#define DoSharedLib !SharedLibGlxWithoutPIC
-#define DoExtraLib NO
-#define DoDebugLib NO
-#define DoProfileLib NO
-#endif
-
-/* Large PIC tables needed for Solaris SPARC builds */
-#if (defined(SunArchitecture) && defined(SparcArchitecture))
-# define LargePICTable YES
-#endif
-
-#define MesaTnlDdBuildDir /**/
-#define NeedToLinkMesaSrc
-#include "Imakefile.inc"
-
-#if Malloc0ReturnsNull
-ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL
-#endif
-
-#if BuildXF86DRI
-  DRI_DEFINES = GlxDefines -DIN_DRI_DRIVER
- DRI_INCLUDES = -I../../../dri -I../../../glx -I../../dri -I../../../include \
-		-I$(XINCLUDESRC) -I$(INCLUDESRC)/GL \
-		-I$(XF86OSSRC) -I$(SERVERSRC)/GL/dri
-#endif
-
-MESA_INCLUDES = -I$(MESASRCDIR)/src \
-		-I$(MESASRCDIR)/src/math \
-		-I$(MESASRCDIR)/src/tnl_dd \
-		-I$(MESASRCDIR)/include \
-		-I../../../include
-
-     INCLUDES = $(MESA_INCLUDES) $(DRI_INCLUDES)
-
-      DEFINES = $(ALLOC_DEFINES) $(DRI_DEFINES) $(ASM_DEFS) $(MATHDEF)
-
-#include <Library.tmpl>
-
-LibraryObjectRule()
-
-DependTarget()
--- a/nx-X11/lib/GL/mesa/tnl_dd/Imakefile.inc
+++ b/nx-X11/lib/GL/mesa/tnl_dd/Imakefile.inc
-XCOMM $XFree86: xc/lib/GL/mesa/src/tnl_dd/Imakefile.inc,v 1.1tsi Exp $
-
-#ifndef MesaTnlDdBuildDir
-#define MesaTnlDdBuildDir $(GLXLIBSRC)/mesa/tnl_dd/
-#endif
-
-MESATNLDDBUILDDIR = MesaTnlDdBuildDir
-
- MESA_TNL_DD_SRCS = $(MESATNLDDBUILDDIR)t_dd.c \
-		    $(MESATNLDDBUILDDIR)t_dd_vb.c
-
-#ifdef NeedToLinkMesaSrc
-LinkSourceFile(t_dd.c, $(MESASRCDIR)/src/mesa/tnl_dd)
-LinkSourceFile(t_dd_vb.c, $(MESASRCDIR)/src/mesa/tnl_dd)
-LinkSourceFile(t_dd_dmatmp2.h, $(MESASRCDIR)/src/mesa/tnl_dd)
-LinkSourceFile(t_dd_dmatmp.h, $(MESASRCDIR)/src/mesa/tnl_dd)
-LinkSourceFile(t_dd_rendertmp.h, $(MESASRCDIR)/src/mesa/tnl_dd)
-LinkSourceFile(t_dd_triemit.h, $(MESASRCDIR)/src/mesa/tnl_dd)
-LinkSourceFile(t_dd_tritmp.h, $(MESASRCDIR)/src/mesa/tnl_dd)
-LinkSourceFile(t_dd_unfilled.h, $(MESASRCDIR)/src/mesa/tnl_dd)
-LinkSourceFile(t_dd_vbtmp.h, $(MESASRCDIR)/src/mesa/tnl_dd)
-LinkSourceFile(t_dd_vertex.h, $(MESASRCDIR)/src/mesa/tnl_dd)
-#endif
-
- MESA_TNL_DD_OBJS = $(MESATNLDDBUILDDIR)t_dd.o \
-		    $(MESATNLDDBUILDDIR)t_dd_vb.o
-
-#if defined(DoSharedLib) && DoSharedLib
-MESA_TNL_DD_UOBJS = $(MESATNLDDBUILDDIR)unshared/t_dd.o \
-		    $(MESATNLDDBUILDDIR)unshared/t_dd_vb.o
-#else
-MESA_TNL_DD_UOBJS = $(MESA_TNL_DD_OBJS)
-#endif
-
-MESA_TNL_DD_DOBJS = $(MESATNLDDBUILDDIR)debugger/t_dd.o \
-		    $(MESATNLDDBUILDDIR)debugger/t_dd_vb.o
-
-MESA_TNL_DD_POBJS = $(MESATNLDDBUILDDIR)profiled/t_dd.o \
-		    $(MESATNLDDBUILDDIR)profiled/t_dd_vb.o
-
--- a/nx-X11/lib/GL/mesa/x86/Imakefile
+++ b/nx-X11/lib/GL/mesa/x86/Imakefile
-XCOMM $XFree86: xc/lib/GL/mesa/src/X86/Imakefile,v 1.23 2002/07/14 17:08:16 alanh Exp $
-
-/*
- * Need both shared and unshared Mesa objects in the following cases:
- *   GlxDriverUsesMesa
- *   GlxBuiltInXMesa
- *   BuildOSMesaLib
- *
- * In other cases, only the shared version is needed to link in to loadable
- * driver modules.
- */
-
-#if GlxDriverUsesMesa || GlxBuiltInXMesa || BuildOSMesaLib
-#define DoNormalLib (NormalLibGlx || SharedLibGlxWithoutPIC)
-#define DoSharedLib (SharedLibGlx && !SharedLibGlxWithoutPIC)
-#define DoExtraLib SharedLibGlx
-#define DoDebugLib DebugLibGlx
-#define DoProfileLib ProfileLibGlx
-#else
-#define DoNormalLib SharedLibGlxWithoutPIC
-#define DoSharedLib !SharedLibGlxWithoutPIC
-#define DoExtraLib NO
-#define DoDebugLib NO
-#define DoProfileLib NO
-#endif
-
-
-#if Malloc0ReturnsNull
-ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL
-#endif
-
-#define MesaX86BuildDir /**/
-#define NeedToLinkMesaSrc
-#include "Imakefile.inc"
-
-      DEFINES = $(ALLOC_DEFINES) GlxDefines -DIN_DRI_DRIVER $(MESA_ASM_DEFINES)
-     INCLUDES = /*-I$(INCLUDESRC) -I$(EXTINCSRC)*/ -I$(MESASRCDIR)/src/mesa \
-		-I$(MESASRCDIR)/include \
-		-I$(GLXLIBSRC)/include \
-		-I$(MESASRCDIR)/src/mesa/main \
-		-I$(MESASRCDIR)/src/mesa/x86 \
-		-I$(MESASRCDIR)/src/mesa/glapi
-
-         SRCS = $(MESA_ASM_SRCS) gen_matypes.c
-         OBJS = $(MESA_ASM_OBJS)
-
-#include <Library.tmpl>
-
-LibraryObjectRule()
-
-STD_CPP_DEFINES = StandardDefines $(PROJECT_DEFINES)
-
-SubdirLibraryRule($(OBJS))
-NormalLintTarget($(SRCS))
-
-ObjectFromAsmSource(common_x86_asm, NullParameter)
-ObjectFromAsmSource(read_rgba_span_x86, NullParameter)
-ObjectFromAsmSource(x86_cliptest, NullParameter)
-ObjectFromAsmSource(x86_xform2, NullParameter)
-ObjectFromAsmSource(x86_xform3, NullParameter)
-ObjectFromAsmSource(x86_xform4, NullParameter)
-
-#if MesaUseMMX
-ObjectFromAsmSource(mmx_blend, NullParameter)
-#endif
-
-#if MesaUse3DNow
-ObjectFromAsmSource(3dnow_normal, NullParameter)
-ObjectFromAsmSource(3dnow_xform1, NullParameter)
-ObjectFromAsmSource(3dnow_xform2, NullParameter)
-ObjectFromAsmSource(3dnow_xform3, NullParameter)
-ObjectFromAsmSource(3dnow_xform4, NullParameter)
-#endif
-
-#if MesaUseSSE
-ObjectFromAsmSource(sse_normal, NullParameter)
-ObjectFromAsmSource(sse_xform1, NullParameter)
-ObjectFromAsmSource(sse_xform2, NullParameter)
-ObjectFromAsmSource(sse_xform3, NullParameter)
-ObjectFromAsmSource(sse_xform4, NullParameter)
-#endif
-
-LinkSourceFile(gen_matypes.c, $(MESASRCDIR)/src/mesa/x86)
-
-#if CrossCompiling
-HOST_CFLAGS=$(TOP_INCLUDES) $(INCLUDES) $(BOOTSTRAPCFLAGS) \
-	$(CROSSCOMPILEDEFINES) $(CROSSCOMPILEBOOTSTRAPDEFINES)
-#else
-HOST_CFLAGS=$(CFLAGS)
-#endif
-
-MATYPES = ./gen_matypes
-
-matypes.h: gen_matypes.c
-	RemoveFiles($@ HostProgramTargetName(gen_matypes))
-	-HostLinkRule(HostProgramTargetName(gen_matypes),$(HOST_CFLAGS) $(LOCAL_LDFLAGS),gen_matypes.c,$(LDLIBS))
-	RunProgram(MATYPES,> matypes_h)
-	$(MV) matypes_h $@
-	RemoveFiles(HostProgramTargetName(gen_matypes))
-
-includes:: matypes.h
-
-depend:: matypes.h
-
-clean::
-	RemoveFiles(matypes.h HostProgramTargetName(gen_matypes))
-
-DependTarget()
--- a/nx-X11/lib/GL/mesa/x86/Imakefile.inc
+++ b/nx-X11/lib/GL/mesa/x86/Imakefile.inc
-XCOMM $XFree86: xc/lib/GL/mesa/src/X86/Imakefile.inc,v 1.5 2002/11/14 21:01:16 tsi Exp $
-
-#ifndef MesaX86BuildDir
-#define MesaX86BuildDir $(GLXLIBSRC)/mesa/x86/
-#endif
-
-MESAX86BUILDDIR = MesaX86BuildDir
-
-MESA_X86_SRCS = $(MESAX86BUILDDIR)common_x86.c \
-		$(MESAX86BUILDDIR)common_x86_asm.S \
-		$(MESAX86BUILDDIR)glapi_x86.S \
-                $(MESAX86BUILDDIR)read_rgba_span_x86.S \
-		$(MESAX86BUILDDIR)x86.c \
-		$(MESAX86BUILDDIR)x86_cliptest.S \
-		$(MESAX86BUILDDIR)x86_xform2.S \
-		$(MESAX86BUILDDIR)x86_xform3.S \
-		$(MESAX86BUILDDIR)x86_xform4.S \
-                $(MESAX86BUILDDIR)x86sse.c
-
-#ifdef NeedToLinkMesaSrc
-LinkSourceFile(common_x86.c, $(MESASRCDIR)/src/mesa/x86)
-LinkSourceFile(common_x86_asm.S, $(MESASRCDIR)/src/mesa/x86)
-LinkSourceFile(glapi_x86.S, $(MESASRCDIR)/src/mesa/x86)
-LinkSourceFile(read_rgba_span_x86.S, $(MESASRCDIR)/src/mesa/x86)
-LinkSourceFile(read_rgba_span_x86.h, $(MESASRCDIR)/src/mesa/x86)
-LinkSourceFile(x86.c, $(MESASRCDIR)/src/mesa/x86)
-LinkSourceFile(x86_cliptest.S, $(MESASRCDIR)/src/mesa/x86)
-LinkSourceFile(x86_xform2.S, $(MESASRCDIR)/src/mesa/x86)
-LinkSourceFile(x86_xform3.S, $(MESASRCDIR)/src/mesa/x86)
-LinkSourceFile(x86_xform4.S, $(MESASRCDIR)/src/mesa/x86)
-LinkSourceFile(x86sse.c, $(MESASRCDIR)/src/mesa/x86/rtasm)
-LinkSourceFile(x86sse.h, $(MESASRCDIR)/src/mesa/x86/rtasm)
-#endif
-
-MESA_X86_OBJS = $(MESAX86BUILDDIR)common_x86.o \
-		$(MESAX86BUILDDIR)common_x86_asm.o \
-                $(MESAX86BUILDDIR)read_rgba_span_x86.o \
-		$(MESAX86BUILDDIR)x86.o \
-		$(MESAX86BUILDDIR)x86_cliptest.o \
-		$(MESAX86BUILDDIR)x86_xform2.o \
-		$(MESAX86BUILDDIR)x86_xform3.o \
-		$(MESAX86BUILDDIR)x86_xform4.o \
-                $(MESAX86BUILDDIR)x86sse.o
-
-#if defined(DoSharedLib) && DoSharedLib
-MESA_X86_UOBJS = $(MESAX86BUILDDIR)unshared/common_x86.o \
-		$(MESAX86BUILDDIR)common_x86_asm.o \
-                $(MESAX86BUILDDIR)read_rgba_span_x86.o \
-		$(MESAX86BUILDDIR)unshared/x86.o \
-		$(MESAX86BUILDDIR)x86_cliptest.o \
-		$(MESAX86BUILDDIR)x86_xform2.o \
-		$(MESAX86BUILDDIR)x86_xform3.o \
-		$(MESAX86BUILDDIR)x86_xform4.o \
-                $(MESAX86BUILDDIR)x86sse.o
-#else
-MESA_X86_UOBJS = $(MESA_X86_OBJS)
-#endif
-
-MESA_X86_DOBJS = $(MESAX86BUILDDIR)debugger/common_x86.o \
-		$(MESAX86BUILDDIR)common_x86_asm.o \
-                $(MESAX86BUILDDIR)read_rgba_span_x86.o \
-		$(MESAX86BUILDDIR)debugger/x86.o \
-		$(MESAX86BUILDDIR)x86_cliptest.o \
-		$(MESAX86BUILDDIR)x86_xform2.o \
-		$(MESAX86BUILDDIR)x86_xform3.o \
-		$(MESAX86BUILDDIR)x86_xform4.o \
-                $(MESAX86BUILDDIR)x86sse.o
-
-MESA_X86_POBJS = $(MESAX86BUILDDIR)profiled/common_x86.o \
-		$(MESAX86BUILDDIR)common_x86_asm.o \
-                $(MESAX86BUILDDIR)read_rgba_span_x86.o \
-		$(MESAX86BUILDDIR)profiled/x86.o \
-		$(MESAX86BUILDDIR)x86_cliptest.o \
-		$(MESAX86BUILDDIR)x86_xform2.o \
-		$(MESAX86BUILDDIR)x86_xform3.o \
-		$(MESAX86BUILDDIR)x86_xform4.o \
-                $(MESAX86BUILDDIR)x86sse.o
-
-MESA_X86_DEFS = -DUSE_X86_ASM
-
-
-#if MesaUseMMX
-MESA_MMX_SRCS = $(MESAX86BUILDDIR)mmx_blend.S
-
-#ifdef NeedToLinkMesaSrc
-LinkSourceFile(mmx_blend.S, $(MESASRCDIR)/src/mesa/x86)
-#endif
-
-MESA_MMX_OBJS = $(MESAX86BUILDDIR)mmx_blend.o
-
-MESA_MMX_UOBJS = $(MESA_MMX_OBJS)
-MESA_MMX_DOBJS = $(MESA_MMX_OBJS)
-MESA_MMX_POBJS = $(MESA_MMX_OBJS)
-
-MESA_MMX_DEFS = -DUSE_MMX_ASM
-#endif
-
-#if MesaUse3DNow
-MESA_3DNOW_SRCS = $(MESAX86BUILDDIR)3dnow.c \
-		$(MESAX86BUILDDIR)3dnow_normal.S \
-		$(MESAX86BUILDDIR)3dnow_xform1.S \
-		$(MESAX86BUILDDIR)3dnow_xform2.S \
-		$(MESAX86BUILDDIR)3dnow_xform3.S \
-		$(MESAX86BUILDDIR)3dnow_xform4.S
-
-#ifdef NeedToLinkMesaSrc
-LinkSourceFile(3dnow.c, $(MESASRCDIR)/src/mesa/x86)
-LinkSourceFile(3dnow_normal.S, $(MESASRCDIR)/src/mesa/x86)
-LinkSourceFile(3dnow_xform1.S, $(MESASRCDIR)/src/mesa/x86)
-LinkSourceFile(3dnow_xform2.S, $(MESASRCDIR)/src/mesa/x86)
-LinkSourceFile(3dnow_xform3.S, $(MESASRCDIR)/src/mesa/x86)
-LinkSourceFile(3dnow_xform4.S, $(MESASRCDIR)/src/mesa/x86)
-#endif
-MESA_3DNOW_OBJS = $(MESAX86BUILDDIR)3dnow.o \
-		$(MESAX86BUILDDIR)3dnow_normal.o \
-		$(MESAX86BUILDDIR)3dnow_xform1.o \
-		$(MESAX86BUILDDIR)3dnow_xform2.o \
-		$(MESAX86BUILDDIR)3dnow_xform3.o \
-		$(MESAX86BUILDDIR)3dnow_xform4.o
-
-#if defined(DoSharedLib) && DoSharedLib
-MESA_3DNOW_UOBJS = $(MESAX86BUILDDIR)unshared/3dnow.o \
-		$(MESAX86BUILDDIR)3dnow_normal.o \
-		$(MESAX86BUILDDIR)3dnow_xform1.o \
-		$(MESAX86BUILDDIR)3dnow_xform2.o \
-		$(MESAX86BUILDDIR)3dnow_xform3.o \
-		$(MESAX86BUILDDIR)3dnow_xform4.o
-#else
-MESA_3DNOW_UOBJS = $(MESA_3DNOW_OBJS)
-#endif
-
-MESA_3DNOW_DOBJS = $(MESAX86BUILDDIR)debugger/3dnow.o \
-		$(MESAX86BUILDDIR)3dnow_normal.o \
-		$(MESAX86BUILDDIR)3dnow_xform1.o \
-		$(MESAX86BUILDDIR)3dnow_xform2.o \
-		$(MESAX86BUILDDIR)3dnow_xform3.o \
-		$(MESAX86BUILDDIR)3dnow_xform4.o
-
-MESA_3DNOW_POBJS = $(MESAX86BUILDDIR)profiled/3dnow.o \
-		$(MESAX86BUILDDIR)3dnow_normal.o \
-		$(MESAX86BUILDDIR)3dnow_xform1.o \
-		$(MESAX86BUILDDIR)3dnow_xform2.o \
-		$(MESAX86BUILDDIR)3dnow_xform3.o \
-		$(MESAX86BUILDDIR)3dnow_xform4.o
-
-MESA_3DNOW_DEFS = -DUSE_3DNOW_ASM
-#endif
-
-#if MesaUseSSE
-MESA_SSE_SRCS = $(MESAX86BUILDDIR)sse.c \
-		$(MESAX86BUILDDIR)sse_normal.S \
-		$(MESAX86BUILDDIR)sse_xform1.S \
-		$(MESAX86BUILDDIR)sse_xform2.S \
-		$(MESAX86BUILDDIR)sse_xform3.S \
-		$(MESAX86BUILDDIR)sse_xform4.S
-
-#ifdef NeedToLinkMesaSrc
-LinkSourceFile(sse.c, $(MESASRCDIR)/src/mesa/x86)
-LinkSourceFile(sse_normal.S, $(MESASRCDIR)/src/mesa/x86)
-LinkSourceFile(sse_xform1.S, $(MESASRCDIR)/src/mesa/x86)
-LinkSourceFile(sse_xform2.S, $(MESASRCDIR)/src/mesa/x86)
-LinkSourceFile(sse_xform3.S, $(MESASRCDIR)/src/mesa/x86)
-LinkSourceFile(sse_xform4.S, $(MESASRCDIR)/src/mesa/x86)
-#endif
-
-MESA_SSE_OBJS = $(MESAX86BUILDDIR)sse.o \
-		$(MESAX86BUILDDIR)sse_normal.o \
-		$(MESAX86BUILDDIR)sse_xform1.o \
-		$(MESAX86BUILDDIR)sse_xform2.o \
-		$(MESAX86BUILDDIR)sse_xform3.o \
-		$(MESAX86BUILDDIR)sse_xform4.o
-
-#if defined(DoSharedLib) && DoSharedLib
-MESA_SSE_UOBJS = $(MESAX86BUILDDIR)unshared/sse.o \
-		$(MESAX86BUILDDIR)sse_normal.o \
-		$(MESAX86BUILDDIR)sse_xform1.o \
-		$(MESAX86BUILDDIR)sse_xform2.o \
-		$(MESAX86BUILDDIR)sse_xform3.o \
-		$(MESAX86BUILDDIR)sse_xform4.o
-#else
-MESA_SSE_UOBJS = $(MESA_SSE_OBJS)
-#endif
-
-MESA_SSE_DOBJS = $(MESAX86BUILDDIR)debugger/sse.o \
-		$(MESAX86BUILDDIR)sse_normal.o \
-		$(MESAX86BUILDDIR)sse_xform1.o \
-		$(MESAX86BUILDDIR)sse_xform2.o \
-		$(MESAX86BUILDDIR)sse_xform3.o \
-		$(MESAX86BUILDDIR)sse_xform4.o
-
-MESA_SSE_POBJS = $(MESAX86BUILDDIR)profiled/sse.o \
-		$(MESAX86BUILDDIR)sse_normal.o \
-		$(MESAX86BUILDDIR)sse_xform1.o \
-		$(MESAX86BUILDDIR)sse_xform2.o \
-		$(MESAX86BUILDDIR)sse_xform3.o \
-		$(MESAX86BUILDDIR)sse_xform4.o
-
-MESA_SSE_DEFS = -DUSE_SSE_ASM
-#endif
-
-MESA_ASM_SRCS = $(MESA_X86_SRCS) $(MESA_MMX_SRCS) $(MESA_3DNOW_SRCS) \
-		$(MESA_SSE_SRCS)
-
-MESA_ASM_OBJS = $(MESA_X86_OBJS) $(MESA_MMX_OBJS) $(MESA_3DNOW_OBJS) \
-		$(MESA_SSE_OBJS)
-
-MESA_ASM_UOBJS = $(MESA_X86_UOBJS) $(MESA_MMX_UOBJS) $(MESA_3DNOW_UOBJS) \
-		$(MESA_SSE_UOBJS)
-
-MESA_ASM_DOBJS = $(MESA_X86_DOBJS) $(MESA_MMX_DOBJS) $(MESA_3DNOW_DOBJS) \
-		$(MESA_SSE_DOBJS)
-
-MESA_ASM_POBJS = $(MESA_X86_POBJS) $(MESA_MMX_POBJS) $(MESA_3DNOW_POBJS) \
-		$(MESA_SSE_POBJS)
-
-MESA_ASM_DEFINES = $(MESA_X86_DEFS) $(MESA_MMX_DEFS) $(MESA_3DNOW_DEFS) $(MESA_SSE_DEFS)
-
--- a/nx-X11/lib/Imakefile
+++ b/nx-X11/lib/Imakefile
@@ -39,10 +39,6 @@ XF86RUSHLIBDIR = Xxf86rush
 XINERAMADIR=Xinerama
 #endif

-#if BuildGLXLibrary
-GLXLIBDIR = GL
-#endif
-
 #if BuildRenderLibrary
 RENDERLIBDIR = Xrender
 #endif
@@ -92,7 +88,6 @@ LINTSUBDIRS = \
 	$(XTSTLIBDIR) \
 	$(XKBLIBDIR) \
 	$(XKBUILIBDIR) \
-	$(GLXLIBDIR) \
 	$(XINERAMADIR) \
 	$(RENDERLIBDIR) \
 	$(XFIXESLIBDIR) \

--- a/nx-X11/lib/X11/Imakefile
+++ b/nx-X11/lib/X11/Imakefile
@@ -27,7 +27,7 @@ XCOMM $XFree86: xc/lib/X11/Imakefile,v 3.52 2003/05/27 16:53:15 tsi Exp $
        HEADERS = Xlib.h Xresource.h Xutil.h cursorfont.h Xlibint.h \
 		Xcms.h Xlocale.h XKBlib.h XlibConf.h Xregion.h ImUtil.h

-#if BuildServersOnly && !BuildGLXLibrary && !BuildClients && !NXAgentServer
+#if BuildServersOnly && !BuildClients && !NXAgentServer
 all::

 BuildIncludes($(HEADERS),IncSubdir,..)

--- a/nx-X11/programs/Xserver/GL/Imakefile
+++ b/nx-X11/programs/Xserver/GL/Imakefile
@@ -5,24 +5,9 @@ XCOMM $XFree86: xc/programs/Xserver/GL/Imakefile,v 1.12 2003/08/06 14:04:01 eich

 #define IHaveSubdirs

-#if GlxUseSGISI
- CORE_SUBDIR = /* opengl */
-#elif defined(DarwinArchitecture) && DarwinQuartzSupport
- CORE_SUBDIR = apple mesa
-#elif defined(cygwinArchitecture) && GlxUseWindows
- CORE_SUBDIR = windows mesa
-#elif defined(Win32Architecture) && GlxUseWindows
- CORE_SUBDIR = windows
-#else
 CORE_SUBDIR = mesa
-#endif
-
-#if BuildXF86DRI && ((defined(XF86Server) && XF86Server) \
-	|| (defined(XorgServer) && XorgServer))
-DRI_SUBDIR = dri
-#endif

-SUBDIRS = glx $(DRI_SUBDIR) $(CORE_SUBDIR)
+SUBDIRS = glx $(CORE_SUBDIR)

 #if DoLoadableServer
 MSRCS = glxmodule.c
@@ -39,7 +24,7 @@ OBJS = glx/?*.o $(MOBJS)

 DONES = glx/DONE

-INCLUDES = -Iinclude -Idri -I$(SERVERSRC)/include -I$(SERVERSRC)/mi \
+INCLUDES = -Iinclude -I$(SERVERSRC)/include -I$(SERVERSRC)/mi \
 	   -I$(XINCLUDESRC) -I$(EXTINCSRC) -I$(XF86OSSRC)
 DEPEND_DEFINES = $(EXT_DEFINES) DependDefines
 DEFINES = $(GLX_DEFINES)

--- a/nx-X11/programs/Xserver/GL/glx/module/Imakefile
+++ b/nx-X11/programs/Xserver/GL/glx/module/Imakefile
-#define IHaveModules
-#define LinkDirectory ..
-
-#include "../Imakefile"
--- a/nx-X11/programs/Xserver/GL/mesa/GLcore/Imakefile
+++ b/nx-X11/programs/Xserver/GL/mesa/GLcore/Imakefile
 XCOMM $XFree86: xc/programs/Xserver/GL/mesa/GLcore/Imakefile,v 1.3 2002/05/31 18:12:36 dawes Exp $

 #if DoLoadableServer
-#if !BuildModuleInSubdir
 #define IHaveModules
-#elif !defined(IHaveModules)
-#define IHaveSubdirs
-SUBDIRS = module
-#endif
 #endif

 #include <Server.tmpl>
@@ -24,17 +19,17 @@ SUBDIRS = module
 #define MesaSlangBuildDir ../shader/slang/
 #define MesaXBuildDir ../X/

-#include "../../../../../lib/GL/mesa/array_cache/Imakefile.inc"
-#include "../../../../../lib/GL/mesa/swrast/Imakefile.inc"
-#include "../../../../../lib/GL/mesa/swrast_setup/Imakefile.inc"
-#include "../../../../../lib/GL/mesa/tnl/Imakefile.inc"
-#include "../../../../../lib/GL/mesa/main/Imakefile.inc"
-#include "../../../../../lib/GL/mesa/math/Imakefile.inc"
-#include "../../../../../lib/GL/mesa/shader/Imakefile.inc"
-#include "../../../../../lib/GL/mesa/shader/grammar/Imakefile.inc"
-#include "../../../../../lib/GL/mesa/shader/slang/Imakefile.inc"
-#include "../../../../../lib/GL/mesa/drivers/x11/Imakefile.inc"
-#include "../../../../../lib/GL/mesa/Imakefile.inc"
+#include "../array_cache/Imakefile.inc"
+#include "../swrast/Imakefile.inc"
+#include "../swrast_setup/Imakefile.inc"
+#include "../tnl/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 "../X/Imakefile.inc"
+#include "../Imakefile.inc"

 #ifdef IHaveModules
        MSRCS = GLcoremodule.c
@@ -51,7 +46,7 @@ SUBDIRS = module
                ../shader/slang/DONE

     INCLUDES = -I$(INCLUDESRC) -I$(XINCLUDESRC) -I$(EXTINCSRC) \
-		-I$(MESASRCDIR)/include -I$(GLXLIBSRC)/include \
+		-I$(MESASRCDIR)/include \
 		-I$(MESASRCDIR)/src/mesa \
 		-I$(SERVERSRC)/include

@@ -74,4 +69,3 @@ InstallDriverSDKLibraryModule(GLcore,$(DRIVERSDKMODULEDIR),extensions)
 MakeSubdirs($(SUBDIRS))
 DependSubdirs($(SUBDIRS))
 #endif
-
--- a/nx-X11/programs/Xserver/GL/mesa/GLcore/module/Imakefile
+++ b/nx-X11/programs/Xserver/GL/mesa/GLcore/module/Imakefile
-XCOMM $XFree86: xc/programs/Xserver/GL/mesa/GLcore/Imakefile,v 1.2 2002/02/25 18:00:38 dawes Exp $
-
-#define IHaveModules
-#include <Server.tmpl>
-
-#define NeedAllMesaSrc
-#define MesaInXServer
-#define MesaBuildDir ../../main/module/
-#define MesaACBuildDir ../../array_cache/module/
-#define MesaMathBuildDir ../../math/module/
-#define MesaSwrastBuildDir ../../swrast/module/
-#define MesaSwrastSetupBuildDir ../../swrast_setup/module/
-#define MesaTnlBuildDir ../../tnl/module/
-#define MesaXBuildDir ../../X/module/
-
-#include "../../../../../../lib/GL/mesa/array_cache/Imakefile.inc"
-#include "../../../../../../lib/GL/mesa/swrast/Imakefile.inc"
-#include "../../../../../../lib/GL/mesa/swrast_setup/Imakefile.inc"
-#include "../../../../../../lib/GL/mesa/tnl/Imakefile.inc"
-#include "../../../../../../lib/GL/mesa/math/Imakefile.inc"
-#include "../../../../../../lib/GL/mesa/drivers/x11/Imakefile.inc"
-#include "../../../../../../lib/GL/mesa/Imakefile.inc"
-
-#if DoLoadableServer
-        MSRCS = GLcoremodule.c
-        MOBJS = GLcoremodule.o
-#endif
-
-        XOBJS = ../../X/module/?*.o
-
-         OBJS = $(COREMESAOBJS) $(MOBJS)
-
-        DONES = ../../module/DONE ../../X/module/DONE \
-		../../array_cache/module/DONE ../../math/module/DONE \
-		../../swrast/module/DONE \
-		../../swrast_setup/module/DONE ../../tnl/module/DONE
-
-     INCLUDES = -I$(INCLUDESRC) -I$(XINCLUDESRC) -I$(EXTINCSRC) \
-		-I$(MESASRCDIR)/include -I$(GLXLIBSRC)/include \
-		-I$(MESASRCDIR)/src/mesa \
-		-I$(SERVERSRC)/include
-
-      DEFINES = $(GLX_DEFINES)
-
-ModuleObjectRule()
-
-DepLibraryModuleTarget(GLcore, $(DONES) $(OBJS),$(OBJS) $(XOBJS))
-InstallLibraryModule(GLcore,$(MODULEDIR),extensions)
-
-InstallDriverSDKLibraryModule(GLcore,$(DRIVERSDKMODULEDIR),extensions)
-
-LinkSourceFile(GLcoremodule.c,..)
-
--- a/nx-X11/programs/Xserver/GL/mesa/Imakefile
+++ b/nx-X11/programs/Xserver/GL/mesa/Imakefile
 XCOMM $XFree86: xc/programs/Xserver/GL/mesa/src/Imakefile,v 1.23 2002/11/22 22:56:00 tsi Exp $

 #if DoLoadableServer
-#if !BuildModuleInSubdir
 #define IHaveModules
-#elif !defined(IHaveModules)
-    MODSUBDIR = module
-#endif
 #endif

-#if !defined(IHaveModules) || !BuildModuleInSubdir
 #define IHaveSubdirs
      SUBDIRS = main math array_cache swrast swrast_setup tnl shader X GLcore $(MODSUBDIR)
-#endif

 #include <Server.tmpl>

@@ -19,11 +13,7 @@ XCOMM $XFree86: xc/programs/Xserver/GL/mesa/src/Imakefile,v 1.23 2002/11/22 22:5
 #define NeedAllMesaSrc
 #define NeedToLinkMesaSrc
 #define MesaBuildDir /**/
-#if !defined(IHaveModules) || !BuildModuleInSubdir
-#include "../../../../lib/GL/mesa/Imakefile.inc"
-#else
-#include "../../../../../../lib/GL/mesa/Imakefile.inc"
-#endif
+#include "Imakefile.inc"

     INCLUDES = -I$(INCLUDESRC) -I$(XINCLUDESRC) -I$(EXTINCSRC) \
 		-I$(MESASRCDIR)/include -I$(GLXLIBSRC)/include \
@@ -44,4 +34,3 @@ DependSubdirs($(SUBDIRS))
 #endif

 DependTarget()
-
--- a/nx-X11/lib/GL/mesa/Imakefile.inc
+++ b/nx-X11/lib/GL/mesa/Imakefile.inc
 XCOMM $XFree86: xc/lib/GL/mesa/src/Imakefile.inc,v 1.7tsi Exp $

-#ifndef MesaBuildDir
-#define MesaBuildDir $(GLXLIBSRC)/mesa/
-#endif
-
 MESABUILDDIR = MesaBuildDir

 COREMESASRCS = $(COREMESABASESRCS) \

--- a/nx-X11/programs/Xserver/GL/mesa/X/Imakefile
+++ b/nx-X11/programs/Xserver/GL/mesa/X/Imakefile
 XCOMM $XFree86: xc/programs/Xserver/GL/mesa/src/X/Imakefile,v 1.16 2002/11/22 22:56:01 tsi Exp $

 #if DoLoadableServer
-#if !BuildModuleInSubdir
 #define IHaveModules
-#elif !defined(IHaveModules)
-#define IHaveSubdirs
-SUBDIRS = module
-#endif
 #endif

 #include <Server.tmpl>
@@ -15,11 +10,7 @@ SUBDIRS = module
 #define NeedToLinkMesaSrc
 #define MesaXBuildDir /**/
 #define MesaInXServer
-#if !defined(IHaveModules) || !BuildModuleInSubdir
-#include "../../../../../lib/GL/mesa/drivers/x11/Imakefile.inc"
-#else
-#include "../../../../../../lib/GL/mesa/drivers/x11/Imakefile.inc"
-#endif
+#include "Imakefile.inc"


 LinkSourceFile(compsize.c,$(MESASRCDIR)/src/glx/x11)
@@ -67,7 +58,6 @@ NormalLibraryObjectRule()

 SubdirLibraryRule($(OBJS))

-LintLibraryTarget(dri,$(SRCS))
 NormalLintTarget($(SRCS))

 DependTarget()

--- a/nx-X11/lib/GL/mesa/drivers/x11/Imakefile.inc
+++ b/nx-X11/lib/GL/mesa/drivers/x11/Imakefile.inc
 XCOMM $XFree86: xc/lib/GL/mesa/src/X/Imakefile.inc,v 1.3tsi Exp $

-#ifndef MesaXBuildDir
-#define MesaXBuildDir $(GLXLIBSRC)/src/mesa/drivers/x11/
-#endif
-
 MESAXBUILDDIR = MesaXBuildDir

 #ifndef MesaInXServer

--- a/nx-X11/programs/Xserver/GL/mesa/X/module/Imakefile
+++ b/nx-X11/programs/Xserver/GL/mesa/X/module/Imakefile
-XCOMM $XFree86: xc/programs/Xserver/GL/mesa/src/X/module/Imakefile,v 1.1 2002/05/31 18:12:38 dawes Exp $
-
-#define IHaveModules
-
-#include "../Imakefile"
-
--- a/nx-X11/programs/Xserver/GL/mesa/array_cache/Imakefile
+++ b/nx-X11/programs/Xserver/GL/mesa/array_cache/Imakefile
 XCOMM $XFree86: xc/programs/Xserver/GL/mesa/src/array_cache/Imakefile,v 1.8 2002/11/22 22:56:01 tsi Exp $

 #if DoLoadableServer
-#if !BuildModuleInSubdir
 #define IHaveModules
-#elif !defined(IHaveModules)
-#define IHaveSubdirs
-SUBDIRS = module
-#endif
 #endif

 #include <Server.tmpl>
@@ -14,11 +9,7 @@ SUBDIRS = module
 #define NeedAllMesaSrc
 #define NeedToLinkMesaSrc
 #define MesaACBuildDir /**/
-#if !defined(IHaveModules) || !BuildModuleInSubdir
-#include "../../../../../lib/GL/mesa/array_cache/Imakefile.inc"
-#else
-#include "../../../../../../lib/GL/mesa/array_cache/Imakefile.inc"
-#endif
+#include "Imakefile.inc"

         SRCS = $(MESA_AC_SRCS)
         OBJS = $(MESA_AC_OBJS)
@@ -44,7 +35,6 @@ NormalLibraryObjectRule()

 SubdirLibraryRule($(OBJS))

-LintLibraryTarget(dri,$(SRCS))
 NormalLintTarget($(SRCS))

 DependTarget()

--- a/nx-X11/lib/GL/mesa/array_cache/Imakefile.inc
+++ b/nx-X11/lib/GL/mesa/array_cache/Imakefile.inc
 XCOMM $XFree86: xc/lib/GL/mesa/src/array_cache/Imakefile.inc,v 1.1tsi Exp $

-#ifndef MesaACBuildDir
-#define MesaACBuildDir $(GLXLIBSRC)/mesa/array_cache/
-#endif
-
 MESAACBUILDDIR = MesaACBuildDir

  MESA_AC_SRCS = $(MESAACBUILDDIR)ac_context.c \

--- a/nx-X11/programs/Xserver/GL/mesa/array_cache/module/Imakefile
+++ b/nx-X11/programs/Xserver/GL/mesa/array_cache/module/Imakefile
-XCOMM $XFree86: xc/programs/Xserver/GL/mesa/src/array_cache/module/Imakefile,v 1.1 2002/05/31 18:12:39 dawes Exp $
-
-#define IHaveModules
-
-#include "../Imakefile"
-
--- a/nx-X11/programs/Xserver/GL/mesa/main/Imakefile
+++ b/nx-X11/programs/Xserver/GL/mesa/main/Imakefile
@@ -2,12 +2,7 @@ XCOMM $XdotOrg: xc/programs/Xserver/GL/mesa/main/Imakefile,v 1.2 2004/08/19 07:3
 XCOMM $XFree86: xc/programs/Xserver/GL/mesa/src/math/Imakefile,v 1.8 2002/11/22 22:56:01 tsi Exp $

 #if DoLoadableServer
-#if !BuildModuleInSubdir
 #define IHaveModules
-#elif !defined(IHaveModules)
-#define IHaveSubdirs
-SUBDIRS = module
-#endif
 #endif

 /* Large PIC tables needed for Solaris/SPARC builds */
@@ -20,11 +15,7 @@ SUBDIRS = module
 #define NeedAllMesaSrc
 #define NeedToLinkMesaSrc
 #define MesaBuildDir /**/
-#if !defined(IHaveModules) || !BuildModuleInSubdir
-#include "../../../../../lib/GL/mesa/main/Imakefile.inc"
-#else
-#include "../../../../../../lib/GL/mesa/main/Imakefile.inc"
-#endif
+#include "Imakefile.inc"

         SRCS = $(COREMESABASESRCS)
         OBJS = $(COREMESABASEOBJS)
@@ -49,7 +40,6 @@ NormalLibraryObjectRule()

 SubdirLibraryRule($(OBJS))

-LintLibraryTarget(dri,$(SRCS))
 NormalLintTarget($(SRCS))

 DependTarget()

--- a/nx-X11/lib/GL/mesa/main/Imakefile.inc
+++ b/nx-X11/lib/GL/mesa/main/Imakefile.inc
@@ -3,10 +3,6 @@ XCOMM $XFree86: xc/lib/GL/mesa/src/Imakefile.inc,v 1.7tsi Exp $
 /* gcc on ppc64 defines this, causes macro recursion with pixel below */
 #undef pixel

-#ifndef MesaBuildDir
-#define MesaBuildDir $(GLXLIBSRC)/mesa/main/
-#endif
-
 MESABUILDDIR = MesaBuildDir

 #ifdef NeedAllMesaSrc

--- a/nx-X11/programs/Xserver/GL/mesa/main/module/Imakefile
+++ b/nx-X11/programs/Xserver/GL/mesa/main/module/Imakefile
-XCOMM $XFree86: xc/programs/Xserver/GL/mesa/src/math/module/Imakefile,v 1.1 2002/05/31 18:12:40 dawes Exp $
-
-#define IHaveModules
-
-#include "../Imakefile"
-
--- a/nx-X11/programs/Xserver/GL/mesa/math/Imakefile
+++ b/nx-X11/programs/Xserver/GL/mesa/math/Imakefile
 XCOMM $XFree86: xc/programs/Xserver/GL/mesa/src/math/Imakefile,v 1.8 2002/11/22 22:56:01 tsi Exp $

 #if DoLoadableServer
-#if !BuildModuleInSubdir
 #define IHaveModules
-#elif !defined(IHaveModules)
-#define IHaveSubdirs
-SUBDIRS = module
-#endif
 #endif

 #include <Server.tmpl>
@@ -14,11 +9,7 @@ SUBDIRS = module
 #define NeedAllMesaSrc
 #define NeedToLinkMesaSrc
 #define MesaMathBuildDir /**/
-#if !defined(IHaveModules) || !BuildModuleInSubdir
-#include "../../../../../lib/GL/mesa/math/Imakefile.inc"
-#else
-#include "../../../../../../lib/GL/mesa/math/Imakefile.inc"
-#endif
+#include "Imakefile.inc"

         SRCS = $(MESA_MATH_SRCS)
         OBJS = $(MESA_MATH_OBJS)
@@ -43,7 +34,6 @@ NormalLibraryObjectRule()

 SubdirLibraryRule($(OBJS))

-LintLibraryTarget(dri,$(SRCS))
 NormalLintTarget($(SRCS))

 DependTarget()

--- a/nx-X11/lib/GL/mesa/math/Imakefile.inc
+++ b/nx-X11/lib/GL/mesa/math/Imakefile.inc
 XCOMM $XFree86: xc/lib/GL/mesa/src/math/Imakefile.inc,v 1.1tsi Exp $

-#ifndef MesaMathBuildDir
-#define MesaMathBuildDir $(GLXLIBSRC)/mesa/math/
-#endif
-
 MESAMATHBUILDDIR = MesaMathBuildDir

  MESA_MATH_SRCS = $(MESAMATHBUILDDIR)m_debug_clip.c \

--- a/nx-X11/programs/Xserver/GL/mesa/math/module/Imakefile
+++ b/nx-X11/programs/Xserver/GL/mesa/math/module/Imakefile
-XCOMM $XFree86: xc/programs/Xserver/GL/mesa/src/math/module/Imakefile,v 1.1 2002/05/31 18:12:40 dawes Exp $
-
-#define IHaveModules
-
-#include "../Imakefile"
-
--- a/nx-X11/programs/Xserver/GL/mesa/shader/Imakefile
+++ b/nx-X11/programs/Xserver/GL/mesa/shader/Imakefile
 #if DoLoadableServer
-#if !BuildModuleInSubdir
 #define IHaveModules
-#elif !defined(IHaveModules)
-#define IHaveSubdirs
-SUBDIRS = module
-#endif
 #endif

-#if !defined(IHaveModules) || !BuildModuleInSubdir
 #define IHaveSubdirs
      SUBDIRS = grammar slang
-#endif

 #include <Server.tmpl>

 #define NeedAllMesaSrc
 #define NeedToLinkMesaSrc
 #define MesaShaderBuildDir /**/
-#if !defined(IHaveModules) || !BuildModuleInSubdir
-#include "../../../../../lib/GL/mesa/shader/Imakefile.inc"
-#else
-#include "../../../../../../lib/GL/mesa/shader/Imakefile.inc"
-#endif
+#include "Imakefile.inc"

         SRCS = $(MESA_SHADER_SRCS)
         OBJS = $(MESA_SHADER_OBJS)
@@ -48,7 +37,6 @@ NormalLibraryObjectRule()

 SubdirLibraryRule($(OBJS))

-LintLibraryTarget(dri,$(SRCS))
 NormalLintTarget($(SRCS))

 DependTarget()

--- a/nx-X11/lib/GL/mesa/shader/Imakefile.inc
+++ b/nx-X11/lib/GL/mesa/shader/Imakefile.inc
 XCOMM $XFree86:$

-#ifndef MesaShaderBuildDir
-#define MesaShaderBuildDir $(GLXLIBSRC)/mesa/shader/
-#endif
-
 MESASHADERBUILDDIR = MesaShaderBuildDir

  MESA_SHADER_SRCS =	$(MESASHADERBUILDDIR)arbprogparse.c \

--- a/nx-X11/programs/Xserver/GL/mesa/shader/grammar/Imakefile
+++ b/nx-X11/programs/Xserver/GL/mesa/shader/grammar/Imakefile
 #if DoLoadableServer
-#if !BuildModuleInSubdir
 #define IHaveModules
-#elif !defined(IHaveModules)
-#define IHaveSubdirs
-SUBDIRS = module
-#endif
 #endif

 #include <Server.tmpl>
@@ -12,11 +7,7 @@ SUBDIRS = module
 #define NeedAllMesaSrc
 #define NeedToLinkMesaSrc
 #define MesaGrammarBuildDir /**/
-#if !defined(IHaveModules) || !BuildModuleInSubdir
-#include "../../../../../../lib/GL/mesa/shader/grammar/Imakefile.inc"
-#else
-#include "../../../../../../../lib/GL/mesa/shader/grammar/Imakefile.inc"
-#endif
+#include "Imakefile.inc"

         SRCS = $(MESA_GRAMMAR_SRCS)
         OBJS = $(MESA_GRAMMAR_OBJS)
@@ -42,7 +33,6 @@ NormalLibraryObjectRule()

 SubdirLibraryRule($(OBJS))

-LintLibraryTarget(dri,$(SRCS))
 NormalLintTarget($(SRCS))

 DependTarget()

--- a/nx-X11/lib/GL/mesa/shader/grammar/Imakefile.inc
+++ b/nx-X11/lib/GL/mesa/shader/grammar/Imakefile.inc
 XCOMM $XFree86$

-#ifndef MesaGrammarBuildDir
-#define MesaGrammarBuildDir $(GLXLIBSRC)/mesa/shader/grammar/
-#endif
-
 MESAGRAMMARBUILDDIR=MesaGrammarBuildDir

  MESA_GRAMMAR_SRCS =	$(MESAGRAMMARBUILDDIR)grammar_mesa.c

--- a/nx-X11/programs/Xserver/GL/mesa/shader/slang/Imakefile
+++ b/nx-X11/programs/Xserver/GL/mesa/shader/slang/Imakefile
 #if DoLoadableServer
-#if !BuildModuleInSubdir
 #define IHaveModules
-#elif !defined(IHaveModules)
-#define IHaveSubdirs
-SUBDIRS = module
-#endif
 #endif

-#if !defined(IHaveModules) || !BuildModuleInSubdir
 #define IHaveSubdirs
      SUBDIRS = library
-#endif

 #include <Server.tmpl>

 #define NeedAllMesaSrc
 #define NeedToLinkMesaSrc
 #define MesaSlangBuildDir /**/
-#if !defined(IHaveModules) || !BuildModuleInSubdir
-#include "../../../../../../lib/GL/mesa/shader/slang/Imakefile.inc"
-#else
-#include "../../../../../../../lib/GL/mesa/shader/slang/Imakefile.inc"
-#endif
+#include "Imakefile.inc"

         SRCS = $(MESA_SLANG_SRCS)
         OBJS = $(MESA_SLANG_OBJS)
@@ -47,7 +36,6 @@ NormalLibraryObjectRule()

 SubdirLibraryRule($(OBJS))

-LintLibraryTarget(dri,$(SRCS))
 NormalLintTarget($(SRCS))

 DependTarget()

--- a/nx-X11/lib/GL/mesa/shader/slang/Imakefile.inc
+++ b/nx-X11/lib/GL/mesa/shader/slang/Imakefile.inc
 XCOMM $XFree86$

-#ifndef MesaSlangBuildDir
-#define MesaSlangBuildDir $(GLXLIBSRC)/mesa/shader/slang/
-#endif
-
 MESASLANGBUILDDIR=MesaSlangBuildDir

  MESA_SLANG_SRCS =	$(MESASLANGBUILDDIR)slang_assemble_assignment.c \

--- a/nx-X11/programs/Xserver/GL/mesa/shader/slang/library/Imakefile
+++ b/nx-X11/programs/Xserver/GL/mesa/shader/slang/library/Imakefile
 #if DoLoadableServer
-#if !BuildModuleInSubdir
 #define IHaveModules
-#elif !defined(IHaveModules)
-#define IHaveSubdirs
-SUBDIRS = module
-#endif
 #endif

 #include <Server.tmpl>
@@ -12,11 +7,7 @@ SUBDIRS = module
 #define NeedAllMesaSrc
 #define NeedToLinkMesaSrc
 #define MesaLibraryBuildDir /**/
-#if !defined(IHaveModules) || !BuildModuleInSubdir
-#include "../../../../../../../lib/GL/mesa/shader/slang/library/Imakefile.inc"
-#else
-#include "../../../../../../../../lib/GL/mesa/shader/slang/library/Imakefile.inc"
-#endif
+#include "Imakefile.inc"

     INCLUDES = -I$(MESASRCDIR)/src/mesa \
 		-I$(MESASRCDIR)/src/mesa/shader \

--- a/nx-X11/lib/GL/mesa/shader/slang/library/Imakefile.inc
+++ b/nx-X11/lib/GL/mesa/shader/slang/library/Imakefile.inc
--- a/nx-X11/programs/Xserver/GL/mesa/swrast/Imakefile
+++ b/nx-X11/programs/Xserver/GL/mesa/swrast/Imakefile
 XCOMM $XFree86: xc/programs/Xserver/GL/mesa/src/swrast/Imakefile,v 1.8 2002/11/22 22:56:01 tsi Exp $

 #if DoLoadableServer
-#if !BuildModuleInSubdir
 #define IHaveModules
-#elif !defined(IHaveModules)
-#define IHaveSubdirs
-SUBDIRS = module
-#endif
 #endif

 /* Large PIC tables needed for Solaris/SPARC builds */
@@ -19,11 +14,7 @@ SUBDIRS = module
 #define NeedAllMesaSrc
 #define NeedToLinkMesaSrc
 #define MesaSwrastBuildDir /**/
-#if !defined(IHaveModules) || !BuildModuleInSubdir
-#include "../../../../../lib/GL/mesa/swrast/Imakefile.inc"
-#else
-#include "../../../../../../lib/GL/mesa/swrast/Imakefile.inc"
-#endif
+#include "Imakefile.inc"


         SRCS = $(MESA_SWRAST_SRCS)
@@ -51,7 +42,6 @@ NormalLibraryObjectRule()

 SubdirLibraryRule($(OBJS))

-LintLibraryTarget(dri,$(SRCS))
 NormalLintTarget($(SRCS))

 DependTarget()
@@ -60,4 +50,3 @@ DependTarget()
 MakeSubdirs($(SUBDIRS))
 DependSubdirs($(SUBDIRS))
 #endif
-
--- a/nx-X11/lib/GL/mesa/swrast/Imakefile.inc
+++ b/nx-X11/lib/GL/mesa/swrast/Imakefile.inc
 XCOMM $XFree86: xc/lib/GL/mesa/src/swrast/Imakefile.inc,v 1.1tsi Exp $

-#ifndef MesaSwrastBuildDir
-#define MesaSwrastBuildDir $(GLXLIBSRC)/mesa/swrast/
-#endif
-
 MESASWRASTBUILDDIR = MesaSwrastBuildDir

  MESA_SWRAST_SRCS = $(MESASWRASTBUILDDIR)s_aaline.c \

--- a/nx-X11/programs/Xserver/GL/mesa/swrast/module/Imakefile
+++ b/nx-X11/programs/Xserver/GL/mesa/swrast/module/Imakefile
-XCOMM $XFree86: xc/programs/Xserver/GL/mesa/src/swrast/module/Imakefile,v 1.1 2002/05/31 18:12:40 dawes Exp $
-
-#define IHaveModules
-
-#include "../Imakefile"
-
--- a/nx-X11/programs/Xserver/GL/mesa/swrast_setup/Imakefile
+++ b/nx-X11/programs/Xserver/GL/mesa/swrast_setup/Imakefile
 XCOMM $XFree86: xc/programs/Xserver/GL/mesa/src/swrast_setup/Imakefile,v 1.8 2002/11/22 22:56:01 tsi Exp $

 #if DoLoadableServer
-#if !BuildModuleInSubdir
 #define IHaveModules
-#elif !defined(IHaveModules)
-#define IHaveSubdirs
-SUBDIRS = module
-#endif
 #endif

 #include <Server.tmpl>
@@ -14,11 +9,7 @@ SUBDIRS = module
 #define NeedAllMesaSrc
 #define NeedToLinkMesaSrc
 #define MesaSwrastSetupBuildDir /**/
-#if !defined(IHaveModules) || !BuildModuleInSubdir
-#include "../../../../../lib/GL/mesa/swrast_setup/Imakefile.inc"
-#else
-#include "../../../../../../lib/GL/mesa/swrast_setup/Imakefile.inc"
-#endif
+#include "Imakefile.inc"

         SRCS = $(MESA_SWR_SETUP_SRCS)
         OBJS = $(MESA_SWR_SETUP_OBJS)
@@ -43,7 +34,6 @@ NormalLibraryObjectRule()

 SubdirLibraryRule($(OBJS))

-LintLibraryTarget(dri,$(SRCS))
 NormalLintTarget($(SRCS))

 DependTarget()
@@ -52,4 +42,3 @@ DependTarget()
 MakeSubdirs($(SUBDIRS))
 DependSubdirs($(SUBDIRS))
 #endif
-
--- a/nx-X11/lib/GL/mesa/swrast_setup/Imakefile.inc
+++ b/nx-X11/lib/GL/mesa/swrast_setup/Imakefile.inc
 XCOMM $XFree86: xc/lib/GL/mesa/src/swrast_setup/Imakefile.inc,v 1.1tsi Exp $

-#ifndef MesaSwrastSetupBuildDir
-#define MesaSwrastSetupBuildDir $(GLXLIBSRC)/mesa/swrast_setup/
-#endif
-
 MESASWRSETUPDIR = MesaSwrastSetupBuildDir

 MESA_SWR_SETUP_SRCS = $(MESASWRSETUPDIR)ss_context.c \

--- a/nx-X11/programs/Xserver/GL/mesa/swrast_setup/module/Imakefile
+++ b/nx-X11/programs/Xserver/GL/mesa/swrast_setup/module/Imakefile
-XCOMM $XFree86: xc/programs/Xserver/GL/mesa/src/swrast_setup/module/Imakefile,v 1.1 2002/05/31 18:12:41 dawes Exp $
-
-#define IHaveModules
-
-#include "../Imakefile"
-
--- a/nx-X11/programs/Xserver/GL/mesa/tnl/Imakefile
+++ b/nx-X11/programs/Xserver/GL/mesa/tnl/Imakefile
@@ -2,12 +2,7 @@ XCOMM $XdotOrg: xc/programs/Xserver/GL/mesa/tnl/Imakefile,v 1.2 2004/08/19 07:34
 XCOMM $XFree86: xc/programs/Xserver/GL/mesa/src/tnl/Imakefile,v 1.8 2002/11/22 22:56:02 tsi Exp $

 #if DoLoadableServer
-#if !BuildModuleInSubdir
 #define IHaveModules
-#elif !defined(IHaveModules)
-#define IHaveSubdirs
-SUBDIRS = module
-#endif
 #endif

 /* Large PIC tables needed for Solaris/SPARC builds */
@@ -21,11 +16,7 @@ SUBDIRS = module
 #define NeedAllMesaSrc
 #define NeedToLinkMesaSrc
 #define MesaTnlBuildDir /**/
-#if !defined(IHaveModules) || !BuildModuleInSubdir
-#include "../../../../../lib/GL/mesa/tnl/Imakefile.inc"
-#else
-#include "../../../../../../lib/GL/mesa/tnl/Imakefile.inc"
-#endif
+#include "Imakefile.inc"


         SRCS = $(MESA_TNL_SRCS)
@@ -54,7 +45,6 @@ NormalLibraryObjectRule()

 SubdirLibraryRule($(OBJS))

-LintLibraryTarget(dri,$(SRCS))
 NormalLintTarget($(SRCS))

 DependTarget()

--- a/nx-X11/lib/GL/mesa/tnl/Imakefile.inc
+++ b/nx-X11/lib/GL/mesa/tnl/Imakefile.inc
 XCOMM $XFree86: xc/lib/GL/mesa/src/tnl/Imakefile.inc,v 1.1tsi Exp $

-#ifndef MesaTnlBuildDir
-#define MesaTnlBuildDir $(GLXLIBSRC)/mesa/tnl/
-#endif
-
 MESATNLBUILDDIR = MesaTnlBuildDir

  MESA_TNL_SRCS = $(MESATNLBUILDDIR)t_array_api.c \

--- a/nx-X11/programs/Xserver/GL/mesa/tnl/module/Imakefile
+++ b/nx-X11/programs/Xserver/GL/mesa/tnl/module/Imakefile
-XCOMM $XFree86: xc/programs/Xserver/GL/mesa/src/tnl/module/Imakefile,v 1.1 2002/05/31 18:12:42 dawes Exp $
-
-#define IHaveModules
-
-#include "../Imakefile"
-
--- a/nx-X11/programs/Xserver/GL/opengl/Imakefile
+++ b/nx-X11/programs/Xserver/GL/opengl/Imakefile
-XCOMM $XFree86$
-
-XCOMM The contents of this file are subject to the GLX Public License Version 1.0
-XCOMM (the "License"). You may not use this file except in compliance with the
-XCOMM License. You may obtain a copy of the License at Silicon Graphics, Inc.,
-XCOMM attn: Legal Services, 2011 N. Shoreline Blvd., Mountain View, CA 94043
-XCOMM or at http://www.sgi.com/software/opensource/glx/license.html.
-XCOMM
-XCOMM Software distributed under the License is distributed on an "AS IS"
-XCOMM basis. ALL WARRANTIES ARE DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY
-XCOMM IMPLIED WARRANTIES OF MERCHANTABILITY, OF FITNESS FOR A PARTICULAR
-XCOMM PURPOSE OR OF NON- INFRINGEMENT. See the License for the specific
-XCOMM language governing rights and limitations under the License.
-XCOMM
-XCOMM The Original Software is GLX version 1.2 source code, released February,
-XCOMM 1999. The developer of the Original Software is Silicon Graphics, Inc.
-XCOMM Those portions of the Subject Software created by Silicon Graphics, Inc.
-XCOMM are Copyright (c) 1991-9 Silicon Graphics, Inc. All Rights Reserved.
-
-#include <Library.tmpl>
-
-OBJS = \
-	ddxci.o \
-	ddxcx.o \
-	ddxrgb.o \
-	ddxscreens.o \
-	dl_block.o \
-	dl_heap.o \
-	dl_init.o \
-	dl_list.o \
-	dl_mopt.o \
-	dl_opt.o \
-	dl_pplst.o \
-	dl_splc.o \
-	dl_splst.o \
-	dl_table.o \
-	g_api.o \
-	g_disp.o \
-	g_lcmpex.o \
-	g_lcomp.o \
-	g_lexec.o \
-	g_ltab.o \
-	g_noptab.o \
-	g_splcmp.o \
-	px_api.o \
-	px_mod.o \
-	px_pack.o \
-	px_paths.o \
-	px_read.o \
-	px_rend.o \
-	px_upack.o \
-	s_accum.o \
-	s_atest.o \
-	s_attrib.o \
-	s_bitmap.o \
-	s_blend.o \
-	s_btdraw.o \
-	s_buffer.o \
-	s_capi.o \
-	s_ci.o \
-	s_clear.o \
-	s_clip.o \
-	s_contxt.o \
-	s_cpydsp.o \
-	s_ctable.o \
-	s_depth.o \
-	s_dlist.o \
-	s_eval.o \
-	s_export.o \
-	s_feed.o \
-	s_finish.o \
-	s_fog.o \
-	s_get.o \
-	s_global.o \
-	s_image.o \
-	s_lcache.o \
-	s_lcomp.o \
-	s_light.o \
-	s_lnclip.o \
-	s_lndraw.o \
-	s_lnfast.o \
-	s_lnfin.o \
-	s_lnspan.o \
-	s_math.o \
-	s_memmgr.o \
-	s_names.o \
-	s_napi.o \
-	s_pgaa.o \
-	s_pgclip.o \
-	s_pgdraw.o \
-	s_pgfin.o \
-	s_pgmode.o \
-	s_pgspan.o \
-	s_pick.o \
-	s_prim.o \
-	s_ptaa.o \
-	s_ptdraw.o \
-	s_ptfin.o \
-	s_rapi.o \
-	s_rect.o \
-	s_rgb.o \
-	s_rpos.o \
-	s_select.o \
-	s_size.o \
-	s_span.o \
-	s_sten.o \
-	s_store.o \
-	s_tapi.o \
-	s_tex.o \
-	s_texel.o \
-	s_texmgr.o \
-	s_trap.o \
-	s_vapi.o \
-	s_varray.o \
-	s_vertex.o \
-	s_xform.o \
-	s_zfuncs.o \
-	vc_cache.o \
-	vc_line.o \
-	vc_point.o \
-	vc_poly.o
-
-INCLUDES = \
-	-I. \
-	-I.. \
-	-Iinclude \
-	-I$(TOP)/server/include \
-	-I$(TOP)/programs/Xserver/include \
-	-I$(TOP)/include \
-	-I$(TOP)/include/GL \
-	-I$(INCLUDESRC)
-
-DEFINES = \
-	-D_LANGUAGE_C \
-	-Dunix
-
-NormalLibraryTarget(GL, $(OBJS))
-NormalLibraryObjectRule()
-
-DependTarget()
--- a/nx-X11/programs/Xserver/Imakefile
+++ b/nx-X11/programs/Xserver/Imakefile
@@ -71,39 +71,15 @@ INSTPGMFLAGS =
 #define AllFBLibs PreFbLibs $(FB) $(CFB) PostFbLibs

 #if BuildGlxExt
-# if BuildXF86DRI && ((defined(XF86Server) && XF86Server) \
-	|| (defined(XorgServer) && XorgServer))
-      DRILIB = GL/dri/ModuleLibraryTargetName(dri)
-# else
-      DRILIB = 
-# endif
-# if GlxUseSGISI
+# if DoLoadableServer
      GLXLIB = GL/glx/ModuleLibraryTargetName(glx) \
-               GL/sgi-si/ModuleLibraryTargetName(GLcore) \
-               $(DRILIB)
+               GL/mesa/GLcore/ModuleLibraryTargetName(GLcore)
 # else
-#  if defined(GlxUseWindows) && GlxUseWindows
-      XWin_GL.exe.GLXLIB = GL/glx/ModuleLibraryTargetName(glx_stdcall) \
-               GL/windows/ModuleLibraryTargetName(GLcore)
-#  endif /* GlxUseWindows */
-#  if defined(Win32Architecture) && defined(GlxUseWindows) && GlxUseWindows
-      GLXLIB = GL/glx/ModuleLibraryTargetName(glx_stdcall) \
-               GL/windows/ModuleLibraryTargetName(GLcore)
-#  elif DoLoadableServer
      GLXLIB = GL/glx/ModuleLibraryTargetName(glx) \
               GL/mesa/GLcore/ModuleLibraryTargetName(GLcore)
-#  else
-      GLXLIB = GL/glx/ModuleLibraryTargetName(glx) \
-               GL/mesa/GLcore/ModuleLibraryTargetName(GLcore) \
-               $(DRILIB)
-#  endif
 # endif
      GLXDIR = GL
-# if defined(cygwinArchitecture) && defined(GlxUseWindows) && GlxUseWindows
-      GLXEXT = $(if $($@.GLXLIB),$($@.GLXLIB), $(GLXLIB))
-# else
      GLXEXT = $(GLXLIB)
-# endif
 #endif

 #if BuildXInputExt
@@ -526,11 +502,7 @@ XWINPARSERLIB = $(XWINPARSERDIR)/LibraryTargetName(xf86config)
 XWINPARSERDIR = 
 XWINPARSERLIB = 
 #endif
-#if defined(GlxUseWindows) && GlxUseWindows
-XWINOPENGLLIB = -lopengl32
-#else
 XWINOPENGLLIB = 
-#endif

 NXWINLIB = $(NXWINDDXDIR)/LibraryTargetName(NXWin)
 NXWINDIRS = $(STDDIRS) $(FBDIR) $(SHADOWDIR) $(LAYERDIR) $(NXWINDDXDIR) \
@@ -545,10 +517,7 @@ PTHREADLIB = -lpthreadGC
 # endif
 #endif
 #if defined(Win32Architecture)
-# if defined(GlxUseWindows) && GlxUseWindows
-XWINGL32 = -lopengl32
-# endif
-XWINW32  = -lgdi32 -lwsock32 $(XWINGL32) $(PTHREADLIB) 
+XWINW32  = -lgdi32 -lwsock32 $(PTHREADLIB)
 #else
 XWINW32  = -lgdi32
 #endif
@@ -577,18 +546,11 @@ $(NXWINOBJS) $(NXWINLIB) $(NXWINLIBS) $(NXWINSYSLIBS) $(NXWINNXLIBS):: $(NXWINDI

 #ifdef mingwArchitecture
 NXWINSERVERNAME=NXming    
-NXWINGLSERVERNAME=NXmingGL    
 #else
 NXWINSERVERNAME=NXWin    
-NXWINGLSERVERNAME=NXWin_GL 
 #endif
 ServerTarget($(NXWINSERVERNAME),$(NXWINDIRS),$(NXWINOBJS), \
 	     $(LIBCWRAPPER) $(NXWINLIBS) $(LOADABLEEXTS),$(NXWINSYSLIBS) $(NXWINNXLIBS))
-#if defined(cygwinArchitecture) && defined(GlxUseWindows) && GlxUseWindows 
-ServerTarget($(NXWINGLSERVERNAME),$(NXWINDIRS),$(NXWINOBJS), \
-	     $(LIBCWRAPPER) $(NXWINLIBS) $(LOADABLEEXTS),$(NXWINSYSLIBS) $(NXWINNXLIBS)\
-	     $(XWINOPENGLLIB)) 
-#endif

 #ifndef ServerToInstall
 # define ServerToInstall $(NXWINSERVERNAME)