imake clean-up: Enforce build of Mesa GLX extension. Drop all other GLX build methods (built-in DRI drivers, etc.).

12 files changed, 1 insertions, 45 deletions

diff --git a/nx-X11/programs/Xserver/GL/mesa/GLcore/Imakefile b/nx-X11/programs/Xserver/GL/mesa/GLcore/Imakefile
index 8e3b77eda..e3e91cdb5 100644
--- a/nx-X11/programs/Xserver/GL/mesa/GLcore/Imakefile
+++ b/nx-X11/programs/Xserver/GL/mesa/GLcore/Imakefile
@@ -46,7 +46,7 @@ XCOMM $XFree86: xc/programs/Xserver/GL/mesa/GLcore/Imakefile,v 1.3 2002/05/31 18
                 ../shader/slang/DONE
 
      INCLUDES = -I$(INCLUDESRC) -I$(XINCLUDESRC) -I$(EXTINCSRC) \
-		-I$(MESASRCDIR)/include -I$(GLXLIBSRC)/include \
+		-I$(MESASRCDIR)/include \
 		-I$(MESASRCDIR)/src/mesa \
 		-I$(SERVERSRC)/include
 
diff --git a/nx-X11/programs/Xserver/GL/mesa/Imakefile.inc b/nx-X11/programs/Xserver/GL/mesa/Imakefile.inc
index 03a7971f8..99e9c71c2 100644
--- a/nx-X11/programs/Xserver/GL/mesa/Imakefile.inc
+++ b/nx-X11/programs/Xserver/GL/mesa/Imakefile.inc
@@ -1,9 +1,5 @@
 XCOMM $XFree86: xc/lib/GL/mesa/src/Imakefile.inc,v 1.7tsi Exp $
 
-#ifndef MesaBuildDir
-#define MesaBuildDir $(GLXLIBSRC)/mesa/
-#endif
-
 MESABUILDDIR = MesaBuildDir
 
 COREMESASRCS = $(COREMESABASESRCS) \
diff --git a/nx-X11/programs/Xserver/GL/mesa/X/Imakefile.inc b/nx-X11/programs/Xserver/GL/mesa/X/Imakefile.inc
index d62800e7d..8e589c69a 100644
--- a/nx-X11/programs/Xserver/GL/mesa/X/Imakefile.inc
+++ b/nx-X11/programs/Xserver/GL/mesa/X/Imakefile.inc
@@ -1,9 +1,5 @@
 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
diff --git a/nx-X11/programs/Xserver/GL/mesa/array_cache/Imakefile.inc b/nx-X11/programs/Xserver/GL/mesa/array_cache/Imakefile.inc
index 9a5044791..3964bdc48 100644
--- a/nx-X11/programs/Xserver/GL/mesa/array_cache/Imakefile.inc
+++ b/nx-X11/programs/Xserver/GL/mesa/array_cache/Imakefile.inc
@@ -1,9 +1,5 @@
 XCOMM $XFree86: xc/lib/GL/mesa/src/array_cache/Imakefile.inc,v 1.1tsi Exp $
 
-#ifndef MesaACBuildDir
-#define MesaACBuildDir $(GLXLIBSRC)/mesa/array_cache/
-#endif
-
 MESAACBUILDDIR = MesaACBuildDir
 
   MESA_AC_SRCS = $(MESAACBUILDDIR)ac_context.c \
diff --git a/nx-X11/programs/Xserver/GL/mesa/main/Imakefile.inc b/nx-X11/programs/Xserver/GL/mesa/main/Imakefile.inc
index 80b3aef07..8927152aa 100644
--- a/nx-X11/programs/Xserver/GL/mesa/main/Imakefile.inc
+++ b/nx-X11/programs/Xserver/GL/mesa/main/Imakefile.inc
@@ -3,10 +3,6 @@ XCOMM $XFree86: xc/lib/GL/mesa/src/Imakefile.inc,v 1.7tsi Exp $
 /* gcc on ppc64 defines this, causes macro recursion with pixel below */
 #undef pixel
 
-#ifndef MesaBuildDir
-#define MesaBuildDir $(GLXLIBSRC)/mesa/main/
-#endif
-
 MESABUILDDIR = MesaBuildDir
 
 #ifdef NeedAllMesaSrc
diff --git a/nx-X11/programs/Xserver/GL/mesa/math/Imakefile.inc b/nx-X11/programs/Xserver/GL/mesa/math/Imakefile.inc
index cd1dcc427..7356a4617 100644
--- a/nx-X11/programs/Xserver/GL/mesa/math/Imakefile.inc
+++ b/nx-X11/programs/Xserver/GL/mesa/math/Imakefile.inc
@@ -1,9 +1,5 @@
 XCOMM $XFree86: xc/lib/GL/mesa/src/math/Imakefile.inc,v 1.1tsi Exp $
 
-#ifndef MesaMathBuildDir
-#define MesaMathBuildDir $(GLXLIBSRC)/mesa/math/
-#endif
-
 MESAMATHBUILDDIR = MesaMathBuildDir
 
   MESA_MATH_SRCS = $(MESAMATHBUILDDIR)m_debug_clip.c \
