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

diff --git a/nx-X11/lib/GL/glx/Imakefile b/nx-X11/lib/GL/glx/Imakefile
deleted file mode 100644
index 97d3b3224..000000000
--- a/nx-X11/lib/GL/glx/Imakefile
+++ /dev/null
@@ -1,233 +0,0 @@
-XCOMM $XFree86: xc/lib/GL/glx/Imakefile,v 1.22 2003/11/12 00:10:24 dawes Exp $
-XCOMM The contents of this file are subject to the GLX Public License Version 1.0
-XCOMM (the "License"). You may not use this file except in compliance with the
-XCOMM License. You may obtain a copy of the License at Silicon Graphics, Inc.,
-XCOMM attn: Legal Services, 2011 N. Shoreline Blvd., Mountain View, CA 94043
-XCOMM or at http://www.sgi.com/software/opensource/glx/license.html.
-XCOMM
-XCOMM Software distributed under the License is distributed on an "AS IS"
-XCOMM basis. ALL WARRANTIES ARE DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY
-XCOMM IMPLIED WARRANTIES OF MERCHANTABILITY, OF FITNESS FOR A PARTICULAR
-XCOMM PURPOSE OR OF NON- INFRINGEMENT. See the License for the specific
-XCOMM language governing rights and limitations under the License.
-XCOMM
-XCOMM The Original Software is GLX version 1.2 source code, released February,
-XCOMM 1999. The developer of the Original Software is Silicon Graphics, Inc.
-XCOMM Those portions of the Subject Software created by Silicon Graphics, Inc.
-XCOMM are Copyright (c) 1991-9 Silicon Graphics, Inc. All Rights Reserved.
-
-XCOMM $XdotOrg: xc/lib/GL/glx/Imakefile,v 1.12 2005/08/23 04:03:51 airlied 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
-
-XCOMM #define IHaveSubdirs
-XCOMM #define PassCDebugFlags 'CDEBUGFLAGS=$(CDEBUGFLAGS)'
-XCOMM 
-XCOMM SUBDIRS = \
-XCOMM 	glu \
-XCOMM 	glw
-
-/* Files from Mesa */
-
-LinkSourceFile(glapi.c, $(MESASRCDIR)/src/mesa/glapi)
-LinkSourceFile(glthread.c, $(MESASRCDIR)/src/mesa/glapi)
-LinkSourceFile(glcontextmodes.c, $(MESASRCDIR)/src/mesa/drivers/dri/common)
-LinkSourceFile(glcontextmodes.h, $(MESASRCDIR)/src/mesa/drivers/dri/common)
-LinkSourceFile(dispatch.c, $(MESASRCDIR)/src/mesa/main)
-
-#ifdef i386Architecture
-LinkSourceFile(glapi_x86.S, $(MESASRCDIR)/src/mesa/x86)
-#endif
-#ifdef SparcArchitecture
-LinkSourceFile(glapi_sparc.S, $(MESASRCDIR)/src/mesa/sparc)
-#endif
-
-LinkSourceFile(XF86dri.c, $(MESASRCDIR)/src/glx/x11)
-LinkSourceFile(clientattrib.c, $(MESASRCDIR)/src/glx/x11)
-LinkSourceFile(compsize.c, $(MESASRCDIR)/src/glx/x11)
-LinkSourceFile(dri_glx.c, $(MESASRCDIR)/src/glx/x11)
-LinkSourceFile(dri_glx.h, $(MESASRCDIR)/src/glx/x11)
-LinkSourceFile(eval.c, $(MESASRCDIR)/src/glx/x11)
-LinkSourceFile(glx_pbuffer.c, $(MESASRCDIR)/src/glx/x11)
-LinkSourceFile(glx_query.c, $(MESASRCDIR)/src/glx/x11)
-LinkSourceFile(glx_texture_compression.c, $(MESASRCDIR)/src/glx/x11)
-LinkSourceFile(glxclient.h, $(MESASRCDIR)/src/glx/x11)
-LinkSourceFile(glxcmds.c, $(MESASRCDIR)/src/glx/x11)
-LinkSourceFile(glxext.c, $(MESASRCDIR)/src/glx/x11)
-LinkSourceFile(glxextensions.c, $(MESASRCDIR)/src/glx/x11)
-LinkSourceFile(glxextensions.h, $(MESASRCDIR)/src/glx/x11)
-LinkSourceFile(indirect.c, $(MESASRCDIR)/src/glx/x11)
-LinkSourceFile(indirect.h, $(MESASRCDIR)/src/glx/x11)
-LinkSourceFile(indirect_init.c, $(MESASRCDIR)/src/glx/x11)
-LinkSourceFile(indirect_init.h, $(MESASRCDIR)/src/glx/x11)
-LinkSourceFile(indirect_size.c, $(MESASRCDIR)/src/glx/x11)
-LinkSourceFile(indirect_size.h, $(MESASRCDIR)/src/glx/x11)
-LinkSourceFile(indirect_transpose_matrix.c, $(MESASRCDIR)/src/glx/x11)
-LinkSourceFile(indirect_va_private.h, $(MESASRCDIR)/src/glx/x11)
-LinkSourceFile(indirect_vertex_array.c, $(MESASRCDIR)/src/glx/x11)
-LinkSourceFile(indirect_vertex_array.h, $(MESASRCDIR)/src/glx/x11)
-LinkSourceFile(indirect_vertex_program.c, $(MESASRCDIR)/src/glx/x11)
-LinkSourceFile(indirect_window_pos.c, $(MESASRCDIR)/src/glx/x11)
-LinkSourceFile(packrender.h, $(MESASRCDIR)/src/glx/x11)
-LinkSourceFile(packsingle.h, $(MESASRCDIR)/src/glx/x11)
-LinkSourceFile(pixel.c, $(MESASRCDIR)/src/glx/x11)
-LinkSourceFile(pixelstore.c, $(MESASRCDIR)/src/glx/x11)
-LinkSourceFile(render2.c, $(MESASRCDIR)/src/glx/x11)
-LinkSourceFile(renderpix.c, $(MESASRCDIR)/src/glx/x11)
-LinkSourceFile(single2.c, $(MESASRCDIR)/src/glx/x11)
-LinkSourceFile(singlepix.c, $(MESASRCDIR)/src/glx/x11)
-LinkSourceFile(vertarr.c, $(MESASRCDIR)/src/glx/x11)
-LinkSourceFile(xf86dri.h, $(MESASRCDIR)/src/glx/x11)
-LinkSourceFile(xf86dristr.h, $(MESASRCDIR)/src/glx/x11)
-LinkSourceFile(xfont.c, $(MESASRCDIR)/src/glx/x11)
-
-/*
- * Maybe some of these could come from
- * xc/extras/ogl-sample/main/glx/lib at some point.
- */
-     GLX_SRCS = \
-		clientattrib.c \
-		compsize.c \
-		dispatch.c \
-		eval.c \
-		glapi.c \
-		glthread.c \
-                glx_pbuffer.c \
-                glx_query.c \
-                glx_texture_compression.c \
-		glxcmds.c \
-		glxext.c \
-		glxextensions.c \
-		glcontextmodes.c \
-                indirect.c \
-		indirect_init.c \
-                indirect_size.c \
-                indirect_transpose_matrix.c \
-                indirect_vertex_array.c \
-                indirect_vertex_program.c \
-                indirect_window_pos.c \
-		pixel.c \
-		pixelstore.c \
-		render2.c \
-		renderpix.c \
-		single2.c \
-		singlepix.c \
-		vertarr.c \
-		xfont.c
-
-     GLX_OBJS = \
-		clientattrib.o \
-		compsize.o \
-		eval.o \
-		dispatch.o \
-		glapi.o \
-		glthread.o \
-                glx_pbuffer.o \
-                glx_query.o \
-                glx_texture_compression.o \
-		glxcmds.o \
-		glxext.o \
-		glxextensions.o \
-		glcontextmodes.o \
-                indirect.o \
-		indirect_init.o \
-                indirect_size.o \
-                indirect_transpose_matrix.o \
-                indirect_vertex_array.o \
-                indirect_vertex_program.o \
-                indirect_window_pos.o \
-		pixel.o \
-		pixelstore.o \
-		render2.o \
-		renderpix.o \
-		single2.o \
-		singlepix.o \
-		vertarr.o \
-		xfont.o
-
-     GLX_DEFS = GlxDefines VidModeExtensionDefines \
-	        -DDEFAULT_DRIVER_DIR=\"$(MODULEDIR)/dri\"
-
-#ifdef i386Architecture
-      ASM_DIR = x86
-#endif
-#ifdef SparcArchitecture
-      ASM_DIR = sparc
-#endif
-
-#if BuildXF86DRI
-     DRI_SRCS = dri_glx.c XF86dri.c
-     DRI_OBJS = dri_glx.o XF86dri.o
-
-     DRI_INCS = -I$(SERVERSRC)/GL/dri
-#if defined(i386Architecture) && MesaUseX86Asm
-     ASM_SRCS = glapi_x86.S
-     ASM_OBJS = glapi_x86.o
-     ASM_DEFS = -DUSE_X86_ASM
-#endif
-#if defined(SparcArchitecture)
-     ASM_SRCS = glapi_sparc.S
-     ASM_OBJS = glapi_sparc.o
-     ASM_DEFS = -DUSE_SPARC_ASM
-#endif
-
-#if GlxBuiltInXMesa
-  XMESA_DEFINES = -DGLX_BUILT_IN_XMESA
-#endif
-#endif
-
-#if defined(DarwinArchitecture) || defined(OS2Architecture) || \
-defined(LynxOSArchitecture)
-ALIAS_DEFINES = -DGLX_ALIAS_UNSUPPORTED
-#endif
-#if defined(DarwinArchitecture) && BuildAppleDRI
-     DRI_SRCS = XF86dri.c
-     DRI_OBJS = XF86dri.o
-
-     DRI_INCS = -I$(SERVERSRC)/GL/dri
-#endif
-
-         SRCS = $(GLX_SRCS) $(ASM_SRCS) $(DRI_SRCS)
-         OBJS = $(GLX_OBJS) $(ASM_OBJS) $(DRI_OBJS)
-      DEFINES = $(GLX_DEFS) $(ASM_DEFS) $(XMESA_DEFINES) $(ALIAS_DEFINES) \
-	        $(THREADS_DEFINES)
-
-     INCLUDES = -I$(XINCLUDESRC) \
-		-I$(MESASRCDIR)/include \
-		-I$(EXTINCSRC) \
-		-I$(GLXLIBSRC)/glx \
-		-I$(MESASRCDIR)/src/mesa/main \
-		-I$(MESASRCDIR)/src/mesa/glapi \
-		-I$(MESASRCDIR)/src/mesa/drivers/x11 \
-		-I$(MESASRCDIR)/src/mesa/$(ASM_DIR) \
-		-I$(XF86OSSRC) \
-		-I$(DRMSRCDIR)/shared-core \
-		$(DRI_INCS)
-
-#include <Library.tmpl>
-
-LibraryObjectRule()
-
-#if BuildXF86DRI && defined(i386Architecture) && MesaUseX86Asm
-ObjectFromAsmSource(glapi_x86, NullParameter)
-#endif
-#if BuildXF86DRI && defined(SparcArchitecture)
-STD_CPP_DEFINES = StandardDefines $(PROJECT_DEFINES)
-ObjectFromAsmSource(glapi_sparc, NullParameter)
-#endif
-
-SubdirLibraryRule($(OBJS))
-NormalLintTarget($(SRCS))
-
-DependTarget()