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, 226 insertions, 16 deletions

diff --git a/nx-X11/programs/Xserver/GL/mesa/tnl/Imakefile b/nx-X11/programs/Xserver/GL/mesa/tnl/Imakefile
index c52696e4f..5c87d1e97 100644
--- a/nx-X11/programs/Xserver/GL/mesa/tnl/Imakefile
+++ b/nx-X11/programs/Xserver/GL/mesa/tnl/Imakefile
@@ -2,12 +2,7 @@ XCOMM $XdotOrg: xc/programs/Xserver/GL/mesa/tnl/Imakefile,v 1.2 2004/08/19 07:34
 XCOMM $XFree86: xc/programs/Xserver/GL/mesa/src/tnl/Imakefile,v 1.8 2002/11/22 22:56:02 tsi Exp $
 
 #if DoLoadableServer
-#if !BuildModuleInSubdir
 #define IHaveModules
-#elif !defined(IHaveModules)
-#define IHaveSubdirs
-SUBDIRS = module
-#endif
 #endif
 
 /* Large PIC tables needed for Solaris/SPARC builds */
@@ -21,11 +16,7 @@ SUBDIRS = module
 #define NeedAllMesaSrc
 #define NeedToLinkMesaSrc
 #define MesaTnlBuildDir /**/
-#if !defined(IHaveModules) || !BuildModuleInSubdir
-#include "../../../../../lib/GL/mesa/tnl/Imakefile.inc"
-#else
-#include "../../../../../../lib/GL/mesa/tnl/Imakefile.inc"
-#endif
+#include "Imakefile.inc"
 
 
          SRCS = $(MESA_TNL_SRCS)
