13 files changed, 5 insertions, 208 deletions
diff --git a/nx-X11/programs/Xserver/GL/Imakefile b/nx-X11/programs/Xserver/GL/Imakefile
index 47134e0a1..c681d23e0 100644
--- a/nx-X11/programs/Xserver/GL/Imakefile
+++ b/nx-X11/programs/Xserver/GL/Imakefile
@@ -5,24 +5,9 @@ XCOMM $XFree86: xc/programs/Xserver/GL/Imakefile,v 1.12 2003/08/06 14:04:01 eich
 
 #define IHaveSubdirs
 
-#if GlxUseSGISI
- CORE_SUBDIR = /* opengl */
-#elif defined(DarwinArchitecture) && DarwinQuartzSupport
- CORE_SUBDIR = apple mesa
-#elif defined(cygwinArchitecture) && GlxUseWindows
- CORE_SUBDIR = windows mesa
-#elif defined(Win32Architecture) && GlxUseWindows
- CORE_SUBDIR = windows
-#else
  CORE_SUBDIR = mesa
-#endif
-
-#if BuildXF86DRI && ((defined(XF86Server) && XF86Server) \
-	|| (defined(XorgServer) && XorgServer))
-DRI_SUBDIR = dri
-#endif
 
-SUBDIRS = glx $(DRI_SUBDIR) $(CORE_SUBDIR)
+SUBDIRS = glx $(CORE_SUBDIR)
 
 #if DoLoadableServer
 MSRCS = glxmodule.c
@@ -39,7 +24,7 @@ OBJS = glx/?*.o $(MOBJS)
 
 DONES = glx/DONE
 
-INCLUDES = -Iinclude -Idri -I$(SERVERSRC)/include -I$(SERVERSRC)/mi \
+INCLUDES = -Iinclude -I$(SERVERSRC)/include -I$(SERVERSRC)/mi \
 	   -I$(XINCLUDESRC) -I$(EXTINCSRC) -I$(XF86OSSRC)
 DEPEND_DEFINES = $(EXT_DEFINES) DependDefines
 DEFINES = $(GLX_DEFINES)
diff --git a/nx-X11/programs/Xserver/GL/mesa/X/Imakefile b/nx-X11/programs/Xserver/GL/mesa/X/Imakefile
index fbdd755fa..deae53bb3 100644
--- a/nx-X11/programs/Xserver/GL/mesa/X/Imakefile
+++ b/nx-X11/programs/Xserver/GL/mesa/X/Imakefile
@@ -58,7 +58,6 @@ NormalLibraryObjectRule()
 
 SubdirLibraryRule($(OBJS))
 
-LintLibraryTarget(dri,$(SRCS))
 NormalLintTarget($(SRCS))
 
 DependTarget()
diff --git a/nx-X11/programs/Xserver/GL/mesa/array_cache/Imakefile b/nx-X11/programs/Xserver/GL/mesa/array_cache/Imakefile
index 21c6689ed..188972b3b 100644
--- a/nx-X11/programs/Xserver/GL/mesa/array_cache/Imakefile
+++ b/nx-X11/programs/Xserver/GL/mesa/array_cache/Imakefile
@@ -35,7 +35,6 @@ NormalLibraryObjectRule()
 
 SubdirLibraryRule($(OBJS))
 
-LintLibraryTarget(dri,$(SRCS))
 NormalLintTarget($(SRCS))
 
 DependTarget()
diff --git a/nx-X11/programs/Xserver/GL/mesa/main/Imakefile b/nx-X11/programs/Xserver/GL/mesa/main/Imakefile
index d6713cada..2dd59ea8f 100644
--- a/nx-X11/programs/Xserver/GL/mesa/main/Imakefile
+++ b/nx-X11/programs/Xserver/GL/mesa/main/Imakefile
@@ -40,7 +40,6 @@ NormalLibraryObjectRule()
 
 SubdirLibraryRule($(OBJS))
 
-LintLibraryTarget(dri,$(SRCS))
 NormalLintTarget($(SRCS))
 
 DependTarget()
diff --git a/nx-X11/programs/Xserver/GL/mesa/math/Imakefile b/nx-X11/programs/Xserver/GL/mesa/math/Imakefile
index 9f1ab6b44..df30ab909 100644
--- a/nx-X11/programs/Xserver/GL/mesa/math/Imakefile
+++ b/nx-X11/programs/Xserver/GL/mesa/math/Imakefile
@@ -34,7 +34,6 @@ NormalLibraryObjectRule()
 
 SubdirLibraryRule($(OBJS))
 
