aboutsummaryrefslogtreecommitdiff
path: root/mesalib/configs
diff options
context:
space:
mode:
Diffstat (limited to 'mesalib/configs')
-rw-r--r--mesalib/configs/aix27
-rw-r--r--mesalib/configs/aix-6424
-rw-r--r--mesalib/configs/aix-64-static21
-rw-r--r--mesalib/configs/aix-gcc21
-rw-r--r--mesalib/configs/aix-static20
-rw-r--r--mesalib/configs/autoconf.in1
-rw-r--r--mesalib/configs/bluegene-osmesa31
-rw-r--r--mesalib/configs/bluegene-xlc-osmesa27
-rw-r--r--mesalib/configs/catamount-osmesa-pgi30
-rw-r--r--mesalib/configs/darwin61
-rw-r--r--mesalib/configs/darwin-fat-32bit7
-rw-r--r--mesalib/configs/darwin-fat-all7
-rw-r--r--mesalib/configs/darwin-fat-intel7
-rw-r--r--mesalib/configs/default13
-rw-r--r--mesalib/configs/freebsd29
-rw-r--r--mesalib/configs/freebsd-dri48
-rw-r--r--mesalib/configs/freebsd-dri-amd6410
-rw-r--r--mesalib/configs/freebsd-dri-x8613
-rw-r--r--mesalib/configs/hpux1013
-rw-r--r--mesalib/configs/hpux10-gcc18
-rw-r--r--mesalib/configs/hpux10-static26
-rw-r--r--mesalib/configs/hpux11-3227
-rw-r--r--mesalib/configs/hpux11-32-static25
-rw-r--r--mesalib/configs/hpux11-32-static-nothreads24
-rw-r--r--mesalib/configs/hpux11-6428
-rw-r--r--mesalib/configs/hpux11-64-static25
-rw-r--r--mesalib/configs/hpux11-ia6428
-rw-r--r--mesalib/configs/hpux11-ia64-static25
-rw-r--r--mesalib/configs/hpux915
-rw-r--r--mesalib/configs/hpux9-gcc13
-rw-r--r--mesalib/configs/irix6-6416
-rw-r--r--mesalib/configs/irix6-64-static24
-rw-r--r--mesalib/configs/irix6-n3216
-rw-r--r--mesalib/configs/irix6-n32-static23
-rw-r--r--mesalib/configs/irix6-o3217
-rw-r--r--mesalib/configs/irix6-o32-static23
-rw-r--r--mesalib/configs/linux37
-rw-r--r--mesalib/configs/linux-alpha19
-rw-r--r--mesalib/configs/linux-alpha-static27
-rw-r--r--mesalib/configs/linux-debug9
-rw-r--r--mesalib/configs/linux-dri72
-rw-r--r--mesalib/configs/linux-dri-debug8
-rw-r--r--mesalib/configs/linux-dri-ppc9
-rw-r--r--mesalib/configs/linux-dri-x8613
-rw-r--r--mesalib/configs/linux-dri-x86-6417
-rw-r--r--mesalib/configs/linux-dri-xcb54
-rw-r--r--mesalib/configs/linux-egl58
-rw-r--r--mesalib/configs/linux-ia64-icc18
-rw-r--r--mesalib/configs/linux-ia64-icc-static23
-rw-r--r--mesalib/configs/linux-icc19
-rw-r--r--mesalib/configs/linux-icc-static23
-rw-r--r--mesalib/configs/linux-indirect52
-rw-r--r--mesalib/configs/linux-llvm47
-rw-r--r--mesalib/configs/linux-llvm-debug12
-rw-r--r--mesalib/configs/linux-opengl-es27
-rw-r--r--mesalib/configs/linux-osmesa26
-rw-r--r--mesalib/configs/linux-osmesa-static32
-rw-r--r--mesalib/configs/linux-osmesa1629
-rw-r--r--mesalib/configs/linux-osmesa16-static30
-rw-r--r--mesalib/configs/linux-osmesa3229
-rw-r--r--mesalib/configs/linux-ppc9
-rw-r--r--mesalib/configs/linux-ppc-static14
-rw-r--r--mesalib/configs/linux-profile8
-rw-r--r--mesalib/configs/linux-sparc9
-rw-r--r--mesalib/configs/linux-sparc57
-rw-r--r--mesalib/configs/linux-static23
-rw-r--r--mesalib/configs/linux-ultrasparc7
-rw-r--r--mesalib/configs/linux-x8611
-rw-r--r--mesalib/configs/linux-x86-327
-rw-r--r--mesalib/configs/linux-x86-6414
-rw-r--r--mesalib/configs/linux-x86-64-debug8
-rw-r--r--mesalib/configs/linux-x86-64-profile8
-rw-r--r--mesalib/configs/linux-x86-64-static21
-rw-r--r--mesalib/configs/linux-x86-debug9
-rw-r--r--mesalib/configs/linux-x86-profile8
-rw-r--r--mesalib/configs/linux-x86-static21
-rw-r--r--mesalib/configs/netbsd15
-rw-r--r--mesalib/configs/openbsd20
-rw-r--r--mesalib/configs/osf114
-rw-r--r--mesalib/configs/osf1-static15
-rw-r--r--mesalib/configs/solaris-x8616
-rw-r--r--mesalib/configs/solaris-x86-gcc18
-rw-r--r--mesalib/configs/solaris-x86-gcc-static24
-rw-r--r--mesalib/configs/sunos411
-rw-r--r--mesalib/configs/sunos4-gcc17
-rw-r--r--mesalib/configs/sunos4-static22
-rw-r--r--mesalib/configs/sunos515
-rw-r--r--mesalib/configs/sunos5-64-gcc11
-rw-r--r--mesalib/configs/sunos5-gcc37
-rw-r--r--mesalib/configs/sunos5-smp16
-rw-r--r--mesalib/configs/sunos5-v815
-rw-r--r--mesalib/configs/sunos5-v8-static14
-rw-r--r--mesalib/configs/sunos5-v920
-rw-r--r--mesalib/configs/sunos5-v9-cc-g++32
-rw-r--r--mesalib/configs/sunos5-v9-static16
-rw-r--r--mesalib/configs/ultrix-gcc22
96 files changed, 13 insertions, 2014 deletions
diff --git a/mesalib/configs/aix b/mesalib/configs/aix
deleted file mode 100644
index e5153b060..000000000
--- a/mesalib/configs/aix
+++ /dev/null
@@ -1,27 +0,0 @@
-# Configuration for AIX, dynamic libs
-
-include $(TOP)/configs/default
-
-CONFIG_NAME = aix
-
-# Compiler and flags
-CC = cc
-CXX = xlC
-
-CFLAGS = -O -DAIXV3 -DPTHREADS
-CXXFLAGS = -O -DAIXV3 -DPTHREADS
-
-# Misc tools and flags
-MKLIB_OPTIONS =
-
-# Library names (actual file names)
-GL_LIB_NAME = libGL.a
-GLU_LIB_NAME = libGLU.a
-GLW_LIB_NAME = libGLw.a
-OSMESA_LIB_NAME = libOSMesa.a
-
-GL_LIB_DEPS = -lX11 -lXext -lpthread -lm
-GLU_LIB_DEPS = -L$(TOP)/lib -l$(GL_LIB) -lm -lC
-GLW_LIB_DEPS = -L$(TOP)/lib -l$(GL_LIB) -lXm -lXt -lX11
-OSMESA_LIB_DEPS = -L$(TOP)/lib -l$(GL_LIB)
-
diff --git a/mesalib/configs/aix-64 b/mesalib/configs/aix-64
deleted file mode 100644
index faa104cbf..000000000
--- a/mesalib/configs/aix-64
+++ /dev/null
@@ -1,24 +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 -DPTHREADS
-CXXFLAGS = -q64 -qmaxmem=16384 -O -DAIXV3 -DPTHREADS
-LIB_DIR = lib64
-
-# Library names (actual file names)
-GL_LIB_NAME = libGL.a
-GLU_LIB_NAME = libGLU.a
-GLW_LIB_NAME = libGLw.a
-OSMESA_LIB_NAME = libOSMesa.a
-
-GL_LIB_DEPS = -lX11 -lXext -lm -lpthread
-GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lm -lC
-GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lXm -lXt -lX11
-
diff --git a/mesalib/configs/aix-64-static b/mesalib/configs/aix-64-static
deleted file mode 100644
index de92daf00..000000000
--- a/mesalib/configs/aix-64-static
+++ /dev/null
@@ -1,21 +0,0 @@
-# Configuration for AIX, static libs
-
-include $(TOP)/configs/default
-
-CONFIG_NAME = aix-64-static
-
-# Compiler and flags
-CC = cc
-CXX = xlC
-
-CFLAGS = -q64 -O -DAIXV3 -DPTHREADS
-CXXFLAGS = -q64 -O -DAIXV3 -DPTHREADS
-MKLIB_OPTIONS = -static
-LIB_DIR = lib64
-
-# Library names (actual file names)
-GL_LIB_NAME = libGL.a
-GLU_LIB_NAME = libGLU.a
-GLW_LIB_NAME = libGLw.a
-OSMESA_LIB_NAME = libOSMesa.a
-
diff --git a/mesalib/configs/aix-gcc b/mesalib/configs/aix-gcc
deleted file mode 100644
index f3fd6c918..000000000
--- a/mesalib/configs/aix-gcc
+++ /dev/null
@@ -1,21 +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
-
-# Work around aliasing bugs - developers should comment this out
-CFLAGS += -fno-strict-aliasing
-CXXFLAGS += -fno-strict-aliasing
-
-MKLIB_OPTIONS = -arch aix-gcc
-GL_LIB_DEPS = -lX11 -lXext -lm
-GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lm
-
diff --git a/mesalib/configs/aix-static b/mesalib/configs/aix-static
deleted file mode 100644
index 5c36cb053..000000000
--- a/mesalib/configs/aix-static
+++ /dev/null
@@ -1,20 +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 -DPTHREADS
-CXXFLAGS = -O -DAIXV3 -DPTHREADS
-MKLIB_OPTIONS = -static
-
-# Library names (actual file names)
-GL_LIB_NAME = libGL.a
-GLU_LIB_NAME = libGLU.a
-GLW_LIB_NAME = libGLw.a
-OSMESA_LIB_NAME = libOSMesa.a
-
diff --git a/mesalib/configs/autoconf.in b/mesalib/configs/autoconf.in
index ce02ae6eb..48f4504a2 100644
--- a/mesalib/configs/autoconf.in
+++ b/mesalib/configs/autoconf.in
@@ -125,7 +125,6 @@ GALLIUM_DRIVERS = $(foreach DIR,$(GALLIUM_DRIVERS_DIRS),$(TOP)/src/gallium/drive
# Driver specific build vars
DRI_DIRS = @DRI_DIRS@
-DRICORE_GLSL_LIBS = @DRICORE_GLSL_LIBS@
DRICORE_LIBS = @DRICORE_LIBS@
DRICORE_LIB_DEPS = @DRICORE_LIB_DEPS@
EGL_PLATFORMS = @EGL_PLATFORMS@
diff --git a/mesalib/configs/bluegene-osmesa b/mesalib/configs/bluegene-osmesa
deleted file mode 100644
index 3fa0a0483..000000000
--- a/mesalib/configs/bluegene-osmesa
+++ /dev/null
@@ -1,31 +0,0 @@
-# Configuration for building only libOSMesa on BlueGene, no Xlib driver
-# This doesn't really have a lot of dependencies, so it should be usable
-# on other (gcc-based) systems too.
-# It uses static linking and disables multithreading.
-
-include $(TOP)/configs/default
-
-CONFIG_NAME = bluegene-osmesa
-
-# Compiler and flags
-CC = /bgl/BlueLight/ppcfloor/blrts-gnu/bin/powerpc-bgl-blrts-gnu-gcc
-CXX = /bgl/BlueLight/ppcfloor/blrts-gnu/bin/powerpc-bgl-blrts-gnu-g++
-CFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
-CXXFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURC
-
-# Work around aliasing bugs - developers should comment this out
-CFLAGS += -fno-strict-aliasing
-CXXFLAGS += -fno-strict-aliasing
-
-MKLIB_OPTIONS = -static
-
-OSMESA_LIB_NAME = libOSMesa.a
-
-# Directories
-SRC_DIRS = mesa glu
-DRIVER_DIRS = osmesa
-
-
-# Dependencies
-OSMESA_LIB_DEPS = -lm
-GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(OSMESA_LIB)
diff --git a/mesalib/configs/bluegene-xlc-osmesa b/mesalib/configs/bluegene-xlc-osmesa
deleted file mode 100644
index 262b9734e..000000000
--- a/mesalib/configs/bluegene-xlc-osmesa
+++ /dev/null
@@ -1,27 +0,0 @@
-# Configuration for building only libOSMesa on BlueGene using the IBM xlc compiler
-# This doesn't really have a lot of dependencies, so it should be usable
-# on similar systems too.
-# It uses static linking and disables multithreading.
-
-include $(TOP)/configs/default
-
-CONFIG_NAME = bluegene-osmesa
-
-# Compiler and flags
-CC = /opt/ibmcmp/vacpp/bg/8.0/bin/blrts_xlc
-CXX = /opt/ibmcmp/vacpp/bg/8.0/bin/blrts_xlC
-CFLAGS = -O3 -pedantic -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
-CXXFLAGS = -O3 -pedantic -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
-
-MKLIB_OPTIONS = -static
-
-OSMESA_LIB_NAME = libOSMesa.a
-
-# Directories
-SRC_DIRS = mesa glu
-DRIVER_DIRS = osmesa
-
-
-# Dependencies
-OSMESA_LIB_DEPS = -lm
-GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(OSMESA_LIB)
diff --git a/mesalib/configs/catamount-osmesa-pgi b/mesalib/configs/catamount-osmesa-pgi
deleted file mode 100644
index d660de3f8..000000000
--- a/mesalib/configs/catamount-osmesa-pgi
+++ /dev/null
@@ -1,30 +0,0 @@
-# Configuration for building only libOSMesa on Cray Xt3
-# for the compute nodes running Catamount using the
-# Portland Group compiler. The Portland Group toolchain has to be
-# enabled before using "module switch PrgEnv-gnu PrgEnv-pgi" .
-# This doesn't really have a lot of dependencies, so it should be usable
-# on other similar systems too.
-# It uses static linking and disables multithreading.
-
-include $(TOP)/configs/default
-
-CONFIG_NAME = catamount-osmesa-pgi
-
-# Compiler and flags
-CC = cc
-CXX = CC
-CFLAGS = -target=catamount -fastsse -O3 -Mnontemporal -Mprefetch=distance:8,nta -fPIC -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
-CXXFLAGS = -target=catamount -fastsse -O3 -Mnontemporal -Mprefetch=distance:8,nta -fPIC -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
-
-MKLIB_OPTIONS = -static
-
-OSMESA_LIB_NAME = libOSMesa.a
-
-# Directories
-SRC_DIRS = mesa glu
-DRIVER_DIRS = osmesa
-
-
-# Dependencies
-OSMESA_LIB_DEPS = -lm
-GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(OSMESA_LIB)
diff --git a/mesalib/configs/darwin b/mesalib/configs/darwin
deleted file mode 100644
index 12e6e3a06..000000000
--- a/mesalib/configs/darwin
+++ /dev/null
@@ -1,61 +0,0 @@
-# Configuration for Darwin / MacOS X, making dynamic libs
-
-include $(TOP)/configs/default
-
-CONFIG_NAME = darwin
-
-INSTALL_DIR = /usr/X11
-
-X11_DIR = $(INSTALL_DIR)
-
-# Compiler and flags
-CC = $(shell xcrun -find cc)
-CXX = $(shell xcrun -find c++)
-PIC_FLAGS = -fPIC
-DEFINES = -D_DARWIN_C_SOURCE -DPTHREADS -D_GNU_SOURCE \
- -DGLX_ALIAS_UNSUPPORTED \
- -DGLX_DIRECT_RENDERING -DGLX_USE_APPLEGL
-
-# -DGLX_INDIRECT_RENDERING \
-
-# -D_GNU_SOURCE - for src/mesa/main ...
-# -DGLX_DIRECT_RENDERING - pulls in libdrm stuff in glx
-# -DGLX_USE_APPLEGL - supposed to be used with GLX_DIRECT_RENDERING to use AGL rather than DRM, but doesn't compile
-# -DIN_DRI_DRIVER
-
-ARCH_FLAGS += $(RC_CFLAGS)
-INCLUDE_FLAGS = -I$(INSTALL_DIR)/include -I$(X11_DIR)/include
-OPT_FLAGS = -g3 -gdwarf-2 -Os -ffast-math -fno-strict-aliasing
-WARN_FLAGS = -Wall -Wmissing-prototypes
-
-CFLAGS = -std=c99 -fvisibility=hidden \
- $(OPT_FLAGS) $(WARN_FLAGS) $(INCLUDE_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(ASM_FLAGS) $(DEFINES) $(EXTRA_CFLAGS)
-CXXFLAGS = -fvisibility=hidden \
- $(OPT_FLAGS) $(WARN_FLAGS) $(INCLUDE_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(ASM_FLAGS) $(DEFINES) $(EXTRA_CFLAGS)
-
-# Library names (actual file names)
-GL_LIB_NAME = lib$(GL_LIB).dylib
-GLU_LIB_NAME = lib$(GLU_LIB).dylib
-GLW_LIB_NAME = lib$(GLW_LIB).dylib
-OSMESA_LIB_NAME = lib$(OSMESA_LIB).dylib
-VG_LIB_NAME = lib$(VG_LIB).dylib
-
-# globs used to install the lib and all symlinks
-GL_LIB_GLOB = lib$(GL_LIB).*dylib
-GLU_LIB_GLOB = lib$(GLU_LIB).*dylib
-GLW_LIB_GLOB = lib$(GLW_LIB).*dylib
-OSMESA_LIB_GLOB = lib$(OSMESA_LIB).*dylib
-VG_LIB_GLOB = lib$(VG_LIB).*dylib
-
-GL_LIB_DEPS = -L$(INSTALL_DIR)/$(LIB_DIR) -L$(X11_DIR)/$(LIB_DIR) -lX11-xcb -lxcb -lX11 -lXext $(EXTRA_LDFLAGS)
-OSMESA_LIB_DEPS = $(EXTRA_LDFLAGS)
-GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) $(EXTRA_LDFLAGS)
-GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -L$(INSTALL_DIR)/$(LIB_DIR) -L$(X11_DIR)/$(LIB_DIR) -lX11 -lXt $(EXTRA_LDFLAGS)
-
-SRC_DIRS = glsl mapi/glapi mapi/vgapi glx/apple mesa glu
-GLU_DIRS = sgi
-DRIVER_DIRS = osmesa
-#DRIVER_DIRS = dri
-DRI_DIRS = swrast
-#GALLIUM_DRIVERS_DIRS = softpipe trace rbug noop identity galahad
-#GALLIUM_DRIVERS_DIRS += llvmpipe
diff --git a/mesalib/configs/darwin-fat-32bit b/mesalib/configs/darwin-fat-32bit
deleted file mode 100644
index 56bc6a37a..000000000
--- a/mesalib/configs/darwin-fat-32bit
+++ /dev/null
@@ -1,7 +0,0 @@
-# Configuration for Darwin / MacOS X, making 32bit fat dynamic libs
-
-RC_CFLAGS=-arch ppc -arch i386
-
-include $(TOP)/configs/darwin
-
-CONFIG_NAME = darwin-fat-32bit
diff --git a/mesalib/configs/darwin-fat-all b/mesalib/configs/darwin-fat-all
deleted file mode 100644
index b8668dc5a..000000000
--- a/mesalib/configs/darwin-fat-all
+++ /dev/null
@@ -1,7 +0,0 @@
-# Configuration for Darwin / MacOS X, making 32bit and 64bit fat dynamic libs
-
-RC_CFLAGS=-arch ppc -arch i386 -arch ppc64 -arch x86_64
-
-include $(TOP)/configs/darwin
-
-CONFIG_NAME = darwin-fat-all
diff --git a/mesalib/configs/darwin-fat-intel b/mesalib/configs/darwin-fat-intel
deleted file mode 100644
index 273ae3d6a..000000000
--- a/mesalib/configs/darwin-fat-intel
+++ /dev/null
@@ -1,7 +0,0 @@
-# Configuration for Darwin / MacOS X, making 32bit and 64bit fat dynamic libs for intel
-
-RC_CFLAGS=-arch i386 -arch x86_64
-
-include $(TOP)/configs/darwin
-
-CONFIG_NAME = darwin-fat-intel
diff --git a/mesalib/configs/default b/mesalib/configs/default
index 0f8b09fc2..20ba79642 100644
--- a/mesalib/configs/default
+++ b/mesalib/configs/default
@@ -172,3 +172,16 @@ GLESv2_PC_CFLAGS =
VG_PC_REQ_PRIV =
VG_PC_LIB_PRIV =
VG_PC_CFLAGS =
+
+# default targets
+# this helps reduce the mismatch between our automake Makefiles and the old
+# custom Makefiles while we transition.
+
+all: default
+
+am--refresh:
+
+distclean: clean
+
+check:
+test:
diff --git a/mesalib/configs/freebsd b/mesalib/configs/freebsd
deleted file mode 100644
index 70b0e03e9..000000000
--- a/mesalib/configs/freebsd
+++ /dev/null
@@ -1,29 +0,0 @@
-# Configuration for FreeBSD
-
-include $(TOP)/configs/default
-
-CONFIG_NAME = FreeBSD
-
-# Compiler and flags
-CC = cc
-CXX = c++
-MAKE = gmake
-
-OPT_FLAGS = -O2
-PIC_FLAGS = -fPIC
-
-DEFINES = -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_BSD_SOURCE -DUSE_XSHM \
- -DHZ=100
-
-X11_INCLUDES = -I/usr/local/include
-
-CFLAGS += $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) $(DEFINES) $(X11_INCLUDES) -ffast-math -pedantic
-
-CXXFLAGS += $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) $(DEFINES) $(X11_INCLUDES)
-
-
-# Work around aliasing bugs - developers should comment this out
-CFLAGS += -fno-strict-aliasing
-CXXFLAGS += -fno-strict-aliasing
-
-EXTRA_LIB_PATH = -L/usr/local/lib
diff --git a/mesalib/configs/freebsd-dri b/mesalib/configs/freebsd-dri
deleted file mode 100644
index 00a11d45c..000000000
--- a/mesalib/configs/freebsd-dri
+++ /dev/null
@@ -1,48 +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 -g
-
-EXPAT_INCLUDES = -I/usr/local/include
-X11_INCLUDES = -I/usr/local/include
-DEFINES = -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER \
- -DGLX_DIRECT_RENDERING -DGLX_INDIRECT_RENDERING \
- -DHAVE_ALIAS
-
-CFLAGS = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) -Wmissing-prototypes -std=c99 -Wundef -ffast-math \
- $(ASM_FLAGS) $(X11_INCLUDES) $(DEFINES)
-
-CXXFLAGS = $(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) $(DEFINES) -Wall -ansi -pedantic $(ASM_FLAGS) $(X11_INCLUDES)
-
-# Work around aliasing bugs - developers should comment this out
-CFLAGS += -fno-strict-aliasing
-CXXFLAGS += -fno-strict-aliasing
-
-ASM_SOURCES =
-MESA_ASM_SOURCES =
-
-# Library/program dependencies
-MESA_MODULES = $(TOP)/src/mesa/libmesa.a
-
-LIBDRM_CFLAGS = `$(PKG_CONFIG) --cflags libdrm`
-LIBDRM_LIB = `$(PKG_CONFIG) --libs libdrm`
-DRI_LIB_DEPS = $(MESA_MODULES) -L/usr/local/lib -lm -pthread -lexpat $(LIBDRM_LIB)
-GL_LIB_DEPS = -L/usr/local/lib -lX11 -lXext -lXxf86vm -lXdamage -lXfixes \
- -lm -pthread $(LIBDRM_LIB)
-
-GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L/usr/local/lib -lGL -lXt -lX11
-
-
-# Directories
-SRC_DIRS = glx gallium mesa glu
-DRIVER_DIRS = dri
-
-DRM_SOURCE_PATH=$(TOP)/../drm
diff --git a/mesalib/configs/freebsd-dri-amd64 b/mesalib/configs/freebsd-dri-amd64
deleted file mode 100644
index bb6c36139..000000000
--- a/mesalib/configs/freebsd-dri-amd64
+++ /dev/null
@@ -1,10 +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
-MESA_ASM_SOURCES = $(X86-64_SOURCES)
-GLAPI_ASM_SOURCES = $(X86-64_API)
diff --git a/mesalib/configs/freebsd-dri-x86 b/mesalib/configs/freebsd-dri-x86
deleted file mode 100644
index 9475437fc..000000000
--- a/mesalib/configs/freebsd-dri-x86
+++ /dev/null
@@ -1,13 +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
-MESA_ASM_SOURCES = $(X86_SOURCES)
-GLAPI_ASM_SOURCES = $(X86_API)
diff --git a/mesalib/configs/hpux10 b/mesalib/configs/hpux10
deleted file mode 100644
index fff274046..000000000
--- a/mesalib/configs/hpux10
+++ /dev/null
@@ -1,13 +0,0 @@
-# Configuration for HPUX v10, shared libs
-
-include $(TOP)/configs/default
-
-CONFIG_NAME = hpux10
-
-# Compiler and flags
-CC = cc
-CXX = aCC
-
-CFLAGS = -O +DAportable +z -Ae -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM
-CXXFLAGS = -O +DAportable +Z -Ae -D_HPUX_SOURCE
-
diff --git a/mesalib/configs/hpux10-gcc b/mesalib/configs/hpux10-gcc
deleted file mode 100644
index cd38fa23a..000000000
--- a/mesalib/configs/hpux10-gcc
+++ /dev/null
@@ -1,18 +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
-
-# Work around aliasing bugs - developers should comment this out
-CFLAGS += -fno-strict-aliasing
-CXXFLAGS += -fno-strict-aliasing
-
-
diff --git a/mesalib/configs/hpux10-static b/mesalib/configs/hpux10-static
deleted file mode 100644
index 82f480c06..000000000
--- a/mesalib/configs/hpux10-static
+++ /dev/null
@@ -1,26 +0,0 @@
-# Configuration for HPUX v10, static libs
-
-include $(TOP)/configs/default
-
-CONFIG_NAME = hpux10-static
-
-# Compiler and flags
-CC = cc
-CXX = aCC
-
-CFLAGS = -O +DAportable +z -Ae -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM
-CXXFLAGS = -O +DAportable +Z -Ae -D_HPUX_SOURCE
-
-MKLIB_OPTIONS = -static
-
-# Library names (actual file names)
-GL_LIB_NAME = libGL.a
-GLU_LIB_NAME = libGLU.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 =
-GLW_LIB_DEPS =
diff --git a/mesalib/configs/hpux11-32 b/mesalib/configs/hpux11-32
deleted file mode 100644
index 41888f39e..000000000
--- a/mesalib/configs/hpux11-32
+++ /dev/null
@@ -1,27 +0,0 @@
-# Configuration for HPUX v11
-
-include $(TOP)/configs/default
-
-CONFIG_NAME = hpux11-32
-
-# Compiler and flags
-CC = cc
-CXX = aCC
-
-CFLAGS = +z -Ae -O +Onolimit -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM -DPTHREADS
-
-CXXFLAGS = +z -Ae -O +Onolimit -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DPTHREADS
-
-MKLIB_OPTIONS =
-
-
-# Library names (actual file names)
-GL_LIB_NAME = libGL.a
-GLU_LIB_NAME = libGLU.a
-GLW_LIB_NAME = libGLw.a
-OSMESA_LIB_NAME = libOSMesa.a
-
-# Library/program dependencies
-GL_LIB_DEPS = -L/usr/lib/X11R6/ -L/usr/contrib/X11R6/lib/ -lXext -lXt -lXi -lX11 -lm -lpthread
-GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lm -lCsup -lcl
-GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) $(GL_LIB_DEPS)
diff --git a/mesalib/configs/hpux11-32-static b/mesalib/configs/hpux11-32-static
deleted file mode 100644
index 40352fb7d..000000000
--- a/mesalib/configs/hpux11-32-static
+++ /dev/null
@@ -1,25 +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 = -O +DA2.0 -Ae -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM -DPTHREADS
-
-CXXFLAGS = -O +DA2.0 -Ae -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DPTHREADS
-
-MKLIB_OPTIONS = -static
-
-
-# Library names (actual file names)
-GL_LIB_NAME = libGL.a
-GLU_LIB_NAME = libGLU.a
-GLW_LIB_NAME = libGLw.a
-OSMESA_LIB_NAME = libOSMesa.a
-
-# Library/program dependencies
-
diff --git a/mesalib/configs/hpux11-32-static-nothreads b/mesalib/configs/hpux11-32-static-nothreads
deleted file mode 100644
index a2a8eda46..000000000
--- a/mesalib/configs/hpux11-32-static-nothreads
+++ /dev/null
@@ -1,24 +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 = -O +DA2.0 -Ae -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM
-
-CXXFLAGS = -O +DA2.0 -Ae -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
-GLW_LIB_NAME = libGLw.a
-OSMESA_LIB_NAME = libOSMesa.a
-
-# Library/program dependencies
diff --git a/mesalib/configs/hpux11-64 b/mesalib/configs/hpux11-64
deleted file mode 100644
index 0e5ef56bb..000000000
--- a/mesalib/configs/hpux11-64
+++ /dev/null
@@ -1,28 +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 -O +Onolimit -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM -DPTHREADS
-
-CXXFLAGS = +z -Ae +DD64 -O +Onolimit -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DPTHREADS
-
-MKLIB_OPTIONS =
-
-LIB_DIR = lib64
-
-# Library names (actual file names)
-GL_LIB_NAME = libGL.a
-GLU_LIB_NAME = libGLU.a
-GLW_LIB_NAME = libGLw.a
-OSMESA_LIB_NAME = libOSMesa.a
-
-# Library/program dependencies
-GL_LIB_DEPS = -L/usr/lib/X11R6/pa20_64 -L/usr/contrib/X11R6/lib/pa20_64 -lXext -lXmu -lXt -lXi -lX11 -lm -lpthread
-GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lm -lCsup -lcl
-GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) $(GL_LIB_DEPS)
diff --git a/mesalib/configs/hpux11-64-static b/mesalib/configs/hpux11-64-static
deleted file mode 100644
index 787f92799..000000000
--- a/mesalib/configs/hpux11-64-static
+++ /dev/null
@@ -1,25 +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 = -O +DA2.0W -Ae -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM -DPTHREADS
-
-CXXFLAGS = -O +DA2.0W -Ae -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DPTHREADS
-
-MKLIB_OPTIONS = -static
-
-LIB_DIR = lib64
-
-# Library names (actual file names)
-GL_LIB_NAME = libGL.a
-GLU_LIB_NAME = libGLU.a
-GLW_LIB_NAME = libGLw.a
-OSMESA_LIB_NAME = libOSMesa.a
-
-# Library/program dependencies
diff --git a/mesalib/configs/hpux11-ia64 b/mesalib/configs/hpux11-ia64
deleted file mode 100644
index e27a22101..000000000
--- a/mesalib/configs/hpux11-ia64
+++ /dev/null
@@ -1,28 +0,0 @@
-# Configuration for HPUX IA64 v11, 64-bit
-
-include $(TOP)/configs/default
-
-CONFIG_NAME = hpux11-ia64
-
-# Compiler and flags
-CC = cc
-CXX = aCC
-
-CFLAGS = +z -Ae +DD64 -O +DSmckinley -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM -DPTHREADS
-
-CXXFLAGS = +z -Ae +DD64 -O +DSmckinley -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DPTHREADS
-
-MKLIB_OPTIONS =
-
-LIB_DIR = lib64
-
-# Library names (actual file names)
-GL_LIB_NAME = libGL.so
-GLU_LIB_NAME = libGLU.so
-GLW_LIB_NAME = libGLw.so
-OSMESA_LIB_NAME = libOSMesa.so
-
-# Library/program dependencies
-GL_LIB_DEPS = -L/usr/lib/X11R6/ -L/usr/contrib/X11R6/lib/ -lXext -lXmu -lXt -lXi -lX11 -lm -lpthread
-GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lm -lCsup -lcl
-GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) $(GL_LIB_DEPS)
diff --git a/mesalib/configs/hpux11-ia64-static b/mesalib/configs/hpux11-ia64-static
deleted file mode 100644
index cadb12239..000000000
--- a/mesalib/configs/hpux11-ia64-static
+++ /dev/null
@@ -1,25 +0,0 @@
-# Configuration for HPUX v11, 64-bit, static libs
-
-include $(TOP)/configs/default
-
-CONFIG_NAME = hpux11-ia64-static
-
-# Compiler and flags
-CC = cc
-CXX = aCC
-
-CFLAGS = -O +DD64 -Ae -D_HPUX_SOURCE +DSmckinley -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM -DPTHREADS
-
-CXXFLAGS = -O +DD64 -Ae -D_HPUX_SOURCE +DSmckinley -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DPTHREADS
-
-MKLIB_OPTIONS = -static
-
-LIB_DIR = lib64
-
-# Library names (actual file names)
-GL_LIB_NAME = libGL.a
-GLU_LIB_NAME = libGLU.a
-GLW_LIB_NAME = libGLw.a
-OSMESA_LIB_NAME = libOSMesa.a
-
-# Library/program dependencies
diff --git a/mesalib/configs/hpux9 b/mesalib/configs/hpux9
deleted file mode 100644
index c37c2005e..000000000
--- a/mesalib/configs/hpux9
+++ /dev/null
@@ -1,15 +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 -O +Olibcalls +ESlit -Ae +Onolimit -D_HPUX_SOURCE -I/usr/include/X11R5 -DUSE_XSHM
-CXXFLAGS = +z -O +Olibcalls +ESlit -Ae +Onolimit -D_HPUX_SOURCE -I/usr/include/X11R5
-
-
diff --git a/mesalib/configs/hpux9-gcc b/mesalib/configs/hpux9-gcc
deleted file mode 100644
index e7fe6847b..000000000
--- a/mesalib/configs/hpux9-gcc
+++ /dev/null
@@ -1,13 +0,0 @@
-# Configuration for HPUX v10, shared libs
-
-include $(TOP)/configs/default
-
-CONFIG_NAME = hpux9-gcc
-
-# Compiler and flags
-CC = cc
-CXX = aCC
-
-CFLAGS = -O +DAportable +z -Ae -D_HPUX_SOURCE -I/usr/include/X11R6 -I/usr/contrib/X11R6/include -DUSE_XSHM
-CXXFLAGS = -O +DAportable +Z -Ae -D_HPUX_SOURCE
-
diff --git a/mesalib/configs/irix6-64 b/mesalib/configs/irix6-64
deleted file mode 100644
index c2e6216ea..000000000
--- a/mesalib/configs/irix6-64
+++ /dev/null
@@ -1,16 +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 -DPTHREADS
-CXXFLAGS = -64 -O3 -ansi -woff 1174 -DPTHREADS
-
-GLW_SOURCES = GLwDrawA.c GLwMDrawA.c
-
-LIB_DIR = lib64
-
diff --git a/mesalib/configs/irix6-64-static b/mesalib/configs/irix6-64-static
deleted file mode 100644
index 9a22f4e11..000000000
--- a/mesalib/configs/irix6-64-static
+++ /dev/null
@@ -1,24 +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 -DPTHREADS
-CXXFLAGS = -64 -O3 -ansi -woff 1174 -DPTHREADS
-MKLIB_OPTIONS = -static
-
-GLW_SOURCES = GLwDrawA.c GLwMDrawA.c
-
-LIB_DIR = lib64
-
-
-GL_LIB_NAME = libGL.a
-GLU_LIB_NAME = libGLU.a
-GLW_LIB_NAME = libGLw.a
-OSMESA_LIB_NAME = libOSMesa.a
-
-
diff --git a/mesalib/configs/irix6-n32 b/mesalib/configs/irix6-n32
deleted file mode 100644
index b02537548..000000000
--- a/mesalib/configs/irix6-n32
+++ /dev/null
@@ -1,16 +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 -DPTHREADS
-CXXFLAGS = -n32 -mips3 -O3 -ansi -woff 1174,1552 -DPTHREADS
-
-GLW_SOURCES = GLwDrawA.c GLwMDrawA.c
-
-LIB_DIR = lib32
-
diff --git a/mesalib/configs/irix6-n32-static b/mesalib/configs/irix6-n32-static
deleted file mode 100644
index 83eb5c0c0..000000000
--- a/mesalib/configs/irix6-n32-static
+++ /dev/null
@@ -1,23 +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 -DPTHREADS
-CXXFLAGS = -n32 -mips2 -O2 -ansi -woff 3262,3666 -DPTHREADS
-MKLIB_OPTIONS = -static
-
-GLW_SOURCES = GLwDrawA.c GLwMDrawA.c
-
-LIB_DIR = lib32
-
-
-GL_LIB_NAME = libGL.a
-GLU_LIB_NAME = libGLU.a
-GLW_LIB_NAME = libGLw.a
-OSMESA_LIB_NAME = libOSMesa.a
-
diff --git a/mesalib/configs/irix6-o32 b/mesalib/configs/irix6-o32
deleted file mode 100644
index ab50953ed..000000000
--- a/mesalib/configs/irix6-o32
+++ /dev/null
@@ -1,17 +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
-
-GLW_SOURCES = GLwDrawA.c GLwMDrawA.c
-
-LIB_DIR = lib32
-
-
diff --git a/mesalib/configs/irix6-o32-static b/mesalib/configs/irix6-o32-static
deleted file mode 100644
index 2e62c1b56..000000000
--- a/mesalib/configs/irix6-o32-static
+++ /dev/null
@@ -1,23 +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 = -static
-
-GLW_SOURCES = GLwDrawA.c GLwMDrawA.c
-
-LIB_DIR = lib32
-
-
-GL_LIB_NAME = libGL.a
-GLU_LIB_NAME = libGLU.a
-GLW_LIB_NAME = libGLw.a
-OSMESA_LIB_NAME = libOSMesa.a
-
diff --git a/mesalib/configs/linux b/mesalib/configs/linux
deleted file mode 100644
index 2560973fa..000000000
--- a/mesalib/configs/linux
+++ /dev/null
@@ -1,37 +0,0 @@
-# Configuration for generic Linux
-
-include $(TOP)/configs/default
-
-CONFIG_NAME = linux
-
-# Compiler and flags
-CC = gcc
-CXX = g++
-
-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 -D_GNU_SOURCE \
- -DPTHREADS -DUSE_XSHM -DHAVE_POSIX_MEMALIGN
-
-X11_INCLUDES = -I/usr/X11R6/include
-
-CFLAGS = -Wall -Wmissing-prototypes -Wdeclaration-after-statement \
- -Wpointer-arith $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) \
- $(DEFINES) $(ASM_FLAGS) $(X11_INCLUDES) -std=c99 -ffast-math
-
-CXXFLAGS = -Wall -Wpointer-arith $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) \
- $(DEFINES) $(X11_INCLUDES)
-
-# Work around aliasing bugs - developers should comment this out
-CFLAGS += -fno-strict-aliasing
-CXXFLAGS += -fno-strict-aliasing
-
-
-EXTRA_LIB_PATH = -L/usr/X11R6/lib
diff --git a/mesalib/configs/linux-alpha b/mesalib/configs/linux-alpha
deleted file mode 100644
index f80c972bb..000000000
--- a/mesalib/configs/linux-alpha
+++ /dev/null
@@ -1,19 +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
-
-# Work around aliasing bugs - developers should comment this out
-CFLAGS += -fno-strict-aliasing
-CXXFLAGS += -fno-strict-aliasing
-
-GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread
-GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -L/usr/X11R6/lib -lXt -lX11
-
diff --git a/mesalib/configs/linux-alpha-static b/mesalib/configs/linux-alpha-static
deleted file mode 100644
index 8b2265cb1..000000000
--- a/mesalib/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
-MKLIB_OPTIONS = -static
-PIC_FLAGS =
-
-# Work around aliasing bugs - developers should comment this out
-CFLAGS += -fno-strict-aliasing
-CXXFLAGS += -fno-strict-aliasing
-
-# Library names (actual file names)
-GL_LIB_NAME = libGL.a
-GLU_LIB_NAME = libGLU.a
-GLW_LIB_NAME = libGLw.a
-OSMESA_LIB_NAME = libOSMesa.a
-
-
-GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread
-GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -L/usr/X11R6/lib -lXt -lX11
diff --git a/mesalib/configs/linux-debug b/mesalib/configs/linux-debug
deleted file mode 100644
index 60e0b9769..000000000
--- a/mesalib/configs/linux-debug
+++ /dev/null
@@ -1,9 +0,0 @@
-# Configuration for debugging on Linux
-
-include $(TOP)/configs/linux
-
-CONFIG_NAME = linux-debug
-
-OPT_FLAGS = -g
-#CFLAGS += -pedantic
-DEFINES += -DDEBUG -DDEBUG_MATH
diff --git a/mesalib/configs/linux-dri b/mesalib/configs/linux-dri
deleted file mode 100644
index f1fb37842..000000000
--- a/mesalib/configs/linux-dri
+++ /dev/null
@@ -1,72 +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
-
-OPT_FLAGS = -O2 -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 -DGLX_INDIRECT_RENDERING \
- -DHAVE_ALIAS -DHAVE_POSIX_MEMALIGN
-
-X11_INCLUDES = -I/usr/X11R6/include
-
-CFLAGS = -Wall -Wmissing-prototypes -std=c99 -ffast-math \
- $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) $(ASM_FLAGS)
-
-CXXFLAGS = -Wall $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES)
-
-
-# Work around aliasing bugs - developers should comment this out
-CFLAGS += -fno-strict-aliasing
-CXXFLAGS += -fno-strict-aliasing
-
-MESA_ASM_SOURCES =
-
-# Library/program dependencies
-EXTRA_LIB_PATH=-L/usr/X11R6/lib
-
-MESA_MODULES = $(TOP)/src/mesa/libmesa.a
-
-LIBDRM_CFLAGS = $(shell $(PKG_CONFIG) --cflags libdrm)
-LIBDRM_LIB = $(shell $(PKG_CONFIG) --libs libdrm)
-DRI_LIB_DEPS = $(MESA_MODULES) $(EXTRA_LIB_PATH) -lm -lpthread -lexpat -ldl $(LIBDRM_LIB)
-GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lXdamage -lXfixes \
- -lm -lpthread -ldl $(LIBDRM_LIB)
-
-
-# Directories
-SRC_DIRS := glx egl $(SRC_DIRS)
-
-DRIVER_DIRS = dri
-GALLIUM_WINSYS_DIRS = sw sw/xlib drm/vmware drm/intel svga/drm
-GALLIUM_TARGET_DIRS = dri-vmwgfx
-GALLIUM_STATE_TRACKERS_DIRS = egl dri
-
-DRI_DIRS = swrast
-
-INTEL_LIBS = $(shell $(PKG_CONFIG) --libs libdrm_intel)
-INTEL_CFLAGS = $(shell $(PKG_CONFIG) --cflags libdrm_intel)
-
-NOUVEAU_LIBS = $(shell $(PKG_CONFIG) --libs libdrm_nouveau)
-NOUVEAU_CFLAGS = $(shell $(PKG_CONFIG) --cflags libdrm_nouveau)
-
-RADEON_LIBS = $(shell $(PKG_CONFIG) --libs libdrm_radeon)
-RADEON_CFLAGS = $(shell $(PKG_CONFIG) --cflags libdrm_radeon)
-RADEON_LDFLAGS = $(LIBDRM_RADEON_LIBS)
diff --git a/mesalib/configs/linux-dri-debug b/mesalib/configs/linux-dri-debug
deleted file mode 100644
index 4ee5d71ee..000000000
--- a/mesalib/configs/linux-dri-debug
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*-makefile-*-
-# Configuration for linux-dri-debug: Linux DRI hardware drivers for XFree86 & others
-
-include $(TOP)/configs/linux-dri
-
-CONFIG_NAME = linux-dri-debug
-OPT_FLAGS = -O0 -g
-ARCH_FLAGS = -DDEBUG
diff --git a/mesalib/configs/linux-dri-ppc b/mesalib/configs/linux-dri-ppc
deleted file mode 100644
index fdf3c5c7a..000000000
--- a/mesalib/configs/linux-dri-ppc
+++ /dev/null
@@ -1,9 +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
diff --git a/mesalib/configs/linux-dri-x86 b/mesalib/configs/linux-dri-x86
deleted file mode 100644
index 4e7d45d35..000000000
--- a/mesalib/configs/linux-dri-x86
+++ /dev/null
@@ -1,13 +0,0 @@
-# -*-makefile-*-
-# Configuration for linux-dri: Linux DRI hardware drivers for XFree86 & others
-
-include $(TOP)/configs/linux-dri
-
-CONFIG_NAME = linux-dri-x86
-
-ARCH_FLAGS = -m32 -mmmx -msse -msse2
-
-ASM_FLAGS = -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM
-MESA_ASM_SOURCES = $(X86_SOURCES)
-GLAPI_ASM_SOURCES = $(X86_API)
-
diff --git a/mesalib/configs/linux-dri-x86-64 b/mesalib/configs/linux-dri-x86-64
deleted file mode 100644
index 6cd629407..000000000
--- a/mesalib/configs/linux-dri-x86-64
+++ /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-x86-64
-
-ARCH_FLAGS = -m64
-
-ASM_FLAGS = -DUSE_X86_64_ASM
-MESA_ASM_SOURCES = $(X86-64_SOURCES)
-GLAPI_ASM_SOURCES = $(X86-64_API)
-
-LIB_DIR = lib64
-
-# Library/program dependencies
-EXTRA_LIB_PATH=-L/usr/X11R6/lib64
diff --git a/mesalib/configs/linux-dri-xcb b/mesalib/configs/linux-dri-xcb
deleted file mode 100644
index fd72c683f..000000000
--- a/mesalib/configs/linux-dri-xcb
+++ /dev/null
@@ -1,54 +0,0 @@
-# -*-makefile-*-
-# Configuration for linux-dri: Linux DRI hardware drivers for XFree86 & others
-
-include $(TOP)/configs/default
-
-CONFIG_NAME = linux-dri-xcb
-
-# Compiler and flags
-CC = gcc
-CXX = g++
-
-#MKDEP = /usr/X11R6/bin/makedepend
-#MKDEP = gcc -M
-#MKDEP_OPTIONS = -MF depend
-
-OPT_FLAGS = -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 -DGLX_INDIRECT_RENDERING \
- -DHAVE_ALIAS -DUSE_XCB -DHAVE_POSIX_MEMALIGN
-
-X11_INCLUDES = $(shell $(PKG_CONFIG) --cflags-only-I x11) $(shell $(PKG_CONFIG) --cflags-only-I xcb) $(shell $(PKG_CONFIG) --cflags-only-I x11-xcb) $(shell $(PKG_CONFIG) --cflags-only-I xcb-glx)
-
-CFLAGS = -Wall -Wmissing-prototypes $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) \
- $(DEFINES) $(ASM_FLAGS) -std=c99 -ffast-math
-
-CXXFLAGS = -Wall $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES)
-
-# Work around aliasing bugs - developers should comment this out
-CFLAGS += -fno-strict-aliasing
-CXXFLAGS += -fno-strict-aliasing
-
-MESA_ASM_SOURCES =
-
-# Library/program dependencies
-EXTRA_LIB_PATH=$(shell $(PKG_CONFIG) --libs-only-L x11)
-
-MESA_MODULES = $(TOP)/src/mesa/libmesa.a
-
-LIBDRM_CFLAGS = $(shell $(PKG_CONFIG) --cflags libdrm)
-LIBDRM_LIB = $(shell $(PKG_CONFIG) --libs libdrm)
-DRI_LIB_DEPS = $(MESA_MODULES) $(EXTRA_LIB_PATH) -lm -lpthread -lexpat -ldl $(LIBDRM_LIB)
-GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lm -lpthread -ldl \
- $(LIBDRM_LIB) $(shell $(PKG_CONFIG) --libs xcb) $(shell $(PKG_CONFIG) --libs x11-xcb) $(shell $(PKG_CONFIG) --libs xcb-glx)
-
-SRC_DIRS = glx gallium mesa glu
-
-DRIVER_DIRS = dri
diff --git a/mesalib/configs/linux-egl b/mesalib/configs/linux-egl
deleted file mode 100644
index 2c8bfdd6f..000000000
--- a/mesalib/configs/linux-egl
+++ /dev/null
@@ -1,58 +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
-
-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 -DGLX_INDIRECT_RENDERING \
- -DHAVE_ALIAS -DHAVE_POSIX_MEMALIGN
-
-X11_INCLUDES = -I/usr/X11R6/include
-
-CFLAGS = -Wall -Wmissing-prototypes -std=c99 -ffast-math \
- $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) $(ASM_FLAGS)
-
-CXXFLAGS = -Wall $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES)
-
-
-MESA_ASM_SOURCES =
-
-# Library/program dependencies
-EXTRA_LIB_PATH=-L/usr/X11R6/lib
-
-MESA_MODULES = $(TOP)/src/mesa/libmesa.a
-
-LIBDRM_CFLAGS = $(shell $(PKG_CONFIG) --cflags libdrm)
-LIBDRM_LIB = $(shell $(PKG_CONFIG) --libs libdrm)
-DRI_LIB_DEPS = $(MESA_MODULES) $(EXTRA_LIB_PATH) -lm -lpthread -lexpat -ldl $(LIBDRM_LIB)
-GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lXdamage -lXfixes \
- -lm -lpthread -ldl \
- $(LIBDRM_LIB)
-
-
-# Directories
-SRC_DIRS = gallium mesa gallium/winsys gallium/targets glu egl
-
-DRIVER_DIRS = dri
-GALLIUM_WINSYS_DIRS = egl_drm
-GALLIUM_TARGET_DIRS =
-
-DRI_DIRS = intel
diff --git a/mesalib/configs/linux-ia64-icc b/mesalib/configs/linux-ia64-icc
deleted file mode 100644
index 8bd90cca2..000000000
--- a/mesalib/configs/linux-ia64-icc
+++ /dev/null
@@ -1,18 +0,0 @@
-# Configuration for Linux with Intel C compiler
-
-include $(TOP)/configs/default
-
-CONFIG_NAME = linux-icc
-
-# Compiler and flags
-CC = icc
-CXX = icpc
-CFLAGS = -O3 -ansi -KPIC -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -I/usr/X11R6/include
-CXXFLAGS = -O3 -ansi -KPIC -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -I/usr/X11R6/include
-MKLIB_OPTIONS = -arch icc-istatic
-
-GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lpthread
-GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB)
-GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) $(GL_LIB_DEPS)
-
-
diff --git a/mesalib/configs/linux-ia64-icc-static b/mesalib/configs/linux-ia64-icc-static
deleted file mode 100644
index f926fb3d9..000000000
--- a/mesalib/configs/linux-ia64-icc-static
+++ /dev/null
@@ -1,23 +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 = icpc
-CFLAGS = -O3 -ansi -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -I/usr/X11R6/include
-CXXFLAGS = -O3 -ansi -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DUSE_XSHM -DPTHREADS -I/usr/X11R6/include
-MKLIB_OPTIONS = -static -arch icc-istatic
-
-# Library names (actual file names)
-GL_LIB_NAME = libGL.a
-GLU_LIB_NAME = libGLU.a
-GLW_LIB_NAME = libGLw.a
-OSMESA_LIB_NAME = libOSMesa.a
-
-GL_LIB_DEPS =
-GLU_LIB_DEPS =
-GLW_LIB_DEPS =
-
diff --git a/mesalib/configs/linux-icc b/mesalib/configs/linux-icc
deleted file mode 100644
index 9d164250c..000000000
--- a/mesalib/configs/linux-icc
+++ /dev/null
@@ -1,19 +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
-MKLIB_OPTIONS = -arch icc
-
-GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread
-
-MESA_ASM_SOURCES = $(X86_SOURCES)
-GLAPI_ASM_SOURCES = $(X86_API)
-
-
diff --git a/mesalib/configs/linux-icc-static b/mesalib/configs/linux-icc-static
deleted file mode 100644
index b9c09d4a1..000000000
--- a/mesalib/configs/linux-icc-static
+++ /dev/null
@@ -1,23 +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 = icpc
-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 -tpp6 -axK -DPTHREADS
-MKLIB_OPTIONS = -static -arch icc
-
-# Library names (actual file names)
-GL_LIB_NAME = libGL.a
-GLU_LIB_NAME = libGLU.a
-GLW_LIB_NAME = libGLw.a
-OSMESA_LIB_NAME = libOSMesa.a
-
-GL_LIB_DEPS =
-
-MESA_ASM_SOURCES = $(X86_SOURCES)
-GLAPI_ASM_SOURCES = $(X86_API)
diff --git a/mesalib/configs/linux-indirect b/mesalib/configs/linux-indirect
deleted file mode 100644
index 5592a8f29..000000000
--- a/mesalib/configs/linux-indirect
+++ /dev/null
@@ -1,52 +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 \
- -DGLX_INDIRECT_RENDERING \
- -DPTHREADS -DHAVE_ALIAS -DHAVE_POSIX_MEMALIGN
-
-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)
-
-# Work around aliasing bugs - developers should comment this out
-CFLAGS += -fno-strict-aliasing
-CXXFLAGS += -fno-strict-aliasing
-
-MESA_ASM_SOURCES =
-
-# Library/program dependencies
-EXTRA_LIB_PATH=-L/usr/X11R6/lib
-
-MESA_MODULES = $(TOP)/src/mesa/libmesa.a
-DRI_LIB_DEPS = $(MESA_MODULES) $(EXTRA_LIB_PATH) -lm -lpthread -lexpat -ldl
-GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lm -lpthread -ldl
-
-
-# Directories
-SRC_DIRS = glx glu
-DRIVER_DIRS =
diff --git a/mesalib/configs/linux-llvm b/mesalib/configs/linux-llvm
deleted file mode 100644
index 259d8ac7a..000000000
--- a/mesalib/configs/linux-llvm
+++ /dev/null
@@ -1,47 +0,0 @@
-# -*-makefile-*-
-# Configuration for Linux and LLVM with optimizations
-# Builds the llvmpipe gallium driver
-
-include $(TOP)/configs/linux
-
-CONFIG_NAME = linux-llvm
-
-# Add llvmpipe driver
-GALLIUM_DRIVERS_DIRS += llvmpipe
-
-OPT_FLAGS = -O3 -ansi -pedantic
-ARCH_FLAGS = -mmmx -msse -msse2 -mstackrealign
-
-DEFINES += -DNDEBUG -DGALLIUM_LLVMPIPE
-
-# override -std=c99
-CFLAGS += -std=gnu99
-
-LLVM_VERSION := $(shell llvm-config --version)
-
-ifeq ($(LLVM_VERSION),)
- $(warning Could not find LLVM! Make Sure 'llvm-config' is in the path)
- MESA_LLVM=0
-else
- MESA_LLVM=1
- HAVE_LLVM := 0x0$(subst .,0,$(LLVM_VERSION:svn=))
- DEFINES += -DHAVE_LLVM=$(HAVE_LLVM)
-# $(info Using LLVM version: $(LLVM_VERSION))
-endif
-
-ifeq ($(MESA_LLVM),1)
- LLVM_CFLAGS=`llvm-config --cppflags|sed 's/-DNDEBUG\>//g'`
- LLVM_CXXFLAGS=`llvm-config --cxxflags` -Wno-long-long
- LLVM_LDFLAGS = $(shell llvm-config --ldflags)
- LLVM_LIBS = $(shell llvm-config --libs)
- MKLIB_OPTIONS=-cplusplus
-else
- LLVM_CFLAGS=
- LLVM_CXXFLAGS=
-endif
-
-LD = g++
-GL_LIB_DEPS = $(LLVM_LDFLAGS) $(LLVM_LIBS) $(EXTRA_LIB_PATH) -lX11 -lXext -lm -lpthread -lstdc++
-
-# to allow the NV drivers to compile
-LIBDRM_CFLAGS = $(shell $(PKG_CONFIG) --cflags libdrm)
diff --git a/mesalib/configs/linux-llvm-debug b/mesalib/configs/linux-llvm-debug
deleted file mode 100644
index 28bcfdb18..000000000
--- a/mesalib/configs/linux-llvm-debug
+++ /dev/null
@@ -1,12 +0,0 @@
-# -*-makefile-*-
-# Configuration for Linux and LLVM with debugging info
-# Builds the llvmpipe gallium driver
-
-include $(TOP)/configs/linux-llvm
-
-CONFIG_NAME = linux-llvm-debug
-
-OPT_FLAGS = -g -ansi -pedantic
-
-DEFINES += -DDEBUG -UNDEBUG
-
diff --git a/mesalib/configs/linux-opengl-es b/mesalib/configs/linux-opengl-es
deleted file mode 100644
index ae48a383f..000000000
--- a/mesalib/configs/linux-opengl-es
+++ /dev/null
@@ -1,27 +0,0 @@
-# Configuration for OpenGL ES on Linux
-
-include $(TOP)/configs/linux
-
-CONFIG_NAME = linux-opengl-es
-
-# Directories to build
-LIB_DIR = lib
-SRC_DIRS = egl glsl mapi/es1api mapi/es2api mesa/es \
- gallium gallium/winsys gallium/targets
-
-# egl st needs this
-DEFINES += -DGLX_DIRECT_RENDERING
-
-# no mesa or egl drivers
-DRIVER_DIRS =
-
-GALLIUM_DRIVERS_DIRS = softpipe
-
-# build libGLES*.so
-GALLIUM_STATE_TRACKERS_DIRS = es
-
-# build egl_x11_{swrast,i915}.so
-GALLIUM_DRIVERS_DIRS += trace rbug i915
-GALLIUM_STATE_TRACKERS_DIRS += egl
-GALLIUM_WINSYS_DIRS += drm/intel
-GALLIUM_TARGET_DIRS += egl-swrast egl-i915
diff --git a/mesalib/configs/linux-osmesa b/mesalib/configs/linux-osmesa
deleted file mode 100644
index 5d7ab463f..000000000
--- a/mesalib/configs/linux-osmesa
+++ /dev/null
@@ -1,26 +0,0 @@
-# Configuration for building only libOSMesa on Linux, no Xlib driver
-# This doesn't really have any Linux dependencies, so it should be usable
-# on other (gcc-based) systems.
-
-include $(TOP)/configs/default
-
-CONFIG_NAME = linux-osmesa
-
-# Compiler and flags
-CC = gcc
-CXX = g++
-CFLAGS = -g -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -D_GNU_SOURCE -DPTHREADS
-CXXFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
-
-# Work around aliasing bugs - developers should comment this out
-CFLAGS += -fno-strict-aliasing
-CXXFLAGS += -fno-strict-aliasing
-
-# Directories
-SRC_DIRS = mapi/glapi glsl mesa glu
-DRIVER_DIRS = osmesa
-
-
-# Dependencies
-OSMESA_LIB_DEPS = -lm -lpthread -ldl
-GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(OSMESA_LIB)
diff --git a/mesalib/configs/linux-osmesa-static b/mesalib/configs/linux-osmesa-static
deleted file mode 100644
index 4bb15bc54..000000000
--- a/mesalib/configs/linux-osmesa-static
+++ /dev/null
@@ -1,32 +0,0 @@
-# Configuration for building static libOSMesa.a on Linux, no Xlib driver
-# This doesn't really have any Linux dependencies, so it should be usable
-# on other (gcc-based) systems.
-
-include $(TOP)/configs/default
-
-CONFIG_NAME = linux-osmesa
-
-# Compiler and flags
-CC = gcc -m32
-CXX = g++ -m32
-CFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -DPTHREADS
-CXXFLAGS = -O3 -ansi -pedantic -fPIC -ffast-math -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE
-
-MKLIB_OPTIONS = -static
-
-# Library names (actual file names)
-GL_LIB_NAME = libGL.a
-GLU_LIB_NAME = libGLU.a
-GLW_LIB_NAME = libGLw.a
-OSMESA_LIB_NAME = libOSMesa.a
-
-# Directories
-SRC_DIRS = mesa glu
-DRIVER_DIRS = osmesa
-
-
-# Dependencies
-GL_LIB_DEPS =
-OSMESA_LIB_DEPS =
-GLU_LIB_DEPS =
-GLW_LIB_DEPS =
diff --git a/mesalib/configs/linux-osmesa16 b/mesalib/configs/linux-osmesa16
deleted file mode 100644
index c424214fe..000000000
--- a/mesalib/configs/linux-osmesa16
+++ /dev/null
@@ -1,29 +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
-
-# Work around aliasing bugs - developers should comment this out
-CFLAGS += -fno-strict-aliasing
-CXXFLAGS += -fno-strict-aliasing
-
-# Library names
-OSMESA_LIB = OSMesa16
-OSMESA_LIB_NAME = libOSMesa16.so
-
-
-# Directories
-SRC_DIRS = mapi/glapi glsl mesa glu
-DRIVER_DIRS = osmesa
-
-
-# Dependencies
-OSMESA_LIB_DEPS = -lm -lpthread
-GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(OSMESA_LIB)
diff --git a/mesalib/configs/linux-osmesa16-static b/mesalib/configs/linux-osmesa16-static
deleted file mode 100644
index 50ae18321..000000000
--- a/mesalib/configs/linux-osmesa16-static
+++ /dev/null
@@ -1,30 +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
-PIC_FLAGS =
-
-# Work around aliasing bugs - developers should comment this out
-CFLAGS += -fno-strict-aliasing
-CXXFLAGS += -fno-strict-aliasing
-
-# Library names
-OSMESA_LIB = OSMesa16
-OSMESA_LIB_NAME = libOSMesa16.a
-
-
-# Directories
-SRC_DIRS = gallium mesa glu
-DRIVER_DIRS = osmesa
-
-
-# Dependencies
-OSMESA_LIB_DEPS = -lm -lpthread
diff --git a/mesalib/configs/linux-osmesa32 b/mesalib/configs/linux-osmesa32
deleted file mode 100644
index 6602c325e..000000000
--- a/mesalib/configs/linux-osmesa32
+++ /dev/null
@@ -1,29 +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
-
-# Work around aliasing bugs - developers should comment this out
-CFLAGS += -fno-strict-aliasing
-CXXFLAGS += -fno-strict-aliasing
-
-# Library names
-OSMESA_LIB = OSMesa32
-OSMESA_LIB_NAME = libOSMesa32.so
-
-
-# Directories
-SRC_DIRS = mapi/glapi glsl mesa glu
-DRIVER_DIRS = osmesa
-
-
-# Dependencies
-OSMESA_LIB_DEPS = -lm -lpthread
-GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(OSMESA_LIB)
diff --git a/mesalib/configs/linux-ppc b/mesalib/configs/linux-ppc
deleted file mode 100644
index 13cfdeb42..000000000
--- a/mesalib/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/mesalib/configs/linux-ppc-static b/mesalib/configs/linux-ppc-static
deleted file mode 100644
index 0a4ba43cc..000000000
--- a/mesalib/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
-PIC_FLAGS =
-
-# Library names (actual file names)
-GL_LIB_NAME = libGL.a
-GLU_LIB_NAME = libGLU.a
-GLW_LIB_NAME = libGLw.a
-OSMESA_LIB_NAME = libOSMesa.a
diff --git a/mesalib/configs/linux-profile b/mesalib/configs/linux-profile
deleted file mode 100644
index e3895dd8b..000000000
--- a/mesalib/configs/linux-profile
+++ /dev/null
@@ -1,8 +0,0 @@
-# Configuration for profiling on Linux with gprof
-
-include $(TOP)/configs/linux-static
-
-CONFIG_NAME = linux-profile
-
-OPT_FLAGS = -pg -g -O2
-DEFINES += -DNDEBUG
diff --git a/mesalib/configs/linux-sparc b/mesalib/configs/linux-sparc
deleted file mode 100644
index 346d438c2..000000000
--- a/mesalib/configs/linux-sparc
+++ /dev/null
@@ -1,9 +0,0 @@
-# Configuration for Linux on Sparc
-
-include $(TOP)/configs/linux
-
-CONFIG_NAME = linux-sparc
-
-#ASM_FLAGS = -DUSE_SPARC_ASM
-#MESA_ASM_SOURCES = $(SPARC_SOURCES)
-#GLAPI_ASM_SOURCES = $(SPARC_API)
diff --git a/mesalib/configs/linux-sparc5 b/mesalib/configs/linux-sparc5
deleted file mode 100644
index e8848d26a..000000000
--- a/mesalib/configs/linux-sparc5
+++ /dev/null
@@ -1,7 +0,0 @@
-# Configuration for Linux on Sparc5
-
-include $(TOP)/configs/linux-sparc
-
-CONFIG_NAME = linux-sparc5
-
-ARCH_FLAGS += -mcpu=ultrasparc
diff --git a/mesalib/configs/linux-static b/mesalib/configs/linux-static
deleted file mode 100644
index 8a8db6edc..000000000
--- a/mesalib/configs/linux-static
+++ /dev/null
@@ -1,23 +0,0 @@
-# Configuration for generic Linux, making static libs
-
-include $(TOP)/configs/linux
-
-CONFIG_NAME = linux-static
-
-MKLIB_OPTIONS = -static
-PIC_FLAGS =
-
-# Library names (actual file names)
-GL_LIB_NAME = libGL.a
-GLU_LIB_NAME = libGLU.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 =
-GLW_LIB_DEPS =
-
-# Need to specify all libraries we may need
- -l$(GL_LIB) -lm -L/usr/X11R6/lib/ -lX11 -lXext -lXmu -lXi -lpthread
diff --git a/mesalib/configs/linux-ultrasparc b/mesalib/configs/linux-ultrasparc
deleted file mode 100644
index d6c838ed9..000000000
--- a/mesalib/configs/linux-ultrasparc
+++ /dev/null
@@ -1,7 +0,0 @@
-# Configuration for Linux on UltraSparc
-
-include $(TOP)/configs/linux-sparc
-
-CONFIG_NAME = linux-ultrasparc
-
-ARCH_FLAGS += -mv8 -mtune=ultrasparc
diff --git a/mesalib/configs/linux-x86 b/mesalib/configs/linux-x86
deleted file mode 100644
index 5970b185c..000000000
--- a/mesalib/configs/linux-x86
+++ /dev/null
@@ -1,11 +0,0 @@
-# Configuration for Linux with x86 optimizations
-
-include $(TOP)/configs/linux
-
-CONFIG_NAME = linux-x86
-
-ARCH_FLAGS = -m32 -mmmx -msse -msse2
-
-ASM_FLAGS = -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM
-MESA_ASM_SOURCES = $(X86_SOURCES)
-GLAPI_ASM_SOURCES = $(X86_API)
diff --git a/mesalib/configs/linux-x86-32 b/mesalib/configs/linux-x86-32
deleted file mode 100644
index f18ce7a45..000000000
--- a/mesalib/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/mesalib/configs/linux-x86-64 b/mesalib/configs/linux-x86-64
deleted file mode 100644
index c2441e09d..000000000
--- a/mesalib/configs/linux-x86-64
+++ /dev/null
@@ -1,14 +0,0 @@
-# Configuration for Linux for 64-bit X86 (Opteron)
-
-include $(TOP)/configs/linux
-
-CONFIG_NAME = linux-x86-64
-
-ARCH_FLAGS = -m64
-
-MESA_ASM_SOURCES = $(X86-64_SOURCES)
-GLAPI_ASM_SOURCES = $(X86-64_API)
-ASM_FLAGS = -DUSE_X86_64_ASM
-
-LIB_DIR = lib64
-EXTRA_LIB_PATH = -L/usr/X11R6/lib64
diff --git a/mesalib/configs/linux-x86-64-debug b/mesalib/configs/linux-x86-64-debug
deleted file mode 100644
index 6f631c0e8..000000000
--- a/mesalib/configs/linux-x86-64-debug
+++ /dev/null
@@ -1,8 +0,0 @@
-# Configuration for Linux for 64-bit X86 (Opteron)
-
-include $(TOP)/configs/linux-x86-64
-
-CONFIG_NAME = linux-x86-64-debug
-
-OPT_FLAGS = -g
-DEFINES += -DDEBUG -DDEBUG_MATH
diff --git a/mesalib/configs/linux-x86-64-profile b/mesalib/configs/linux-x86-64-profile
deleted file mode 100644
index 6eb9c6844..000000000
--- a/mesalib/configs/linux-x86-64-profile
+++ /dev/null
@@ -1,8 +0,0 @@
-# Configuration for profiling on Linux for 64-bit X86 (Opteron) with gprof
-
-include $(TOP)/configs/linux-x86-64-static
-
-CONFIG_NAME = linux-x86-64-profile
-
-OPT_FLAGS = -pg -g -O2
-DEFINES += -DNDEBUG
diff --git a/mesalib/configs/linux-x86-64-static b/mesalib/configs/linux-x86-64-static
deleted file mode 100644
index a066743b5..000000000
--- a/mesalib/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
-PIC_FLAGS =
-
-# Library names (actual file names)
-GL_LIB_NAME = libGL.a
-GLU_LIB_NAME = libGLU.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 =
-GLW_LIB_DEPS =
-
diff --git a/mesalib/configs/linux-x86-debug b/mesalib/configs/linux-x86-debug
deleted file mode 100644
index d35012ffa..000000000
--- a/mesalib/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 -DDEBUG_MATH
diff --git a/mesalib/configs/linux-x86-profile b/mesalib/configs/linux-x86-profile
deleted file mode 100644
index 987b5f0cf..000000000
--- a/mesalib/configs/linux-x86-profile
+++ /dev/null
@@ -1,8 +0,0 @@
-# Configuration for profiling on Linux with x86 optimizations with gprof
-
-include $(TOP)/configs/linux-x86-static
-
-CONFIG_NAME = linux-x86-profile
-
-OPT_FLAGS = -pg -g -O2
-DEFINES += -DNDEBUG
diff --git a/mesalib/configs/linux-x86-static b/mesalib/configs/linux-x86-static
deleted file mode 100644
index 255a5dd5e..000000000
--- a/mesalib/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
-PIC_FLAGS =
-
-# Library names (actual file names)
-GL_LIB_NAME = libGL.a
-GLU_LIB_NAME = libGLU.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 =
-GLW_LIB_DEPS =
-
diff --git a/mesalib/configs/netbsd b/mesalib/configs/netbsd
deleted file mode 100644
index e74ca632e..000000000
--- a/mesalib/configs/netbsd
+++ /dev/null
@@ -1,15 +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
-
-# Work around aliasing bugs - developers should comment this out
-CFLAGS += -fno-strict-aliasing
-CXXFLAGS += -fno-strict-aliasing
diff --git a/mesalib/configs/openbsd b/mesalib/configs/openbsd
deleted file mode 100644
index 259da0b08..000000000
--- a/mesalib/configs/openbsd
+++ /dev/null
@@ -1,20 +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
-
-# Work around aliasing bugs - developers should comment this out
-CFLAGS += -fno-strict-aliasing
-CXXFLAGS += -fno-strict-aliasing
-
-GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm
-OSMESA_LIB_DEPS = -lm
-GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB)
-
diff --git a/mesalib/configs/osf1 b/mesalib/configs/osf1
deleted file mode 100644
index 782f483c0..000000000
--- a/mesalib/configs/osf1
+++ /dev/null
@@ -1,14 +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 -DPTHREADS -D_REENTRANT
-CXXFLAGS = -O2 -std ansi -ieee -DPTHREADS -D_REENTRANT
-
-GL_LIB_DEPS = -lX11 -lXext -lm -lpthread
-GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lm
diff --git a/mesalib/configs/osf1-static b/mesalib/configs/osf1-static
deleted file mode 100644
index ccc97ac38..000000000
--- a/mesalib/configs/osf1-static
+++ /dev/null
@@ -1,15 +0,0 @@
-# Configuration for OSF/1
-
-include $(TOP)/configs/default
-
-CONFIG_NAME = osf1
-
-# Compiler and flags
-CC = cc
-CXX = cxx
-CFLAGS = -O2 -std1 -ieee_with_no_inexact -DUSE_XSHM -DPTHREADS -D_REENTRANT
-CXXFLAGS = -O2 -std ansi -ieee -DPTHREADS -D_REENTRANT
-MKLIB_OPTIONS = -static
-
-GL_LIB_DEPS =
-GLU_LIB_DEPS =
diff --git a/mesalib/configs/solaris-x86 b/mesalib/configs/solaris-x86
deleted file mode 100644
index 2975f5752..000000000
--- a/mesalib/configs/solaris-x86
+++ /dev/null
@@ -1,16 +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
-
-
-GL_LIB_NAME = libGL.a
-GLU_LIB_NAME = libGLU.a
-GLW_LIB_NAME = libGLw.a
-OSMESA_LIB_NAME = libOSMesa.a
diff --git a/mesalib/configs/solaris-x86-gcc b/mesalib/configs/solaris-x86-gcc
deleted file mode 100644
index baa306482..000000000
--- a/mesalib/configs/solaris-x86-gcc
+++ /dev/null
@@ -1,18 +0,0 @@
-# Configuration for Solaris on x86 with gcc, dynamic libs
-
-include $(TOP)/configs/default
-
-CONFIG_NAME = solaris-x86-gcc
-
-# Compiler and flags
-CC = gcc
-CXX = g++
-CFLAGS = -O3 -march=i486 -fPIC -I/usr/openwin/include -DUSE_XSHM
-CXXFLAGS = -O3 -march=i486 -fPIC
-
-# Work around aliasing bugs - developers should comment this out
-CFLAGS += -fno-strict-aliasing
-CXXFLAGS += -fno-strict-aliasing
-
-GL_LIB_DEPS = -L/usr/openwin/lib -lX11 -lXext -lm -lpthread
-GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lm
diff --git a/mesalib/configs/solaris-x86-gcc-static b/mesalib/configs/solaris-x86-gcc-static
deleted file mode 100644
index 9d2aa52c5..000000000
--- a/mesalib/configs/solaris-x86-gcc-static
+++ /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 -march=i486 -fPIC -I/usr/openwin/include -DUSE_XSHM
-CXXFLAGS = -O3 -march=i486 -fPIC
-MKLIB_OPTIONS = -static
-
-# Work around aliasing bugs - developers should comment this out
-CFLAGS += -fno-strict-aliasing
-CXXFLAGS += -fno-strict-aliasing
-
-GL_LIB_DEPS = -L/usr/openwin/lib -lX11 -lXext -lm -lpthread
-GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lm
-
-GL_LIB_NAME = libGL.a
-GLU_LIB_NAME = libGLU.a
-GLW_LIB_NAME = libGLw.a
-OSMESA_LIB_NAME = libOSMesa.a
diff --git a/mesalib/configs/sunos4 b/mesalib/configs/sunos4
deleted file mode 100644
index f8f1e7532..000000000
--- a/mesalib/configs/sunos4
+++ /dev/null
@@ -1,11 +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
-
-
diff --git a/mesalib/configs/sunos4-gcc b/mesalib/configs/sunos4-gcc
deleted file mode 100644
index 36a75497a..000000000
--- a/mesalib/configs/sunos4-gcc
+++ /dev/null
@@ -1,17 +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
-
-# Work around aliasing bugs - developers should comment this out
-CFLAGS += -fno-strict-aliasing
-CXXFLAGS += -fno-strict-aliasing
-
-
diff --git a/mesalib/configs/sunos4-static b/mesalib/configs/sunos4-static
deleted file mode 100644
index 4432bfd71..000000000
--- a/mesalib/configs/sunos4-static
+++ /dev/null
@@ -1,22 +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
-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 =
-GLW_LIB_DEPS =
diff --git a/mesalib/configs/sunos5 b/mesalib/configs/sunos5
deleted file mode 100644
index 3632dabf6..000000000
--- a/mesalib/configs/sunos5
+++ /dev/null
@@ -1,15 +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
-
-GL_LIB_DEPS = -L/usr/openwin/lib -L/usr/dt/lib -lX11 -lXext -lXmu -lXi -lm
-GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lm
-GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -L/usr/openwin/lib -lXt -lX11
diff --git a/mesalib/configs/sunos5-64-gcc b/mesalib/configs/sunos5-64-gcc
deleted file mode 100644
index c03903f8c..000000000
--- a/mesalib/configs/sunos5-64-gcc
+++ /dev/null
@@ -1,11 +0,0 @@
-# Configuration for 64-bit SunOS 5, with gcc
-
-include $(TOP)/configs/sunos5-gcc
-
-CONFIG_NAME = sunos5-64-gcc
-
-# only set vars that differ from sunos5-gcc config
-
-OPT_FLAGS = -O3 -m64 -mcpu=ultrasparc -mv8plus -mvis -g -fomit-frame-pointer -pipe
-
-ARCH_FLAGS = -m64
diff --git a/mesalib/configs/sunos5-gcc b/mesalib/configs/sunos5-gcc
deleted file mode 100644
index f9c1dfab5..000000000
--- a/mesalib/configs/sunos5-gcc
+++ /dev/null
@@ -1,37 +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
-
-MESA_ASM_SOURCES = $(SPARC_SOURCES)
-GLAPI_ASM_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
-
-
-# Work around aliasing bugs - developers should comment this out
-CFLAGS += -fno-strict-aliasing
-CXXFLAGS += -fno-strict-aliasing
-
-# Library/program dependencies
-EXTRA_LIB_PATH=-L/usr/openwin/lib
-
-GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lXmu -lXi -lm
diff --git a/mesalib/configs/sunos5-smp b/mesalib/configs/sunos5-smp
deleted file mode 100644
index 2d3e1026e..000000000
--- a/mesalib/configs/sunos5-smp
+++ /dev/null
@@ -1,16 +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
-
-GL_LIB_DEPS = -L/usr/openwin/lib -lX11 -lXext -lXmu -lXi -lm
-GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lm
-GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -L/usr/openwin/lib -lXt -lX11
-
diff --git a/mesalib/configs/sunos5-v8 b/mesalib/configs/sunos5-v8
deleted file mode 100644
index 5a7be86e1..000000000
--- a/mesalib/configs/sunos5-v8
+++ /dev/null
@@ -1,15 +0,0 @@
-# Configuration for SunOS 5
-
-include $(TOP)/configs/default
-
-CONFIG_NAME = sunos5-v8
-
-# Compiler and flags
-CC = cc
-CXX = CC
-CFLAGS = -xarch=v8 -KPIC -O -I/usr/openwin/include -I/usr/dt/include -DUSE_XSHM -DPTHREADS
-CXXFLAGS = -xarch=v8 -KPIC -O -I/usr/openwin/include -I/usr/dt/include -DPTHREADS
-
-GL_LIB_DEPS = -L/usr/openwin/lib -L/usr/dt/lib -lX11 -lXext -lXmu -lXi -lm -lpthread
-GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lm -lCstd -lCrun
-GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -L/usr/openwin/lib -lXt -lX11
diff --git a/mesalib/configs/sunos5-v8-static b/mesalib/configs/sunos5-v8-static
deleted file mode 100644
index b3b182d17..000000000
--- a/mesalib/configs/sunos5-v8-static
+++ /dev/null
@@ -1,14 +0,0 @@
-# Configuration for SunOS 5
-
-include $(TOP)/configs/default
-
-CONFIG_NAME = sunos5-v8-static
-
-MKLIB_OPTIONS = -static
-
-# Compiler and flags
-CC = cc
-CXX = CC
-CFLAGS = -xarch=v8 -KPIC -O -I/usr/openwin/include -I/usr/dt/include -DUSE_XSHM -DPTHREADS
-CXXFLAGS = -xarch=v8 -KPIC -O -I/usr/openwin/include -I/usr/dt/include -DPTHREADS
-
diff --git a/mesalib/configs/sunos5-v9 b/mesalib/configs/sunos5-v9
deleted file mode 100644
index 6ebe0ee49..000000000
--- a/mesalib/configs/sunos5-v9
+++ /dev/null
@@ -1,20 +0,0 @@
-# Configuration for SunOS 5, SPARC V9
-
-include $(TOP)/configs/default
-
-CONFIG_NAME = sunos5-v9
-
-MKLIB_OPTIONS = -cplusplus
-
-LIB_DIR = lib64
-
-# Compiler and flags
-CC = cc
-CXX = CC
-CFLAGS = -xarch=v9 -KPIC -O -I/usr/openwin/include -I/usr/dt/include -DUSE_XSHM -DPTHREADS
-CXXFLAGS = -xarch=v9 -KPIC -O -I/usr/openwin/include -I/usr/dt/include -DPTHREADS
-
-GL_LIB_DEPS = -L/usr/openwin/lib -L/usr/dt/lib -lX11 -lXext -lXmu -lXi -lm -lpthread
-GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lm -lCstd -lCrun
-GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -L/usr/openwin/lib -lXt -lX11
-
diff --git a/mesalib/configs/sunos5-v9-cc-g++ b/mesalib/configs/sunos5-v9-cc-g++
deleted file mode 100644
index a9e9bd3e9..000000000
--- a/mesalib/configs/sunos5-v9-cc-g++
+++ /dev/null
@@ -1,32 +0,0 @@
-# Configuration for SunOS 5, SPARC V9 and cc/g++ (for C and C++ sources)
-
-include $(TOP)/configs/default
-
-CONFIG_NAME = sunos5-v9-cc-g++
-
-MKLIB_OPTIONS = -cplusplus
-
-LIB_DIR = lib64
-
-# Compiler and flags
-CC = cc
-CXX = g++
-
-CXX_WARN_FLAGS = -Wall
-CXX_PIC_FLAGS = -fPIC
-CXX_OPT_FLAGS = -O3 -m64 -mcpu=ultrasparc -mv8plus -mvis -g -fomit-frame-pointer -pipe
-CXX_ARCH_FLAGS = -m64
-
-
-CXXFLAGS = $(CXX_WARN_FLAGS) $(CXX_OPT_FLAGS) $(CXX_PIC_FLAGS) $(CXX_ARCH_FLAGS) $(DEFINES) \
- -I/usr/openwin/include
-
-# Work around aliasing bugs - developers should comment this out
-CXXFLAGS += -fno-strict-aliasing
-
-CFLAGS = -xarch=v9 -KPIC -O -I/usr/openwin/include -I/usr/dt/include -DUSE_XSHM -DPTHREADS
-#CXXFLAGS = -xarch=v9 -KPIC -O -I/usr/openwin/include -I/usr/dt/include -DPTHREADS
-
-GL_LIB_DEPS = -L/usr/openwin/lib -L/usr/dt/lib -lX11 -lXext -lXmu -lXi -lm -lpthread
-GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lm -lCstd -lCrun
-GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -L/usr/openwin/lib -lXt -lX11
diff --git a/mesalib/configs/sunos5-v9-static b/mesalib/configs/sunos5-v9-static
deleted file mode 100644
index b2da747b8..000000000
--- a/mesalib/configs/sunos5-v9-static
+++ /dev/null
@@ -1,16 +0,0 @@
-# Configuration for SunOS 5, SPARC V9, static libs
-
-include $(TOP)/configs/default
-
-CONFIG_NAME = sunos5-v9-static
-
-MKLIB_OPTIONS = -static -cplusplus
-
-LIB_DIR = lib64
-
-# Compiler and flags
-CC = cc
-CXX = CC
-CFLAGS = -xarch=v9 -KPIC -O -I/usr/openwin/include -I/usr/dt/include -DUSE_XSHM -DPTHREADS
-CXXFLAGS = -xarch=v9 -KPIC -O -I/usr/openwin/include -I/usr/dt/include -DPTHREADS
-
diff --git a/mesalib/configs/ultrix-gcc b/mesalib/configs/ultrix-gcc
deleted file mode 100644
index d38260060..000000000
--- a/mesalib/configs/ultrix-gcc
+++ /dev/null
@@ -1,22 +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
-MKLIB_OPTIONS = -static
-
-# Work around aliasing bugs - developers should comment this out
-CFLAGS += -fno-strict-aliasing
-CXXFLAGS += -fno-strict-aliasing
-
-GL_LIB_NAME = libGL.a
-GLU_LIB_NAME = libGLU.a
-GLW_LIB_NAME = libGLw.a
-OSMESA_LIB_NAME = libOSMesa.a
-