Merge branch 'sunweaver-pr/libglx-cleanup' into arctica-3.6.x

Attributes GH PR #40: https://github.com/ArcticaProject/nx-libs/pull/40

8 files changed, 0 insertions, 649 deletions

diff --git a/nx-X11/lib/GL/mesa/shader/Imakefile b/nx-X11/lib/GL/mesa/shader/Imakefile
deleted file mode 100644
index d46834740..000000000
--- a/nx-X11/lib/GL/mesa/shader/Imakefile
+++ /dev/null
@@ -1,107 +0,0 @@
-XCOMM $XFree86$
-
-#include <Threads.tmpl>
-
-/*
- * 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 BuildOSMesaLib || (BuildXF86DRI && (GlxDriverUsesMesa || GlxBuiltInXMesa))
-#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
-
-/* Large PIC tables needed for Solaris SPARC builds */
-#if (defined(SunArchitecture) && defined(SparcArchitecture))
-# define LargePICTable YES
-#endif
-
-#define MesaShaderBuildDir /**/
-#define NeedToLinkMesaSrc
-#include "Imakefile.inc"
-
-
-#if Malloc0ReturnsNull
-ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL
-#endif
-
-#if BuildXF86DRI
-  DRI_DEFINES = GlxDefines -DIN_DRI_DRIVER
- DRI_INCLUDES = -I../../../dri -I../../../glx -I../../dri -I.. \
-		-I$(INCLUDESRC)/GL -I$(XF86OSSRC) -I$(SERVERSRC)/GL/dri
-#endif
-
-#if defined(i386Architecture) && MesaUseX86Asm
-      ASM_DIR = x86
-     ASM_SRCS =
-     ASM_OBJS =
-#if MesaUseMMX
-     MMX_DEFS = -DUSE_MMX_ASM
-#endif
-#if MesaUse3DNow
-   3DNOW_DEFS = -DUSE_3DNOW_ASM
-#endif
-#if MesaUseSSE
-     SSE_DEFS = -DUSE_SSE_ASM
-#endif
-     ASM_DEFS = -DUSE_X86_ASM $(MMX_DEFS) $(3DNOW_DEFS) $(SSE_DEFS)
-#endif
-
-#ifdef SparcArchitecture
-      ASM_DIR = sparc
-     ASM_SRCS =
-     ASM_OBJS =
-     ASM_DEFS = -DUSE_SPARC_ASM
-#endif
-
-#ifdef UseCompaqMathLibrary
-      MATHDEF = -DCCPML
-#endif
-
-MESA_INCLUDES = -I$(MESASRCDIR)/src/mesa/main \
-		-I$(MESASRCDIR)/src/mesa/math \
-		-I$(MESASRCDIR)/src/mesa/glapi \
-                -I$(MESASRCDIR)/src/mesa/shader/grammar \
-                -I$(MESASRCDIR)/src/mesa/shader/slang \
-		-I$(MESASRCDIR)/src/mesa \
-		-I$(MESASRCDIR)/src/mesa/$(ASM_DIR) \
-		-I$(MESASRCDIR)/include \
-		-I../../../include -I$(XINCLUDESRC)
-
-      DEFINES = $(ALLOC_DEFINES) $(DRI_DEFINES) $(ASM_DEFS) $(MATHDEF)
-     INCLUDES = $(MESA_INCLUDES) $(DRI_INCLUDES)
-         SRCS = $(MESA_SHADER_SRCS)
-         OBJS = $(MESA_SHADER_OBJS)
-
-
-#include <Library.tmpl>
-
-LibraryObjectRule()
-
-SubdirLibraryRule($(OBJS))
-NormalLintTarget($(SRCS))
-
-#define IHaveSubdirs
-#define PassCDebugFlags
-
-SUBDIRS = grammar slang
-
-MakeSubdirs($(SUBDIRS))
-DependSubdirs($(SUBDIRS))
-
-DependTarget()
diff --git a/nx-X11/lib/GL/mesa/shader/Imakefile.inc b/nx-X11/lib/GL/mesa/shader/Imakefile.inc
deleted file mode 100644
index 7d0032e56..000000000
--- a/nx-X11/lib/GL/mesa/shader/Imakefile.inc
+++ /dev/null
@@ -1,106 +0,0 @@
-XCOMM $XFree86:$
-
-#ifndef MesaShaderBuildDir
-#define MesaShaderBuildDir $(GLXLIBSRC)/mesa/shader/
-#endif
-
-MESASHADERBUILDDIR = MesaShaderBuildDir
-
-  MESA_SHADER_SRCS =	$(MESASHADERBUILDDIR)arbprogparse.c \
-			$(MESASHADERBUILDDIR)arbprogram.c \
-			$(MESASHADERBUILDDIR)arbfragparse.c \
-			$(MESASHADERBUILDDIR)arbvertparse.c \
-                        $(MESASHADERBUILDDIR)atifragshader.c \
-			$(MESASHADERBUILDDIR)nvprogram.c \
-			$(MESASHADERBUILDDIR)nvfragparse.c \
-			$(MESASHADERBUILDDIR)nvvertexec.c \
-			$(MESASHADERBUILDDIR)nvvertparse.c \
-			$(MESASHADERBUILDDIR)program.c \
-                        $(MESASHADERBUILDDIR)shaderobjects.c \
-                        $(MESASHADERBUILDDIR)shaderobjects_3dlabs.c
-
-#ifdef NeedToLinkMesaSrc
-LinkSourceFile(arbprogparse.c, $(MESASRCDIR)/src/mesa/shader)
-LinkSourceFile(arbprogram.c, $(MESASRCDIR)/src/mesa/shader)
-LinkSourceFile(arbfragparse.c, $(MESASRCDIR)/src/mesa/shader)
-LinkSourceFile(arbvertparse.c, $(MESASRCDIR)/src/mesa/shader)
-LinkSourceFile(arbfragparse.h, $(MESASRCDIR)/src/mesa/shader)
-LinkSourceFile(arbprogparse.h, $(MESASRCDIR)/src/mesa/shader)
-LinkSourceFile(arbprogram.h, $(MESASRCDIR)/src/mesa/shader)
-LinkSourceFile(arbprogram_syn.h, $(MESASRCDIR)/src/mesa/shader)
-LinkSourceFile(arbvertparse.h, $(MESASRCDIR)/src/mesa/shader)
-LinkSourceFile(atifragshader.c, $(MESASRCDIR)/src/mesa/shader)
-LinkSourceFile(atifragshader.h, $(MESASRCDIR)/src/mesa/shader)
-LinkSourceFile(nvfragparse.h, $(MESASRCDIR)/src/mesa/shader)
-LinkSourceFile(nvfragprog.h, $(MESASRCDIR)/src/mesa/shader)
-LinkSourceFile(nvprogram.c, $(MESASRCDIR)/src/mesa/shader)
-LinkSourceFile(nvprogram.h, $(MESASRCDIR)/src/mesa/shader)
-LinkSourceFile(nvfragparse.c, $(MESASRCDIR)/src/mesa/shader)
-LinkSourceFile(nvvertexec.c, $(MESASRCDIR)/src/mesa/shader)
-LinkSourceFile(nvvertexec.h, $(MESASRCDIR)/src/mesa/shader)
-LinkSourceFile(nvvertparse.c, $(MESASRCDIR)/src/mesa/shader)
-LinkSourceFile(nvvertparse.h, $(MESASRCDIR)/src/mesa/shader)
-LinkSourceFile(nvvertprog.h, $(MESASRCDIR)/src/mesa/shader)
-LinkSourceFile(program.c, $(MESASRCDIR)/src/mesa/shader)
-LinkSourceFile(program.h, $(MESASRCDIR)/src/mesa/shader)
-LinkSourceFile(shaderobjects.c, $(MESASRCDIR)/src/mesa/shader)
-LinkSourceFile(shaderobjects.h, $(MESASRCDIR)/src/mesa/shader)
-LinkSourceFile(shaderobjects_3dlabs.c, $(MESASRCDIR)/src/mesa/shader)
-LinkSourceFile(shaderobjects_3dlabs.h, $(MESASRCDIR)/src/mesa/shader)
-#endif
-
-  MESA_SHADER_OBJS =	$(MESASHADERBUILDDIR)arbprogparse.o \
-			$(MESASHADERBUILDDIR)arbprogram.o \
-			$(MESASHADERBUILDDIR)arbfragparse.o \
-			$(MESASHADERBUILDDIR)arbvertparse.o \
-                        $(MESASHADERBUILDDIR)atifragshader.o \
-			$(MESASHADERBUILDDIR)nvprogram.o \
-			$(MESASHADERBUILDDIR)nvfragparse.o \
-			$(MESASHADERBUILDDIR)nvvertexec.o \
-			$(MESASHADERBUILDDIR)nvvertparse.o \
-			$(MESASHADERBUILDDIR)program.o \
-                        $(MESASHADERBUILDDIR)shaderobjects.o \
-                        $(MESASHADERBUILDDIR)shaderobjects_3dlabs.o
-
-#if defined(DoSharedLib) && DoSharedLib
-  MESA_SHADER_UOBJS =	$(MESASHADERBUILDDIR)unshared/arbprogparse.o \
-			$(MESASHADERBUILDDIR)unshared/arbprogram.o \
-			$(MESASHADERBUILDDIR)unshared/arbfragparse.o \
-			$(MESASHADERBUILDDIR)unshared/arbvertparse.o \
-                        $(MESASHADERBUILDDIR)unshared/atifragshader.o \
-			$(MESASHADERBUILDDIR)unshared/nvprogram.o \
-			$(MESASHADERBUILDDIR)unshared/nvfragparse.o \
-			$(MESASHADERBUILDDIR)unshared/nvvertexec.o \
-			$(MESASHADERBUILDDIR)unshared/nvvertparse.o \
-			$(MESASHADERBUILDDIR)unshared/program.o \
-                        $(MESASHADERBUILDDIR)unshared/shaderobjects.o \
-                        $(MESASHADERBUILDDIR)unshared/shaderobjects_3dlabs.o
-#else
- MESA_SHADER_UOBJS = $(MESA_SHADER_OBJS)
-#endif
-
-  MESA_SHADER_DOBJS =	$(MESASHADERBUILDDIR)debugger/arbprogparse.o \
-			$(MESASHADERBUILDDIR)debugger/arbprogram.o \
-			$(MESASHADERBUILDDIR)debugger/arbfragparse.o \
-			$(MESASHADERBUILDDIR)debugger/arbvertparse.o \
-                        $(MESASHADERBUILDDIR)debugger/atifragshader.o \
-			$(MESASHADERBUILDDIR)debugger/nvprogram.o \
-			$(MESASHADERBUILDDIR)debugger/nvfragparse.o \
-			$(MESASHADERBUILDDIR)debugger/nvvertexec.o \
-			$(MESASHADERBUILDDIR)debugger/nvvertparse.o \
-			$(MESASHADERBUILDDIR)debugger/program.o \
-                        $(MESASHADERBUILDDIR)debugger/shaderobjects.o \
-                        $(MESASHADERBUILDDIR)debugger/shaderobjects_3dlabs.o
-
-  MESA_SHADER_POBJS =	$(MESASHADERBUILDDIR)profiled/arbprogparse.o \
-			$(MESASHADERBUILDDIR)profiled/arbprogram.o \
-			$(MESASHADERBUILDDIR)profiled/arbfragparse.o \
-			$(MESASHADERBUILDDIR)profiled/arbvertparse.o \
-                        $(MESASHADERBUILDDIR)profiled/atifragshader.o \
-			$(MESASHADERBUILDDIR)profiled/nvprogram.o \
-			$(MESASHADERBUILDDIR)profiled/nvfragparse.o \
-			$(MESASHADERBUILDDIR)profiled/nvvertexec.o \
-			$(MESASHADERBUILDDIR)profiled/nvvertparse.o \
-			$(MESASHADERBUILDDIR)profiled/program.o \
-                        $(MESASHADERBUILDDIR)profiled/shaderobjects.o \
-                        $(MESASHADERBUILDDIR)profiled/shaderobjects_3dlabs.o
diff --git a/nx-X11/lib/GL/mesa/shader/grammar/Imakefile b/nx-X11/lib/GL/mesa/shader/grammar/Imakefile
deleted file mode 100644
index bbdec9764..000000000
--- a/nx-X11/lib/GL/mesa/shader/grammar/Imakefile
+++ /dev/null
@@ -1,98 +0,0 @@
-XCOMM $XFree86$
-
-#include <Threads.tmpl>
-
-/*
- * 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 BuildOSMesaLib || (BuildXF86DRI && (GlxDriverUsesMesa || GlxBuiltInXMesa))
-#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
-
-/* Large PIC tables needed for Solaris SPARC builds */
-#if (defined(SunArchitecture) && defined(SparcArchitecture))
-# define LargePICTable YES
-#endif
-
-#define MesaGrammarBuildDir /**/
-#define NeedToLinkMesaSrc
-#include "Imakefile.inc"
-
-
-#if Malloc0ReturnsNull
-ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL
-#endif
-
-#if BuildXF86DRI
-  DRI_DEFINES = GlxDefines -DIN_DRI_DRIVER
- DRI_INCLUDES = -I../../../dri -I../../../glx -I../../dri -I.. \
-		-I$(INCLUDESRC)/GL -I$(XF86OSSRC) -I$(SERVERSRC)/GL/dri
-#endif
-
-#if defined(i386Architecture) && MesaUseX86Asm
-      ASM_DIR = x86
-     ASM_SRCS =
-     ASM_OBJS =
-#if MesaUseMMX
-     MMX_DEFS = -DUSE_MMX_ASM
-#endif
-#if MesaUse3DNow
-   3DNOW_DEFS = -DUSE_3DNOW_ASM
-#endif
-#if MesaUseSSE
-     SSE_DEFS = -DUSE_SSE_ASM
-#endif
-     ASM_DEFS = -DUSE_X86_ASM $(MMX_DEFS) $(3DNOW_DEFS) $(SSE_DEFS)
-#endif
-
-#ifdef SparcArchitecture
-      ASM_DIR = sparc
-     ASM_SRCS =
-     ASM_OBJS =
-     ASM_DEFS = -DUSE_SPARC_ASM
-#endif
-
-#ifdef UseCompaqMathLibrary
-      MATHDEF = -DCCPML
-#endif
-
-MESA_INCLUDES = -I$(MESASRCDIR)/src/mesa/main \
-		-I$(MESASRCDIR)/src/mesa/math \
-		-I$(MESASRCDIR)/src/mesa/glapi \
-                -I$(MESASRCDIR)/src/mesa/shader/grammar \
-		-I$(MESASRCDIR)/src/mesa \
-		-I$(MESASRCDIR)/src/mesa/$(ASM_DIR) \
-		-I$(MESASRCDIR)/include \
-		-I../../../include -I$(XINCLUDESRC)
-
-      DEFINES = $(ALLOC_DEFINES) $(DRI_DEFINES) $(ASM_DEFS) $(MATHDEF)
-     INCLUDES = $(MESA_INCLUDES) $(DRI_INCLUDES)
-         SRCS = $(MESA_GRAMMAR_SRCS)
-         OBJS = $(MESA_GRAMMAR_OBJS)
-
-
-#include <Library.tmpl>
-
-LibraryObjectRule()
-
-SubdirLibraryRule($(OBJS))
-NormalLintTarget($(SRCS))
-
-DependTarget()
diff --git a/nx-X11/lib/GL/mesa/shader/grammar/Imakefile.inc b/nx-X11/lib/GL/mesa/shader/grammar/Imakefile.inc
deleted file mode 100644
index b2e885f89..000000000
--- a/nx-X11/lib/GL/mesa/shader/grammar/Imakefile.inc
+++ /dev/null
@@ -1,29 +0,0 @@
-XCOMM $XFree86$
-
-#ifndef MesaGrammarBuildDir
-#define MesaGrammarBuildDir $(GLXLIBSRC)/mesa/shader/grammar/
-#endif
-
-MESAGRAMMARBUILDDIR=MesaGrammarBuildDir
-
-  MESA_GRAMMAR_SRCS =	$(MESAGRAMMARBUILDDIR)grammar_mesa.c
-
-#ifdef NeedToLinkMesaSrc
-LinkSourceFile(grammar.c, $(MESASRCDIR)/src/mesa/shader/grammar)
-LinkSourceFile(grammar.h, $(MESASRCDIR)/src/mesa/shader/grammar)
-LinkSourceFile(grammar_syn.h, $(MESASRCDIR)/src/mesa/shader/grammar)
-LinkSourceFile(grammar_mesa.c, $(MESASRCDIR)/src/mesa/shader/grammar)
-LinkSourceFile(grammar_mesa.h, $(MESASRCDIR)/src/mesa/shader/grammar)
-#endif
-
-  MESA_GRAMMAR_OBJS =	 $(MESAGRAMMARBUILDDIR)grammar_mesa.o
-
-#if defined(DoSharedLib) && DoSharedLib
- MESA_GRAMMAR_UOBJS = $(MESAGRAMMARBUILDDIR)unshared/grammar_mesa.o
-#else
- MESA_GRAMMAR_UOBJS = $(MESA_GRAMMAR_OBJS)
-#endif
-
- MESA_GRAMMAR_DOBJS = $(MESAGRAMMARBUILDDIR)debugger/grammar_mesa.o
-
- MESA_GRAMMAR_POBJS = $(MESAGRAMMARBUILDDIR)profiled/grammar_mesa.o
diff --git a/nx-X11/lib/GL/mesa/shader/slang/Imakefile b/nx-X11/lib/GL/mesa/shader/slang/Imakefile
deleted file mode 100644
index 096a8ea63..000000000
--- a/nx-X11/lib/GL/mesa/shader/slang/Imakefile
+++ /dev/null
@@ -1,108 +0,0 @@
-XCOMM $XFree86$
-
-#include <Threads.tmpl>
-
-/*
- * 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 BuildOSMesaLib || (BuildXF86DRI && (GlxDriverUsesMesa || GlxBuiltInXMesa))
-#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
-
-/* Large PIC tables needed for Solaris SPARC builds */
-#if (defined(SunArchitecture) && defined(SparcArchitecture))
-# define LargePICTable YES
-#endif
-
-#define MesaSlangBuildDir /**/
-#define NeedToLinkMesaSrc
-#include "Imakefile.inc"
-
-
-#if Malloc0ReturnsNull
-ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL
-#endif
-
-#if BuildXF86DRI
-  DRI_DEFINES = GlxDefines -DIN_DRI_DRIVER
- DRI_INCLUDES = -I../../../dri -I../../../glx -I../../dri -I.. \
-		-I$(INCLUDESRC)/GL -I$(XF86OSSRC) -I$(SERVERSRC)/GL/dri
-#endif
-
-#if defined(i386Architecture) && MesaUseX86Asm
-      ASM_DIR = x86
-     ASM_SRCS =
-     ASM_OBJS =
-#if MesaUseMMX
-     MMX_DEFS = -DUSE_MMX_ASM
-#endif
-#if MesaUse3DNow
-   3DNOW_DEFS = -DUSE_3DNOW_ASM
-#endif
-#if MesaUseSSE
-     SSE_DEFS = -DUSE_SSE_ASM
-#endif
-     ASM_DEFS = -DUSE_X86_ASM $(MMX_DEFS) $(3DNOW_DEFS) $(SSE_DEFS)
-#endif
-
-#ifdef SparcArchitecture
-      ASM_DIR = sparc
-     ASM_SRCS =
-     ASM_OBJS =
-     ASM_DEFS = -DUSE_SPARC_ASM
-#endif
-
-#ifdef UseCompaqMathLibrary
-      MATHDEF = -DCCPML
-#endif
-
-MESA_INCLUDES = -I$(MESASRCDIR)/src/mesa/main \
-		-I$(MESASRCDIR)/src/mesa/math \
-		-I$(MESASRCDIR)/src/mesa/glapi \
-                -I$(MESASRCDIR)/src/mesa/shader/grammar \
-                -I$(MESASRCDIR)/src/mesa/shader/slang \
-                -I$(MESASRCDIR)/src/mesa/shader/slang/library \
-		-I$(MESASRCDIR)/src/mesa \
-		-I$(MESASRCDIR)/src/mesa/$(ASM_DIR) \
-		-I$(MESASRCDIR)/include \
-		-I../../../include -I$(XINCLUDESRC)
-
-      DEFINES = $(ALLOC_DEFINES) $(DRI_DEFINES) $(ASM_DEFS) $(MATHDEF)
-     INCLUDES = $(MESA_INCLUDES) $(DRI_INCLUDES)
-         SRCS = $(MESA_SLANG_SRCS)
-         OBJS = $(MESA_SLANG_OBJS)
-
-
-#include <Library.tmpl>
-
-#define IHaveSubdirs
-#define PassCDebugFlags
-
-SUBDIRS = library
-
-MakeSubdirs($(SUBDIRS))
-DependSubdirs($(SUBDIRS))
-
-LibraryObjectRule()
-
-SubdirLibraryRule($(OBJS))
-NormalLintTarget($(SRCS))
-
-DependTarget()
diff --git a/nx-X11/lib/GL/mesa/shader/slang/Imakefile.inc b/nx-X11/lib/GL/mesa/shader/slang/Imakefile.inc
deleted file mode 100644
index d824ca797..000000000
--- a/nx-X11/lib/GL/mesa/shader/slang/Imakefile.inc
+++ /dev/null
@@ -1,90 +0,0 @@
-XCOMM $XFree86$
-
-#ifndef MesaSlangBuildDir
-#define MesaSlangBuildDir $(GLXLIBSRC)/mesa/shader/slang/
-#endif
-
-MESASLANGBUILDDIR=MesaSlangBuildDir
-
-  MESA_SLANG_SRCS =	$(MESASLANGBUILDDIR)slang_assemble_assignment.c \
-                        $(MESASLANGBUILDDIR)slang_assemble.c \
-                        $(MESASLANGBUILDDIR)slang_assemble_conditional.c \
-                        $(MESASLANGBUILDDIR)slang_assemble_constructor.c \
-                        $(MESASLANGBUILDDIR)slang_assemble_typeinfo.c \
-                        $(MESASLANGBUILDDIR)slang_compile.c \
-                        $(MESASLANGBUILDDIR)slang_execute.c \
-                        $(MESASLANGBUILDDIR)slang_preprocess.c \
-                        $(MESASLANGBUILDDIR)slang_storage.c \
-                        $(MESASLANGBUILDDIR)slang_utility.c
-
-#ifdef NeedToLinkMesaSrc
-LinkSourceFile(slang_assemble_assignment.c, $(MESASRCDIR)/src/mesa/shader/slang)
-LinkSourceFile(slang_assemble_assignment.h, $(MESASRCDIR)/src/mesa/shader/slang)
-LinkSourceFile(slang_assemble.c, $(MESASRCDIR)/src/mesa/shader/slang)
-LinkSourceFile(slang_assemble.h, $(MESASRCDIR)/src/mesa/shader/slang)
-LinkSourceFile(slang_assemble_conditional.c, $(MESASRCDIR)/src/mesa/shader/slang)
-LinkSourceFile(slang_assemble_conditional.h, $(MESASRCDIR)/src/mesa/shader/slang)
-LinkSourceFile(slang_assemble_constructor.c, $(MESASRCDIR)/src/mesa/shader/slang)
-LinkSourceFile(slang_assemble_constructor.h, $(MESASRCDIR)/src/mesa/shader/slang)
-LinkSourceFile(slang_assemble_typeinfo.c, $(MESASRCDIR)/src/mesa/shader/slang)
-LinkSourceFile(slang_assemble_typeinfo.h, $(MESASRCDIR)/src/mesa/shader/slang)
-LinkSourceFile(slang_compile.c, $(MESASRCDIR)/src/mesa/shader/slang)
-LinkSourceFile(slang_compile.h, $(MESASRCDIR)/src/mesa/shader/slang)
-LinkSourceFile(slang_execute.c, $(MESASRCDIR)/src/mesa/shader/slang)
-LinkSourceFile(slang_execute.h, $(MESASRCDIR)/src/mesa/shader/slang)
-LinkSourceFile(slang_preprocess.c, $(MESASRCDIR)/src/mesa/shader/slang)
-LinkSourceFile(slang_preprocess.h, $(MESASRCDIR)/src/mesa/shader/slang)
-LinkSourceFile(slang_storage.c, $(MESASRCDIR)/src/mesa/shader/slang)
-LinkSourceFile(slang_storage.h, $(MESASRCDIR)/src/mesa/shader/slang)
-LinkSourceFile(slang_utility.c, $(MESASRCDIR)/src/mesa/shader/slang)
-LinkSourceFile(slang_utility.h, $(MESASRCDIR)/src/mesa/shader/slang)
-LinkSourceFile(traverse_wrap.h, $(MESASRCDIR)/src/mesa/shader/slang)
-#endif
-
-  MESA_SLANG_OBJS =	$(MESASLANGBUILDDIR)slang_assemble_assignment.o \
-                        $(MESASLANGBUILDDIR)slang_assemble.o \
-                        $(MESASLANGBUILDDIR)slang_assemble_conditional.o \
-                        $(MESASLANGBUILDDIR)slang_assemble_constructor.o \
-                        $(MESASLANGBUILDDIR)slang_assemble_typeinfo.o \
-                        $(MESASLANGBUILDDIR)slang_compile.o \
-                        $(MESASLANGBUILDDIR)slang_execute.o \
-                        $(MESASLANGBUILDDIR)slang_preprocess.o \
-                        $(MESASLANGBUILDDIR)slang_storage.o \
-                        $(MESASLANGBUILDDIR)slang_utility.o
-
-#if defined(DoSharedLib) && DoSharedLib
- MESA_SLANG_UOBJS = $(MESASLANGBUILDDIR)unshared/slang_assemble_assignment.o \
-                    $(MESASLANGBUILDDIR)unshared/slang_assemble.o \
-                    $(MESASLANGBUILDDIR)unshared/slang_assemble_conditional.o \
-                    $(MESASLANGBUILDDIR)unshared/slang_assemble_constructor.o \
-                    $(MESASLANGBUILDDIR)unshared/slang_assemble_typeinfo.o \
-                    $(MESASLANGBUILDDIR)unshared/slang_compile.o \
-                    $(MESASLANGBUILDDIR)unshared/slang_execute.o \
-                    $(MESASLANGBUILDDIR)unshared/slang_preprocess.o \
-                    $(MESASLANGBUILDDIR)unshared/slang_storage.o \
-                    $(MESASLANGBUILDDIR)unshared/slang_utility.o
-#else
- MESA_SLANG_UOBJS = $(MESA_SLANG_OBJS)
-#endif
-
- MESA_SLANG_DOBJS = $(MESASLANGBUILDDIR)debuggerslang_assemble_assignment.o \
-                    $(MESASLANGBUILDDIR)debuggerslang_assemble.o \
-                    $(MESASLANGBUILDDIR)debuggerslang_assemble_conditional.o \
-                    $(MESASLANGBUILDDIR)debuggerslang_assemble_constructor.o \
-                    $(MESASLANGBUILDDIR)debuggerslang_assemble_typeinfo.o \
-                    $(MESASLANGBUILDDIR)debuggerslang_compile.o \
-                    $(MESASLANGBUILDDIR)debuggerslang_execute.o \
-                    $(MESASLANGBUILDDIR)debuggerslang_preprocess.o \
-                    $(MESASLANGBUILDDIR)debuggerslang_storage.o \
-                    $(MESASLANGBUILDDIR)debuggerslang_utility.o
-
- MESA_SLANG_POBJS = $(MESASLANGBUILDDIR)profiled/slang_assemble_assignment.o \
-                    $(MESASLANGBUILDDIR)profiled/slang_assemble.o \
-                    $(MESASLANGBUILDDIR)profiled/slang_assemble_conditional.o \
-                    $(MESASLANGBUILDDIR)profiled/slang_assemble_constructor.o \
-                    $(MESASLANGBUILDDIR)profiled/slang_assemble_typeinfo.o \
-                    $(MESASLANGBUILDDIR)profiled/slang_compile.o \
-                    $(MESASLANGBUILDDIR)profiled/slang_execute.o \
-                    $(MESASLANGBUILDDIR)profiled/slang_preprocess.o \
-                    $(MESASLANGBUILDDIR)profiled/slang_storage.o \
-                    $(MESASLANGBUILDDIR)profiled/slang_utility.o
diff --git a/nx-X11/lib/GL/mesa/shader/slang/library/Imakefile b/nx-X11/lib/GL/mesa/shader/slang/library/Imakefile
deleted file mode 100644
index de32171ae..000000000
--- a/nx-X11/lib/GL/mesa/shader/slang/library/Imakefile
+++ /dev/null
@@ -1,97 +0,0 @@
-XCOMM $XFree86$
-
-#include <Threads.tmpl>
-
-/*
- * 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 BuildOSMesaLib || (BuildXF86DRI && (GlxDriverUsesMesa || GlxBuiltInXMesa))
-#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
-
-/* Large PIC tables needed for Solaris SPARC builds */
-#if (defined(SunArchitecture) && defined(SparcArchitecture))
-# define LargePICTable YES
-#endif
-
-#define MesaShaderBuildDir /**/
-#define NeedToLinkMesaSrc
-#include "Imakefile.inc"
-
-
-#if Malloc0ReturnsNull
-ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL
-#endif
-
-#if BuildXF86DRI
-  DRI_DEFINES = GlxDefines -DIN_DRI_DRIVER
- DRI_INCLUDES = -I../../../dri -I../../../glx -I../../dri -I.. \
-		-I$(INCLUDESRC)/GL -I$(XF86OSSRC) -I$(SERVERSRC)/GL/dri
-#endif
-
-#if defined(i386Architecture) && MesaUseX86Asm
-      ASM_DIR = x86
-     ASM_SRCS =
-     ASM_OBJS =
-#if MesaUseMMX
-     MMX_DEFS = -DUSE_MMX_ASM
-#endif
-#if MesaUse3DNow
-   3DNOW_DEFS = -DUSE_3DNOW_ASM
-#endif
-#if MesaUseSSE
-     SSE_DEFS = -DUSE_SSE_ASM
-#endif
-     ASM_DEFS = -DUSE_X86_ASM $(MMX_DEFS) $(3DNOW_DEFS) $(SSE_DEFS)
-#endif
-
-#ifdef SparcArchitecture
-      ASM_DIR = sparc
-     ASM_SRCS =
-     ASM_OBJS =
-     ASM_DEFS = -DUSE_SPARC_ASM
-#endif
-
-#ifdef UseCompaqMathLibrary
-      MATHDEF = -DCCPML
-#endif
-
-MESA_INCLUDES = -I$(MESASRCDIR)/src/mesa/main \
-		-I$(MESASRCDIR)/src/mesa/math \
-		-I$(MESASRCDIR)/src/mesa/glapi \
-                -I$(MESASRCDIR)/src/mesa/shader/slang \
-                -I$(MESASRCDIR)/src/mesa/shader/slang/library \
-		-I$(MESASRCDIR)/src/mesa \
-		-I$(MESASRCDIR)/src/mesa/$(ASM_DIR) \
-		-I$(MESASRCDIR)/include \
-		-I../../../include -I$(XINCLUDESRC)
-
-      DEFINES = $(ALLOC_DEFINES) $(DRI_DEFINES) $(ASM_DEFS) $(MATHDEF)
-     INCLUDES = $(MESA_INCLUDES) $(DRI_INCLUDES)
-         SRCS = $(MESA_SLANG_SRCS)
-         OBJS = $(MESA_SLANG_OBJS)
-
-
-#include <Library.tmpl>
-
-SubdirLibraryRule($(OBJS))
-NormalLintTarget($(SRCS))
-
-DependTarget()
diff --git a/nx-X11/lib/GL/mesa/shader/slang/library/Imakefile.inc b/nx-X11/lib/GL/mesa/shader/slang/library/Imakefile.inc
deleted file mode 100644
index 3489b7a28..000000000
--- a/nx-X11/lib/GL/mesa/shader/slang/library/Imakefile.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-XCOMM $XFree86:$
-
-#ifdef NeedToLinkMesaSrc
-LinkSourceFile(slang_common_builtin_gc_bin.h, $(MESASRCDIR)/src/mesa/shader/slang/library)
-LinkSourceFile(slang_common_builtin_gc.h, $(MESASRCDIR)/src/mesa/shader/slang/library)
-LinkSourceFile(slang_core_gc_bin.h, $(MESASRCDIR)/src/mesa/shader/slang/library)
-LinkSourceFile(slang_core_gc.h, $(MESASRCDIR)/src/mesa/shader/slang/library)
-LinkSourceFile(slang_fragment_builtin_gc_bin.h, $(MESASRCDIR)/src/mesa/shader/slang/library)
-LinkSourceFile(slang_fragment_builtin_gc.h, $(MESASRCDIR)/src/mesa/shader/slang/library)
-LinkSourceFile(slang_shader_syn.h, $(MESASRCDIR)/src/mesa/shader/slang/library)
-LinkSourceFile(slang_version_syn.h, $(MESASRCDIR)/src/mesa/shader/slang/library)
-LinkSourceFile(slang_vertex_builtin_gc_bin.h, $(MESASRCDIR)/src/mesa/shader/slang/library)
-LinkSourceFile(slang_vertex_builtin_gc.h, $(MESASRCDIR)/src/mesa/shader/slang/library)
-#endif