-LintLibraryTarget(dri,$(SRCS))
 NormalLintTarget($(SRCS))
 
 DependTarget()
diff --git a/nx-X11/programs/Xserver/GL/mesa/shader/Imakefile b/nx-X11/programs/Xserver/GL/mesa/shader/Imakefile
index 6129d71b9..b52d193d3 100644
--- a/nx-X11/programs/Xserver/GL/mesa/shader/Imakefile
+++ b/nx-X11/programs/Xserver/GL/mesa/shader/Imakefile
@@ -37,7 +37,6 @@ NormalLibraryObjectRule()
 
 SubdirLibraryRule($(OBJS))
 
-LintLibraryTarget(dri,$(SRCS))
 NormalLintTarget($(SRCS))
 
 DependTarget()
diff --git a/nx-X11/programs/Xserver/GL/mesa/shader/grammar/Imakefile b/nx-X11/programs/Xserver/GL/mesa/shader/grammar/Imakefile
index d975ec73c..56cfb4bc9 100644
--- a/nx-X11/programs/Xserver/GL/mesa/shader/grammar/Imakefile
+++ b/nx-X11/programs/Xserver/GL/mesa/shader/grammar/Imakefile
@@ -33,7 +33,6 @@ NormalLibraryObjectRule()
 
 SubdirLibraryRule($(OBJS))
 
-LintLibraryTarget(dri,$(SRCS))
 NormalLintTarget($(SRCS))
 
 DependTarget()
diff --git a/nx-X11/programs/Xserver/GL/mesa/shader/slang/Imakefile b/nx-X11/programs/Xserver/GL/mesa/shader/slang/Imakefile
index da3fbc703..572000f26 100644
--- a/nx-X11/programs/Xserver/GL/mesa/shader/slang/Imakefile
+++ b/nx-X11/programs/Xserver/GL/mesa/shader/slang/Imakefile
@@ -36,7 +36,6 @@ NormalLibraryObjectRule()
 
 SubdirLibraryRule($(OBJS))
 
-LintLibraryTarget(dri,$(SRCS))
 NormalLintTarget($(SRCS))
 
 DependTarget()
diff --git a/nx-X11/programs/Xserver/GL/mesa/swrast/Imakefile b/nx-X11/programs/Xserver/GL/mesa/swrast/Imakefile
index 46b22b6a1..c4c55a86f 100644
--- a/nx-X11/programs/Xserver/GL/mesa/swrast/Imakefile
+++ b/nx-X11/programs/Xserver/GL/mesa/swrast/Imakefile
@@ -42,7 +42,6 @@ NormalLibraryObjectRule()
 
 SubdirLibraryRule($(OBJS))
 
-LintLibraryTarget(dri,$(SRCS))
 NormalLintTarget($(SRCS))
 
 DependTarget()
diff --git a/nx-X11/programs/Xserver/GL/mesa/swrast_setup/Imakefile b/nx-X11/programs/Xserver/GL/mesa/swrast_setup/Imakefile
index 992c4925c..52be70141 100644
--- a/nx-X11/programs/Xserver/GL/mesa/swrast_setup/Imakefile
+++ b/nx-X11/programs/Xserver/GL/mesa/swrast_setup/Imakefile
@@ -34,7 +34,6 @@ NormalLibraryObjectRule()
 
 SubdirLibraryRule($(OBJS))
 
-LintLibraryTarget(dri,$(SRCS))
 NormalLintTarget($(SRCS))
 
 DependTarget()
diff --git a/nx-X11/programs/Xserver/GL/mesa/tnl/Imakefile b/nx-X11/programs/Xserver/GL/mesa/tnl/Imakefile
index 5c87d1e97..3f1c4bbc5 100644
--- a/nx-X11/programs/Xserver/GL/mesa/tnl/Imakefile
+++ b/nx-X11/programs/Xserver/GL/mesa/tnl/Imakefile
@@ -45,7 +45,6 @@ NormalLibraryObjectRule()
 
 SubdirLibraryRule($(OBJS))
 
-LintLibraryTarget(dri,$(SRCS))
 NormalLintTarget($(SRCS))
 
 DependTarget()
