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.

1 files changed, 0 insertions, 111 deletions

diff --git a/nx-X11/lib/GL/mesa/drivers/osmesa/Imakefile b/nx-X11/lib/GL/mesa/drivers/osmesa/Imakefile
deleted file mode 100644
index 014945699..000000000
--- a/nx-X11/lib/GL/mesa/drivers/osmesa/Imakefile
+++ /dev/null
@@ -1,111 +0,0 @@
-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()
-