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.

3 files changed, 105 insertions, 16 deletions

diff --git a/nx-X11/programs/Xserver/GL/mesa/X/Imakefile b/nx-X11/programs/Xserver/GL/mesa/X/Imakefile
index f0e722f00..fbdd755fa 100644
--- a/nx-X11/programs/Xserver/GL/mesa/X/Imakefile
+++ b/nx-X11/programs/Xserver/GL/mesa/X/Imakefile
@@ -1,12 +1,7 @@
 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)
diff --git a/nx-X11/programs/Xserver/GL/mesa/X/Imakefile.inc b/nx-X11/programs/Xserver/GL/mesa/X/Imakefile.inc
new file mode 100644
index 000000000..d62800e7d
--- /dev/null
+++ b/nx-X11/programs/Xserver/GL/mesa/X/Imakefile.inc
@@ -0,0 +1,104 @@
+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
+XMESA_GLX_SRCS = $(MESAXBUILDDIR)fakeglx.c \
+		 $(MESAXBUILDDIR)glxapi.c \
+		 $(MESAXBUILDDIR)realglx.c \
+		 $(MESAXBUILDDIR)xfonts.c
+#endif
+
+   XMESA_SRCS = $(XMESA_GLX_SRCS) \
+		$(MESAXBUILDDIR)xm_api.c \
+                $(MESAXBUILDDIR)xm_buffer.c \
+		$(MESAXBUILDDIR)xm_dd.c \
+		$(MESAXBUILDDIR)xm_line.c \
+		$(MESAXBUILDDIR)xm_span.c \
+		$(MESAXBUILDDIR)xm_tri.c
+
+#ifdef NeedToLinkMesaSrc
+#ifndef MesaInXServer
+LinkSourceFile(fakeglx.c, $(MESASRCDIR)/src/mesa/drivers/x11)
+LinkSourceFile(glxapi.c, $(MESASRCDIR)/src/mesa/drivers/x11)
+LinkSourceFile(glxapi.h, $(MESASRCDIR)/src/mesa/drivers/x11)
+LinkSourceFile(realglx.c, $(MESASRCDIR)/src/mesa/drivers/x11)
+LinkSourceFile(xfonts.c, $(MESASRCDIR)/src/mesa/drivers/x11)
+#endif
+LinkSourceFile(xm_api.c, $(MESASRCDIR)/src/mesa/drivers/x11)
+LinkSourceFile(xm_buffer.c, $(MESASRCDIR)/src/mesa/drivers/x11)
+LinkSourceFile(xm_dd.c, $(MESASRCDIR)/src/mesa/drivers/x11)
+LinkSourceFile(xm_line.c, $(MESASRCDIR)/src/mesa/drivers/x11)
+LinkSourceFile(xm_span.c, $(MESASRCDIR)/src/mesa/drivers/x11)
+LinkSourceFile(xm_tri.c, $(MESASRCDIR)/src/mesa/drivers/x11)
+#endif
+
+#ifndef MesaInXServer
+XMESA_GLX_OBJS = $(MESAXBUILDDIR)fakeglx.o \
+		 $(MESAXBUILDDIR)glxapi.o \
+		 $(MESAXBUILDDIR)realglx.o \
+		 $(MESAXBUILDDIR)xfonts.o
+#endif
+
+   XMESA_OBJS = $(XMESA_GLX_OBJS) \
+		$(MESAXBUILDDIR)xm_api.o \
+                $(MESAXBUILDDIR)xm_buffer.o \
+		$(MESAXBUILDDIR)xm_dd.o \
+		$(MESAXBUILDDIR)xm_line.o \
+		$(MESAXBUILDDIR)xm_span.o \
+		$(MESAXBUILDDIR)xm_tri.o
+
+#if defined(DoSharedLib) && DoSharedLib
+#ifndef MesaInXServer
+XMESA_GLX_UOBJS = $(MESAXBUILDDIR)unshared/fakeglx.o \
+		  $(MESAXBUILDDIR)unshared/glxapi.o \
+		  $(MESAXBUILDDIR)unshared/realglx.o \
+		  $(MESAXBUILDDIR)unshared/xfonts.o
+#endif
+
+  XMESA_UOBJS = $(XMESA_GLX_UOBJS) \
+		$(MESAXBUILDDIR)unshared/xm_api.o \
+                $(MESAXBUILDDIR)unshared/xm_buffer.o \
+		$(MESAXBUILDDIR)unshared/xm_dd.o \
+		$(MESAXBUILDDIR)unshared/xm_line.o \
+		$(MESAXBUILDDIR)unshared/xm_span.o \
+		$(MESAXBUILDDIR)unshared/xm_tri.o
+#else
+XMESA_GLX_UOBJS = $(XMESA_GLX_OBJS)
+  XMESA_UOBJS = $(XMESA_OBJS)
+#endif
+
+#ifndef MesaInXServer
+XMESA_GLX_DOBJS = $(MESAXBUILDDIR)debugger/fakeglx.o \
+		  $(MESAXBUILDDIR)debugger/glxapi.o \
+		  $(MESAXBUILDDIR)debugger/realglx.o \
+		  $(MESAXBUILDDIR)debugger/xfonts.o
+#endif
+
+  XMESA_DOBJS = $(XMESA_GLX_DOBJS) \
+		$(MESAXBUILDDIR)debugger/xm_api.o \
+                $(MESAXBUILDDIR)debugger/xm_buffer.o \
+		$(MESAXBUILDDIR)debugger/xm_dd.o \
+		$(MESAXBUILDDIR)debugger/xm_line.o \
+		$(MESAXBUILDDIR)debugger/xm_span.o \
+		$(MESAXBUILDDIR)debugger/xm_tri.o
+
+#ifndef MesaInXServer
+XMESA_GLX_POBJS = $(MESAXBUILDDIR)profiled/fakeglx.o \
+		  $(MESAXBUILDDIR)profiled/glxapi.o \
+		  $(MESAXBUILDDIR)profiled/realglx.o \
+		  $(MESAXBUILDDIR)profiled/xfonts.o
+#endif
+
+  XMESA_POBJS = $(XMESA_GLX_POBJS) \
+		$(MESAXBUILDDIR)profiled/xm_api.o \
+                $(MESAXBUILDDIR)profiled/xm_buffer.o \
+		$(MESAXBUILDDIR)profiled/xm_dd.o \
+		$(MESAXBUILDDIR)profiled/xm_line.o \
+		$(MESAXBUILDDIR)profiled/xm_span.o \
+		$(MESAXBUILDDIR)profiled/xm_tri.o
+
diff --git a/nx-X11/programs/Xserver/GL/mesa/X/module/Imakefile b/nx-X11/programs/Xserver/GL/mesa/X/module/Imakefile
deleted file mode 100644
index eee4c7556..000000000
--- a/nx-X11/programs/Xserver/GL/mesa/X/module/Imakefile
+++ /dev/null
@@ -1,6 +0,0 @@
-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"
-