diff --git a/nx-X11/programs/Xserver/GL/opengl/Imakefile b/nx-X11/programs/Xserver/GL/opengl/Imakefile
deleted file mode 100644
index 420405d9c..000000000
--- a/nx-X11/programs/Xserver/GL/opengl/Imakefile
+++ /dev/null
@@ -1,140 +0,0 @@
-XCOMM $XFree86$
-
-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.
-
-#include <Library.tmpl>
-
-OBJS = \
-	ddxci.o \
-	ddxcx.o \
-	ddxrgb.o \
-	ddxscreens.o \
-	dl_block.o \
-	dl_heap.o \
-	dl_init.o \
-	dl_list.o \
-	dl_mopt.o \
-	dl_opt.o \
-	dl_pplst.o \
-	dl_splc.o \
-	dl_splst.o \
-	dl_table.o \
-	g_api.o \
-	g_disp.o \
-	g_lcmpex.o \
-	g_lcomp.o \
-	g_lexec.o \
-	g_ltab.o \
-	g_noptab.o \
-	g_splcmp.o \
-	px_api.o \
-	px_mod.o \
-	px_pack.o \
-	px_paths.o \
-	px_read.o \
-	px_rend.o \
-	px_upack.o \
-	s_accum.o \
-	s_atest.o \
-	s_attrib.o \
-	s_bitmap.o \
-	s_blend.o \
-	s_btdraw.o \
-	s_buffer.o \
-	s_capi.o \
-	s_ci.o \
-	s_clear.o \
-	s_clip.o \
-	s_contxt.o \
-	s_cpydsp.o \
-	s_ctable.o \
-	s_depth.o \
-	s_dlist.o \
-	s_eval.o \
-	s_export.o \
-	s_feed.o \
-	s_finish.o \
-	s_fog.o \
-	s_get.o \
-	s_global.o \
-	s_image.o \
-	s_lcache.o \
-	s_lcomp.o \
-	s_light.o \
-	s_lnclip.o \
-	s_lndraw.o \
-	s_lnfast.o \
-	s_lnfin.o \
-	s_lnspan.o \
-	s_math.o \
-	s_memmgr.o \
-	s_names.o \
-	s_napi.o \
-	s_pgaa.o \
-	s_pgclip.o \
-	s_pgdraw.o \
-	s_pgfin.o \
-	s_pgmode.o \
-	s_pgspan.o \
-	s_pick.o \
-	s_prim.o \
-	s_ptaa.o \
-	s_ptdraw.o \
-	s_ptfin.o \
-	s_rapi.o \
-	s_rect.o \
-	s_rgb.o \
-	s_rpos.o \
-	s_select.o \
-	s_size.o \
-	s_span.o \
-	s_sten.o \
-	s_store.o \
-	s_tapi.o \
-	s_tex.o \
-	s_texel.o \
-	s_texmgr.o \
-	s_trap.o \
-	s_vapi.o \
-	s_varray.o \
-	s_vertex.o \
-	s_xform.o \
-	s_zfuncs.o \
-	vc_cache.o \
-	vc_line.o \
-	vc_point.o \
-	vc_poly.o
-
-INCLUDES = \
-	-I. \
-	-I.. \
-	-Iinclude \
-	-I$(TOP)/server/include \
-	-I$(TOP)/programs/Xserver/include \
-	-I$(TOP)/include \
-	-I$(TOP)/include/GL \
-	-I$(INCLUDESRC)
-
-DEFINES = \
-	-D_LANGUAGE_C \
-	-Dunix
-
-NormalLibraryTarget(GL, $(OBJS))
-NormalLibraryObjectRule()
-
-DependTarget()
diff --git a/nx-X11/programs/Xserver/Imakefile b/nx-X11/programs/Xserver/Imakefile
index 9f730cb97..5ddfb9b5e 100644
--- a/nx-X11/programs/Xserver/Imakefile
+++ b/nx-X11/programs/Xserver/Imakefile
@@ -71,39 +71,15 @@ INSTPGMFLAGS =
 #define AllFBLibs PreFbLibs $(FB) $(CFB) PostFbLibs
 
 #if BuildGlxExt