diff --git a/nx-X11/programs/Xserver/GL/mesa/shader/Imakefile.inc b/nx-X11/programs/Xserver/GL/mesa/shader/Imakefile.inc
index 7d0032e56..383bdc008 100644
--- a/nx-X11/programs/Xserver/GL/mesa/shader/Imakefile.inc
+++ b/nx-X11/programs/Xserver/GL/mesa/shader/Imakefile.inc
@@ -1,9 +1,5 @@
 XCOMM $XFree86:$
 
-#ifndef MesaShaderBuildDir
-#define MesaShaderBuildDir $(GLXLIBSRC)/mesa/shader/
-#endif
-
 MESASHADERBUILDDIR = MesaShaderBuildDir
 
   MESA_SHADER_SRCS =	$(MESASHADERBUILDDIR)arbprogparse.c \
diff --git a/nx-X11/programs/Xserver/GL/mesa/shader/grammar/Imakefile.inc b/nx-X11/programs/Xserver/GL/mesa/shader/grammar/Imakefile.inc
index b2e885f89..e1196201d 100644
--- a/nx-X11/programs/Xserver/GL/mesa/shader/grammar/Imakefile.inc
+++ b/nx-X11/programs/Xserver/GL/mesa/shader/grammar/Imakefile.inc
@@ -1,9 +1,5 @@
 XCOMM $XFree86$
 
-#ifndef MesaGrammarBuildDir
-#define MesaGrammarBuildDir $(GLXLIBSRC)/mesa/shader/grammar/
-#endif
-
 MESAGRAMMARBUILDDIR=MesaGrammarBuildDir
 
   MESA_GRAMMAR_SRCS =	$(MESAGRAMMARBUILDDIR)grammar_mesa.c
diff --git a/nx-X11/programs/Xserver/GL/mesa/shader/slang/Imakefile.inc b/nx-X11/programs/Xserver/GL/mesa/shader/slang/Imakefile.inc
index d824ca797..4358b8975 100644
--- a/nx-X11/programs/Xserver/GL/mesa/shader/slang/Imakefile.inc
+++ b/nx-X11/programs/Xserver/GL/mesa/shader/slang/Imakefile.inc
@@ -1,9 +1,5 @@
 XCOMM $XFree86$
 
-#ifndef MesaSlangBuildDir
-#define MesaSlangBuildDir $(GLXLIBSRC)/mesa/shader/slang/
-#endif
-
 MESASLANGBUILDDIR=MesaSlangBuildDir
 
   MESA_SLANG_SRCS =	$(MESASLANGBUILDDIR)slang_assemble_assignment.c \
diff --git a/nx-X11/programs/Xserver/GL/mesa/swrast/Imakefile.inc b/nx-X11/programs/Xserver/GL/mesa/swrast/Imakefile.inc
index 683b8f0a7..c57416d85 100644
--- a/nx-X11/programs/Xserver/GL/mesa/swrast/Imakefile.inc
+++ b/nx-X11/programs/Xserver/GL/mesa/swrast/Imakefile.inc
@@ -1,9 +1,5 @@
 XCOMM $XFree86: xc/lib/GL/mesa/src/swrast/Imakefile.inc,v 1.1tsi Exp $
 
-#ifndef MesaSwrastBuildDir
-#define MesaSwrastBuildDir $(GLXLIBSRC)/mesa/swrast/
-#endif
-
 MESASWRASTBUILDDIR = MesaSwrastBuildDir
 
   MESA_SWRAST_SRCS = $(MESASWRASTBUILDDIR)s_aaline.c \
diff --git a/nx-X11/programs/Xserver/GL/mesa/swrast_setup/Imakefile.inc b/nx-X11/programs/Xserver/GL/mesa/swrast_setup/Imakefile.inc
index 8d32aedb3..4fb10763a 100644
--- a/nx-X11/programs/Xserver/GL/mesa/swrast_setup/Imakefile.inc
+++ b/nx-X11/programs/Xserver/GL/mesa/swrast_setup/Imakefile.inc
@@ -1,9 +1,5 @@
 XCOMM $XFree86: xc/lib/GL/mesa/src/swrast_setup/Imakefile.inc,v 1.1tsi Exp $
 
-#ifndef MesaSwrastSetupBuildDir
-#define MesaSwrastSetupBuildDir $(GLXLIBSRC)/mesa/swrast_setup/
-#endif
-
 MESASWRSETUPDIR = MesaSwrastSetupBuildDir
 
  MESA_SWR_SETUP_SRCS = $(MESASWRSETUPDIR)ss_context.c \
diff --git a/nx-X11/programs/Xserver/GL/mesa/tnl/Imakefile.inc b/nx-X11/programs/Xserver/GL/mesa/tnl/Imakefile.inc
index a294a6fbf..3a124c195 100644
--- a/nx-X11/programs/Xserver/GL/mesa/tnl/Imakefile.inc
+++ b/nx-X11/programs/Xserver/GL/mesa/tnl/Imakefile.inc
@@ -1,9 +1,5 @@
 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 \