diff --git a/nx-X11/programs/Xserver/GL/mesa/tnl/Imakefile.inc b/nx-X11/programs/Xserver/GL/mesa/tnl/Imakefile.inc
new file mode 100644
index 000000000..a294a6fbf
--- /dev/null
+++ b/nx-X11/programs/Xserver/GL/mesa/tnl/Imakefile.inc
@@ -0,0 +1,225 @@
+XCOMM $XFree86: xc/lib/GL/mesa/src/tnl/Imakefile.inc,v 1.1tsi Exp $
+
+#ifndef MesaTnlBuildDir
+#define MesaTnlBuildDir $(GLXLIBSRC)/mesa/tnl/
+#endif
+
+MESATNLBUILDDIR = MesaTnlBuildDir
+
+  MESA_TNL_SRCS = $(MESATNLBUILDDIR)t_array_api.c \
+		  $(MESATNLBUILDDIR)t_array_import.c \
+		  $(MESATNLBUILDDIR)t_context.c \
+		  $(MESATNLBUILDDIR)t_pipeline.c \
+		  $(MESATNLBUILDDIR)t_save_api.c \
+		  $(MESATNLBUILDDIR)t_save_loopback.c \
+		  $(MESATNLBUILDDIR)t_save_playback.c \
+                  $(MESATNLBUILDDIR)t_vb_arbprogram.c \
+                  $(MESATNLBUILDDIR)t_vb_arbprogram_sse.c \
+		  $(MESATNLBUILDDIR)t_vb_fog.c \
+		  $(MESATNLBUILDDIR)t_vb_cull.c \
+		  $(MESATNLBUILDDIR)t_vb_light.c \
+		  $(MESATNLBUILDDIR)t_vb_normals.c \
+		  $(MESATNLBUILDDIR)t_vb_points.c \
+		  $(MESATNLBUILDDIR)t_vb_program.c \
+		  $(MESATNLBUILDDIR)t_vb_render.c \
+		  $(MESATNLBUILDDIR)t_vb_texgen.c \
+		  $(MESATNLBUILDDIR)t_vb_texmat.c \
+		  $(MESATNLBUILDDIR)t_vb_vertex.c \
+		  $(MESATNLBUILDDIR)t_vertex.c \
+                  $(MESATNLBUILDDIR)t_vertex_generic.c \
+                  $(MESATNLBUILDDIR)t_vertex_sse.c \
+                  $(MESATNLBUILDDIR)t_vp_build.c \
+		  $(MESATNLBUILDDIR)t_vtx_api.c \
+		  $(MESATNLBUILDDIR)t_vtx_eval.c \
+		  $(MESATNLBUILDDIR)t_vtx_exec.c \
+		  $(MESATNLBUILDDIR)t_vtx_generic.c
+
+#if defined(i386Architecture) && MesaUseX86Asm
+  MESA_TNL_SRCS += MesaTnlAsmSrcs $(MESATNLBUILDDIR)t_vtx_x86.c \
+		  $(MESATNLBUILDDIR)t_vtx_x86_gcc.S
+#endif
+
+#ifdef NeedToLinkMesaSrc
+LinkSourceFile(t_array_api.c, $(MESASRCDIR)/src/mesa/tnl)
+LinkSourceFile(t_array_api.h, $(MESASRCDIR)/src/mesa/tnl)
+LinkSourceFile(t_array_import.c, $(MESASRCDIR)/src/mesa/tnl)
+LinkSourceFile(t_array_import.h, $(MESASRCDIR)/src/mesa/tnl)
+LinkSourceFile(t_context.c, $(MESASRCDIR)/src/mesa/tnl)
+LinkSourceFile(t_context.h, $(MESASRCDIR)/src/mesa/tnl)
+LinkSourceFile(tnl.h, $(MESASRCDIR)/src/mesa/tnl)
+LinkSourceFile(t_pipeline.c, $(MESASRCDIR)/src/mesa/tnl)
+LinkSourceFile(t_pipeline.h, $(MESASRCDIR)/src/mesa/tnl)
+LinkSourceFile(t_save_api.c, $(MESASRCDIR)/src/mesa/tnl)
+LinkSourceFile(t_save_api.h, $(MESASRCDIR)/src/mesa/tnl)
+LinkSourceFile(t_save_loopback.c, $(MESASRCDIR)/src/mesa/tnl)
+LinkSourceFile(t_save_playback.c, $(MESASRCDIR)/src/mesa/tnl)
+LinkSourceFile(t_vb_arbprogram.c, $(MESASRCDIR)/src/mesa/tnl)
+LinkSourceFile(t_vb_arbprogram.h, $(MESASRCDIR)/src/mesa/tnl)
+LinkSourceFile(t_vb_arbprogram_sse.c, $(MESASRCDIR)/src/mesa/tnl)
+LinkSourceFile(t_vb_cliptmp.h, $(MESASRCDIR)/src/mesa/tnl)
+LinkSourceFile(t_vb_fog.c, $(MESASRCDIR)/src/mesa/tnl)
+LinkSourceFile(t_vb_cull.c, $(MESASRCDIR)/src/mesa/tnl)
+LinkSourceFile(t_vb_light.c, $(MESASRCDIR)/src/mesa/tnl)
+LinkSourceFile(t_vb_lighttmp.h, $(MESASRCDIR)/src/mesa/tnl)
+LinkSourceFile(t_vb_normals.c, $(MESASRCDIR)/src/mesa/tnl)
+LinkSourceFile(t_vb_points.c, $(MESASRCDIR)/src/mesa/tnl)
+LinkSourceFile(t_vb_program.c, $(MESASRCDIR)/src/mesa/tnl)
+LinkSourceFile(t_vb_render.c, $(MESASRCDIR)/src/mesa/tnl)
+LinkSourceFile(t_vb_rendertmp.h, $(MESASRCDIR)/src/mesa/tnl)
+LinkSourceFile(t_vb_texgen.c, $(MESASRCDIR)/src/mesa/tnl)
+LinkSourceFile(t_vb_texmat.c, $(MESASRCDIR)/src/mesa/tnl)
+LinkSourceFile(t_vb_vertex.c, $(MESASRCDIR)/src/mesa/tnl)
+LinkSourceFile(t_vertex.c, $(MESASRCDIR)/src/mesa/tnl)
+LinkSourceFile(t_vertex.h, $(MESASRCDIR)/src/mesa/tnl)
+LinkSourceFile(t_vertex_generic.c, $(MESASRCDIR)/src/mesa/tnl)
+LinkSourceFile(t_vertex_sse.c, $(MESASRCDIR)/src/mesa/tnl)
+LinkSourceFile(t_vp_build.c, $(MESASRCDIR)/src/mesa/tnl)
+LinkSourceFile(t_vp_build.h, $(MESASRCDIR)/src/mesa/tnl)
+LinkSourceFile(t_vtx_api.c, $(MESASRCDIR)/src/mesa/tnl)
+LinkSourceFile(t_vtx_api.h, $(MESASRCDIR)/src/mesa/tnl)
+LinkSourceFile(t_vtx_eval.c, $(MESASRCDIR)/src/mesa/tnl)
+LinkSourceFile(t_vtx_exec.c, $(MESASRCDIR)/src/mesa/tnl)
+LinkSourceFile(t_vtx_generic.c, $(MESASRCDIR)/src/mesa/tnl)
+#if defined(i386Architecture) && MesaUseX86Asm
+LinkSourceFile(t_vtx_x86.c, $(MESASRCDIR)/src/mesa/tnl)
+LinkSourceFile(t_vtx_x86_gcc.S, $(MESASRCDIR)/src/mesa/tnl)
+#endif
+#endif
+
+  MESA_TNL_OBJS = $(MESATNLBUILDDIR)t_array_api.o \
+                  $(MESATNLBUILDDIR)t_array_import.o \
+                  $(MESATNLBUILDDIR)t_context.o \
+                  $(MESATNLBUILDDIR)t_pipeline.o \
+                  $(MESATNLBUILDDIR)t_save_api.o \
+                  $(MESATNLBUILDDIR)t_save_loopback.o \
+                  $(MESATNLBUILDDIR)t_save_playback.o \
+                  $(MESATNLBUILDDIR)t_vb_arbprogram.o \
+                  $(MESATNLBUILDDIR)t_vb_arbprogram_sse.o \
+                  $(MESATNLBUILDDIR)t_vb_fog.o \
+                  $(MESATNLBUILDDIR)t_vb_cull.o \
+                  $(MESATNLBUILDDIR)t_vb_light.o \
+                  $(MESATNLBUILDDIR)t_vb_normals.o \
+                  $(MESATNLBUILDDIR)t_vb_points.o \
+                  $(MESATNLBUILDDIR)t_vb_program.o \
+                  $(MESATNLBUILDDIR)t_vb_render.o \
+                  $(MESATNLBUILDDIR)t_vb_texgen.o \
+                  $(MESATNLBUILDDIR)t_vb_texmat.o \
+                  $(MESATNLBUILDDIR)t_vb_vertex.o \
+                  $(MESATNLBUILDDIR)t_vertex.o \
+                  $(MESATNLBUILDDIR)t_vertex_generic.o \
+                  $(MESATNLBUILDDIR)t_vertex_sse.o \
+                  $(MESATNLBUILDDIR)t_vp_build.o \
+                  $(MESATNLBUILDDIR)t_vtx_api.o \
+                  $(MESATNLBUILDDIR)t_vtx_eval.o \
+                  $(MESATNLBUILDDIR)t_vtx_exec.o \
+                  $(MESATNLBUILDDIR)t_vtx_generic.o
+
+#if defined(i386Architecture) && MesaUseX86Asm
+  MESA_TNL_OBJS += $(MESATNLBUILDDIR)t_vtx_x86.o \
+		  $(MESATNLBUILDDIR)t_vtx_x86_gcc.o
+#endif
+
+#if defined(DoSharedLib) && DoSharedLib
+ MESA_TNL_UOBJS = $(MESATNLBUILDDIR)unshared/t_array_api.o \
+		  $(MESATNLBUILDDIR)unshared/t_array_import.o \
+		  $(MESATNLBUILDDIR)unshared/t_context.o \
+		  $(MESATNLBUILDDIR)unshared/t_pipeline.o \
+		  $(MESATNLBUILDDIR)unshared/t_save_api.o \
+		  $(MESATNLBUILDDIR)unshared/t_save_loopback.o \
+		  $(MESATNLBUILDDIR)unshared/t_save_playback.o \
+                  $(MESATNLBUILDDIR)unshared/t_vb_arbprogram.o \
+                  $(MESATNLBUILDDIR)unshared/t_vb_arbprogram_sse.o \
+		  $(MESATNLBUILDDIR)unshared/t_vb_fog.o \
+		  $(MESATNLBUILDDIR)unshared/t_vb_cull.o \
+		  $(MESATNLBUILDDIR)unshared/t_vb_light.o \
+		  $(MESATNLBUILDDIR)unshared/t_vb_normals.o \
+		  $(MESATNLBUILDDIR)unshared/t_vb_points.o \
+		  $(MESATNLBUILDDIR)unshared/t_vb_program.o \
+		  $(MESATNLBUILDDIR)unshared/t_vb_render.o \
+		  $(MESATNLBUILDDIR)unshared/t_vb_texgen.o \
+		  $(MESATNLBUILDDIR)unshared/t_vb_texmat.o \
+		  $(MESATNLBUILDDIR)unshared/t_vb_vertex.o \
+		  $(MESATNLBUILDDIR)unshared/t_vertex.o \
+                  $(MESATNLBUILDDIR)unshared/t_vertex_generic.o \
+                  $(MESATNLBUILDDIR)unshared/t_vertex_sse.o \
+                  $(MESATNLBUILDDIR)unshared/t_vp_build.o \
+		  $(MESATNLBUILDDIR)unshared/t_vtx_api.o \
+		  $(MESATNLBUILDDIR)unshared/t_vtx_eval.o \
+		  $(MESATNLBUILDDIR)unshared/t_vtx_exec.o \
+		  $(MESATNLBUILDDIR)unshared/t_vtx_generic.o
+
+#if defined(i386Architecture) && MesaUseX86Asm
+ MESA_TNL_UOBJS += $(MESATNLBUILDDIR)unshared/t_vtx_x86.o \
+		  $(MESATNLBUILDDIR)t_vtx_x86_gcc.o
+#endif
+
+#else
+ MESA_TNL_UOBJS = $(MESA_TNL_OBJS)
+#endif
+
+ MESA_TNL_DOBJS = $(MESATNLBUILDDIR)debugger/t_array_api.o \
+		  $(MESATNLBUILDDIR)debugger/t_array_import.o \
+		  $(MESATNLBUILDDIR)debugger/t_context.o \
+		  $(MESATNLBUILDDIR)debugger/t_pipeline.o \
+		  $(MESATNLBUILDDIR)debugger/t_save_api.o \
+		  $(MESATNLBUILDDIR)debugger/t_save_loopback.o \
+		  $(MESATNLBUILDDIR)debugger/t_save_playback.o \
+                  $(MESATNLBUILDDIR)debugger/t_vb_arbprogram.o \
+                  $(MESATNLBUILDDIR)debugger/t_vb_arbprogram_sse.o \
+		  $(MESATNLBUILDDIR)debugger/t_vb_fog.o \
+		  $(MESATNLBUILDDIR)debugger/t_vb_cull.o \
+		  $(MESATNLBUILDDIR)debugger/t_vb_light.o \
+		  $(MESATNLBUILDDIR)debugger/t_vb_normals.o \
+		  $(MESATNLBUILDDIR)debugger/t_vb_points.o \
+		  $(MESATNLBUILDDIR)debugger/t_vb_program.o \
+		  $(MESATNLBUILDDIR)debugger/t_vb_render.o \
+		  $(MESATNLBUILDDIR)debugger/t_vb_texgen.o \
+		  $(MESATNLBUILDDIR)debugger/t_vb_texmat.o \
+		  $(MESATNLBUILDDIR)debugger/t_vb_vertex.o \
+		  $(MESATNLBUILDDIR)debugger/t_vertex.o \
+                  $(MESATNLBUILDDIR)debugger/t_vertex_generic.o \
+                  $(MESATNLBUILDDIR)debugger/t_vertex_sse.o \
+                  $(MESATNLBUILDDIR)debugger/t_vp_build.o \
+		  $(MESATNLBUILDDIR)debugger/t_vtx_api.o \
+		  $(MESATNLBUILDDIR)debugger/t_vtx_eval.o \
+		  $(MESATNLBUILDDIR)debugger/t_vtx_exec.o \
+		  $(MESATNLBUILDDIR)debugger/t_vtx_generic.o
+
+#if defined(i386Architecture) && MesaUseX86Asm
+ MESA_TNL_DOBJS += $(MESATNLBUILDDIR)debugger/t_vtx_x86.o \
+		  $(MESATNLBUILDDIR)debugger/t_vtx_x86_gcc.o
+#endif
+
+ MESA_TNL_POBJS = $(MESATNLBUILDDIR)profiled/t_array_api.o \
+		  $(MESATNLBUILDDIR)profiled/t_array_import.o \
+		  $(MESATNLBUILDDIR)profiled/t_context.o \
+		  $(MESATNLBUILDDIR)profiled/t_pipeline.o \
+		  $(MESATNLBUILDDIR)profiled/t_save_api.o \
+		  $(MESATNLBUILDDIR)profiled/t_save_loopback.o \
+		  $(MESATNLBUILDDIR)profiled/t_save_playback.o \
+                  $(MESATNLBUILDDIR)profiled/t_vb_arbprogram.o \
+                  $(MESATNLBUILDDIR)profiled/t_vb_arbprogram_sse.o \
+		  $(MESATNLBUILDDIR)profiled/t_vb_fog.o \
+		  $(MESATNLBUILDDIR)profiled/t_vb_cull.o \
+		  $(MESATNLBUILDDIR)profiled/t_vb_light.o \
+		  $(MESATNLBUILDDIR)profiled/t_vb_normals.o \
+		  $(MESATNLBUILDDIR)profiled/t_vb_points.o \
+		  $(MESATNLBUILDDIR)profiled/t_vb_program.o \
+		  $(MESATNLBUILDDIR)profiled/t_vb_render.o \
+		  $(MESATNLBUILDDIR)profiled/t_vb_texgen.o \
+		  $(MESATNLBUILDDIR)profiled/t_vb_texmat.o \
+		  $(MESATNLBUILDDIR)profiled/t_vb_vertex.o \
+		  $(MESATNLBUILDDIR)profiled/t_vertex.o \
+                  $(MESATNLBUILDDIR)profiled/t_vertex_generic.o \
+                  $(MESATNLBUILDDIR)profiled/t_vertex_sse.o \
+                  $(MESATNLBUILDDIR)profiled/t_vp_build.o \
+		  $(MESATNLBUILDDIR)profiled/t_vtx_api.o \
+		  $(MESATNLBUILDDIR)profiled/t_vtx_eval.o \
+		  $(MESATNLBUILDDIR)profiled/t_vtx_exec.o \
+		  $(MESATNLBUILDDIR)profiled/t_vtx_generic.o
+
+#if defined(i386Architecture) && MesaUseX86Asm
+ MESA_TNL_POBJS += $(MESATNLBUILDDIR)profiled/t_vtx_x86.o \
+		  $(MESATNLBUILDDIR)profiled/t_vtx_x86_gcc.o
+#endif
+
diff --git a/nx-X11/programs/Xserver/GL/mesa/tnl/module/Imakefile b/nx-X11/programs/Xserver/GL/mesa/tnl/module/Imakefile
deleted file mode 100644
index 5d2a4489d..000000000
--- a/nx-X11/programs/Xserver/GL/mesa/tnl/module/Imakefile
+++ /dev/null
@@ -1,6 +0,0 @@
-XCOMM $XFree86: xc/programs/Xserver/GL/mesa/src/tnl/module/Imakefile,v 1.1 2002/05/31 18:12:42 dawes Exp $
-
-#define IHaveModules
-
-#include "../Imakefile"
-