Drop nx-X11/lib/GL and move Imakefile.inc include files into Xserver code tree.

 The client-side library libNX_GL.{a,so} is not built when building nx-libs.

 However, nx-X11/lib/GL/** ships several imake include files
 (Imakefile.inc) that are also used in nx-X11/programs/Xserver/GL/**.
 These files have been moved from the nx-X11/lib/GL/ code subtree to the
 nx-X11/programs/Xserver/GL/.

 Furthermore, we don't provide module builds of the GL extension anymore,
 as that feature is neither used in nx-libs.

2 files changed, 0 insertions, 103 deletions

diff --git a/nx-X11/lib/GL/mesa/tnl_dd/Imakefile b/nx-X11/lib/GL/mesa/tnl_dd/Imakefile
deleted file mode 100644
index 93b8c8877..000000000
--- a/nx-X11/lib/GL/mesa/tnl_dd/Imakefile
+++ /dev/null
@@ -1,63 +0,0 @@
-XCOMM $XFree86: xc/lib/GL/mesa/src/tnl_dd/Imakefile,v 1.6 2002/11/25 12:58:55 tsi Exp $
-
-#include <Threads.tmpl>
-
-/*
- * Need both shared and unshared Mesa objects in the following cases:
- *   GlxDriverUsesMesa
- *   GlxBuiltInXMesa
- *   BuildOSMesaLib
- *
- * In other cases, only the shared version is needed to link in to loadable
- * driver modules.
- */
-
-#if GlxDriverUsesMesa || GlxBuiltInXMesa || BuildOSMesaLib
-#define DoNormalLib (NormalLibGlx || SharedLibGlxWithoutPIC)
-#define DoSharedLib (SharedLibGlx && !SharedLibGlxWithoutPIC)
-#define DoExtraLib SharedLibGlx
-#define DoDebugLib DebugLibGlx
-#define DoProfileLib ProfileLibGlx
-#else
-#define DoNormalLib SharedLibGlxWithoutPIC
-#define DoSharedLib !SharedLibGlxWithoutPIC
-#define DoExtraLib NO
-#define DoDebugLib NO
-#define DoProfileLib NO
-#endif
-
-/* Large PIC tables needed for Solaris SPARC builds */
-#if (defined(SunArchitecture) && defined(SparcArchitecture))
-# define LargePICTable YES
-#endif
-
-#define MesaTnlDdBuildDir /**/
-#define NeedToLinkMesaSrc
-#include "Imakefile.inc"
-
-#if Malloc0ReturnsNull
-ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL
-#endif
-
-#if BuildXF86DRI
-  DRI_DEFINES = GlxDefines -DIN_DRI_DRIVER
- DRI_INCLUDES = -I../../../dri -I../../../glx -I../../dri -I../../../include \
-		-I$(XINCLUDESRC) -I$(INCLUDESRC)/GL \
-		-I$(XF86OSSRC) -I$(SERVERSRC)/GL/dri
-#endif
-
-MESA_INCLUDES = -I$(MESASRCDIR)/src \
-		-I$(MESASRCDIR)/src/math \
-		-I$(MESASRCDIR)/src/tnl_dd \
-		-I$(MESASRCDIR)/include \
-		-I../../../include
-
-     INCLUDES = $(MESA_INCLUDES) $(DRI_INCLUDES)
-
-      DEFINES = $(ALLOC_DEFINES) $(DRI_DEFINES) $(ASM_DEFS) $(MATHDEF)
-
-#include <Library.tmpl>
-
-LibraryObjectRule()
-
-DependTarget()
diff --git a/nx-X11/lib/GL/mesa/tnl_dd/Imakefile.inc b/nx-X11/lib/GL/mesa/tnl_dd/Imakefile.inc
deleted file mode 100644
index 8d5d3da2d..000000000
--- a/nx-X11/lib/GL/mesa/tnl_dd/Imakefile.inc
+++ /dev/null
@@ -1,40 +0,0 @@
-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
-