-# if BuildXF86DRI && ((defined(XF86Server) && XF86Server) \
-	|| (defined(XorgServer) && XorgServer))
-      DRILIB = GL/dri/ModuleLibraryTargetName(dri)
-# else
-      DRILIB = 
-# endif
-# if GlxUseSGISI
+# if DoLoadableServer
       GLXLIB = GL/glx/ModuleLibraryTargetName(glx) \
-               GL/sgi-si/ModuleLibraryTargetName(GLcore) \
-               $(DRILIB)
+               GL/mesa/GLcore/ModuleLibraryTargetName(GLcore)
 # else
-#  if defined(GlxUseWindows) && GlxUseWindows
-      XWin_GL.exe.GLXLIB = GL/glx/ModuleLibraryTargetName(glx_stdcall) \
-               GL/windows/ModuleLibraryTargetName(GLcore)
-#  endif /* GlxUseWindows */
-#  if defined(Win32Architecture) && defined(GlxUseWindows) && GlxUseWindows
-      GLXLIB = GL/glx/ModuleLibraryTargetName(glx_stdcall) \
-               GL/windows/ModuleLibraryTargetName(GLcore)
-#  elif DoLoadableServer
       GLXLIB = GL/glx/ModuleLibraryTargetName(glx) \
                GL/mesa/GLcore/ModuleLibraryTargetName(GLcore)
-#  else
-      GLXLIB = GL/glx/ModuleLibraryTargetName(glx) \
-               GL/mesa/GLcore/ModuleLibraryTargetName(GLcore) \
-               $(DRILIB)
-#  endif
 # endif
       GLXDIR = GL
-# if defined(cygwinArchitecture) && defined(GlxUseWindows) && GlxUseWindows
-      GLXEXT = $(if $($@.GLXLIB),$($@.GLXLIB), $(GLXLIB))
-# else
       GLXEXT = $(GLXLIB)
-# endif
 #endif
 
 #if BuildXInputExt
@@ -526,11 +502,7 @@ XWINPARSERLIB = $(XWINPARSERDIR)/LibraryTargetName(xf86config)
 XWINPARSERDIR = 
 XWINPARSERLIB = 
 #endif
-#if defined(GlxUseWindows) && GlxUseWindows
-XWINOPENGLLIB = -lopengl32
-#else
 XWINOPENGLLIB = 
-#endif
 
 NXWINLIB = $(NXWINDDXDIR)/LibraryTargetName(NXWin)
 NXWINDIRS = $(STDDIRS) $(FBDIR) $(SHADOWDIR) $(LAYERDIR) $(NXWINDDXDIR) \
@@ -545,10 +517,7 @@ PTHREADLIB = -lpthreadGC
 # endif
 #endif
 #if defined(Win32Architecture)
-# if defined(GlxUseWindows) && GlxUseWindows
-XWINGL32 = -lopengl32
-# endif
-XWINW32  = -lgdi32 -lwsock32 $(XWINGL32) $(PTHREADLIB) 
+XWINW32  = -lgdi32 -lwsock32 $(PTHREADLIB)
 #else
 XWINW32  = -lgdi32
 #endif
@@ -577,18 +546,11 @@ $(NXWINOBJS) $(NXWINLIB) $(NXWINLIBS) $(NXWINSYSLIBS) $(NXWINNXLIBS):: $(NXWINDI
 
 #ifdef mingwArchitecture
 NXWINSERVERNAME=NXming    
-NXWINGLSERVERNAME=NXmingGL    
 #else
 NXWINSERVERNAME=NXWin    
-NXWINGLSERVERNAME=NXWin_GL 
 #endif
 ServerTarget($(NXWINSERVERNAME),$(NXWINDIRS),$(NXWINOBJS), \
 	     $(LIBCWRAPPER) $(NXWINLIBS) $(LOADABLEEXTS),$(NXWINSYSLIBS) $(NXWINNXLIBS))
-#if defined(cygwinArchitecture) && defined(GlxUseWindows) && GlxUseWindows 
-ServerTarget($(NXWINGLSERVERNAME),$(NXWINDIRS),$(NXWINOBJS), \
-	     $(LIBCWRAPPER) $(NXWINLIBS) $(LOADABLEEXTS),$(NXWINSYSLIBS) $(NXWINNXLIBS)\
-	     $(XWINOPENGLLIB)) 
-#endif
 
 #ifndef ServerToInstall
 # define ServerToInstall $(NXWINSERVERNAME)