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

diff --git a/nx-X11/lib/GL/mesa/x86/Imakefile b/nx-X11/lib/GL/mesa/x86/Imakefile
deleted file mode 100644
index 543c05143..000000000
--- a/nx-X11/lib/GL/mesa/x86/Imakefile
+++ /dev/null
@@ -1,108 +0,0 @@
-XCOMM $XFree86: xc/lib/GL/mesa/src/X86/Imakefile,v 1.23 2002/07/14 17:08:16 alanh Exp $
-
-/*
- * 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 GlxDriverUsesMesa || GlxBuiltInXMesa || BuildOSMesaLib
-#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
-
-
-#if Malloc0ReturnsNull
-ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL
-#endif
-
-#define MesaX86BuildDir /**/
-#define NeedToLinkMesaSrc
-#include "Imakefile.inc"
-
-      DEFINES = $(ALLOC_DEFINES) GlxDefines -DIN_DRI_DRIVER $(MESA_ASM_DEFINES)
-     INCLUDES = /*-I$(INCLUDESRC) -I$(EXTINCSRC)*/ -I$(MESASRCDIR)/src/mesa \
-		-I$(MESASRCDIR)/include \
-		-I$(GLXLIBSRC)/include \
-		-I$(MESASRCDIR)/src/mesa/main \
-		-I$(MESASRCDIR)/src/mesa/x86 \
-		-I$(MESASRCDIR)/src/mesa/glapi
-
-         SRCS = $(MESA_ASM_SRCS) gen_matypes.c
-         OBJS = $(MESA_ASM_OBJS)
-
-#include <Library.tmpl>
-
-LibraryObjectRule()
-
-STD_CPP_DEFINES = StandardDefines $(PROJECT_DEFINES)
-
-SubdirLibraryRule($(OBJS))
-NormalLintTarget($(SRCS))
-
-ObjectFromAsmSource(common_x86_asm, NullParameter)
-ObjectFromAsmSource(read_rgba_span_x86, NullParameter)
-ObjectFromAsmSource(x86_cliptest, NullParameter)
-ObjectFromAsmSource(x86_xform2, NullParameter)
-ObjectFromAsmSource(x86_xform3, NullParameter)
-ObjectFromAsmSource(x86_xform4, NullParameter)
-
-#if MesaUseMMX
-ObjectFromAsmSource(mmx_blend, NullParameter)
-#endif
-
-#if MesaUse3DNow
-ObjectFromAsmSource(3dnow_normal, NullParameter)
-ObjectFromAsmSource(3dnow_xform1, NullParameter)
-ObjectFromAsmSource(3dnow_xform2, NullParameter)
-ObjectFromAsmSource(3dnow_xform3, NullParameter)
-ObjectFromAsmSource(3dnow_xform4, NullParameter)
-#endif
-
-#if MesaUseSSE
-ObjectFromAsmSource(sse_normal, NullParameter)
-ObjectFromAsmSource(sse_xform1, NullParameter)
-ObjectFromAsmSource(sse_xform2, NullParameter)
-ObjectFromAsmSource(sse_xform3, NullParameter)
-ObjectFromAsmSource(sse_xform4, NullParameter)
-#endif
-
-LinkSourceFile(gen_matypes.c, $(MESASRCDIR)/src/mesa/x86)
-
-#if CrossCompiling
-HOST_CFLAGS=$(TOP_INCLUDES) $(INCLUDES) $(BOOTSTRAPCFLAGS) \
-	$(CROSSCOMPILEDEFINES) $(CROSSCOMPILEBOOTSTRAPDEFINES)
-#else
-HOST_CFLAGS=$(CFLAGS)
-#endif
-
-MATYPES = ./gen_matypes
-
-matypes.h: gen_matypes.c
-	RemoveFiles($@ HostProgramTargetName(gen_matypes))
-	-HostLinkRule(HostProgramTargetName(gen_matypes),$(HOST_CFLAGS) $(LOCAL_LDFLAGS),gen_matypes.c,$(LDLIBS))
-	RunProgram(MATYPES,> matypes_h)
-	$(MV) matypes_h $@
-	RemoveFiles(HostProgramTargetName(gen_matypes))
-
-includes:: matypes.h
-
-depend:: matypes.h
-
-clean::
-	RemoveFiles(matypes.h HostProgramTargetName(gen_matypes))
-
-DependTarget()
diff --git a/nx-X11/lib/GL/mesa/x86/Imakefile.inc b/nx-X11/lib/GL/mesa/x86/Imakefile.inc
deleted file mode 100644
index b21c6f659..000000000
--- a/nx-X11/lib/GL/mesa/x86/Imakefile.inc
+++ /dev/null
@@ -1,217 +0,0 @@
-XCOMM $XFree86: xc/lib/GL/mesa/src/X86/Imakefile.inc,v 1.5 2002/11/14 21:01:16 tsi Exp $
-
-#ifndef MesaX86BuildDir
-#define MesaX86BuildDir $(GLXLIBSRC)/mesa/x86/
-#endif
-
-MESAX86BUILDDIR = MesaX86BuildDir
-
-MESA_X86_SRCS = $(MESAX86BUILDDIR)common_x86.c \
-		$(MESAX86BUILDDIR)common_x86_asm.S \
-		$(MESAX86BUILDDIR)glapi_x86.S \
-                $(MESAX86BUILDDIR)read_rgba_span_x86.S \
-		$(MESAX86BUILDDIR)x86.c \
-		$(MESAX86BUILDDIR)x86_cliptest.S \
-		$(MESAX86BUILDDIR)x86_xform2.S \
-		$(MESAX86BUILDDIR)x86_xform3.S \
-		$(MESAX86BUILDDIR)x86_xform4.S \
-                $(MESAX86BUILDDIR)x86sse.c
-
-#ifdef NeedToLinkMesaSrc
-LinkSourceFile(common_x86.c, $(MESASRCDIR)/src/mesa/x86)
-LinkSourceFile(common_x86_asm.S, $(MESASRCDIR)/src/mesa/x86)
-LinkSourceFile(glapi_x86.S, $(MESASRCDIR)/src/mesa/x86)
-LinkSourceFile(read_rgba_span_x86.S, $(MESASRCDIR)/src/mesa/x86)
-LinkSourceFile(read_rgba_span_x86.h, $(MESASRCDIR)/src/mesa/x86)
-LinkSourceFile(x86.c, $(MESASRCDIR)/src/mesa/x86)
-LinkSourceFile(x86_cliptest.S, $(MESASRCDIR)/src/mesa/x86)
-LinkSourceFile(x86_xform2.S, $(MESASRCDIR)/src/mesa/x86)
-LinkSourceFile(x86_xform3.S, $(MESASRCDIR)/src/mesa/x86)
-LinkSourceFile(x86_xform4.S, $(MESASRCDIR)/src/mesa/x86)
-LinkSourceFile(x86sse.c, $(MESASRCDIR)/src/mesa/x86/rtasm)
-LinkSourceFile(x86sse.h, $(MESASRCDIR)/src/mesa/x86/rtasm)
-#endif
-
-MESA_X86_OBJS = $(MESAX86BUILDDIR)common_x86.o \
-		$(MESAX86BUILDDIR)common_x86_asm.o \
-                $(MESAX86BUILDDIR)read_rgba_span_x86.o \
-		$(MESAX86BUILDDIR)x86.o \
-		$(MESAX86BUILDDIR)x86_cliptest.o \
-		$(MESAX86BUILDDIR)x86_xform2.o \
-		$(MESAX86BUILDDIR)x86_xform3.o \
-		$(MESAX86BUILDDIR)x86_xform4.o \
-                $(MESAX86BUILDDIR)x86sse.o
-
-#if defined(DoSharedLib) && DoSharedLib
-MESA_X86_UOBJS = $(MESAX86BUILDDIR)unshared/common_x86.o \
-		$(MESAX86BUILDDIR)common_x86_asm.o \
-                $(MESAX86BUILDDIR)read_rgba_span_x86.o \
-		$(MESAX86BUILDDIR)unshared/x86.o \
-		$(MESAX86BUILDDIR)x86_cliptest.o \
-		$(MESAX86BUILDDIR)x86_xform2.o \
-		$(MESAX86BUILDDIR)x86_xform3.o \
-		$(MESAX86BUILDDIR)x86_xform4.o \
-                $(MESAX86BUILDDIR)x86sse.o
-#else
-MESA_X86_UOBJS = $(MESA_X86_OBJS)
-#endif
-
-MESA_X86_DOBJS = $(MESAX86BUILDDIR)debugger/common_x86.o \
-		$(MESAX86BUILDDIR)common_x86_asm.o \
-                $(MESAX86BUILDDIR)read_rgba_span_x86.o \
-		$(MESAX86BUILDDIR)debugger/x86.o \
-		$(MESAX86BUILDDIR)x86_cliptest.o \
-		$(MESAX86BUILDDIR)x86_xform2.o \
-		$(MESAX86BUILDDIR)x86_xform3.o \
-		$(MESAX86BUILDDIR)x86_xform4.o \
-                $(MESAX86BUILDDIR)x86sse.o
-
-MESA_X86_POBJS = $(MESAX86BUILDDIR)profiled/common_x86.o \
-		$(MESAX86BUILDDIR)common_x86_asm.o \
-                $(MESAX86BUILDDIR)read_rgba_span_x86.o \
-		$(MESAX86BUILDDIR)profiled/x86.o \
-		$(MESAX86BUILDDIR)x86_cliptest.o \
-		$(MESAX86BUILDDIR)x86_xform2.o \
-		$(MESAX86BUILDDIR)x86_xform3.o \
-		$(MESAX86BUILDDIR)x86_xform4.o \
-                $(MESAX86BUILDDIR)x86sse.o
-
-MESA_X86_DEFS = -DUSE_X86_ASM
-
-
-#if MesaUseMMX
-MESA_MMX_SRCS = $(MESAX86BUILDDIR)mmx_blend.S
-
-#ifdef NeedToLinkMesaSrc
-LinkSourceFile(mmx_blend.S, $(MESASRCDIR)/src/mesa/x86)
-#endif
-
-MESA_MMX_OBJS = $(MESAX86BUILDDIR)mmx_blend.o
-
-MESA_MMX_UOBJS = $(MESA_MMX_OBJS)
-MESA_MMX_DOBJS = $(MESA_MMX_OBJS)
-MESA_MMX_POBJS = $(MESA_MMX_OBJS)
-
-MESA_MMX_DEFS = -DUSE_MMX_ASM
-#endif
-
-#if MesaUse3DNow
-MESA_3DNOW_SRCS = $(MESAX86BUILDDIR)3dnow.c \
-		$(MESAX86BUILDDIR)3dnow_normal.S \
-		$(MESAX86BUILDDIR)3dnow_xform1.S \
-		$(MESAX86BUILDDIR)3dnow_xform2.S \
-		$(MESAX86BUILDDIR)3dnow_xform3.S \
-		$(MESAX86BUILDDIR)3dnow_xform4.S
-
-#ifdef NeedToLinkMesaSrc
-LinkSourceFile(3dnow.c, $(MESASRCDIR)/src/mesa/x86)
-LinkSourceFile(3dnow_normal.S, $(MESASRCDIR)/src/mesa/x86)
-LinkSourceFile(3dnow_xform1.S, $(MESASRCDIR)/src/mesa/x86)
-LinkSourceFile(3dnow_xform2.S, $(MESASRCDIR)/src/mesa/x86)
-LinkSourceFile(3dnow_xform3.S, $(MESASRCDIR)/src/mesa/x86)
-LinkSourceFile(3dnow_xform4.S, $(MESASRCDIR)/src/mesa/x86)
-#endif
-MESA_3DNOW_OBJS = $(MESAX86BUILDDIR)3dnow.o \
-		$(MESAX86BUILDDIR)3dnow_normal.o \
-		$(MESAX86BUILDDIR)3dnow_xform1.o \
-		$(MESAX86BUILDDIR)3dnow_xform2.o \
-		$(MESAX86BUILDDIR)3dnow_xform3.o \
-		$(MESAX86BUILDDIR)3dnow_xform4.o
-
-#if defined(DoSharedLib) && DoSharedLib
-MESA_3DNOW_UOBJS = $(MESAX86BUILDDIR)unshared/3dnow.o \
-		$(MESAX86BUILDDIR)3dnow_normal.o \
-		$(MESAX86BUILDDIR)3dnow_xform1.o \
-		$(MESAX86BUILDDIR)3dnow_xform2.o \
-		$(MESAX86BUILDDIR)3dnow_xform3.o \
-		$(MESAX86BUILDDIR)3dnow_xform4.o
-#else
-MESA_3DNOW_UOBJS = $(MESA_3DNOW_OBJS)
-#endif
-
-MESA_3DNOW_DOBJS = $(MESAX86BUILDDIR)debugger/3dnow.o \
-		$(MESAX86BUILDDIR)3dnow_normal.o \
-		$(MESAX86BUILDDIR)3dnow_xform1.o \
-		$(MESAX86BUILDDIR)3dnow_xform2.o \
-		$(MESAX86BUILDDIR)3dnow_xform3.o \
-		$(MESAX86BUILDDIR)3dnow_xform4.o
-
-MESA_3DNOW_POBJS = $(MESAX86BUILDDIR)profiled/3dnow.o \
-		$(MESAX86BUILDDIR)3dnow_normal.o \
-		$(MESAX86BUILDDIR)3dnow_xform1.o \
-		$(MESAX86BUILDDIR)3dnow_xform2.o \
-		$(MESAX86BUILDDIR)3dnow_xform3.o \
-		$(MESAX86BUILDDIR)3dnow_xform4.o
-
-MESA_3DNOW_DEFS = -DUSE_3DNOW_ASM
-#endif
-
-#if MesaUseSSE
-MESA_SSE_SRCS = $(MESAX86BUILDDIR)sse.c \
-		$(MESAX86BUILDDIR)sse_normal.S \
-		$(MESAX86BUILDDIR)sse_xform1.S \
-		$(MESAX86BUILDDIR)sse_xform2.S \
-		$(MESAX86BUILDDIR)sse_xform3.S \
-		$(MESAX86BUILDDIR)sse_xform4.S
-
-#ifdef NeedToLinkMesaSrc
-LinkSourceFile(sse.c, $(MESASRCDIR)/src/mesa/x86)
-LinkSourceFile(sse_normal.S, $(MESASRCDIR)/src/mesa/x86)
-LinkSourceFile(sse_xform1.S, $(MESASRCDIR)/src/mesa/x86)
-LinkSourceFile(sse_xform2.S, $(MESASRCDIR)/src/mesa/x86)
-LinkSourceFile(sse_xform3.S, $(MESASRCDIR)/src/mesa/x86)
-LinkSourceFile(sse_xform4.S, $(MESASRCDIR)/src/mesa/x86)
-#endif
-
-MESA_SSE_OBJS = $(MESAX86BUILDDIR)sse.o \
-		$(MESAX86BUILDDIR)sse_normal.o \
-		$(MESAX86BUILDDIR)sse_xform1.o \
-		$(MESAX86BUILDDIR)sse_xform2.o \
-		$(MESAX86BUILDDIR)sse_xform3.o \
-		$(MESAX86BUILDDIR)sse_xform4.o
-
-#if defined(DoSharedLib) && DoSharedLib
-MESA_SSE_UOBJS = $(MESAX86BUILDDIR)unshared/sse.o \
-		$(MESAX86BUILDDIR)sse_normal.o \
-		$(MESAX86BUILDDIR)sse_xform1.o \
-		$(MESAX86BUILDDIR)sse_xform2.o \
-		$(MESAX86BUILDDIR)sse_xform3.o \
-		$(MESAX86BUILDDIR)sse_xform4.o
-#else
-MESA_SSE_UOBJS = $(MESA_SSE_OBJS)
-#endif
-
-MESA_SSE_DOBJS = $(MESAX86BUILDDIR)debugger/sse.o \
-		$(MESAX86BUILDDIR)sse_normal.o \
-		$(MESAX86BUILDDIR)sse_xform1.o \
-		$(MESAX86BUILDDIR)sse_xform2.o \
-		$(MESAX86BUILDDIR)sse_xform3.o \
-		$(MESAX86BUILDDIR)sse_xform4.o
-
-MESA_SSE_POBJS = $(MESAX86BUILDDIR)profiled/sse.o \
-		$(MESAX86BUILDDIR)sse_normal.o \
-		$(MESAX86BUILDDIR)sse_xform1.o \
-		$(MESAX86BUILDDIR)sse_xform2.o \
-		$(MESAX86BUILDDIR)sse_xform3.o \
-		$(MESAX86BUILDDIR)sse_xform4.o
-
-MESA_SSE_DEFS = -DUSE_SSE_ASM
-#endif
-
-MESA_ASM_SRCS = $(MESA_X86_SRCS) $(MESA_MMX_SRCS) $(MESA_3DNOW_SRCS) \
-		$(MESA_SSE_SRCS)
-
-MESA_ASM_OBJS = $(MESA_X86_OBJS) $(MESA_MMX_OBJS) $(MESA_3DNOW_OBJS) \
-		$(MESA_SSE_OBJS)
-
-MESA_ASM_UOBJS = $(MESA_X86_UOBJS) $(MESA_MMX_UOBJS) $(MESA_3DNOW_UOBJS) \
-		$(MESA_SSE_UOBJS)
-
-MESA_ASM_DOBJS = $(MESA_X86_DOBJS) $(MESA_MMX_DOBJS) $(MESA_3DNOW_DOBJS) \
-		$(MESA_SSE_DOBJS)
-
-MESA_ASM_POBJS = $(MESA_X86_POBJS) $(MESA_MMX_POBJS) $(MESA_3DNOW_POBJS) \
-		$(MESA_SSE_POBJS)
-
-MESA_ASM_DEFINES = $(MESA_X86_DEFS) $(MESA_MMX_DEFS) $(MESA_3DNOW_DEFS) $(MESA_SSE_DEFS)
-