aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/extras/Mesa/configs
diff options
context:
space:
mode:
Diffstat (limited to 'nx-X11/extras/Mesa/configs')
-rw-r--r--nx-X11/extras/Mesa/configs/aix28
-rw-r--r--nx-X11/extras/Mesa/configs/aix-6428
-rw-r--r--nx-X11/extras/Mesa/configs/aix-gcc19
-rw-r--r--nx-X11/extras/Mesa/configs/aix-static23
-rw-r--r--nx-X11/extras/Mesa/configs/beos99
-rw-r--r--nx-X11/extras/Mesa/configs/darwin29
-rw-r--r--nx-X11/extras/Mesa/configs/darwin-static24
-rw-r--r--nx-X11/extras/Mesa/configs/default74
-rw-r--r--nx-X11/extras/Mesa/configs/freebsd16
-rw-r--r--nx-X11/extras/Mesa/configs/freebsd-dri45
-rw-r--r--nx-X11/extras/Mesa/configs/freebsd-dri-amd649
-rw-r--r--nx-X11/extras/Mesa/configs/freebsd-dri-x8612
-rw-r--r--nx-X11/extras/Mesa/configs/hpux1014
-rw-r--r--nx-X11/extras/Mesa/configs/hpux10-gcc16
-rw-r--r--nx-X11/extras/Mesa/configs/hpux10-static30
-rw-r--r--nx-X11/extras/Mesa/configs/hpux11-3226
-rw-r--r--nx-X11/extras/Mesa/configs/hpux11-32-static26
-rw-r--r--nx-X11/extras/Mesa/configs/hpux11-32-static-nothreads26
-rw-r--r--nx-X11/extras/Mesa/configs/hpux11-6427
-rw-r--r--nx-X11/extras/Mesa/configs/hpux11-64-static27
-rw-r--r--nx-X11/extras/Mesa/configs/hpux916
-rw-r--r--nx-X11/extras/Mesa/configs/hpux9-gcc14
-rw-r--r--nx-X11/extras/Mesa/configs/irix6-6418
-rw-r--r--nx-X11/extras/Mesa/configs/irix6-64-static25
-rw-r--r--nx-X11/extras/Mesa/configs/irix6-n3218
-rw-r--r--nx-X11/extras/Mesa/configs/irix6-n32-static25
-rw-r--r--nx-X11/extras/Mesa/configs/irix6-o3219
-rw-r--r--nx-X11/extras/Mesa/configs/irix6-o32-static25
-rw-r--r--nx-X11/extras/Mesa/configs/linux33
-rw-r--r--nx-X11/extras/Mesa/configs/linux-alpha18
-rw-r--r--nx-X11/extras/Mesa/configs/linux-alpha-static27
-rw-r--r--nx-X11/extras/Mesa/configs/linux-debug8
-rw-r--r--nx-X11/extras/Mesa/configs/linux-directfb29
-rw-r--r--nx-X11/extras/Mesa/configs/linux-dri68
-rw-r--r--nx-X11/extras/Mesa/configs/linux-dri-ppc17
-rw-r--r--nx-X11/extras/Mesa/configs/linux-dri-x8616
-rw-r--r--nx-X11/extras/Mesa/configs/linux-dri-x86-6423
-rw-r--r--nx-X11/extras/Mesa/configs/linux-fbdev10
-rw-r--r--nx-X11/extras/Mesa/configs/linux-glide20
-rw-r--r--nx-X11/extras/Mesa/configs/linux-icc21
-rw-r--r--nx-X11/extras/Mesa/configs/linux-icc-static29
-rw-r--r--nx-X11/extras/Mesa/configs/linux-indirect49
-rw-r--r--nx-X11/extras/Mesa/configs/linux-osmesa1627
-rw-r--r--nx-X11/extras/Mesa/configs/linux-osmesa16-static28
-rw-r--r--nx-X11/extras/Mesa/configs/linux-osmesa3227
-rw-r--r--nx-X11/extras/Mesa/configs/linux-ppc9
-rw-r--r--nx-X11/extras/Mesa/configs/linux-ppc-static14
-rw-r--r--nx-X11/extras/Mesa/configs/linux-profile29
-rw-r--r--nx-X11/extras/Mesa/configs/linux-solo43
-rw-r--r--nx-X11/extras/Mesa/configs/linux-solo-ia647
-rw-r--r--nx-X11/extras/Mesa/configs/linux-solo-x8612
-rw-r--r--nx-X11/extras/Mesa/configs/linux-sparc30
-rw-r--r--nx-X11/extras/Mesa/configs/linux-sparc517
-rw-r--r--nx-X11/extras/Mesa/configs/linux-static21
-rw-r--r--nx-X11/extras/Mesa/configs/linux-tcc22
-rw-r--r--nx-X11/extras/Mesa/configs/linux-ultrasparc17
-rw-r--r--nx-X11/extras/Mesa/configs/linux-x868
-rw-r--r--nx-X11/extras/Mesa/configs/linux-x86-327
-rw-r--r--nx-X11/extras/Mesa/configs/linux-x86-6413
-rw-r--r--nx-X11/extras/Mesa/configs/linux-x86-64-debug7
-rw-r--r--nx-X11/extras/Mesa/configs/linux-x86-64-static21
-rw-r--r--nx-X11/extras/Mesa/configs/linux-x86-debug9
-rw-r--r--nx-X11/extras/Mesa/configs/linux-x86-glide24
-rw-r--r--nx-X11/extras/Mesa/configs/linux-x86-static21
-rw-r--r--nx-X11/extras/Mesa/configs/linux-x86-xcb24
-rw-r--r--nx-X11/extras/Mesa/configs/netbsd14
-rw-r--r--nx-X11/extras/Mesa/configs/openbsd18
-rw-r--r--nx-X11/extras/Mesa/configs/osf116
-rw-r--r--nx-X11/extras/Mesa/configs/solaris-x8618
-rw-r--r--nx-X11/extras/Mesa/configs/solaris-x86-gcc24
-rw-r--r--nx-X11/extras/Mesa/configs/sunos412
-rw-r--r--nx-X11/extras/Mesa/configs/sunos4-gcc15
-rw-r--r--nx-X11/extras/Mesa/configs/sunos4-static25
-rw-r--r--nx-X11/extras/Mesa/configs/sunos518
-rw-r--r--nx-X11/extras/Mesa/configs/sunos5-gcc35
-rw-r--r--nx-X11/extras/Mesa/configs/sunos5-smp19
-rw-r--r--nx-X11/extras/Mesa/configs/ultrix-gcc21
77 files changed, 0 insertions, 1798 deletions
diff --git a/nx-X11/extras/Mesa/configs/aix b/nx-X11/extras/Mesa/configs/aix
deleted file mode 100644
index fe8e48cd6..000000000
--- a/nx-X11/extras/Mesa/configs/aix
+++ /dev/null
@@ -1,28 +0,0 @@
-# Configuration for AIX, dynamic libs
-
-include $(TOP)/configs/default
-
-CONFIG_NAME = aix
-
-# Compiler and flags
-CC = cc
-CXX = xlC
-
-CFLAGS = -O -DAIXV3
-CXXFLAGS = -O -DAIXV3
-MKLIB_OPTIONS =
-
-# Library names (actual file names)
-GL_LIB_NAME = libGL.a
-GLU_LIB_NAME = libGLU.a
-GLUT_LIB_NAME = libglut.a
-GLW_LIB_NAME = libGLw.a
-OSMESA_LIB_NAME = libOSMesa.a
-
-GL_LIB_DEPS = -lX11 -lXext -lm
-GLU_LIB_DEPS = -L$(TOP)/lib -l$(GL_LIB) -lm -lC
-GLUT_LIB_DEPS = -L$(TOP)/lib -l$(GLU_LIB) -l$(GL_LIB) -lXi -lXmu -lX11 -lm
-GLW_LIB_DEPS = -L$(TOP)/lib -l$(GL_LIB) -lXt -lX11
-OSMESA_LIB_DEPS = -L$(TOP)/lib -l$(GL_LIB)
-APP_LIB_DEPS = -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXext -lXmu -lXi -lm -lC
-
diff --git a/nx-X11/extras/Mesa/configs/aix-64 b/nx-X11/extras/Mesa/configs/aix-64
deleted file mode 100644
index 0d9847529..000000000
--- a/nx-X11/extras/Mesa/configs/aix-64
+++ /dev/null
@@ -1,28 +0,0 @@
-# Configuration for AIX 64-bit, dynamic libs
-
-include $(TOP)/configs/default
-
-CONFIG_NAME = aix-64
-
-# Compiler and flags
-CC = xlc
-CXX = xlC
-
-CFLAGS = -q64 -qmaxmem=16384 -O -DAIXV3
-CXXFLAGS = -q64 -qmaxmem=16384 -O -DAIXV3
-MKLIB_OPTIONS = -arch AIX64
-
-# Library names (actual file names)
-GL_LIB_NAME = libGL.a
-GLU_LIB_NAME = libGLU.a
-GLUT_LIB_NAME = libglut.a
-GLW_LIB_NAME = libGLw.a
-OSMESA_LIB_NAME = libOSMesa.a
-
-GL_LIB_DEPS = -lX11 -lXext -lm
-GLU_LIB_DEPS = -L$(TOP)/lib -l$(GL_LIB) -lm -lC
-GLUT_LIB_DEPS = -L$(TOP)/lib -l$(GLU_LIB) -l$(GL_LIB) -lXi -lXmu -lX11 -lm
-GLW_LIB_DEPS = -L$(TOP)/lib -l$(GL_LIB) -lXt -lX11
-OSMESA_LIB_DEPS = -L$(TOP)/lib -l$(GL_LIB)
-APP_LIB_DEPS = -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXext -lXmu -lXi -lm -lC
-
diff --git a/nx-X11/extras/Mesa/configs/aix-gcc b/nx-X11/extras/Mesa/configs/aix-gcc
deleted file mode 100644
index 5f10bf25d..000000000
--- a/nx-X11/extras/Mesa/configs/aix-gcc
+++ /dev/null
@@ -1,19 +0,0 @@
-# Configuration for AIX with gcc
-
-include $(TOP)/configs/default
-
-CONFIG_NAME = aix-gcc
-
-# Compiler and flags
-CC = gcc
-CXX = g++
-
-CFLAGS = -O2 -DAIXV3
-CXXFLAGS = -O2 -DAIXV3
-
-MKLIB_OPTIONS = -arch aix-gcc
-GL_LIB_DEPS = -lX11 -lXext -lm
-GLU_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -lm
-GLUT_LIB_DEPS = -L$(LIB_DIR -l$(GLU_LIB) -l$(GL_LIB) -lXi -lXmu
-APP_LIB_DEPS = -L$(LIB_DIR) -Wl,-brtl -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm -lX11 -lXext -lXmu -lXi
-
diff --git a/nx-X11/extras/Mesa/configs/aix-static b/nx-X11/extras/Mesa/configs/aix-static
deleted file mode 100644
index f6f086edb..000000000
--- a/nx-X11/extras/Mesa/configs/aix-static
+++ /dev/null
@@ -1,23 +0,0 @@
-# Configuration for AIX, static libs
-
-include $(TOP)/configs/default
-
-CONFIG_NAME = aix-static
-
-# Compiler and flags
-CC = cc
-CXX = xlC
-
-CFLAGS = -O -DAIXV3
-CXXFLAGS = -O -DAIXV3
-MKLIB_OPTIONS = -static
-
-# Library names (actual file names)
-GL_LIB_NAME = libGL.a
-GLU_LIB_NAME = libGLU.a
-GLUT_LIB_NAME = libglut.a
-GLW_LIB_NAME = libGLw.a
-OSMESA_LIB_NAME = libOSMesa.a
-
-APP_LIB_DEPS = -L$(LIB_DIR) -lX11 -lXext -lXmu -lXi -lm
-
diff --git a/nx-X11/extras/Mesa/configs/beos b/nx-X11/extras/Mesa/configs/beos
deleted file mode 100644
index 1d2eaa959..000000000
--- a/nx-X11/extras/Mesa/configs/beos
+++ /dev/null
@@ -1,99 +0,0 @@
-# Configuration for BeOS
-# Written by Philippe Houdoin
-
-include $(TOP)/configs/default
-
-CONFIG_NAME = beos
-
-
-DEFINES = \
- -DBEOS_THREADS
-
-MACHINE=$(shell uname -m)
-ifeq ($(MACHINE), BePC)
- CPU = x86
-else
- CPU = ppc
-endif
-
-ifeq ($(CPU), x86)
- # BeOS x86 settings
-
- DEFINES += \
- -DGNU_ASSEMBLER \
- -DUSE_X86_ASM \
- -DUSE_MMX_ASM \
- -DUSE_3DNOW_ASM \
- -DUSE_SSE_ASM
-
- ASM_SOURCES = $(X86_SOURCES) $(X86_API)
-
- CC = gcc
- CXX = g++
- LD = gcc
-
- CFLAGS = \
- -Wall -Wno-multichar -Wno-ctor-dtor-privacy \
- $(DEFINES)
-
- CXXFLAGS = $(CFLAGS)
-
- LDFLAGS += -Xlinker
-
- ifdef DEBUG
- CFLAGS += -g -O0
- LDFLAGS += -g
- DEFINES += -DDEBUG
- else
- CFLAGS += -O3
- endif
-
- GLUT_CFLAGS = -fexceptions
-
-else
- # BeOS PPC settings
-
- CC = mwcc
- CXX = $(CC)
- LD = mwldppc
-
- CFLAGS = \
- -w on -requireprotos \
- $(DEFINES)
-
- CXXFLAGS = $(CFLAGS)
-
- LDFLAGS += \
- -export pragma \
- -init _init_routine_ \
- -term _term_routine_ \
- -lroot \
- /boot/develop/lib/ppc/glue-noinit.a \
- /boot/develop/lib/ppc/init_term_dyn.o \
- /boot/develop/lib/ppc/start_dyn.o
-
- ifdef DEBUG
- CFLAGS += -g -O0
- CXXFLAGS += -g -O0
- LDFLAGS += -g
- else
- CFLAGS += -O7
- CXXFLAGS += -O7
- endif
-
- GLUT_CFLAGS = -fexceptions
-endif
-
-# Directories
-SRC_DIRS = mesa glu glut/beos
-GLU_DIRS = sgi
-DRIVER_DIRS = beos
-PROGRAM_DIRS = beos samples redbook demos tests
-
-# Library/program dependencies
-GL_LIB_DEPS =
-OSMESA_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB)
-GLU_LIB_DEPS =
-GLUT_LIB_DEPS = -lgame -L$(LIB_DIR) -l$(GL_LIB)
-APP_LIB_DEPS = -lbe -L$(LIB_DIR) -l$(GL_LIB) -l$(GLUT_LIB)
-
diff --git a/nx-X11/extras/Mesa/configs/darwin b/nx-X11/extras/Mesa/configs/darwin
deleted file mode 100644
index 0c8a6ec47..000000000
--- a/nx-X11/extras/Mesa/configs/darwin
+++ /dev/null
@@ -1,29 +0,0 @@
-# Configuration for Darwin / MacOS X, making dynamic libs
-
-include $(TOP)/configs/default
-
-CONFIG_NAME = darwin
-
-# Compiler and flags
-CC = cc
-CXX = cc
-CFLAGS = -I/usr/X11R6/include -O3 -fPIC -fno-common -ffast-math -funroll-loops -fexpensive-optimizations -no-cpp-precomp -dynamic -Ddarwin
-CXXFLAGS = -I/usr/X11R6/include -O3 -fPIC -fno-common -ffast-math -funroll-loops -fexpensive-optimizations -no-cpp-precomp -dynamic -Ddarwin
-
-# Library names (actual file names)
-GL_LIB_NAME = libGL.dylib
-GLU_LIB_NAME = libGLU.dylib
-GLUT_LIB_NAME = libglut.dylib
-GLW_LIB_NAME = libGLw.dylib
-OSMESA_LIB_NAME = libOSMesa.dylib
-
-GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread
-OSMESA_LIB_DEPS = -L$(LIB_DIR) -lGL
-GLU_LIB_DEPS = -L$(LIB_DIR) -lGL
-GLUT_LIB_DEPS = -L$(LIB_DIR) -lGL -lGLU -L/usr/X11R6/lib -lX11 -lXmu -lXi -lXext
-GLW_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXt $(TOP)/lib/GL.dylib
-APP_LIB_DEPS = -L$(TOP)/lib -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm
-
-# omit glw lib for now:
-SRC_DIRS = mesa glu glut/glx
-
diff --git a/nx-X11/extras/Mesa/configs/darwin-static b/nx-X11/extras/Mesa/configs/darwin-static
deleted file mode 100644
index c7f9c5f06..000000000
--- a/nx-X11/extras/Mesa/configs/darwin-static
+++ /dev/null
@@ -1,24 +0,0 @@
-# Configuration for Darwin / MacOS X, making static libs
-
-include $(TOP)/configs/darwin
-
-CONFIG_NAME = darwin-static
-
-# Compiler and flags
-CFLAGS = -I/usr/X11R6/include -O3 -fno-common -ffast-math -funroll-loops -fexpensive-optimizations -no-cpp-precomp -dynamic -Ddarwin
-CXXFLAGS = -I/usr/X11R6/include -O3 -fno-common -ffast-math -funroll-loops -fexpensive-optimizations -no-cpp-precomp -dynamic -Ddarwin
-MKLIB_OPTIONS = -static
-
-# Library names (actual file names)
-GL_LIB_NAME = libGL.a
-GLU_LIB_NAME = libGLU.a
-GLUT_LIB_NAME = libglut.a
-GLW_LIB_NAME = libGLw.a
-OSMESA_LIB_NAME = libOSMesa.a
-
-GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread
-OSMESA_LIB_DEPS =
-GLU_LIB_DEPS =
-GLUT_LIB_DEPS =
-GLW_LIB_DEPS =
-APP_LIB_DEPS = -L$(TOP)/lib -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm
diff --git a/nx-X11/extras/Mesa/configs/default b/nx-X11/extras/Mesa/configs/default
deleted file mode 100644
index e3b1bc0ec..000000000
--- a/nx-X11/extras/Mesa/configs/default
+++ /dev/null
@@ -1,74 +0,0 @@
-# Default/template configuration
-
-# This is included by other config files which may override some
-# of these variables.
-
-CONFIG_NAME = default
-
-# Version info
-MESA_MAJOR=6
-MESA_MINOR=4
-MESA_TINY=1
-
-# external projects. This should be useless now that we use libdrm.
-DRM_SOURCE_PATH=$(TOP)/../drm
-
-# Compiler and flags
-CC = cc
-CXX = CC
-CFLAGS = -O
-CXXFLAGS = -O
-GLU_CFLAGS =
-
-# Misc tools and flags
-MKLIB_OPTIONS =
-MKDEP = makedepend
-MKDEP_OPTIONS = -fdepend
-MAKE = make
-
-# Python and flags (generally only needed by the developers)
-PYTHON2 = python
-PYTHON_FLAGS = -t -O -O
-
-# Library names (base name)
-GL_LIB = GL
-GLU_LIB = GLU
-GLUT_LIB = glut
-GLW_LIB = GLw
-OSMESA_LIB = OSMesa
-
-
-# Library names (actual file names)
-GL_LIB_NAME = lib$(GL_LIB).so
-GLU_LIB_NAME = lib$(GLU_LIB).so
-GLUT_LIB_NAME = lib$(GLUT_LIB).so
-GLW_LIB_NAME = lib$(GLW_LIB).so
-OSMESA_LIB_NAME = lib$(OSMESA_LIB).so
-
-
-# Optional assembly language optimization files for libGL
-ASM_SOURCES =
-
-# GLw widget sources (Append "GLwMDrawA.c" here and add -lXm to GLW_LIB_DEPS in
-# order to build the Motif widget too)
-GLW_SOURCES = GLwDrawA.c
-
-
-# Directories
-LIB_DIR = $(TOP)/lib
-INSTALL_PREFIX = /usr/local
-SRC_DIRS = mesa glu glut/glx glw
-GLU_DIRS = sgi
-DRIVER_DIRS = x11 osmesa
-# Which subdirs under $(TOP)/progs/ to enter:
-PROGRAM_DIRS = demos redbook samples xdemos
-
-
-# Library/program dependencies
-EXTRA_LIB_PATH ?=
-GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lm -lpthread
-OSMESA_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB)
-GLU_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -lm
-GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) $(EXTRA_LIB_PATH) -lX11 -lXmu -lXt -lXi -lm
-GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) $(EXTRA_LIB_PATH) -lXt -lX11
-APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm
diff --git a/nx-X11/extras/Mesa/configs/freebsd b/nx-X11/extras/Mesa/configs/freebsd
deleted file mode 100644
index 910352abd..000000000
--- a/nx-X11/extras/Mesa/configs/freebsd
+++ /dev/null
@@ -1,16 +0,0 @@
-# Configuration for FreeBSD
-
-include $(TOP)/configs/default
-
-CONFIG_NAME = FreeBSD
-
-# Compiler and flags
-CC = gcc
-CXX = g++
-MAKE = gmake
-
-CFLAGS = -O2 -fPIC -pedantic -I/usr/X11R6/include -DUSE_XSHM -DHZ=100
-CXXFLAGS = -O2 -fPIC -pedantic
-GLUT_CFLAGS = -fexceptions
-
-APP_LIB_DEPS = -L$(LIB_DIR) -L/usr/X11R6/lib -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lXext -lXmu -lXi -lX11 -lm
diff --git a/nx-X11/extras/Mesa/configs/freebsd-dri b/nx-X11/extras/Mesa/configs/freebsd-dri
deleted file mode 100644
index fd07dbefe..000000000
--- a/nx-X11/extras/Mesa/configs/freebsd-dri
+++ /dev/null
@@ -1,45 +0,0 @@
-# -*-makefile-*-
-# Configuration for freebsd-dri: FreeBSD DRI hardware drivers
-
-include $(TOP)/configs/freebsd
-
-CONFIG_NAME = freebsd-dri
-
-# Compiler and flags
-CC = gcc
-CXX = g++
-WARN_FLAGS = -Wall
-OPT_FLAGS = -O
-
-EXPAT_INCLUDES = -I/usr/local/include
-X11_INCLUDES = -I/usr/X11R6/include
-DEFINES = -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER \
- -DGLX_DIRECT_RENDERING -DHAVE_ALIAS
-CFLAGS = $(DEFINES) -Wmissing-prototypes -g -std=c99 -Wundef -fPIC \
- -ffast-math $(X11_INCLUDES)
-CXXFLAGS = $(DEFINES) -Wall -g -ansi -pedantic -fPIC
-
-ASM_SOURCES =
-
-# Library/program dependencies
-LIBDRM_LIB = `pkg-config --libs libdrm` -ldrm
-DRI_LIB_DEPS = -L/usr/local/lib -lm -lpthread -lexpat $(LIBDRM_LIB)
-GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread $(LIBDRM_LIB)
-
-GLUT_LIB_DEPS = -L$(LIB_DIR) -L/usr/X11R6/lib -lGLU -lGL -lX11 -lXmu -lXt -lXi -lm
-GLW_LIB_DEPS = -L$(LIB_DIR) -L/usr/X11R6/lib -lGL -lXt -lXm -lX11
-
-
-# Directories
-SRC_DIRS = glx/x11 mesa glu glut/glx glw
-DRIVER_DIRS = dri
-PROGRAM_DIRS =
-WINDOW_SYSTEM=dri
-
-DRM_SOURCE_PATH=$(TOP)/../drm
-
-# ffb and gamma are missing because they have not been converted to use the new
-# interface.
-DRI_DIRS = i810 i830 i915 mach64 mga r128 r200 r300 radeon tdfx \
- unichrome savage sis
-
diff --git a/nx-X11/extras/Mesa/configs/freebsd-dri-amd64 b/nx-X11/extras/Mesa/configs/freebsd-dri-amd64
deleted file mode 100644
index ffddfd835..000000000
--- a/nx-X11/extras/Mesa/configs/freebsd-dri-amd64
+++ /dev/null
@@ -1,9 +0,0 @@
-# -*-makefile-*-
-# Configuration for freebsd-dri-amd64: FreeBSD DRI hardware drivers
-
-include $(TOP)/configs/freebsd-dri
-
-CONFIG_NAME = freebsd-dri-x86-64
-
-ASM_FLAGS = -DUSE_X86_64_ASM
-ASM_SOURCES = $(X86-64_SOURCES) $(X86-64_API)
diff --git a/nx-X11/extras/Mesa/configs/freebsd-dri-x86 b/nx-X11/extras/Mesa/configs/freebsd-dri-x86
deleted file mode 100644
index 31316b1f7..000000000
--- a/nx-X11/extras/Mesa/configs/freebsd-dri-x86
+++ /dev/null
@@ -1,12 +0,0 @@
-# -*-makefile-*-
-# Configuration for freebsd-dri: FreeBSD DRI hardware drivers
-
-include $(TOP)/configs/freebsd-dri
-
-CONFIG_NAME = freebsd-dri-x86
-
-# Unnecessary on x86, generally.
-PIC_FLAGS =
-
-ASM_FLAGS = -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM
-ASM_SOURCES = $(X86_SOURCES)
diff --git a/nx-X11/extras/Mesa/configs/hpux10 b/nx-X11/extras/Mesa/configs/hpux10
deleted file mode 100644
index e17c8b681..000000000
--- a/nx-X11/extras/Mesa/configs/hpux10
+++ /dev/null
@@ -1,14 +0,0 @@
-# Configuration for HPUX v10, shared libs
-
-include $(TOP)/configs/default
-
-CONFIG_NAME = hpux10
-
-# Compiler and flags
-CC = cc
-CXX = aCC
-
-CFLAGS = +O3 +DAportable +z -Aa -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM
-CXXFLAGS = +O3 +DAportable +Z -Aa -D_HPUX_SOURCE
-
-APP_LIB_DEPS = -$(LIB_DIR) -L/usr/lib/X11R6 -L/usr/contrib/X11R6/lib -lXext -lXmu -lXi -lX11 -lm
diff --git a/nx-X11/extras/Mesa/configs/hpux10-gcc b/nx-X11/extras/Mesa/configs/hpux10-gcc
deleted file mode 100644
index 107a99a85..000000000
--- a/nx-X11/extras/Mesa/configs/hpux10-gcc
+++ /dev/null
@@ -1,16 +0,0 @@
-# Configuration for HPUX v10, with gcc
-
-include $(TOP)/configs/default
-
-CONFIG_NAME = hpux10-gcc
-
-# Compiler and flags
-CC = gcc
-CXX = g++
-
-CFLAGS = -ansi -O3 -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM
-CXXFLAGS = -ansi -O3 -D_HPUX_SOURCE
-GLUT_CFLAGS = -fexceptions
-
-APP_LIB_DEPS = -L$(LIB_DIR) -L/usr/lib/X11R6 -L/usr/contrib/X11R6/lib -lXext -lXmu -lXi -lX11 -lm
-
diff --git a/nx-X11/extras/Mesa/configs/hpux10-static b/nx-X11/extras/Mesa/configs/hpux10-static
deleted file mode 100644
index 38a1313e6..000000000
--- a/nx-X11/extras/Mesa/configs/hpux10-static
+++ /dev/null
@@ -1,30 +0,0 @@
-# Configuration for HPUX v10, static libs
-
-include $(TOP)/configs/default
-
-CONFIG_NAME = hpux10-static
-
-# Compiler and flags
-CC = cc
-CXX = aCC
-
-CFLAGS = +O3 +DAportable +z -Aa -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM
-CXXFLAGS = +O3 +DAportable +Z -Aa -D_HPUX_SOURCE
-
-MKLIB_OPTIONS = -static
-
-# Library names (actual file names)
-GL_LIB_NAME = libGL.a
-GLU_LIB_NAME = libGLU.a
-GLUT_LIB_NAME = libglut.a
-GLW_LIB_NAME = libGLw.a
-OSMESA_LIB_NAME = libOSMesa.a
-
-# Library/program dependencies (static libs don't have dependencies)
-GL_LIB_DEPS =
-OSMESA_LIB_DEPS =
-GLU_LIB_DEPS =
-GLUT_LIB_DEPS =
-GLW_LIB_DEPS =
-APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lpthread -lm -lstdc++
-APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/lib/X11R6 -L/usr/contrib/X11R6/lib -lXext -lXmu -lXi -lX11 -lm -lstdc++
diff --git a/nx-X11/extras/Mesa/configs/hpux11-32 b/nx-X11/extras/Mesa/configs/hpux11-32
deleted file mode 100644
index 9ff407bd5..000000000
--- a/nx-X11/extras/Mesa/configs/hpux11-32
+++ /dev/null
@@ -1,26 +0,0 @@
-# Configuration for HPUX v11
-
-include $(TOP)/configs/default
-
-CONFIG_NAME = hpux11-32
-
-# Compiler and flags
-CC = cc
-CXX = aCC
-
-CFLAGS = +z -Ae +O2 +Onolimit +Oaggressive -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM -DPTHREADS
-
-CXXFLAGS = +z -Aa +O2 +Onolimit +Oaggressive -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include
-
-MKLIB_OPTIONS =
-
-
-# Library names (actual file names)
-GL_LIB_NAME = libGL.a
-GLU_LIB_NAME = libGLU.a
-GLUT_LIB_NAME = libglut.a
-GLW_LIB_NAME = libGLw.a
-OSMESA_LIB_NAME = libOSMesa.a
-
-# Library/program dependencies
-APP_LIB_DEPS = -L/usr/lib/X11R6 -L/usr/contrib/X11R6/lib -lXext -lXmu -lXi -lX11 -lm
diff --git a/nx-X11/extras/Mesa/configs/hpux11-32-static b/nx-X11/extras/Mesa/configs/hpux11-32-static
deleted file mode 100644
index 7507ab0b0..000000000
--- a/nx-X11/extras/Mesa/configs/hpux11-32-static
+++ /dev/null
@@ -1,26 +0,0 @@
-# Configuration for HPUX v11, static libs
-
-include $(TOP)/configs/default
-
-CONFIG_NAME = hpux11-32-static
-
-# Compiler and flags
-CC = cc
-CXX = aCC
-
-CFLAGS = +O3 +DA2.0 -Aa -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM -DPTHREADS
-
-CXXFLAGS = +O3 +DA2.0 -Aa -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include
-
-MKLIB_OPTIONS = -static
-
-
-# Library names (actual file names)
-GL_LIB_NAME = libGL.a
-GLU_LIB_NAME = libGLU.a
-GLUT_LIB_NAME = libglut.a
-GLW_LIB_NAME = libGLw.a
-OSMESA_LIB_NAME = libOSMesa.a
-
-# Library/program dependencies
-APP_LIB_DEPS = -L/usr/lib/X11R6 -L/usr/contrib/X11R6/lib -lXext -lXmu -lXi -lX11 -lm
diff --git a/nx-X11/extras/Mesa/configs/hpux11-32-static-nothreads b/nx-X11/extras/Mesa/configs/hpux11-32-static-nothreads
deleted file mode 100644
index 91b365408..000000000
--- a/nx-X11/extras/Mesa/configs/hpux11-32-static-nothreads
+++ /dev/null
@@ -1,26 +0,0 @@
-# Configuration for HPUX v11, static libs
-
-include $(TOP)/configs/default
-
-CONFIG_NAME = hpux11-32-static
-
-# Compiler and flags
-CC = cc
-CXX = aCC
-
-CFLAGS = +O3 +DA2.0 -Aa -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM
-
-CXXFLAGS = +O3 +DA2.0 -Aa -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include
-
-MKLIB_OPTIONS = -static
-
-
-# Library names (actual file names)
-GL_LIB_NAME = libGL.a
-GLU_LIB_NAME = libGLU.a
-GLUT_LIB_NAME = libglut.a
-GLW_LIB_NAME = libGLw.a
-OSMESA_LIB_NAME = libOSMesa.a
-
-# Library/program dependencies
-APP_LIB_DEPS = -L/usr/lib/X11R6 -L/usr/contrib/X11R6/lib -lXext -lXmu -lXi -lX11 -lm
diff --git a/nx-X11/extras/Mesa/configs/hpux11-64 b/nx-X11/extras/Mesa/configs/hpux11-64
deleted file mode 100644
index b0869cf81..000000000
--- a/nx-X11/extras/Mesa/configs/hpux11-64
+++ /dev/null
@@ -1,27 +0,0 @@
-# Configuration for HPUX v11, 64-bit
-
-include $(TOP)/configs/default
-
-CONFIG_NAME = hpux11-64
-
-# Compiler and flags
-CC = cc
-CXX = aCC
-
-CFLAGS = +z -Ae +DD64 +O2 +Onolimit +Oaggressive -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM -DPTHREADS
-
-CXXFLAGS = +z -Aa +DD64 +O2 +Onolimit +Oaggressive -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include
-
-MKLIB_OPTIONS =
-
-LIBDIR = $(TOP)/lib64
-
-# Library names (actual file names)
-GL_LIB_NAME = libGL.a
-GLU_LIB_NAME = libGLU.a
-GLUT_LIB_NAME = libglut.a
-GLW_LIB_NAME = libGLw.a
-OSMESA_LIB_NAME = libOSMesa.a
-
-# Library/program dependencies
-APP_LIB_DEPS = -L/usr/lib/X11R6 -L/usr/contrib/X11R6/lib -lXext -lXmu -lXi -lX11 -lm
diff --git a/nx-X11/extras/Mesa/configs/hpux11-64-static b/nx-X11/extras/Mesa/configs/hpux11-64-static
deleted file mode 100644
index 451dc4208..000000000
--- a/nx-X11/extras/Mesa/configs/hpux11-64-static
+++ /dev/null
@@ -1,27 +0,0 @@
-# Configuration for HPUX v11, 64-bit, static libs
-
-include $(TOP)/configs/default
-
-CONFIG_NAME = hpux11-64-static
-
-# Compiler and flags
-CC = cc
-CXX = aCC
-
-CFLAGS = +O3 +DA2.0W -Aa -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM -DPTHREADS
-
-CXXFLAGS = +O3 +DA2.0W -Aa -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include
-
-MKLIB_OPTIONS = -static
-
-LIBDIR = $(TOP)/lib64
-
-# Library names (actual file names)
-GL_LIB_NAME = libGL.a
-GLU_LIB_NAME = libGLU.a
-GLUT_LIB_NAME = libglut.a
-GLW_LIB_NAME = libGLw.a
-OSMESA_LIB_NAME = libOSMesa.a
-
-# Library/program dependencies
-APP_LIB_DEPS = -L/usr/lib/X11R6 -L/usr/contrib/X11R6/lib -lXext -lXmu -lXi -lX11 -lm
diff --git a/nx-X11/extras/Mesa/configs/hpux9 b/nx-X11/extras/Mesa/configs/hpux9
deleted file mode 100644
index 037381757..000000000
--- a/nx-X11/extras/Mesa/configs/hpux9
+++ /dev/null
@@ -1,16 +0,0 @@
-# Configuration for HPUX v9, shared libs
-
-include $(TOP)/configs/default
-
-CONFIG_NAME = hpux9
-
-# Compiler and flags
-CC = cc
-# XXX fix this
-CXX = c++
-
-CFLAGS = +z +O3 +Olibcalls +ESlit -Aa +Onolimit -D_HPUX_SOURCE -I/usr/include/X11R5 -DUSE_XSHM
-CXXFLAGS = +z +O3 +Olibcalls +ESlit -Aa +Onolimit -D_HPUX_SOURCE -I/usr/include/X11R5
-
-APP_LIB_DEPS = -L$(LIB_DIR) -L/usr/lib/X11R5 -s -Wl,+s,-B,nonfatal,-B,immediate -lXext -lXmu -lXi -lX11 -lm
-
diff --git a/nx-X11/extras/Mesa/configs/hpux9-gcc b/nx-X11/extras/Mesa/configs/hpux9-gcc
deleted file mode 100644
index 47d579ea5..000000000
--- a/nx-X11/extras/Mesa/configs/hpux9-gcc
+++ /dev/null
@@ -1,14 +0,0 @@
-# Configuration for HPUX v10, shared libs
-
-include $(TOP)/configs/default
-
-CONFIG_NAME = hpux9-gcc
-
-# Compiler and flags
-CC = cc
-CXX = aCC
-
-CFLAGS = +O3 +DAportable +z -Aa -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM
-CXXFLAGS = +O3 +DAportable +Z -Aa -D_HPUX_SOURCE
-
-APP_LIB_DEPS = -L$(LIB_DIR) -L/usr/lib/X11R6 -L/usr/contrib/X11R6/lib -lXext -lXmu -lXi -lX11 -lm
diff --git a/nx-X11/extras/Mesa/configs/irix6-64 b/nx-X11/extras/Mesa/configs/irix6-64
deleted file mode 100644
index 6c33d33ba..000000000
--- a/nx-X11/extras/Mesa/configs/irix6-64
+++ /dev/null
@@ -1,18 +0,0 @@
-# Configuration for IRIX 6.x, make n64 DSOs
-
-include $(TOP)/configs/default
-
-CONFIG_NAME = irix6-64
-
-# Compiler and flags
-CC = cc
-CXX = CC
-CFLAGS = -64 -O3 -ansi -woff 1068,1069,1174,1185,1209,1474,1552 -DUSE_XSHM
-CXXFLAGS = -64 -O3 -ansi -woff 1174
-MKLIB_OPTIONS = -archopt 64
-
-GLW_SOURCES = GLwDrawA.c GLwMDrawA.c
-
-LIB_DIR = $(TOP)/lib64
-
-APP_LIB_DEPS = -L$(LIB_DIR) -64 -rpath $(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXmu -lXi -lm
diff --git a/nx-X11/extras/Mesa/configs/irix6-64-static b/nx-X11/extras/Mesa/configs/irix6-64-static
deleted file mode 100644
index d66af5be8..000000000
--- a/nx-X11/extras/Mesa/configs/irix6-64-static
+++ /dev/null
@@ -1,25 +0,0 @@
-# Configuration for IRIX 6.x, make n64 static libs
-
-include $(TOP)/configs/default
-
-CONFIG_NAME = irix6-64-static
-
-# Compiler and flags
-CC = cc
-CXX = CC
-CFLAGS = -64 -O3 -ansi -woff 1068,1069,1174,1185,1209,1474,1552 -DUSE_XSHM
-CXXFLAGS = -64 -O3 -ansi -woff 1174
-MKLIB_OPTIONS = -archopt 64 -static
-
-GLW_SOURCES = GLwDrawA.c GLwMDrawA.c
-
-LIB_DIR = $(TOP)/lib64
-
-APP_LIB_DEPS = -L$(LIB_DIR) -64 -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXext -lXmu -lXi -lm
-
-GL_LIB_NAME = libGL.a
-GLU_LIB_NAME = libGLU.a
-GLUT_LIB_NAME = libglut.a
-GLW_LIB_NAME = libGLw.a
-OSMESA_LIB_NAME = libOSMesa.a
-
diff --git a/nx-X11/extras/Mesa/configs/irix6-n32 b/nx-X11/extras/Mesa/configs/irix6-n32
deleted file mode 100644
index 4bf296401..000000000
--- a/nx-X11/extras/Mesa/configs/irix6-n32
+++ /dev/null
@@ -1,18 +0,0 @@
-# Configuration for IRIX 6.x, make n32 DSOs
-
-include $(TOP)/configs/default
-
-CONFIG_NAME = irix6-n32
-
-# Compiler and flags
-CC = cc
-CXX = CC
-CFLAGS = -n32 -mips3 -O3 -ansi -woff 1174,1521,1552 -DUSE_XSHM
-CXXFLAGS = -n32 -mips3 -O3 -ansi -woff 1174,1552
-MKLIB_OPTIONS = -archopt n32
-
-GLW_SOURCES = GLwDrawA.c GLwMDrawA.c
-
-LIB_DIR = $(TOP)/lib32
-
-APP_LIB_DEPS = -L$(LIB_DIR) -n32 -rpath $(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXmu -lXi -lfpe -lm
diff --git a/nx-X11/extras/Mesa/configs/irix6-n32-static b/nx-X11/extras/Mesa/configs/irix6-n32-static
deleted file mode 100644
index b60de380c..000000000
--- a/nx-X11/extras/Mesa/configs/irix6-n32-static
+++ /dev/null
@@ -1,25 +0,0 @@
-# Configuration for IRIX 6.x, make n32 static libs
-
-include $(TOP)/configs/default
-
-CONFIG_NAME = irix6-n32-static
-
-# Compiler and flags
-CC = cc
-CXX = CC
-CFLAGS = -n32 -mips2 -O2 -ansi -woff 1521,1552 -DUSE_XSHM
-CXXFLAGS = -n32 -mips2 -O2 -ansi -woff 3262,3666
-MKLIB_OPTIONS = -archopt n32 -static
-
-GLW_SOURCES = GLwDrawA.c GLwMDrawA.c
-
-LIB_DIR = $(TOP)/lib32
-
-APP_LIB_DEPS = -L$(LIB_DIR) -n32 -glut -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXext -lXmu -lXi -lm
-
-GL_LIB_NAME = libGL.a
-GLU_LIB_NAME = libGLU.a
-GLUT_LIB_NAME = libglut.a
-GLW_LIB_NAME = libGLw.a
-OSMESA_LIB_NAME = libOSMesa.a
-
diff --git a/nx-X11/extras/Mesa/configs/irix6-o32 b/nx-X11/extras/Mesa/configs/irix6-o32
deleted file mode 100644
index 56a197960..000000000
--- a/nx-X11/extras/Mesa/configs/irix6-o32
+++ /dev/null
@@ -1,19 +0,0 @@
-# Configuration for IRIX 6.x, make o32 DSOs
-
-include $(TOP)/configs/default
-
-CONFIG_NAME = irix6-o32
-
-# Compiler and flags
-CC = cc
-CXX = CC
-CFLAGS = -32 -mips2 -O2 -ansi -woff 1521,1552 -DUSE_XSHM
-CXXFLAGS = -32 -mips2 -O2 -ansi -woff 3262,3666
-MKLIB_OPTIONS = -archopt o32
-
-GLW_SOURCES = GLwDrawA.c GLwMDrawA.c
-
-LIB_DIR = $(TOP)/lib32
-
-APP_LIB_DEPS = -L$(LIB_DIR) -32 -rpath $(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXext -lXmu -lXi -lm
-
diff --git a/nx-X11/extras/Mesa/configs/irix6-o32-static b/nx-X11/extras/Mesa/configs/irix6-o32-static
deleted file mode 100644
index ac3d6ee17..000000000
--- a/nx-X11/extras/Mesa/configs/irix6-o32-static
+++ /dev/null
@@ -1,25 +0,0 @@
-# Configuration for IRIX 6.x, make o32 static libs
-
-include $(TOP)/configs/default
-
-CONFIG_NAME = irix6-o32-static
-
-# Compiler and flags
-CC = cc
-CXX = CC
-CFLAGS = -32 -mips2 -O2 -ansi -woff 1521,1552 -DUSE_XSHM
-CXXFLAGS = -32 -mips2 -O2 -ansi -woff 3262,3666
-MKLIB_OPTIONS = -archopt o32 -static
-
-GLW_SOURCES = GLwDrawA.c GLwMDrawA.c
-
-LIB_DIR = $(TOP)/lib32
-
-APP_LIB_DEPS = -L$(LIB_DIR) -32 -glut -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXext -lXmu -lXi -lm
-
-GL_LIB_NAME = libGL.a
-GLU_LIB_NAME = libGLU.a
-GLUT_LIB_NAME = libglut.a
-GLW_LIB_NAME = libGLw.a
-OSMESA_LIB_NAME = libOSMesa.a
-
diff --git a/nx-X11/extras/Mesa/configs/linux b/nx-X11/extras/Mesa/configs/linux
deleted file mode 100644
index e3119ec5c..000000000
--- a/nx-X11/extras/Mesa/configs/linux
+++ /dev/null
@@ -1,33 +0,0 @@
-# Configuration for generic Linux
-
-include $(TOP)/configs/default
-
-CONFIG_NAME = linux
-
-# Compiler and flags
-CC = gcc
-CXX = g++
-
-WARN_FLAGS = -Wall
-OPT_FLAGS = -O3 -g
-PIC_FLAGS = -fPIC
-
-# Add '-DGLX_USE_TLS' to ARCH_FLAGS to enable TLS support. Add -m32
-# to build properly on 64-bit platforms.
-
-ARCH_FLAGS ?=
-
-DEFINES = -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE \
- -D_BSD_SOURCE -DPTHREADS -DUSE_XSHM
-
-X11_INCLUDES = -I/usr/X11R6/include
-
-CFLAGS = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) \
- $(ASM_FLAGS) $(X11_INCLUDES) -std=c99 -ffast-math
-
-CXXFLAGS = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) \
- $(X11_INCLUDES)
-
-GLUT_CFLAGS = -fexceptions
-
-EXTRA_LIB_PATH = -L/usr/X11R6/lib
diff --git a/nx-X11/extras/Mesa/configs/linux-alpha b/nx-X11/extras/Mesa/configs/linux-alpha
deleted file mode 100644
index 507c80845..000000000
--- a/nx-X11/extras/Mesa/configs/linux-alpha
+++ /dev/null
@@ -1,18 +0,0 @@
-# Configuration for Linux on Alpha
-
-include $(TOP)/configs/default
-
-CONFIG_NAME = linux-alpha
-
-# Compiler and flags
-CC = gcc
-CXX = g++
-CFLAGS = -O3 -mcpu=ev5 -ansi -mieee -pedantic -fPIC -D_XOPEN_SOURCE -DUSE_XSHM
-CXXFLAGS = -O3 -mcpu=ev5 -ansi -mieee -pedantic -fPIC -D_XOPEN_SOURCE
-GLUT_CFLAGS = -fexceptions
-
-GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread
-GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm
-GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -L/usr/X11R6/lib -lXt -lX11
-APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm
-
diff --git a/nx-X11/extras/Mesa/configs/linux-alpha-static b/nx-X11/extras/Mesa/configs/linux-alpha-static
deleted file mode 100644
index 7b7ee07eb..000000000
--- a/nx-X11/extras/Mesa/configs/linux-alpha-static
+++ /dev/null
@@ -1,27 +0,0 @@
-# Configuration for Linux on Alpha, static libs
-
-include $(TOP)/configs/default
-
-CONFIG_NAME = linux-alpha-static
-
-# Compiler and flags
-CC = gcc
-CXX = g++
-CFLAGS = -O3 -mcpu=ev5 -ansi -mieee -pedantic -D_XOPEN_SOURCE -DUSE_XSHM
-CXXFLAGS = -O3 -mcpu=ev5 -ansi -mieee -pedantic -D_XOPEN_SOURCE
-GLUT_CFLAGS = -fexceptions
-MKLIB_OPTIONS = -static
-
-
-# Library names (actual file names)
-GL_LIB_NAME = libGL.a
-GLU_LIB_NAME = libGLU.a
-GLUT_LIB_NAME = libglut.a
-GLW_LIB_NAME = libGLw.a
-OSMESA_LIB_NAME = libOSMesa.a
-
-
-GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread
-GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm
-GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -L/usr/X11R6/lib -lXt -lX11
-APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm -L/usr/X11R6/lib -lX11 -lm
diff --git a/nx-X11/extras/Mesa/configs/linux-debug b/nx-X11/extras/Mesa/configs/linux-debug
deleted file mode 100644
index ff4d1c33b..000000000
--- a/nx-X11/extras/Mesa/configs/linux-debug
+++ /dev/null
@@ -1,8 +0,0 @@
-# Configuration for debugging on Linux
-
-include $(TOP)/configs/linux
-
-CONFIG_NAME = linux-debug
-
-OPT_FLAGS = -g
-DEFINES += -DDEBUG -DMESA_DEBUG -DRUN_DEBUG_BENCHMARK
diff --git a/nx-X11/extras/Mesa/configs/linux-directfb b/nx-X11/extras/Mesa/configs/linux-directfb
deleted file mode 100644
index f09c69dda..000000000
--- a/nx-X11/extras/Mesa/configs/linux-directfb
+++ /dev/null
@@ -1,29 +0,0 @@
-# Configuration for DirectFB
-
-include $(TOP)/configs/default
-
-CONFIG_NAME = linux-directfb
-
-# Compiler and flags
-CC = gcc
-CXX = g++
-
-CFLAGS = -Wall -O3 -ffast-math -fPIC -std=c99 -D_GNU_SOURCE -D_POSIX_SOURCE -D_SVID_SOURCE \
- -D_POSIX_C_SOURCE=199309L -D_BSD_SOURCE -DPTHREADS
-
-CXXFLAGS = -Wall -O3 -fPIC -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
-
-HAVE_X86 = $(shell uname -m | grep 'i[3-6]86' >/dev/null && echo yes)
-ifeq ($(HAVE_X86), yes)
- CFLAGS += -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM
- CXXFLAGS += -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM
- ASM_SOURCES = $(X86_SOURCES) $(X86_API)
-endif
-
-# Directories
-SRC_DIRS = mesa glu
-DRIVER_DIRS = directfb
-PROGRAM_DIRS = # disabled
-
-# Library/program dependencies
-GL_LIB_DEPS = -lm -lpthread
diff --git a/nx-X11/extras/Mesa/configs/linux-dri b/nx-X11/extras/Mesa/configs/linux-dri
deleted file mode 100644
index 293f2e789..000000000
--- a/nx-X11/extras/Mesa/configs/linux-dri
+++ /dev/null
@@ -1,68 +0,0 @@
-# -*-makefile-*-
-# Configuration for linux-dri: Linux DRI hardware drivers for XFree86 & others
-
-include $(TOP)/configs/default
-
-CONFIG_NAME = linux-dri
-
-# Compiler and flags
-CC = gcc
-CXX = g++
-
-MKDEP = /usr/X11R6/bin/makedepend
-#MKDEP = gcc -M
-#MKDEP_OPTIONS = -MF depend
-
-WARN_FLAGS = -Wall
-OPT_FLAGS = -O -g
-PIC_FLAGS = -fPIC
-
-# Add '-DGLX_USE_TLS' to ARCH_FLAGS to enable TLS support.
-ARCH_FLAGS ?=
-
-DEFINES = -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE \
- -D_BSD_SOURCE -D_GNU_SOURCE \
- -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER \
- -DGLX_DIRECT_RENDERING -DHAVE_ALIAS
-
-X11_INCLUDES = -I/usr/X11R6/include
-
-CFLAGS = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) \
- $(ASM_FLAGS) -std=c99 -ffast-math
-
-CXXFLAGS = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES)
-
-
-ASM_SOURCES =
-
-# Library/program dependencies
-EXTRA_LIB_PATH=-L/usr/X11R6/lib
-
-LIBDRM_LIB = `pkg-config --libs libdrm` -ldrm
-DRI_LIB_DEPS = $(EXTRA_LIB_PATH) -lm -lpthread -lexpat -ldl $(LIBDRM_LIB)
-GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lm -lpthread -ldl \
- $(LIBDRM_LIB)
-
-
-# This is now 0 by default since it seems to confuse the hell out of people
-# and generate a lot of extra noise on bugzilla. If you need to build with
-# EGL, do 'make linux-dri USING_EGL=1'
-
-USING_EGL=0
-
-# Directories
-ifeq ($(USING_EGL), 1)
-SRC_DIRS = egl glx/x11 mesa glu glut/glx glw
-PROGRAM_DIRS = egl
-else
-SRC_DIRS = glx/x11 mesa glu glut/glx glw
-PROGRAM_DIRS =
-endif
-
-DRIVER_DIRS = dri
-WINDOW_SYSTEM=dri
-
-# gamma are missing because they have not been converted to use the new
-# interface.
-DRI_DIRS = i810 i830 i915 mach64 mga r128 r200 r300 radeon s3v \
- savage sis tdfx trident unichrome ffb
diff --git a/nx-X11/extras/Mesa/configs/linux-dri-ppc b/nx-X11/extras/Mesa/configs/linux-dri-ppc
deleted file mode 100644
index fb8768806..000000000
--- a/nx-X11/extras/Mesa/configs/linux-dri-ppc
+++ /dev/null
@@ -1,17 +0,0 @@
-# -*-makefile-*-
-# Configuration for linux-dri: Linux DRI hardware drivers for XFree86 & others
-
-include $(TOP)/configs/linux-dri
-
-CONFIG_NAME = linux-dri-ppc
-
-OPT_FLAGS = -Os -mcpu=603
-PIC_FLAGS = -fPIC
-
-ASM_FLAGS = -DUSE_PPC_ASM -DUSE_VMX_ASM
-ASM_SOURCES = $(PPC_SOURCES)
-
-# Build only the drivers for cards that exist on PowerPC. At some point MGA
-# will be added, but not yet.
-DRI_DIRS = mach64 r128 r200 r300 radeon tdfx
-
diff --git a/nx-X11/extras/Mesa/configs/linux-dri-x86 b/nx-X11/extras/Mesa/configs/linux-dri-x86
deleted file mode 100644
index bef24e059..000000000
--- a/nx-X11/extras/Mesa/configs/linux-dri-x86
+++ /dev/null
@@ -1,16 +0,0 @@
-# -*-makefile-*-
-# Configuration for linux-dri: Linux DRI hardware drivers for XFree86 & others
-
-include $(TOP)/configs/linux-dri
-
-CONFIG_NAME = linux-dri-x86
-
-# Unnecessary on x86, generally.
-PIC_FLAGS =
-
-# Add -m32 to CFLAGS:
-ARCH_FLAGS = -m32
-
-ASM_FLAGS = -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM
-ASM_SOURCES = $(X86_SOURCES)
-
diff --git a/nx-X11/extras/Mesa/configs/linux-dri-x86-64 b/nx-X11/extras/Mesa/configs/linux-dri-x86-64
deleted file mode 100644
index affbe2bc6..000000000
--- a/nx-X11/extras/Mesa/configs/linux-dri-x86-64
+++ /dev/null
@@ -1,23 +0,0 @@
-# -*-makefile-*-
-# Configuration for linux-dri: Linux DRI hardware drivers for XFree86 & others
-
-include $(TOP)/configs/linux-dri
-
-CONFIG_NAME = linux-dri-x86-64
-
-ARCH_FLAGS = -m64
-
-ASM_FLAGS = -DUSE_X86_64_ASM
-ASM_SOURCES = $(X86-64_SOURCES) $(X86-64_API)
-
-LIB_DIR = $(TOP)/lib64
-
-# Library/program dependencies
-EXTRA_LIB_PATH=-L/usr/X11R6/lib64
-
-# ffb, gamma, and sis are missing because they have not be converted to use
-# the new interface. i810 and i830 are missing because there is no x86-64
-# system where they could *ever* be used.
-#
-DRI_DIRS = i915 mach64 mga r128 r200 radeon tdfx unichrome savage r300
-
diff --git a/nx-X11/extras/Mesa/configs/linux-fbdev b/nx-X11/extras/Mesa/configs/linux-fbdev
deleted file mode 100644
index c357485ea..000000000
--- a/nx-X11/extras/Mesa/configs/linux-fbdev
+++ /dev/null
@@ -1,10 +0,0 @@
-# Configuration for Linux fbdev interface
-
-include $(TOP)/configs/linux
-
-CONFIG_NAME = linux-fbdev
-DRIVER_DIRS = fbdev
-
-CFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -DUSE_GLFBDEV_DRIVER
-
-PROGRAM_DIRS = fbdev
diff --git a/nx-X11/extras/Mesa/configs/linux-glide b/nx-X11/extras/Mesa/configs/linux-glide
deleted file mode 100644
index d3e0dc32d..000000000
--- a/nx-X11/extras/Mesa/configs/linux-glide
+++ /dev/null
@@ -1,20 +0,0 @@
-# Configuration for generic Linux with 3Dfx Glide driver
-
-include $(TOP)/configs/default
-
-CONFIG_NAME = linux-glide
-
-# Compiler and flags
-CC = gcc
-CXX = g++
-
-CFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -I/usr/X11R6/include -DFX -I/usr/include/glide -I/usr/local/glide/include
-CXXFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
-GLUT_CFLAGS = -fexceptions
-
-
-# Library/program dependencies
-GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -L/usr/local/glide/lib -lglide3x -lm -lpthread
-GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm
-GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -L/usr/X11R6/lib -lXt -lX11
-APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/local/glide/lib -lglide3x -lm
diff --git a/nx-X11/extras/Mesa/configs/linux-icc b/nx-X11/extras/Mesa/configs/linux-icc
deleted file mode 100644
index 0da3b836a..000000000
--- a/nx-X11/extras/Mesa/configs/linux-icc
+++ /dev/null
@@ -1,21 +0,0 @@
-# Configuration for Linux with Intel C compiler
-
-include $(TOP)/configs/default
-
-CONFIG_NAME = linux-icc
-
-# Compiler and flags
-CC = icc
-CXX = g++
-CFLAGS = -O3 -tpp6 -axK -KPIC -D_GCC_LIMITS_H_ -D__GNUC__ -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM -DPTHREADS -I/usr/X11R6/include
-CXXFLAGS = -O3
-GLUT_CFLAGS = -fexceptions
-MKLIB_OPTIONS = -arch icc
-
-GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread
-GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm
-APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm
-
-ASM_SOURCES = $(X86_SOURCES) $(X86_API)
-
-
diff --git a/nx-X11/extras/Mesa/configs/linux-icc-static b/nx-X11/extras/Mesa/configs/linux-icc-static
deleted file mode 100644
index 5c65f0561..000000000
--- a/nx-X11/extras/Mesa/configs/linux-icc-static
+++ /dev/null
@@ -1,29 +0,0 @@
-# Configuration for Linux with Intel C compiler, static libs
-
-include $(TOP)/configs/default
-
-CONFIG_NAME = linux-icc-static
-
-# Compiler and flags
-CC = icc
-CXX = g++
-CFLAGS = -O3 -tpp6 -axK -D_GCC_LIMITS_H_ -D__GNUC__ -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM -DPTHREADS -I/usr/X11R6/include
-CXXFLAGS = -O3
-GLUT_CFLAGS = -fexceptions
-MKLIB_OPTIONS = -static -arch icc
-
-# Library names (actual file names)
-GL_LIB_NAME = libGL.a
-GLU_LIB_NAME = libGLU.a
-GLUT_LIB_NAME = libglut.a
-GLW_LIB_NAME = libGLw.a
-OSMESA_LIB_NAME = libOSMesa.a
-
-GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread
-GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm
-APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm
-MKLIB_OPTIONS = -arch icc
-
-ASM_SOURCES = $(X86_SOURCES) $(X86_API)
-
-
diff --git a/nx-X11/extras/Mesa/configs/linux-indirect b/nx-X11/extras/Mesa/configs/linux-indirect
deleted file mode 100644
index 93166e2e9..000000000
--- a/nx-X11/extras/Mesa/configs/linux-indirect
+++ /dev/null
@@ -1,49 +0,0 @@
-# -*-makefile-*-
-# Configuration for linux-indirect: Builds a libGL capable of indirect
-# rendering, but *NOT* capable of direct rendering.
-
-include $(TOP)/configs/default
-
-CONFIG_NAME = linux-dri
-
-# Compiler and flags
-CC = gcc
-CXX = g++
-
-MKDEP = /usr/X11R6/bin/makedepend
-#MKDEP = gcc -M
-#MKDEP_OPTIONS = -MF depend
-
-WARN_FLAGS = -Wall
-OPT_FLAGS = -O -g
-PIC_FLAGS = -fPIC
-
-# Add '-DGLX_USE_TLS' to ARCH_FLAGS to enable TLS support.
-ARCH_FLAGS ?=
-
-DEFINES = -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE \
- -D_BSD_SOURCE -D_GNU_SOURCE \
- -DPTHREADS -DHAVE_ALIAS
-
-X11_INCLUDES = -I/usr/X11R6/include
-
-CFLAGS = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) \
- $(ASM_FLAGS) -std=c99 -ffast-math
-
-CXXFLAGS = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES)
-
-
-ASM_SOURCES =
-
-# Library/program dependencies
-EXTRA_LIB_PATH=-L/usr/X11R6/lib
-
-DRI_LIB_DEPS = $(EXTRA_LIB_PATH) -lm -lpthread -lexpat -ldl
-GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lm -lpthread -ldl
-
-
-# Directories
-SRC_DIRS = glx/x11 glu glut/glx glw
-DRIVER_DIRS =
-PROGRAM_DIRS =
-WINDOW_SYSTEM=dri
diff --git a/nx-X11/extras/Mesa/configs/linux-osmesa16 b/nx-X11/extras/Mesa/configs/linux-osmesa16
deleted file mode 100644
index 16a3b0bba..000000000
--- a/nx-X11/extras/Mesa/configs/linux-osmesa16
+++ /dev/null
@@ -1,27 +0,0 @@
-# Configuration for 16 bits/channel OSMesa library on Linux
-
-include $(TOP)/configs/default
-
-CONFIG_NAME = linux-osmesa16
-
-# Compiler and flags
-CC = gcc
-CXX = g++
-CFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -I/usr/X11R6/include -DCHAN_BITS=16 -DDEFAULT_SOFTWARE_DEPTH_BITS=31
-CXXFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
-
-
-# Library names
-OSMESA_LIB = OSMesa16
-OSMESA_LIB_NAME = libOSMesa16.so
-
-
-# Directories
-SRC_DIRS = mesa glu
-DRIVER_DIRS = osmesa
-PROGRAM_DIRS =
-
-
-# Dependencies
-OSMESA_LIB_DEPS = -lm -lpthread
-APP_LIB_DEPS = -lOSMesa16
diff --git a/nx-X11/extras/Mesa/configs/linux-osmesa16-static b/nx-X11/extras/Mesa/configs/linux-osmesa16-static
deleted file mode 100644
index 664550447..000000000
--- a/nx-X11/extras/Mesa/configs/linux-osmesa16-static
+++ /dev/null
@@ -1,28 +0,0 @@
-# Configuration for 16 bits/channel OSMesa library on Linux
-
-include $(TOP)/configs/default
-
-CONFIG_NAME = linux-osmesa16-static
-
-# Compiler and flags
-CC = gcc
-CXX = g++
-CFLAGS = -O3 -ansi -pedantic -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -I/usr/X11R6/include -DCHAN_BITS=16 -DDEFAULT_SOFTWARE_DEPTH_BITS=31
-CXXFLAGS = -O3 -ansi -pedantic -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
-MKLIB_OPTIONS = -static
-
-
-# Library names
-OSMESA_LIB = OSMesa16
-OSMESA_LIB_NAME = libOSMesa16.a
-
-
-# Directories
-SRC_DIRS = mesa glu
-DRIVER_DIRS = osmesa
-PROGRAM_DIRS =
-
-
-# Dependencies
-OSMESA_LIB_DEPS = -lm -lpthread
-APP_LIB_DEPS = -lOSMesa16
diff --git a/nx-X11/extras/Mesa/configs/linux-osmesa32 b/nx-X11/extras/Mesa/configs/linux-osmesa32
deleted file mode 100644
index 0ff0a6db9..000000000
--- a/nx-X11/extras/Mesa/configs/linux-osmesa32
+++ /dev/null
@@ -1,27 +0,0 @@
-# Configuration for 32 bits/channel OSMesa library on Linux
-
-include $(TOP)/configs/default
-
-CONFIG_NAME = linux-osmesa32
-
-# Compiler and flags
-CC = gcc
-CXX = g++
-CFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -I/usr/X11R6/include -DCHAN_BITS=32 -DDEFAULT_SOFTWARE_DEPTH_BITS=31
-CXXFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
-
-
-# Library names
-OSMESA_LIB = OSMesa32
-OSMESA_LIB_NAME = libOSMesa32.so
-
-
-# Directories
-SRC_DIRS = mesa glu
-DRIVER_DIRS = osmesa
-PROGRAM_DIRS =
-
-
-# Dependencies
-OSMESA_LIB_DEPS = -lm -lpthread
-APP_LIB_DEPS = -lOSMesa32
diff --git a/nx-X11/extras/Mesa/configs/linux-ppc b/nx-X11/extras/Mesa/configs/linux-ppc
deleted file mode 100644
index 13cfdeb42..000000000
--- a/nx-X11/extras/Mesa/configs/linux-ppc
+++ /dev/null
@@ -1,9 +0,0 @@
-# Configuration for Linux on PPC
-
-include $(TOP)/configs/linux
-
-CONFIG_NAME = linux-ppc
-
-OPT_FLAGS = -O3 -mcpu=603 -fsigned-char -funroll-loops
-
-# FIXME: Use of PowerPC assembly should be enabled here. \ No newline at end of file
diff --git a/nx-X11/extras/Mesa/configs/linux-ppc-static b/nx-X11/extras/Mesa/configs/linux-ppc-static
deleted file mode 100644
index d0e168811..000000000
--- a/nx-X11/extras/Mesa/configs/linux-ppc-static
+++ /dev/null
@@ -1,14 +0,0 @@
-# Configuration for Linux on PPC, static libs
-
-include $(TOP)/configs/linux-ppc
-
-CONFIG_NAME = linux-ppc-static
-
-MKLIB_OPTIONS = -static
-
-# Library names (actual file names)
-GL_LIB_NAME = libGL.a
-GLU_LIB_NAME = libGLU.a
-GLUT_LIB_NAME = libglut.a
-GLW_LIB_NAME = libGLw.a
-OSMESA_LIB_NAME = libOSMesa.a
diff --git a/nx-X11/extras/Mesa/configs/linux-profile b/nx-X11/extras/Mesa/configs/linux-profile
deleted file mode 100644
index b2531f562..000000000
--- a/nx-X11/extras/Mesa/configs/linux-profile
+++ /dev/null
@@ -1,29 +0,0 @@
-# Configuration for profiling on Linux with gprof
-
-include $(TOP)/configs/default
-
-CONFIG_NAME = linux-profile
-
-# Compiler and flags
-CC = gcc
-CXX = g++
-
-CFLAGS = -pg -O -ansi -pedantic -Wall -Wmissing-prototypes -Wundef -fPIC -ffast-math -D_POSIX_SOURCE -D_SVID_SOURCE -D_BSD_SOURCE -I/usr/X11R6/include -DUSE_XSHM -DPTHREADS -DDEBUG -DMESA_DEBUG
-
-CXXFLAGS = -pg -O -ansi -pedantic -Wall -Wundef -fPIC -ffast-math -D_POSIX_SOURCE -D_SVID_SOURCE -D_BSD_SOURCE -DDEBUG -DMESA_DEBUG
-
-GLUT_CFLAGS = -fexceptions
-
-# Need to have -L/usr/X11R6/lib in these:
-GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread
-GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm
-GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -lXt -L/usr/X11R6/lib -lX11
-
-# Need to make static libs for profiling:
-MKLIB_OPTIONS = -static
-GL_LIB_NAME = lib$(GL_LIB).a
-GLU_LIB_NAME = lib$(GLU_LIB).a
-GLUT_LIB_NAME = lib$(GLUT_LIB).a
-GLW_LIB_NAME = lib$(GLW_LIB).a
-OSMESA_LIB_NAME = lib$(OSMesa).a
-APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm -lpthread
diff --git a/nx-X11/extras/Mesa/configs/linux-solo b/nx-X11/extras/Mesa/configs/linux-solo
deleted file mode 100644
index a3deb7c20..000000000
--- a/nx-X11/extras/Mesa/configs/linux-solo
+++ /dev/null
@@ -1,43 +0,0 @@
-# Configuration for linux-solo: Linux DRI hardware drivers for fbdev
-
-include $(TOP)/configs/default
-
-CONFIG_NAME = linux-solo
-
-# Compiler and flags
-CC = gcc
-CXX = g++
-
-WARN_FLAGS = -Wall -Wundef
-OPT_FLAGS = -O3 -g
-PIC_FLAGS = -fPIC
-
-# Add '-DGLX_USE_TLS' to ARCH_FLAGS to enable TLS support.
-ARCH_FLAGS ?=
-
-DEFINES = -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE \
- -D_BSD_SOURCE -D_GNU_SOURCE \
- -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 -DDRM_USE_MALLOC -DIN_DRI_DRIVER
-
-CFLAGS = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) \
- $(ASM_FLAGS) -std=c99 -ffast-math
-
-CXXFLAGS = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES)
-
-
-ASM_SOURCES =
-
-# Library/program dependencies
-DRI_LIB_DEPS = -lm -lpthread -lexpat -ldl -L$(LIB_DIR)
-GL_LIB_DEPS = -lm -lpthread -ldl
-GLU_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -lm
-GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -lm
-APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm -lpthread
-
-# Directories
-SRC_DIRS = glx/mini mesa glu glut/mini
-DRIVER_DIRS = dri
-PROGRAM_DIRS = miniglx
-
-#DRI_DIRS = ffb gamma sis savage
-DRI_DIRS = i810 i830 i915 mach64 mga r128 r200 radeon tdfx unichrome fb
diff --git a/nx-X11/extras/Mesa/configs/linux-solo-ia64 b/nx-X11/extras/Mesa/configs/linux-solo-ia64
deleted file mode 100644
index b2051fac8..000000000
--- a/nx-X11/extras/Mesa/configs/linux-solo-ia64
+++ /dev/null
@@ -1,7 +0,0 @@
-# Configuration for linux-solo-ia64: Linux DRI hardware drivers for fbdev
-
-include $(TOP)/configs/linux-solo
-
-CONFIG_NAME = linux-solo-ia64
-
-DRI_DIRS = fb mach64 mga r128 r200 radeon sis tdfx unichrome
diff --git a/nx-X11/extras/Mesa/configs/linux-solo-x86 b/nx-X11/extras/Mesa/configs/linux-solo-x86
deleted file mode 100644
index b4e79ba2c..000000000
--- a/nx-X11/extras/Mesa/configs/linux-solo-x86
+++ /dev/null
@@ -1,12 +0,0 @@
-# -*-makefile-*-
-# Configuration for linux-solo-x86: Linux hardware drivers for fbdev for x86
-
-include $(TOP)/configs/linux-solo
-
-CONFIG_NAME = linux-solo-x86
-
-# Unnecessary on x86, generally.
-PIC_FLAGS =
-
-ASM_FLAGS = -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM
-ASM_SOURCES = $(X86_SOURCES)
diff --git a/nx-X11/extras/Mesa/configs/linux-sparc b/nx-X11/extras/Mesa/configs/linux-sparc
deleted file mode 100644
index 15e0b6d4b..000000000
--- a/nx-X11/extras/Mesa/configs/linux-sparc
+++ /dev/null
@@ -1,30 +0,0 @@
-# Configuration for Linux on Sparc
-
-include $(TOP)/configs/default
-
-CONFIG_NAME = linux-sparc
-
-# Compiler and flags
-CC = gcc
-CXX = g++
-
-WARN_FLAGS = -Wall
-OPT_FLAGS = -O2
-PIC_FLAGS = -fPIC
-
-DEFINES = -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM
-
-X11_INCLUDES = -I/usr/X11R6/include
-
-CFLAGS = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) \
- $(ASM_FLAGS) -std=c99 -ffast-math
-
-CXXFLAGS = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES)
-
-GLUT_CFLAGS = -fexceptions
-
-EXTRA_LIB_PATH=-L/usr/X11R6/lib
-
-GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lm -lpthread
-GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) $(EXTRA_LIB_PATH) -lX11 -lXmu -lXt -lXi -lm
-GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) $(EXTRA_LIB_PATH) -lXt -lX11
diff --git a/nx-X11/extras/Mesa/configs/linux-sparc5 b/nx-X11/extras/Mesa/configs/linux-sparc5
deleted file mode 100644
index aa9461af7..000000000
--- a/nx-X11/extras/Mesa/configs/linux-sparc5
+++ /dev/null
@@ -1,17 +0,0 @@
-# Configuration for Linux on Sparc5
-
-include $(TOP)/configs/default
-
-CONFIG_NAME = linux-sparc5
-
-# Compiler and flags
-CC = gcc
-CXX = g++
-CFLAGS = -mcpu=ultrasparc -O2 -ffast-math -ansi -pedantic -fPIC -D_SVID_SOURCE -D_BSD_SOURCE -I/usr/X11R6/include -DUSE_XSHM
-CXXFLAGS = -mcpu=ultrasparc -O2 -ffast-math -ansi -pedantic -fPIC -D_SVID_SOURCE -D_BSD_SOURCE
-GLUT_CFLAGS = -fexceptions
-
-GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread
-GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm
-GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -L/usr/X11R6/lib -lXt -lX11
-
diff --git a/nx-X11/extras/Mesa/configs/linux-static b/nx-X11/extras/Mesa/configs/linux-static
deleted file mode 100644
index 0104d3402..000000000
--- a/nx-X11/extras/Mesa/configs/linux-static
+++ /dev/null
@@ -1,21 +0,0 @@
-# Configuration for generic Linux, making static libs
-
-include $(TOP)/configs/linux
-
-CONFIG_NAME = linux-static
-
-MKLIB_OPTIONS = -static
-
-# Library names (actual file names)
-GL_LIB_NAME = libGL.a
-GLU_LIB_NAME = libGLU.a
-GLUT_LIB_NAME = libglut.a
-GLW_LIB_NAME = libGLw.a
-OSMESA_LIB_NAME = libOSMesa.a
-
-# Library/program dependencies (static libs don't have dependencies)
-GL_LIB_DEPS =
-OSMESA_LIB_DEPS =
-GLU_LIB_DEPS =
-GLUT_LIB_DEPS =
-GLW_LIB_DEPS =
diff --git a/nx-X11/extras/Mesa/configs/linux-tcc b/nx-X11/extras/Mesa/configs/linux-tcc
deleted file mode 100644
index 4371fe21f..000000000
--- a/nx-X11/extras/Mesa/configs/linux-tcc
+++ /dev/null
@@ -1,22 +0,0 @@
-# Configuration for debugging on Linux
-
-include $(TOP)/configs/default
-
-CONFIG_NAME = linux-tcc
-
-# Compiler and flags
-CC = gcc
-CXX = g++
-
-TCC_DIR=/home/progs/tcc-0.9.20
-
-CFLAGS = -g -ansi -pedantic -Wall -Wmissing-prototypes -Wundef -fPIC -ffast-math -D_POSIX_SOURCE -D_SVID_SOURCE -D_BSD_SOURCE -I/usr/X11R6/include -DUSE_XSHM -DPTHREADS -DDEBUG -DMESA_DEBUG -DUSE_TCC -I$(TCC_DIR)
-
-CXXFLAGS = -g -ansi -pedantic -Wall -Wundef -fPIC -ffast-math -D_POSIX_SOURCE -D_SVID_SOURCE -D_BSD_SOURCE -DDEBUG -DMESA_DEBUG
-
-GLUT_CFLAGS = -fexceptions
-
-GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread -L$(TCC_DIR) -ltcc -ldl
-GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm
-GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -lXt -L/usr/X11R6/lib -lX11
-APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm
diff --git a/nx-X11/extras/Mesa/configs/linux-ultrasparc b/nx-X11/extras/Mesa/configs/linux-ultrasparc
deleted file mode 100644
index e235b56de..000000000
--- a/nx-X11/extras/Mesa/configs/linux-ultrasparc
+++ /dev/null
@@ -1,17 +0,0 @@
-# Configuration for Linux on UltraSparc
-
-include $(TOP)/configs/default
-
-CONFIG_NAME = linux-ultrasparc
-
-# Compiler and flags
-CC = gcc
-CXX = g++
-CFLAGS = -mv8 -O2 -mtune=ultrasparc -ansi -pedantic -fPIC -D_SVID_SOURCE -D_BSD_SOURCE -I/usr/X11R6/include -DUSE_XSHM
-CXXFLAGS = -mv8 -O2 -mtune=ultrasparc -ansi -pedantic -fPIC -D_SVID_SOURCE -D_BSD_SOURCE
-GLUT_CFLAGS = -fexceptions
-
-GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread
-GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm
-GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -L/usr/X11R6/lib -lXt -lX11
-APP_LIB_DEPS = -L$(LIB_DIR)-l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm
diff --git a/nx-X11/extras/Mesa/configs/linux-x86 b/nx-X11/extras/Mesa/configs/linux-x86
deleted file mode 100644
index b239653e6..000000000
--- a/nx-X11/extras/Mesa/configs/linux-x86
+++ /dev/null
@@ -1,8 +0,0 @@
-# Configuration for Linux with x86 optimizations
-
-include $(TOP)/configs/linux
-
-CONFIG_NAME = linux-x86
-
-ASM_FLAGS = -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM
-ASM_SOURCES = $(X86_SOURCES) $(X86_API)
diff --git a/nx-X11/extras/Mesa/configs/linux-x86-32 b/nx-X11/extras/Mesa/configs/linux-x86-32
deleted file mode 100644
index f18ce7a45..000000000
--- a/nx-X11/extras/Mesa/configs/linux-x86-32
+++ /dev/null
@@ -1,7 +0,0 @@
-# To build Linux x86 32-bit in an x86-64 environment
-
-include $(TOP)/configs/linux-x86
-
-CONFIG_NAME = linux-x86-32
-
-ARCH_FLAGS += -m32
diff --git a/nx-X11/extras/Mesa/configs/linux-x86-64 b/nx-X11/extras/Mesa/configs/linux-x86-64
deleted file mode 100644
index f8ff5489f..000000000
--- a/nx-X11/extras/Mesa/configs/linux-x86-64
+++ /dev/null
@@ -1,13 +0,0 @@
-# Configuration for Linux for 64-bit X86 (Opteron)
-
-include $(TOP)/configs/linux
-
-CONFIG_NAME = linux-x86-64
-
-ARCH_FLAGS = -m64
-
-ASM_SOURCES = $(X86-64_SOURCES) $(X86-64_API)
-ASM_FLAGS = -DUSE_X86_64_ASM
-
-LIB_DIR = $(TOP)/lib64
-EXTRA_LIB_PATH = -L/usr/X11R6/lib64
diff --git a/nx-X11/extras/Mesa/configs/linux-x86-64-debug b/nx-X11/extras/Mesa/configs/linux-x86-64-debug
deleted file mode 100644
index bbdaec801..000000000
--- a/nx-X11/extras/Mesa/configs/linux-x86-64-debug
+++ /dev/null
@@ -1,7 +0,0 @@
-# Configuration for Linux for 64-bit X86 (Opteron)
-
-include $(TOP)/configs/linux-x86-64
-
-CONFIG_NAME = linux-x86-64-debug
-
-DEFINES += -DDEBUG -DMESA_DEBUG -DRUN_DEBUG_BENCHMARK
diff --git a/nx-X11/extras/Mesa/configs/linux-x86-64-static b/nx-X11/extras/Mesa/configs/linux-x86-64-static
deleted file mode 100644
index 05f21d87a..000000000
--- a/nx-X11/extras/Mesa/configs/linux-x86-64-static
+++ /dev/null
@@ -1,21 +0,0 @@
-# Configuration for Linux for 64-bit X86 (Opteron), static libs
-
-include $(TOP)/configs/linux-x86-64
-
-CONFIG_NAME = linux-x86-64-static
-
-MKLIB_OPTIONS = -static
-
-# Library names (actual file names)
-GL_LIB_NAME = libGL.a
-GLU_LIB_NAME = libGLU.a
-GLUT_LIB_NAME = libglut.a
-GLW_LIB_NAME = libGLw.a
-OSMESA_LIB_NAME = libOSMesa.a
-
-# Library/program dependencies (static libs don't have dependencies)
-GL_LIB_DEPS =
-OSMESA_LIB_DEPS =
-GLU_LIB_DEPS =
-GLUT_LIB_DEPS =
-GLW_LIB_DEPS =
diff --git a/nx-X11/extras/Mesa/configs/linux-x86-debug b/nx-X11/extras/Mesa/configs/linux-x86-debug
deleted file mode 100644
index dbb970300..000000000
--- a/nx-X11/extras/Mesa/configs/linux-x86-debug
+++ /dev/null
@@ -1,9 +0,0 @@
-# Configuration for Linux with x86 code, but no gcc optimizations and
-# debugging enabled.
-
-include $(TOP)/configs/linux-x86
-
-CONFIG_NAME = linux-x86-debug
-
-OPT_FLAGS = -g
-DEFINES += -DDEBUG -DMESA_DEBUG -DRUN_DEBUG_BENCHMARK
diff --git a/nx-X11/extras/Mesa/configs/linux-x86-glide b/nx-X11/extras/Mesa/configs/linux-x86-glide
deleted file mode 100644
index b874b923f..000000000
--- a/nx-X11/extras/Mesa/configs/linux-x86-glide
+++ /dev/null
@@ -1,24 +0,0 @@
-# Configuration for Linux with 3Dfx Glide driver and x86 optimizations
-
-include $(TOP)/configs/default
-
-CONFIG_NAME = linux-x86-glide
-
-# Compiler and flags
-CC = gcc
-CXX = g++
-
-CFLAGS = -Wall -O3 -ansi -pedantic -fPIC -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM -DPTHREADS -I/usr/X11R6/include -DFX -I/usr/include/glide -I/usr/local/glide/include
-
-CXXFLAGS = -Wall -O3 -ansi -pedantic -fPIC -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
-
-GLUT_CFLAGS = -fexceptions
-
-
-ASM_SOURCES = $(X86_SOURCES) $(X86_API)
-
-# Library/program dependencies
-GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -L/usr/local/glide/lib -lglide3x -lm -lpthread
-GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm
-GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -L/usr/X11R6/lib -lXt -lX11
-APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/local/glide/lib -lglide3x -lm
diff --git a/nx-X11/extras/Mesa/configs/linux-x86-static b/nx-X11/extras/Mesa/configs/linux-x86-static
deleted file mode 100644
index d4ccfca80..000000000
--- a/nx-X11/extras/Mesa/configs/linux-x86-static
+++ /dev/null
@@ -1,21 +0,0 @@
-# Configuration for Linux with x86 optimizations, static libs
-
-include $(TOP)/configs/linux-x86
-
-CONFIG_NAME = linux-x86-static
-
-MKLIB_OPTIONS = -static
-
-# Library names (actual file names)
-GL_LIB_NAME = libGL.a
-GLU_LIB_NAME = libGLU.a
-GLUT_LIB_NAME = libglut.a
-GLW_LIB_NAME = libGLw.a
-OSMESA_LIB_NAME = libOSMesa.a
-
-# Library/program dependencies (static libs don't have dependencies)
-GL_LIB_DEPS =
-OSMESA_LIB_DEPS =
-GLU_LIB_DEPS =
-GLUT_LIB_DEPS =
-GLW_LIB_DEPS =
diff --git a/nx-X11/extras/Mesa/configs/linux-x86-xcb b/nx-X11/extras/Mesa/configs/linux-x86-xcb
deleted file mode 100644
index 7c5074c30..000000000
--- a/nx-X11/extras/Mesa/configs/linux-x86-xcb
+++ /dev/null
@@ -1,24 +0,0 @@
-# Configuration for Linux with x86 optimizations
-
-include $(TOP)/configs/default
-
-CONFIG_NAME = linux-x86-xcb
-
-# Compiler and flags
-CC = gcc
-CXX = g++
-
-CFLAGS = -Wall -O3 -ansi -pedantic -fPIC -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM -DPTHREADS -DUSE_XCB -I/usr/X11R6/include
-
-CXXFLAGS = -Wall -O3 -ansi -pedantic -fPIC -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XCB
-
-GLUT_CFLAGS = -fexceptions
-
-
-ASM_SOURCES = $(X86_SOURCES) $(X86_API)
-
-# Library/program dependencies
-GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread -lXCB
-GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm
-GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -L/usr/X11R6/lib -lXt -lX11
-APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm
diff --git a/nx-X11/extras/Mesa/configs/netbsd b/nx-X11/extras/Mesa/configs/netbsd
deleted file mode 100644
index 104daae0d..000000000
--- a/nx-X11/extras/Mesa/configs/netbsd
+++ /dev/null
@@ -1,14 +0,0 @@
-# Configuration for NetBSD
-
-include $(TOP)/configs/default
-
-CONFIG_NAME = netbsd
-
-# Compiler and flags
-CC = gcc
-CXX = g++
-CFLAGS = -O2 -fPIC -DUSE_XSHM -I/usr/X11R6/include -DHZ=100
-CXXFLAGS = -O2 -fPIC
-GLUT_CFLAGS = -fexceptions
-APP_LIB_DEPS = -L$(LIB_DIR) -L/usr/X11R6/lib -lXext -lXmu -lXi -lX11 -lm
-
diff --git a/nx-X11/extras/Mesa/configs/openbsd b/nx-X11/extras/Mesa/configs/openbsd
deleted file mode 100644
index f769259a3..000000000
--- a/nx-X11/extras/Mesa/configs/openbsd
+++ /dev/null
@@ -1,18 +0,0 @@
-# Configuration for OpenBSD
-
-include $(TOP)/configs/default
-
-CONFIG_NAME = openbsd
-
-# Compiler and flags
-CC = gcc
-CXX = g++
-CFLAGS = -O2 -fPIC -I/usr/X11R6/include -DUSE_XSHM -DHZ=100
-CXXFLAGS = -O2 -fPIC -I/usr/X11R6/include -DHZ=100
-
-GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm
-OSMESA_LIB_DEPS = -lm
-GLU_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB)
-GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lm
-APP_LIB_DEPS = -L$(LIB_DIR) -L/usr/X11R6/lib -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm
-
diff --git a/nx-X11/extras/Mesa/configs/osf1 b/nx-X11/extras/Mesa/configs/osf1
deleted file mode 100644
index bc88c2042..000000000
--- a/nx-X11/extras/Mesa/configs/osf1
+++ /dev/null
@@ -1,16 +0,0 @@
-# Configuration for OSF/1
-
-include $(TOP)/configs/default
-
-CONFIG_NAME = osf1
-
-# Compiler and flags
-CC = cc
-CXX = cxx
-CFLAGS = -O0 -std1 -ieee_with_no_inexact -DUSE_XSHM
-CXXFLAGS = -O2 -std ansi -ieee
-
-GL_LIB_DEPS = -lX11 -lXext -lm -lpthread
-GLU_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -lm
-GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXmu -lXt -lXi -lm
-APP_LIB_DEPS = -L$(LIB_DIR) -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXext -lXmu -lXi -lm
diff --git a/nx-X11/extras/Mesa/configs/solaris-x86 b/nx-X11/extras/Mesa/configs/solaris-x86
deleted file mode 100644
index 7a04417f0..000000000
--- a/nx-X11/extras/Mesa/configs/solaris-x86
+++ /dev/null
@@ -1,18 +0,0 @@
-# Configuration for Solaris on x86
-
-include $(TOP)/configs/default
-
-CONFIG_NAME = solaris-x86
-
-# Compiler and flags
-CC = cc
-CFLAGS = -Xa -xO3 -xpentium -KPIC -I/usr/openwin/include -DUSE_XSHM
-MKLIB_OPTIONS = -static
-
-APP_LIB_DEPS = -L$(LIB_DIR) -L/usr/openwin/lib -R/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lm -lglut -lGLU -lGL
-
-GL_LIB_NAME = libGL.a
-GLU_LIB_NAME = libGLU.a
-GLUT_LIB_NAME = libglut.a
-GLW_LIB_NAME = libGLw.a
-OSMESA_LIB_NAME = libOSMesa.a
diff --git a/nx-X11/extras/Mesa/configs/solaris-x86-gcc b/nx-X11/extras/Mesa/configs/solaris-x86-gcc
deleted file mode 100644
index 01f3d86d1..000000000
--- a/nx-X11/extras/Mesa/configs/solaris-x86-gcc
+++ /dev/null
@@ -1,24 +0,0 @@
-# Configuration for Solaris on x86 with gcc, static libs
-
-include $(TOP)/configs/default
-
-CONFIG_NAME = solaris-x86-gcc
-
-# Compiler and flags
-CC = gcc
-CXX = g++
-CFLAGS = -O3 -m486 -fPIC -I/usr/openwin/include -DUSE_XSHM
-CXXFLAGS = -O3 -m486 -fPIC
-GLUT_CFLAGS = -fexceptions
-MKLIB_OPTIONS = -static
-
-GL_LIB_DEPS = -L/usr/openwin/lib -lX11 -lXext -lm -lpthread
-GLU_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -lm
-GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/openwin/lib -lX11 -lXmu -lXt -lXi -lm
-APP_LIB_DEPS = -L$(LIB_DIR) -L/usr/openwin/lib -R/usr/openwin/lib -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm
-
-GL_LIB_NAME = libGL.a
-GLU_LIB_NAME = libGLU.a
-GLUT_LIB_NAME = libglut.a
-GLW_LIB_NAME = libGLw.a
-OSMESA_LIB_NAME = libOSMesa.a
diff --git a/nx-X11/extras/Mesa/configs/sunos4 b/nx-X11/extras/Mesa/configs/sunos4
deleted file mode 100644
index 483b9aa73..000000000
--- a/nx-X11/extras/Mesa/configs/sunos4
+++ /dev/null
@@ -1,12 +0,0 @@
-# Configuration for SunOS 4, shared libs
-
-include $(TOP)/configs/default
-
-CONFIG_NAME = sunos4
-
-# Compiler and flags
-CC = acc
-CFLAGS = -Kpic -O -I/usr/include/X11R5 -DUSE_XSHM -DSUNOS4
-APP_LIB_DEPS = -L$(LIB_DIR) -L/usr/lib/X11R5 -lX11 -lXext -lXmu -lXi -lm
-
-
diff --git a/nx-X11/extras/Mesa/configs/sunos4-gcc b/nx-X11/extras/Mesa/configs/sunos4-gcc
deleted file mode 100644
index 8fb1414fa..000000000
--- a/nx-X11/extras/Mesa/configs/sunos4-gcc
+++ /dev/null
@@ -1,15 +0,0 @@
-# Configuration for SunOS 4, with gcc, shared libs
-
-include $(TOP)/configs/default
-
-CONFIG_NAME = sunos4-gcc
-
-# Compiler and flags
-CC = gcc
-CXX = g++
-CFLAGS = -fPIC -O3 -I/usr/openwin/include -I/usr/include/X11R5 -I/usr/include/X11R5 -DUSE_XSHM -DSUNOS4
-CXXFLAGS = -fPIC -O3 -I/usr/openwin/include -DSUNOS4
-GLUT_CFLAGS = -fexceptions -DSOLARIS_2_4_BUG
-
-APP_LIB_DEPS = -L$(LIB_DIR) -L/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lm
-
diff --git a/nx-X11/extras/Mesa/configs/sunos4-static b/nx-X11/extras/Mesa/configs/sunos4-static
deleted file mode 100644
index 3e510e751..000000000
--- a/nx-X11/extras/Mesa/configs/sunos4-static
+++ /dev/null
@@ -1,25 +0,0 @@
-# Configuration for SunOS 4, static libs
-
-include $(TOP)/configs/default
-
-CONFIG_NAME = sunos4-static
-
-# Compiler and flags
-CC = acc
-CFLAGS = -O -DUSE_XSHM -DSUNOS4
-MKLIB_OPTIONS = -static
-
-# Library names (actual file names)
-GL_LIB_NAME = libGL.a
-GLU_LIB_NAME = libGLU.a
-GLUT_LIB_NAME = libglut.a
-GLW_LIB_NAME = libGLw.a
-OSMESA_LIB_NAME = libOSMesa.a
-
-# Library/program dependencies (static libs don't have dependencies)
-GL_LIB_DEPS =
-OSMESA_LIB_DEPS =
-GLU_LIB_DEPS =
-GLUT_LIB_DEPS =
-GLW_LIB_DEPS =
-APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXext -lXmu -lXt -lXi -lpthread -lm
diff --git a/nx-X11/extras/Mesa/configs/sunos5 b/nx-X11/extras/Mesa/configs/sunos5
deleted file mode 100644
index 9347fb842..000000000
--- a/nx-X11/extras/Mesa/configs/sunos5
+++ /dev/null
@@ -1,18 +0,0 @@
-# Configuration for SunOS 5
-
-include $(TOP)/configs/default
-
-CONFIG_NAME = sunos5
-
-# Compiler and flags
-CC = cc
-CXX = c++
-CFLAGS = -KPIC -Xa -O -I/usr/openwin/include -I/usr/dt/include -DUSE_XSHM
-CXXFLAGS = -KPIC -Xa -O -I/usr/openwin/include -I/usr/dt/include
-GLUT_CFLAGS = -DSOLARIS_2_4_BUG
-
-GL_LIB_DEPS = -L/usr/openwin/lib -L/usr/dt/lib -lX11 -lXext -lXmu -lXi -lm
-GLU_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -lm
-GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -lm
-GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -L/usr/openwin/lib -lXt -lX11
-APP_LIB_DEPS = -L$(LIB_DIR) -lCrun -lX11 -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm
diff --git a/nx-X11/extras/Mesa/configs/sunos5-gcc b/nx-X11/extras/Mesa/configs/sunos5-gcc
deleted file mode 100644
index 7917c9b00..000000000
--- a/nx-X11/extras/Mesa/configs/sunos5-gcc
+++ /dev/null
@@ -1,35 +0,0 @@
-# Configuration for SunOS 5, with gcc
-
-include $(TOP)/configs/default
-
-CONFIG_NAME = sunos5-gcc
-
-# Compiler and flags
-CC = gcc
-CXX = g++
-
-WARN_FLAGS = -Wall
-OPT_FLAGS = -O3 -g -fomit-frame-pointer -pipe
-PIC_FLAGS = -fPIC
-
-ARCH_FLAGS ?=
-
-DEFINES = -D_REENTRANT -DUSE_XSHM
-
-ASM_SOURCES = $(SPARC_SOURCES) $(SPARC_API)
-ASM_FLAGS = -DUSE_SPARC_ASM
-
-CFLAGS = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) \
- $(ASM_FLAGS) -std=c99 -ffast-math -I/usr/openwin/include
-
-CXXFLAGS = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) \
- -I/usr/openwin/include
-
-GLUT_CFLAGS = -fexceptions -DSOLARIS_2_4_BUG
-
-# Library/program dependencies
-EXTRA_LIB_PATH=-L/usr/openwin/lib
-
-GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lXmu -lXi -lm
-GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -lm
-APP_LIB_DEPS = -L$(LIB_DIR) -lX11 -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm
diff --git a/nx-X11/extras/Mesa/configs/sunos5-smp b/nx-X11/extras/Mesa/configs/sunos5-smp
deleted file mode 100644
index 633bced68..000000000
--- a/nx-X11/extras/Mesa/configs/sunos5-smp
+++ /dev/null
@@ -1,19 +0,0 @@
-# Configuration for SunOS 5, SMP systems
-
-include $(TOP)/configs/default
-
-CONFIG_NAME = sunos5-smp
-
-# Compiler and flags
-CC = cc
-CXX = c++
-CFLAGS = -KPIC -Xa -native -fast -xO5 -xlibmil -xsafe=mem -xdepend -I/usr/openwin/include -I/usr/dt/include -DUSE_XSHM -DSOLARIS_2_4_BUG
-CXXFLAGS = -KPIC -Xa -native -fast -xO5 -xlibmil -xsafe=mem -xdepend -I/usr/openwin/include -I/usr/dt/include
-GLUT_CFLAGS = -DSOLARIS_2_4_BUG
-
-GL_LIB_DEPS = -L/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lm
-GLU_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -lm
-GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -lm
-GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -L/usr/openwin/lib -lXt -lX11
-APP_LIB_DEPS = -L$(LIB_DIR) -lX11 -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm -lCrun
-
diff --git a/nx-X11/extras/Mesa/configs/ultrix-gcc b/nx-X11/extras/Mesa/configs/ultrix-gcc
deleted file mode 100644
index c65e27582..000000000
--- a/nx-X11/extras/Mesa/configs/ultrix-gcc
+++ /dev/null
@@ -1,21 +0,0 @@
-# Configuration for Ultrix, with gcc
-
-include $(TOP)/configs/default
-
-CONFIG_NAME = ultrix-gcc
-
-# Compiler and flags
-CC = gcc
-CXX = g++
-CFLAGS = -pedantic -O2
-CXXFLAGS = -pedantic -O2
-GLUT_CFLAGS = -fexceptions
-MKLIB_OPTIONS = -static
-
-GL_LIB_NAME = libGL.a
-GLU_LIB_NAME = libGLU.a
-GLUT_LIB_NAME = libglut.a
-GLW_LIB_NAME = libGLw.a
-OSMESA_LIB_NAME = libOSMesa.a
-
-APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lXmu -lX11 -lXi -lm