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

diff --git a/nx-X11/lib/GL/mesa/drivers/dri/common/Imakefile b/nx-X11/lib/GL/mesa/drivers/dri/common/Imakefile
deleted file mode 100644
index 5c910489f..000000000
--- a/nx-X11/lib/GL/mesa/drivers/dri/common/Imakefile
+++ /dev/null
@@ -1,44 +0,0 @@
-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()
diff --git a/nx-X11/lib/GL/mesa/drivers/dri/common/Imakefile.inc b/nx-X11/lib/GL/mesa/drivers/dri/common/Imakefile.inc
deleted file mode 100644
index 388b724b2..000000000
--- a/nx-X11/lib/GL/mesa/drivers/dri/common/Imakefile.inc
+++ /dev/null
@@ -1,105 +0,0 @@
-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