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, 135 deletions

diff --git a/nx-X11/lib/GL/mesa/swrast_setup/Imakefile b/nx-X11/lib/GL/mesa/swrast_setup/Imakefile
deleted file mode 100644
index 58766149d..000000000
--- a/nx-X11/lib/GL/mesa/swrast_setup/Imakefile
+++ /dev/null
@@ -1,99 +0,0 @@
-XCOMM $XFree86: xc/lib/GL/mesa/src/swrast_setup/Imakefile,v 1.8 2002/11/25 12:58:55 tsi Exp $
-
-#include <Threads.tmpl>
-
-/*
- * Need both shared and unshared Mesa objects in the following cases:
- *   GlxDriverUsesMesa
- *   GlxBuiltInXMesa
- *   BuildOSMesaLib
- *
- * In other cases, only the shared version is needed to link in to loadable
- * driver modules.
- */
-
-#if BuildOSMesaLib || (BuildXF86DRI && (GlxDriverUsesMesa || GlxBuiltInXMesa))
-#define DoNormalLib (NormalLibGlx || SharedLibGlxWithoutPIC)
-#define DoSharedLib (SharedLibGlx && !SharedLibGlxWithoutPIC)
-#define DoExtraLib SharedLibGlx
-#define DoDebugLib DebugLibGlx
-#define DoProfileLib ProfileLibGlx
-#else
-#define DoNormalLib SharedLibGlxWithoutPIC
-#define DoSharedLib !SharedLibGlxWithoutPIC
-#define DoExtraLib NO
-#define DoDebugLib NO
-#define DoProfileLib NO
-#endif
-
-/* Large PIC tables needed for Solaris SPARC builds */
-#if (defined(SunArchitecture) && defined(SparcArchitecture))
-# define LargePICTable YES
-#endif
-
-
-#define MesaSwrastSetupBuildDir /**/
-#define NeedToLinkMesaSrc
-#include "Imakefile.inc"
-
-#if Malloc0ReturnsNull
-ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL
-#endif
-
-#if BuildXF86DRI
-  DRI_DEFINES = GlxDefines -DIN_DRI_DRIVER
- DRI_INCLUDES = -I../../../dri -I../../../glx -I../../dri -I../../../include \
-		-I$(INCLUDESRC)/GL -I$(XF86OSSRC) -I$(SERVERSRC)/GL/dri
-#endif
-
-#if defined(i386Architecture) && MesaUseX86Asm
-      ASM_DIR = x86
-     ASM_SRCS =
-     ASM_OBJS =
-#if MesaUseMMX
-     MMX_DEFS = -DUSE_MMX_ASM
-#endif
-#if MesaUse3DNow
-   3DNOW_DEFS = -DUSE_3DNOW_ASM
-#endif
-#if MesaUseSSE
-     SSE_DEFS = -DUSE_SSE_ASM
-#endif
-     ASM_DEFS = -DUSE_X86_ASM $(MMX_DEFS) $(3DNOW_DEFS) $(SSE_DEFS)
-#endif
-
-#ifdef SparcArchitecture
-      ASM_DIR = sparc
-     ASM_SRCS =
-     ASM_OBJS =
-     ASM_DEFS = -DUSE_SPARC_ASM
-#endif
-
-#ifdef UseCompaqMathLibrary
-      MATHDEF = -DCCPML
-#endif
-
-MESA_INCLUDES = -I$(MESASRCDIR)/src/mesa \
-		-I$(MESASRCDIR)/src/mesa/$(ASM_DIR) \
-		-I$(MESASRCDIR)/src/mesa/math \
-		-I$(MESASRCDIR)/src/mesa/main \
-		-I$(MESASRCDIR)/src/mesa/glapi \
-		-I$(MESASRCDIR)/src/mesa/swrast_setup \
-		-I$(MESASRCDIR)/src/mesa/tnl \
-		-I$(MESASRCDIR)/include \
-		-I../../../include -I$(XINCLUDESRC)
-
-      DEFINES = $(ALLOC_DEFINES) $(DRI_DEFINES) $(ASM_DEFS) $(MATHDEF)
-     INCLUDES = $(MESA_INCLUDES) $(DRI_INCLUDES)
-         SRCS = $(MESA_SWR_SETUP_SRCS)
-         OBJS = $(MESA_SWR_SETUP_OBJS)
-
-
-#include <Library.tmpl>
-
-LibraryObjectRule()
-
-SubdirLibraryRule($(OBJS))
-NormalLintTarget($(SRCS))
-
-DependTarget()
diff --git a/nx-X11/lib/GL/mesa/swrast_setup/Imakefile.inc b/nx-X11/lib/GL/mesa/swrast_setup/Imakefile.inc
deleted file mode 100644
index 8d32aedb3..000000000
--- a/nx-X11/lib/GL/mesa/swrast_setup/Imakefile.inc
+++ /dev/null
@@ -1,36 +0,0 @@
-XCOMM $XFree86: xc/lib/GL/mesa/src/swrast_setup/Imakefile.inc,v 1.1tsi Exp $
-
-#ifndef MesaSwrastSetupBuildDir
-#define MesaSwrastSetupBuildDir $(GLXLIBSRC)/mesa/swrast_setup/
-#endif
-
-MESASWRSETUPDIR = MesaSwrastSetupBuildDir
-
- MESA_SWR_SETUP_SRCS = $(MESASWRSETUPDIR)ss_context.c \
-		       $(MESASWRSETUPDIR)ss_triangle.c 
-
-#ifdef NeedToLinkMesaSrc
-LinkSourceFile(ss_context.c, $(MESASRCDIR)/src/mesa/swrast_setup)
-LinkSourceFile(ss_context.h, $(MESASRCDIR)/src/mesa/swrast_setup)
-LinkSourceFile(ss_triangle.c, $(MESASRCDIR)/src/mesa/swrast_setup)
-LinkSourceFile(ss_triangle.h, $(MESASRCDIR)/src/mesa/swrast_setup)
-LinkSourceFile(ss_tritmp.h, $(MESASRCDIR)/src/mesa/swrast_setup)
-LinkSourceFile(swrast_setup.h, $(MESASRCDIR)/src/mesa/swrast_setup)
-#endif
-
- MESA_SWR_SETUP_OBJS = $(MESASWRSETUPDIR)ss_context.o \
-		       $(MESASWRSETUPDIR)ss_triangle.o 
-
-#if defined(DoSharedLib) && DoSharedLib
-MESA_SWR_SETUP_UOBJS = $(MESASWRSETUPDIR)unshared/ss_context.o \
-		       $(MESASWRSETUPDIR)unshared/ss_triangle.o 
-#else
-MESA_SWR_SETUP_UOBJS = $(MESA_SWR_SETUP_OBJS)
-#endif
-
-MESA_SWR_SETUP_DOBJS = $(MESASWRSETUPDIR)debugger/ss_context.o \
-		       $(MESASWRSETUPDIR)debugger/ss_triangle.o 
-
-MESA_SWR_SETUP_POBJS = $(MESASWRSETUPDIR)profiled/ss_context.o \
-		       $(MESASWRSETUPDIR)profiled/ss_triangle.o 
-