aboutsummaryrefslogtreecommitdiff
path: root/mesalib
diff options
context:
space:
mode:
Diffstat (limited to 'mesalib')
-rw-r--r--mesalib/.gitignore1
-rw-r--r--mesalib/Makefile271
-rw-r--r--mesalib/Makefile.am124
-rw-r--r--mesalib/bin/.gitignore1
-rw-r--r--mesalib/bin/extract_git_sha120
-rw-r--r--mesalib/bin/version.mk17
-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
-rw-r--r--mesalib/configure.ac49
-rw-r--r--mesalib/scons/source_list.py5
-rw-r--r--mesalib/src/.gitignore1
-rw-r--r--mesalib/src/Makefile40
-rw-r--r--mesalib/src/Makefile.am4
-rw-r--r--mesalib/src/glsl/Android.mk1
-rw-r--r--mesalib/src/glsl/Makefile36
-rw-r--r--mesalib/src/glsl/Makefile.sources174
-rw-r--r--mesalib/src/glsl/opt_algebraic.cpp4
-rw-r--r--mesalib/src/glsl/opt_constant_folding.cpp4
-rw-r--r--mesalib/src/glsl/opt_constant_propagation.cpp4
-rw-r--r--mesalib/src/glsl/opt_constant_variable.cpp4
-rw-r--r--mesalib/src/glsl/opt_copy_propagation.cpp4
-rw-r--r--mesalib/src/glsl/opt_copy_propagation_elements.cpp4
-rw-r--r--mesalib/src/glsl/opt_dead_code_local.cpp3
-rw-r--r--mesalib/src/glsl/opt_dead_functions.cpp3
-rw-r--r--mesalib/src/glsl/opt_function_inlining.cpp3
-rw-r--r--mesalib/src/glsl/opt_if_simplification.cpp4
-rw-r--r--mesalib/src/glsl/opt_noop_swizzle.cpp4
-rw-r--r--mesalib/src/glsl/opt_redundant_jumps.cpp4
-rw-r--r--mesalib/src/glsl/opt_structure_splitting.cpp4
-rw-r--r--mesalib/src/glsl/opt_swizzle_swizzle.cpp4
-rw-r--r--mesalib/src/glsl/opt_tree_grafting.cpp4
-rw-r--r--mesalib/src/mapi/glapi/gen/Makefile2
-rw-r--r--mesalib/src/mesa/Android.gen.mk45
-rw-r--r--mesalib/src/mesa/Makefile17
-rw-r--r--mesalib/src/mesa/main/bufferobj.c10
-rw-r--r--mesalib/src/mesa/main/dlist.c3
-rw-r--r--mesalib/src/mesa/sources.mak2
131 files changed, 377 insertions, 2530 deletions
diff --git a/mesalib/.gitignore b/mesalib/.gitignore
index 717d45d23..f481dc47e 100644
--- a/mesalib/.gitignore
+++ b/mesalib/.gitignore
@@ -40,3 +40,4 @@ Makefile.in
.dir-locals.el
.deps/
.libs/
+/Makefile
diff --git a/mesalib/Makefile b/mesalib/Makefile
deleted file mode 100644
index 0f88071aa..000000000
--- a/mesalib/Makefile
+++ /dev/null
@@ -1,271 +0,0 @@
-# Top-level Mesa makefile
-
-TOP = .
-
-SUBDIRS = src
-
-
-# The git command below generates an empty string when we're not
-# building in a GIT tree (i.e., building from a release tarball).
-default: $(TOP)/configs/current
- @$(TOP)/bin/extract_git_sha1
- @for dir in $(SUBDIRS) ; do \
- if [ -d $$dir ] ; then \
- (cd $$dir && $(MAKE)) || exit 1 ; \
- fi \
- done
-
-all: default
-
-
-doxygen:
- cd doxygen && $(MAKE)
-
-check:
- make -C src/glsl/tests check
- make -C tests check
-
-clean:
- -@touch $(TOP)/configs/current
- -@for dir in $(SUBDIRS) ; do \
- if [ -d $$dir ] ; then \
- (cd $$dir && $(MAKE) clean) ; \
- fi \
- done
- -@test -s $(TOP)/configs/current || rm -f $(TOP)/configs/current
-
-
-realclean: clean
- -rm -rf lib*
- -rm -f $(TOP)/configs/current
- -rm -f $(TOP)/configs/autoconf
- -rm -rf autom4te.cache
- -find . '(' -name '*.o' -o -name '*.a' -o -name '*.so' -o \
- -name depend -o -name depend.bak ')' -exec rm -f '{}' ';'
-
-
-distclean: realclean
-
-
-install:
- @for dir in $(SUBDIRS) ; do \
- if [ -d $$dir ] ; then \
- (cd $$dir && $(MAKE) install) || exit 1 ; \
- fi \
- done
-
-
-.PHONY: default doxygen clean realclean distclean install check
-
-# If there's no current configuration file
-$(TOP)/configs/current:
- @echo
- @echo
- @echo "Please choose a configuration from the following list:"
- @ls -1 $(TOP)/configs | grep -v "current\|default\|CVS\|autoconf.*"
- @echo
- @echo "Then type 'make <config>' (ex: 'make linux-x86')"
- @echo
- @echo "Or, run './configure' then 'make'"
- @echo "See './configure --help' for details"
- @echo
- @echo "(ignore the following error message)"
- @exit 1
-
-
-# Rules to set/install a specific build configuration
-aix \
-aix-64 \
-aix-64-static \
-aix-gcc \
-aix-static \
-autoconf \
-bluegene-osmesa \
-bluegene-xlc-osmesa \
-catamount-osmesa-pgi \
-darwin \
-darwin-fat-32bit \
-darwin-fat-all \
-freebsd \
-freebsd-dri \
-freebsd-dri-amd64 \
-freebsd-dri-x86 \
-hpux10 \
-hpux10-gcc \
-hpux10-static \
-hpux11-32 \
-hpux11-32-static \
-hpux11-32-static-nothreads \
-hpux11-64 \
-hpux11-64-static \
-hpux11-ia64 \
-hpux11-ia64-static \
-hpux9 \
-hpux9-gcc \
-irix6-64 \
-irix6-64-static \
-irix6-n32 \
-irix6-n32-static \
-irix6-o32 \
-irix6-o32-static \
-linux \
-linux-i965 \
-linux-alpha \
-linux-alpha-static \
-linux-debug \
-linux-dri \
-linux-dri-debug \
-linux-dri-x86 \
-linux-dri-x86-64 \
-linux-dri-ppc \
-linux-dri-xcb \
-linux-egl \
-linux-indirect \
-linux-fbdev \
-linux-ia64-icc \
-linux-ia64-icc-static \
-linux-icc \
-linux-icc-static \
-linux-llvm \
-linux-llvm-debug \
-linux-opengl-es \
-linux-osmesa \
-linux-osmesa-static \
-linux-osmesa16 \
-linux-osmesa16-static \
-linux-osmesa32 \
-linux-ppc \
-linux-ppc-static \
-linux-profile \
-linux-sparc \
-linux-sparc5 \
-linux-static \
-linux-ultrasparc \
-linux-tcc \
-linux-x86 \
-linux-x86-debug \
-linux-x86-32 \
-linux-x86-64 \
-linux-x86-64-debug \
-linux-x86-64-profile \
-linux-x86-64-static \
-linux-x86-profile \
-linux-x86-static \
-netbsd \
-openbsd \
-osf1 \
-osf1-static \
-solaris-x86 \
-solaris-x86-gcc \
-solaris-x86-gcc-static \
-sunos4 \
-sunos4-gcc \
-sunos4-static \
-sunos5 \
-sunos5-gcc \
-sunos5-64-gcc \
-sunos5-smp \
-sunos5-v8 \
-sunos5-v8-static \
-sunos5-v9 \
-sunos5-v9-static \
-sunos5-v9-cc-g++ \
-ultrix-gcc:
- @ if test -f configs/current -o -L configs/current; then \
- if ! cmp configs/$@ configs/current > /dev/null; then \
- echo "Please run 'make realclean' before changing configs" ; \
- exit 1 ; \
- fi ; \
- else \
- cd configs && rm -f current && ln -s $@ current ; \
- fi
- $(MAKE) default
-
-
-# Rules for making release tarballs
-
-PACKAGE_VERSION=8.1-devel
-PACKAGE_DIR = Mesa-$(PACKAGE_VERSION)
-PACKAGE_NAME = MesaLib-$(PACKAGE_VERSION)
-
-EXTRA_FILES = \
- aclocal.m4 \
- configure \
- tests/Makefile.in \
- tests/glx/Makefile.in \
- src/glsl/glsl_parser.cpp \
- src/glsl/glsl_parser.h \
- src/glsl/glsl_lexer.cpp \
- src/glsl/glcpp/glcpp-lex.c \
- src/glsl/glcpp/glcpp-parse.c \
- src/glsl/glcpp/glcpp-parse.h \
- src/mesa/main/api_exec_es1.c \
- src/mesa/main/api_exec_es1_dispatch.h \
- src/mesa/main/api_exec_es1_remap_helper.h \
- src/mesa/main/api_exec_es2.c \
- src/mesa/main/api_exec_es2_dispatch.h \
- src/mesa/main/api_exec_es2_remap_helper.h \
- src/mesa/program/lex.yy.c \
- src/mesa/program/program_parse.tab.c \
- src/mesa/program/program_parse.tab.h
-
-IGNORE_FILES = \
- -x autogen.sh
-
-
-parsers: configure
- -@touch $(TOP)/configs/current
- $(MAKE) -C src/glsl glsl_parser.cpp glsl_parser.h glsl_lexer.cpp
- $(MAKE) -C src/glsl/glcpp glcpp-lex.c glcpp-parse.c glcpp-parse.h
- $(MAKE) -C src/mesa program/lex.yy.c program/program_parse.tab.c program/program_parse.tab.h
-
-# Everything for new a Mesa release:
-ARCHIVES = $(PACKAGE_NAME).tar.gz \
- $(PACKAGE_NAME).tar.bz2 \
- $(PACKAGE_NAME).zip \
-
-tarballs: md5
- rm -f ../$(PACKAGE_DIR) $(PACKAGE_NAME).tar
-
-# Helper for autoconf builds
-ACLOCAL = aclocal
-ACLOCAL_FLAGS =
-AUTOCONF = autoconf
-AC_FLAGS =
-aclocal.m4: configure.ac acinclude.m4
- $(ACLOCAL) $(ACLOCAL_FLAGS)
-configure: configure.ac aclocal.m4 acinclude.m4
- $(AUTOCONF) $(AC_FLAGS)
-
-manifest.txt: .git
- ( \
- ls -1 $(EXTRA_FILES) ; \
- git ls-files $(IGNORE_FILES) \
- ) | sed -e '/^\(.*\/\)\?\./d' -e "s@^@$(PACKAGE_DIR)/@" > $@
-
-../$(PACKAGE_DIR):
- ln -s $(PWD) $@
-
-$(PACKAGE_NAME).tar: parsers ../$(PACKAGE_DIR) manifest.txt
- cd .. ; tar -cf $(PACKAGE_DIR)/$(PACKAGE_NAME).tar -T $(PACKAGE_DIR)/manifest.txt
-
-$(PACKAGE_NAME).tar.gz: $(PACKAGE_NAME).tar ../$(PACKAGE_DIR)
- gzip --stdout --best $(PACKAGE_NAME).tar > $(PACKAGE_NAME).tar.gz
-
-$(PACKAGE_NAME).tar.bz2: $(PACKAGE_NAME).tar
- bzip2 --stdout --best $(PACKAGE_NAME).tar > $(PACKAGE_NAME).tar.bz2
-
-$(PACKAGE_NAME).zip: parsers ../$(PACKAGE_DIR) manifest.txt
- rm -f $(PACKAGE_NAME).zip ; \
- cd .. ; \
- zip -q -@ $(PACKAGE_NAME).zip < $(PACKAGE_DIR)/manifest.txt ; \
- mv $(PACKAGE_NAME).zip $(PACKAGE_DIR)
-
-md5: $(ARCHIVES)
- @-md5sum $(PACKAGE_NAME).tar.gz
- @-md5sum $(PACKAGE_NAME).tar.bz2
- @-md5sum $(PACKAGE_NAME).zip
-
-am--refresh:
-
-.PHONY: tarballs md5 am--refresh
diff --git a/mesalib/Makefile.am b/mesalib/Makefile.am
new file mode 100644
index 000000000..59fd9b584
--- /dev/null
+++ b/mesalib/Makefile.am
@@ -0,0 +1,124 @@
+# Copyright © 2012 Intel Corporation
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the "Software"),
+# to deal in the Software without restriction, including without limitation
+# the rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice (including the next
+# paragraph) shall be included in all copies or substantial portions of the
+# Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+# IN THE SOFTWARE.
+
+SUBDIRS = src tests
+
+doxygen:
+ cd doxygen && $(MAKE)
+
+check-local:
+ $(MAKE) -C src/glsl/tests check
+
+clean-local:
+ -@touch $(top_builddir)/configs/current
+ -@for dir in $(SUBDIRS) ; do \
+ if [ -d $$dir ] ; then \
+ (cd $$dir && $(MAKE) clean) ; \
+ fi \
+ done
+ -@test -s $(top_builddir)/configs/current || rm -f $(top_builddir)/configs/current
+
+
+
+distclean-local:
+ -rm -rf lib*
+ -rm -f $(top_builddir)/configs/current
+ -rm -f $(top_builddir)/configs/autoconf
+ -find . '(' -name '*.o' -o -name '*.a' -o -name '*.so' -o \
+ -name depend -o -name depend.bak ')' -exec rm -f '{}' ';'
+
+.PHONY: doxygen
+
+# Rules for making release tarballs
+
+PACKAGE_VERSION=8.1-devel
+PACKAGE_DIR = Mesa-$(PACKAGE_VERSION)
+PACKAGE_NAME = MesaLib-$(PACKAGE_VERSION)
+
+EXTRA_FILES = \
+ aclocal.m4 \
+ configure \
+ tests/Makefile.in \
+ tests/glx/Makefile.in \
+ src/glsl/glsl_parser.cpp \
+ src/glsl/glsl_parser.h \
+ src/glsl/glsl_lexer.cpp \
+ src/glsl/glcpp/glcpp-lex.c \
+ src/glsl/glcpp/glcpp-parse.c \
+ src/glsl/glcpp/glcpp-parse.h \
+ src/mesa/main/api_exec_es1.c \
+ src/mesa/main/api_exec_es1_dispatch.h \
+ src/mesa/main/api_exec_es1_remap_helper.h \
+ src/mesa/main/api_exec_es2.c \
+ src/mesa/main/api_exec_es2_dispatch.h \
+ src/mesa/main/api_exec_es2_remap_helper.h \
+ src/mesa/program/lex.yy.c \
+ src/mesa/program/program_parse.tab.c \
+ src/mesa/program/program_parse.tab.h
+
+IGNORE_FILES = \
+ -x autogen.sh
+
+
+parsers: configure
+ -@touch $(top_builddir)/configs/current
+ $(MAKE) -C src/glsl glsl_parser.cpp glsl_parser.h glsl_lexer.cpp
+ $(MAKE) -C src/glsl/glcpp glcpp-lex.c glcpp-parse.c glcpp-parse.h
+ $(MAKE) -C src/mesa program/lex.yy.c program/program_parse.tab.c program/program_parse.tab.h
+
+# Everything for new a Mesa release:
+ARCHIVES = $(PACKAGE_NAME).tar.gz \
+ $(PACKAGE_NAME).tar.bz2 \
+ $(PACKAGE_NAME).zip
+
+tarballs: md5
+ rm -f ../$(PACKAGE_DIR) $(PACKAGE_NAME).tar
+
+manifest.txt: .git
+ ( \
+ ls -1 $(EXTRA_FILES) ; \
+ git ls-files $(IGNORE_FILES) \
+ ) | sed -e '/^\(.*\/\)\?\./d' -e "s@^@$(PACKAGE_DIR)/@" > $@
+
+../$(PACKAGE_DIR):
+ ln -s $(PWD) $@
+
+$(PACKAGE_NAME).tar: parsers ../$(PACKAGE_DIR) manifest.txt
+ cd .. ; tar -cf $(PACKAGE_DIR)/$(PACKAGE_NAME).tar -T $(PACKAGE_DIR)/manifest.txt
+
+$(PACKAGE_NAME).tar.gz: $(PACKAGE_NAME).tar ../$(PACKAGE_DIR)
+ gzip --stdout --best $(PACKAGE_NAME).tar > $(PACKAGE_NAME).tar.gz
+
+$(PACKAGE_NAME).tar.bz2: $(PACKAGE_NAME).tar
+ bzip2 --stdout --best $(PACKAGE_NAME).tar > $(PACKAGE_NAME).tar.bz2
+
+$(PACKAGE_NAME).zip: parsers ../$(PACKAGE_DIR) manifest.txt
+ rm -f $(PACKAGE_NAME).zip ; \
+ cd .. ; \
+ zip -q -@ $(PACKAGE_NAME).zip < $(PACKAGE_DIR)/manifest.txt ; \
+ mv $(PACKAGE_NAME).zip $(PACKAGE_DIR)
+
+md5: $(ARCHIVES)
+ @-md5sum $(PACKAGE_NAME).tar.gz
+ @-md5sum $(PACKAGE_NAME).tar.bz2
+ @-md5sum $(PACKAGE_NAME).zip
+
+.PHONY: tarballs md5
diff --git a/mesalib/bin/.gitignore b/mesalib/bin/.gitignore
index 2ee67a666..dfaa6d366 100644
--- a/mesalib/bin/.gitignore
+++ b/mesalib/bin/.gitignore
@@ -5,3 +5,4 @@ install-sh
/missing
ylwrap
compile
+ar-lib
diff --git a/mesalib/bin/extract_git_sha1 b/mesalib/bin/extract_git_sha1
deleted file mode 100644
index 828387016..000000000
--- a/mesalib/bin/extract_git_sha1
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-if [ ! -f src/mesa/main/git_sha1.h ]; then
- touch src/mesa/main/git_sha1.h
-fi
-
-if [ ! -d .git ]; then
- exit
-fi
-
-if which git > /dev/null; then
- # Extract the 7-digit "short" SHA1 for the current HEAD, convert
- # it to a string, and wrap it in a #define. This is used in
- # src/mesa/main/version.c to put the GIT SHA1 in the GL_VERSION string.
- git log -n 1 --oneline |\
- sed 's/^\([^ ]*\) .*/#define MESA_GIT_SHA1 "git-\1"/' \
- > src/mesa/main/git_sha1.h.tmp
- if ! cmp -s src/mesa/main/git_sha1.h.tmp src/mesa/main/git_sha1.h; then
- mv src/mesa/main/git_sha1.h.tmp src/mesa/main/git_sha1.h
- fi
-fi
diff --git a/mesalib/bin/version.mk b/mesalib/bin/version.mk
deleted file mode 100644
index ab20d79da..000000000
--- a/mesalib/bin/version.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/usr/bin/make -sf
-# Print the various Mesa version fields. This is mostly used to add the
-# version to configure.
-
-# This reflects that this script is usually called from the toplevel
-TOP = .
-
-include $(TOP)/configs/default
-
-version:
- @echo $(MESA_VERSION)
-major:
- @echo $(MESA_MAJOR)
-minor:
- @echo $(MESA_MINOR)
-tiny:
- @echo $(MESA_TINY)
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
-
diff --git a/mesalib/configure.ac b/mesalib/configure.ac
index fb7c4a684..29ee87bb0 100644
--- a/mesalib/configure.ac
+++ b/mesalib/configure.ac
@@ -2,17 +2,11 @@ dnl Process this file with autoconf to create configure.
AC_PREREQ([2.60])
-dnl Versioning - scrape the version from configs/default
-m4_define([mesa_version],
- [m4_esyscmd([${MAKE-make} -s -f bin/version.mk version | tr -d '\n' | tr -d '\r'])])
-m4_ifval(mesa_version,,
- [m4_fatal([Failed to get the Mesa version from `make -f bin/version.mk version`])])
-
dnl Tell the user about autoconf.html in the --help output
m4_divert_once([HELP_END], [
See docs/autoconf.html for more details on the options for Mesa.])
-AC_INIT([Mesa],[mesa_version],
+AC_INIT([Mesa], [8.1.0],
[https://bugs.freedesktop.org/enter_bug.cgi?product=Mesa])
AC_CONFIG_AUX_DIR([bin])
AC_CANONICAL_HOST
@@ -27,6 +21,8 @@ echo \#buildapi-variable-no-builddir >/dev/null
# to make
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
+
LT_PREREQ([2.2])
LT_INIT([disable-static])
@@ -356,6 +352,24 @@ else
LIB_EXTENSION='so' ;;
esac
fi
+AC_ARG_WITH([gl-lib-name],
+ [AS_HELP_STRING([--with-gl-lib-name@<:@=NAME@:>@],
+ [specify GL library name @<:@default=GL@:>@])],
+ [GL_LIB=$withval],
+ [GL_LIB=GL])
+AC_ARG_WITH([glu-lib-name],
+ [AS_HELP_STRING([--with-glu-lib-name@<:@=NAME@:>@],
+ [specify GLU library name @<:@default=GLU@:>@])],
+ [GLU_LIB=$withval],
+ [GLU_LIB=GLU])
+AC_ARG_WITH([osmesa-lib-name],
+ [AS_HELP_STRING([--with-osmesa-lib-name@<:@=NAME@:>@],
+ [specify OSMesa library name @<:@default=OSMesa@:>@])],
+ [OSMESA_LIB=$withval],
+ [OSMESA_LIB=OSMesa])
+AS_IF([test "x$GL_LIB" = xyes], [GL_LIB=GL])
+AS_IF([test "x$GLU_LIB" = xyes], [GLU_LIB=GLU])
+AS_IF([test "x$OSMESA_LIB" = xyes], [OSMESA_LIB=OSMesa])
dnl
dnl Mangled Mesa support
@@ -366,19 +380,16 @@ AC_ARG_ENABLE([mangling],
[enable_mangling="${enableval}"],
[enable_mangling=no]
)
-GL_LIB="GL"
-GLU_LIB="GLU"
-OSMESA_LIB="OSMesa"
if test "x${enable_mangling}" = "xyes" ; then
DEFINES="${DEFINES} -DUSE_MGL_NAMESPACE"
- GL_LIB="MangledGL"
- GLU_LIB="MangledGLU"
- OSMESA_LIB="MangledOSMesa"
+ GL_LIB="Mangled${GL_LIB}"
+ GLU_LIB="Mangled${GLU_LIB}"
+ OSMESA_LIB="Mangled${OSMESA_LIB}"
fi
AC_SUBST([GL_LIB])
AC_SUBST([GLU_LIB])
AC_SUBST([OSMESA_LIB])
-AM_CONDITIONAL(HAVE_MANGLED_GL, test $GL_LIB = MangledGL)
+AM_CONDITIONAL(HAVE_MANGLED_GL, test "x${enable_mangling}" = "xyes")
dnl
dnl potentially-infringing-but-nobody-knows-for-sure stuff
@@ -1087,18 +1098,16 @@ DRI_LIB_DEPS='$(TOP)/src/mesa/libmesa.a'
MESA_MODULES='$(TOP)/src/mesa/libmesa.a'
if test "x$enable_dri" = xyes && test "x$driglx_direct" = xyes ; then
- DRICORE_GLSL_LIBS='$(TOP)/$(LIB_DIR)/libglsl.so'
DRICORE_LIBS='$(TOP)/$(LIB_DIR)/libdricore.so'
- DRICORE_LIB_DEPS='-L$(TOP)/$(LIB_DIR) -Wl,-R$(DRI_DRIVER_INSTALL_DIR) -lglsl'
- DRI_LIB_DEPS='-L$(TOP)/$(LIB_DIR) -Wl,-R$(DRI_DRIVER_INSTALL_DIR) -ldricore -lglsl'
+ DRICORE_LIB_DEPS='-L$(TOP)/$(LIB_DIR) -Wl,-R$(DRI_DRIVER_INSTALL_DIR)'
+ DRI_LIB_DEPS='-L$(TOP)/$(LIB_DIR) -Wl,-R$(DRI_DRIVER_INSTALL_DIR) -ldricore'
DRI_CFLAGS='$(CFLAGS_NOVISIBILITY) -DUSE_DRICORE'
DRI_CXXFLAGS='$(CXXFLAGS_NOVISIBILITY) -DUSE_DRICORE'
- MESA_MODULES='$(DRICORE_LIBS) $(DRICORE_GLSL_LIBS)'
+ MESA_MODULES='$(DRICORE_LIBS)'
HAVE_DRICORE=yes
fi
AM_CONDITIONAL(HAVE_DRICORE, test x$HAVE_DRICORE = xyes)
AC_SUBST([DRICORE_LIBS])
-AC_SUBST([DRICORE_GLSL_LIBS])
AC_SUBST([DRICORE_LIB_DEPS])
AC_SUBST([DRI_CXXFLAGS])
AC_SUBST([DRI_CFLAGS])
@@ -2136,6 +2145,8 @@ CXXFLAGS="$CXXFLAGS $USER_CXXFLAGS"
dnl Substitute the config
AC_CONFIG_FILES([configs/autoconf
+ Makefile
+ src/Makefile
src/gallium/auxiliary/pipe-loader/Makefile
src/gallium/state_trackers/clover/Makefile
src/gallium/drivers/Makefile
diff --git a/mesalib/scons/source_list.py b/mesalib/scons/source_list.py
index 1d5166ba1..8111f4318 100644
--- a/mesalib/scons/source_list.py
+++ b/mesalib/scons/source_list.py
@@ -63,7 +63,7 @@ class SourceListParser(object):
self._error('not a variable definition')
if op_pos > 0:
- if line[op_pos - 1] in [':', '+']:
+ if line[op_pos - 1] in [':', '+', '?']:
op_pos -= 1
else:
self._error('only =, :=, and += are supported')
@@ -77,6 +77,9 @@ class SourceListParser(object):
self.symbol_table[sym] = val
elif op == '+=':
self.symbol_table[sym] += ' ' + val
+ elif op == '?=':
+ if sym not in self.symbol_table:
+ self.symbol_table[sym] = val
def _parse_line(self, line):
"""Parse a source list line."""
diff --git a/mesalib/src/.gitignore b/mesalib/src/.gitignore
new file mode 100644
index 000000000..5fc607b9e
--- /dev/null
+++ b/mesalib/src/.gitignore
@@ -0,0 +1 @@
+/Makefile
diff --git a/mesalib/src/Makefile b/mesalib/src/Makefile
deleted file mode 100644
index 4f65da0e3..000000000
--- a/mesalib/src/Makefile
+++ /dev/null
@@ -1,40 +0,0 @@
-# src/Makefile
-
-TOP = ..
-
-include $(TOP)/configs/current
-
-SUBDIRS = $(SRC_DIRS)
-
-
-default: message $(TOP)/$(LIB_DIR) subdirs
-
-
-message:
- @echo "Making sources for" $(CONFIG_NAME)
-
-
-subdirs:
- @for dir in $(SUBDIRS) ; do \
- if [ -d $$dir ] ; then \
- (cd $$dir && $(MAKE)) || exit 1; \
- fi \
- done
-
-install: $(TOP)/$(LIB_DIR)
- @for dir in $(SUBDIRS) ; do \
- if [ -d $$dir ] ; then \
- (cd $$dir && $(MAKE) install) || exit 1 ; \
- fi \
- done
-
-$(TOP)/$(LIB_DIR):
- -@test -d $(TOP)/$(LIB_DIR) || mkdir -p $(TOP)/$(LIB_DIR)
-
-
-clean:
- -@for dir in $(SUBDIRS) ; do \
- if [ -d $$dir ] ; then \
- (cd $$dir && $(MAKE) clean) ; \
- fi \
- done
diff --git a/mesalib/src/Makefile.am b/mesalib/src/Makefile.am
new file mode 100644
index 000000000..d6a7946ef
--- /dev/null
+++ b/mesalib/src/Makefile.am
@@ -0,0 +1,4 @@
+SUBDIRS=$(SRC_DIRS)
+
+all-local:
+ $(MKDIR_P) $(top_builddir)/$(LIB_DIR)
diff --git a/mesalib/src/glsl/Android.mk b/mesalib/src/glsl/Android.mk
index cf793d65e..66c8bec32 100644
--- a/mesalib/src/glsl/Android.mk
+++ b/mesalib/src/glsl/Android.mk
@@ -25,6 +25,7 @@
LOCAL_PATH := $(call my-dir)
+GLSL_SRCDIR = .
include $(LOCAL_PATH)/Makefile.sources
# ---------------------------------------
diff --git a/mesalib/src/glsl/Makefile b/mesalib/src/glsl/Makefile
index 7c80c95d8..3cf9fc962 100644
--- a/mesalib/src/glsl/Makefile
+++ b/mesalib/src/glsl/Makefile
@@ -7,6 +7,7 @@ include $(TOP)/configs/current
LIBNAME = glsl
+GLSL_SRCDIR=.
include Makefile.sources
GLCPP_SOURCES = \
@@ -67,9 +68,6 @@ OBJECTS = \
$(C_SOURCES:.c=.o) \
$(CXX_SOURCES:.cpp=.o)
-DRICORE_OBJ_DIR = obj-visible
-OBJECTS_DRICORE = $(addprefix $(DRICORE_OBJ_DIR)/,$(OBJECTS))
-
INCLUDES = \
-I. \
-I../mesa \
@@ -87,13 +85,7 @@ ALL_SOURCES = \
##### TARGETS #####
-default: depend lib$(LIBNAME).a $(APPS) $(DRICORE_GLSL_LIBS)
-
-$(TOP)/$(LIB_DIR)/libglsl.so: $(OBJECTS_DRICORE) builtin_function.o Makefile $(TOP)/src/glsl/Makefile.template
- $(MKLIB) -o $@ -linker '$(CXX)' -ldflags '$(LDFLAGS)' \
- -cplusplus -noprefix \
- -install $(TOP)/$(LIB_DIR) -id $(INSTALL_LIB_DIR)/$@.dylib \
- $(OBJECTS_DRICORE) builtin_function.o
+default: depend lib$(LIBNAME).a $(APPS)
lib$(LIBNAME).a: $(OBJECTS) builtin_function.o Makefile $(TOP)/src/glsl/Makefile.template
$(MKLIB) -cplusplus -o $(LIBNAME) -static $(OBJECTS) builtin_function.o
@@ -102,28 +94,16 @@ depend: $(ALL_SOURCES) Makefile
rm -f depend
touch depend
$(MKDEP) $(MKDEP_OPTIONS) $(INCLUDES) $(ALL_SOURCES) 2> /dev/null
- $(MKDEP) $(MKDEP_OPTIONS) -a -p $(DRICORE_OBJ_DIR)/ $(INCLUDES) $(ALL_SOURCES) 2> /dev/null
# Remove .o and backup files
-clean: clean-dricore
+clean:
rm -f $(GLCPP_OBJECTS) $(GLSL2_OBJECTS) $(TEST_OBJECTS) $(OBJECTS) lib$(LIBNAME).a depend depend.bak builtin_function.cpp builtin_function.o builtin_stubs.o builtin_compiler
-rm -f $(APPS)
-clean-dricore:
- -rm -f $(OBJECTS_DRICORE) $(TOP)/$(LIB_DIR)/libglsl.so libglsl.so
-
-ifneq (,$(DRICORE_GLSL_LIBS))
-DRICORE_INSTALL_TARGET = install-dricore
-endif
-
# Dummy target
-install: $(DRICORE_INSTALL_TARGET)
+install:
@echo -n ""
-install-dricore: default
- $(INSTALL) -d $(DESTDIR)$(DRI_DRIVER_INSTALL_DIR)
- $(INSTALL) -m 755 $(DRICORE_GLSL_LIBS) $(DESTDIR)$(DRI_DRIVER_INSTALL_DIR)
-
##### RULES #####
glsl_compiler: $(GLSL2_OBJECTS) libglsl.a
@@ -142,14 +122,6 @@ glcpp/glcpp: $(GLCPP_OBJECTS)
.c.o:
$(CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES) $< -o $@
-$(DRICORE_OBJ_DIR)/%.o : %.cpp
- @mkdir -p $(dir $@)
- $(CXX) -c $(INCLUDES) $(DRI_CXXFLAGS) $(DEFINES) $< -o $@
-
-$(DRICORE_OBJ_DIR)/%.o : %.c
- @mkdir -p $(dir $@)
- $(CC) -c $(INCLUDES) $(DRI_CFLAGS) $(DEFINES) $< -o $@
-
glsl_lexer.cpp: glsl_lexer.ll
$(FLEX) --nounistd -o$@ $<
diff --git a/mesalib/src/glsl/Makefile.sources b/mesalib/src/glsl/Makefile.sources
index caa8ad590..0425fa33e 100644
--- a/mesalib/src/glsl/Makefile.sources
+++ b/mesalib/src/glsl/Makefile.sources
@@ -1,93 +1,95 @@
# shared source lists for Makefile, SConscript, and Android.mk
+GLSL_SRCDIR ?= .
+
# libglcpp
-LIBGLCPP_FILES := \
- glcpp/pp.c
+LIBGLCPP_FILES = \
+ $(GLSL_SRCDIR)/glcpp/pp.c
-LIBGLCPP_GENERATED_FILES := \
- glcpp/glcpp-lex.c \
- glcpp/glcpp-parse.c
+LIBGLCPP_GENERATED_FILES = \
+ $(GLSL_SRCDIR)/glcpp/glcpp-lex.c \
+ $(GLSL_SRCDIR)/glcpp/glcpp-parse.c
# libglsl
-LIBGLSL_FILES := \
- strtod.c \
- ralloc.c
+LIBGLSL_FILES = \
+ $(GLSL_SRCDIR)/strtod.c \
+ $(GLSL_SRCDIR)/ralloc.c
-LIBGLSL_CXX_FILES := \
- ast_expr.cpp \
- ast_function.cpp \
- ast_to_hir.cpp \
- ast_type.cpp \
- builtin_variables.cpp \
- glsl_parser_extras.cpp \
- glsl_types.cpp \
- glsl_symbol_table.cpp \
- hir_field_selection.cpp \
- ir_basic_block.cpp \
- ir_builder.cpp \
- ir_clone.cpp \
- ir_constant_expression.cpp \
- ir.cpp \
- ir_expression_flattening.cpp \
- ir_function_can_inline.cpp \
- ir_function_detect_recursion.cpp \
- ir_function.cpp \
- ir_hierarchical_visitor.cpp \
- ir_hv_accept.cpp \
- ir_import_prototypes.cpp \
- ir_print_visitor.cpp \
- ir_reader.cpp \
- ir_rvalue_visitor.cpp \
- ir_set_program_inouts.cpp \
- ir_validate.cpp \
- ir_variable_refcount.cpp \
- linker.cpp \
- link_functions.cpp \
- link_uniforms.cpp \
- link_uniform_initializers.cpp \
- loop_analysis.cpp \
- loop_controls.cpp \
- loop_unroll.cpp \
- lower_clip_distance.cpp \
- lower_discard.cpp \
- lower_discard_flow.cpp \
- lower_if_to_cond_assign.cpp \
- lower_instructions.cpp \
- lower_jumps.cpp \
- lower_mat_op_to_vec.cpp \
- lower_noise.cpp \
- lower_texture_projection.cpp \
- lower_variable_index_to_cond_assign.cpp \
- lower_vec_index_to_cond_assign.cpp \
- lower_vec_index_to_swizzle.cpp \
- lower_vector.cpp \
- lower_output_reads.cpp \
- opt_algebraic.cpp \
- opt_array_splitting.cpp \
- opt_constant_folding.cpp \
- opt_constant_propagation.cpp \
- opt_constant_variable.cpp \
- opt_copy_propagation.cpp \
- opt_copy_propagation_elements.cpp \
- opt_dead_code.cpp \
- opt_dead_code_local.cpp \
- opt_dead_functions.cpp \
- opt_function_inlining.cpp \
- opt_if_simplification.cpp \
- opt_noop_swizzle.cpp \
- opt_redundant_jumps.cpp \
- opt_structure_splitting.cpp \
- opt_swizzle_swizzle.cpp \
- opt_tree_grafting.cpp \
- s_expression.cpp
+LIBGLSL_CXX_FILES = \
+ $(GLSL_SRCDIR)/ast_expr.cpp \
+ $(GLSL_SRCDIR)/ast_function.cpp \
+ $(GLSL_SRCDIR)/ast_to_hir.cpp \
+ $(GLSL_SRCDIR)/ast_type.cpp \
+ $(GLSL_SRCDIR)/builtin_variables.cpp \
+ $(GLSL_SRCDIR)/glsl_parser_extras.cpp \
+ $(GLSL_SRCDIR)/glsl_types.cpp \
+ $(GLSL_SRCDIR)/glsl_symbol_table.cpp \
+ $(GLSL_SRCDIR)/hir_field_selection.cpp \
+ $(GLSL_SRCDIR)/ir_basic_block.cpp \
+ $(GLSL_SRCDIR)/ir_builder.cpp \
+ $(GLSL_SRCDIR)/ir_clone.cpp \
+ $(GLSL_SRCDIR)/ir_constant_expression.cpp \
+ $(GLSL_SRCDIR)/ir.cpp \
+ $(GLSL_SRCDIR)/ir_expression_flattening.cpp \
+ $(GLSL_SRCDIR)/ir_function_can_inline.cpp \
+ $(GLSL_SRCDIR)/ir_function_detect_recursion.cpp \
+ $(GLSL_SRCDIR)/ir_function.cpp \
+ $(GLSL_SRCDIR)/ir_hierarchical_visitor.cpp \
+ $(GLSL_SRCDIR)/ir_hv_accept.cpp \
+ $(GLSL_SRCDIR)/ir_import_prototypes.cpp \
+ $(GLSL_SRCDIR)/ir_print_visitor.cpp \
+ $(GLSL_SRCDIR)/ir_reader.cpp \
+ $(GLSL_SRCDIR)/ir_rvalue_visitor.cpp \
+ $(GLSL_SRCDIR)/ir_set_program_inouts.cpp \
+ $(GLSL_SRCDIR)/ir_validate.cpp \
+ $(GLSL_SRCDIR)/ir_variable_refcount.cpp \
+ $(GLSL_SRCDIR)/linker.cpp \
+ $(GLSL_SRCDIR)/link_functions.cpp \
+ $(GLSL_SRCDIR)/link_uniforms.cpp \
+ $(GLSL_SRCDIR)/link_uniform_initializers.cpp \
+ $(GLSL_SRCDIR)/loop_analysis.cpp \
+ $(GLSL_SRCDIR)/loop_controls.cpp \
+ $(GLSL_SRCDIR)/loop_unroll.cpp \
+ $(GLSL_SRCDIR)/lower_clip_distance.cpp \
+ $(GLSL_SRCDIR)/lower_discard.cpp \
+ $(GLSL_SRCDIR)/lower_discard_flow.cpp \
+ $(GLSL_SRCDIR)/lower_if_to_cond_assign.cpp \
+ $(GLSL_SRCDIR)/lower_instructions.cpp \
+ $(GLSL_SRCDIR)/lower_jumps.cpp \
+ $(GLSL_SRCDIR)/lower_mat_op_to_vec.cpp \
+ $(GLSL_SRCDIR)/lower_noise.cpp \
+ $(GLSL_SRCDIR)/lower_texture_projection.cpp \
+ $(GLSL_SRCDIR)/lower_variable_index_to_cond_assign.cpp \
+ $(GLSL_SRCDIR)/lower_vec_index_to_cond_assign.cpp \
+ $(GLSL_SRCDIR)/lower_vec_index_to_swizzle.cpp \
+ $(GLSL_SRCDIR)/lower_vector.cpp \
+ $(GLSL_SRCDIR)/lower_output_reads.cpp \
+ $(GLSL_SRCDIR)/opt_algebraic.cpp \
+ $(GLSL_SRCDIR)/opt_array_splitting.cpp \
+ $(GLSL_SRCDIR)/opt_constant_folding.cpp \
+ $(GLSL_SRCDIR)/opt_constant_propagation.cpp \
+ $(GLSL_SRCDIR)/opt_constant_variable.cpp \
+ $(GLSL_SRCDIR)/opt_copy_propagation.cpp \
+ $(GLSL_SRCDIR)/opt_copy_propagation_elements.cpp \
+ $(GLSL_SRCDIR)/opt_dead_code.cpp \
+ $(GLSL_SRCDIR)/opt_dead_code_local.cpp \
+ $(GLSL_SRCDIR)/opt_dead_functions.cpp \
+ $(GLSL_SRCDIR)/opt_function_inlining.cpp \
+ $(GLSL_SRCDIR)/opt_if_simplification.cpp \
+ $(GLSL_SRCDIR)/opt_noop_swizzle.cpp \
+ $(GLSL_SRCDIR)/opt_redundant_jumps.cpp \
+ $(GLSL_SRCDIR)/opt_structure_splitting.cpp \
+ $(GLSL_SRCDIR)/opt_swizzle_swizzle.cpp \
+ $(GLSL_SRCDIR)/opt_tree_grafting.cpp \
+ $(GLSL_SRCDIR)/s_expression.cpp
# glsl_compiler
-GLSL_COMPILER_CXX_FILES := \
- standalone_scaffolding.cpp \
- main.cpp
+GLSL_COMPILER_CXX_FILES = \
+ $(GLSL_SRCDIR)/standalone_scaffolding.cpp \
+ $(GLSL_SRCDIR)/main.cpp
# builtin_compiler
#
@@ -95,14 +97,14 @@ GLSL_COMPILER_CXX_FILES := \
# For this to work, a dummy version of builtin_function.cpp,
# builtin_stubs.cpp, is used.
-BUILTIN_COMPILER_CXX_FILES := \
- builtin_stubs.cpp
+BUILTIN_COMPILER_CXX_FILES = \
+ $(GLSL_SRCDIR)/builtin_stubs.cpp
-BUILTIN_COMPILER_GENERATED_CXX_FILES := \
- glsl_lexer.cpp \
- glsl_parser.cpp
+BUILTIN_COMPILER_GENERATED_CXX_FILES = \
+ $(GLSL_SRCDIR)/glsl_lexer.cpp \
+ $(GLSL_SRCDIR)/glsl_parser.cpp
# libglsl generated sources
-LIBGLSL_GENERATED_CXX_FILES := \
- $(BUILTIN_COMPILER_GENERATED_CXX_FILES) \
- builtin_function.cpp
+LIBGLSL_GENERATED_CXX_FILES = \
+ $(GLSL_SRCDIR)/$(BUILTIN_COMPILER_GENERATED_CXX_FILES) \
+ $(GLSL_SRCDIR)/builtin_function.cpp
diff --git a/mesalib/src/glsl/opt_algebraic.cpp b/mesalib/src/glsl/opt_algebraic.cpp
index cade9611d..d39761260 100644
--- a/mesalib/src/glsl/opt_algebraic.cpp
+++ b/mesalib/src/glsl/opt_algebraic.cpp
@@ -34,6 +34,8 @@
#include "ir_optimization.h"
#include "glsl_types.h"
+namespace {
+
/**
* Visitor class for replacing expressions with ir_constant values.
*/
@@ -68,6 +70,8 @@ public:
bool progress;
};
+} /* unnamed namespace */
+
static inline bool
is_vec_zero(ir_constant *ir)
{
diff --git a/mesalib/src/glsl/opt_constant_folding.cpp b/mesalib/src/glsl/opt_constant_folding.cpp
index dcad59997..7d94d481c 100644
--- a/mesalib/src/glsl/opt_constant_folding.cpp
+++ b/mesalib/src/glsl/opt_constant_folding.cpp
@@ -32,6 +32,8 @@
#include "ir_optimization.h"
#include "glsl_types.h"
+namespace {
+
/**
* Visitor class for replacing expressions with ir_constant values.
*/
@@ -56,6 +58,8 @@ public:
bool progress;
};
+} /* unnamed namespace */
+
void
ir_constant_folding_visitor::handle_rvalue(ir_rvalue **rvalue)
{
diff --git a/mesalib/src/glsl/opt_constant_propagation.cpp b/mesalib/src/glsl/opt_constant_propagation.cpp
index 2601b52f6..c5ae36b69 100644
--- a/mesalib/src/glsl/opt_constant_propagation.cpp
+++ b/mesalib/src/glsl/opt_constant_propagation.cpp
@@ -41,6 +41,8 @@
#include "ir_optimization.h"
#include "glsl_types.h"
+namespace {
+
class acp_entry : public exec_node
{
public:
@@ -450,6 +452,8 @@ ir_constant_propagation_visitor::add_constant(ir_assignment *ir)
this->acp->push_tail(entry);
}
+} /* unnamed namespace */
+
/**
* Does a constant propagation pass on the code present in the instruction stream.
*/
diff --git a/mesalib/src/glsl/opt_constant_variable.cpp b/mesalib/src/glsl/opt_constant_variable.cpp
index f3bc8675e..1bbaf8e47 100644
--- a/mesalib/src/glsl/opt_constant_variable.cpp
+++ b/mesalib/src/glsl/opt_constant_variable.cpp
@@ -37,6 +37,8 @@
#include "ir_optimization.h"
#include "glsl_types.h"
+namespace {
+
struct assignment_entry {
exec_node link;
int assignment_count;
@@ -55,6 +57,8 @@ public:
exec_list list;
};
+} /* unnamed namespace */
+
static struct assignment_entry *
get_assignment_entry(ir_variable *var, exec_list *list)
{
diff --git a/mesalib/src/glsl/opt_copy_propagation.cpp b/mesalib/src/glsl/opt_copy_propagation.cpp
index 923619db4..2952ce594 100644
--- a/mesalib/src/glsl/opt_copy_propagation.cpp
+++ b/mesalib/src/glsl/opt_copy_propagation.cpp
@@ -38,6 +38,8 @@
#include "ir_optimization.h"
#include "glsl_types.h"
+namespace {
+
class acp_entry : public exec_node
{
public:
@@ -107,6 +109,8 @@ public:
void *mem_ctx;
};
+} /* unnamed namespace */
+
ir_visitor_status
ir_copy_propagation_visitor::visit_enter(ir_function_signature *ir)
{
diff --git a/mesalib/src/glsl/opt_copy_propagation_elements.cpp b/mesalib/src/glsl/opt_copy_propagation_elements.cpp
index 11d9d7baf..de9f4ef6f 100644
--- a/mesalib/src/glsl/opt_copy_propagation_elements.cpp
+++ b/mesalib/src/glsl/opt_copy_propagation_elements.cpp
@@ -49,6 +49,8 @@
static bool debug = false;
+namespace {
+
class acp_entry : public exec_node
{
public:
@@ -135,6 +137,8 @@ public:
void *shader_mem_ctx;
};
+} /* unnamed namespace */
+
ir_visitor_status
ir_copy_propagation_elements_visitor::visit_enter(ir_function_signature *ir)
{
diff --git a/mesalib/src/glsl/opt_dead_code_local.cpp b/mesalib/src/glsl/opt_dead_code_local.cpp
index 4af78a72c..8c31802a6 100644
--- a/mesalib/src/glsl/opt_dead_code_local.cpp
+++ b/mesalib/src/glsl/opt_dead_code_local.cpp
@@ -40,6 +40,8 @@
static bool debug = false;
+namespace {
+
class assignment_entry : public exec_node
{
public:
@@ -138,6 +140,7 @@ public:
ir_hierarchical_visitor *visitor;
};
+} /* unnamed namespace */
/**
* Adds an entry to the available copy list if it's a plain assignment
diff --git a/mesalib/src/glsl/opt_dead_functions.cpp b/mesalib/src/glsl/opt_dead_functions.cpp
index f50349395..cd3b2c12e 100644
--- a/mesalib/src/glsl/opt_dead_functions.cpp
+++ b/mesalib/src/glsl/opt_dead_functions.cpp
@@ -32,6 +32,8 @@
#include "ir_expression_flattening.h"
#include "glsl_types.h"
+namespace {
+
class signature_entry : public exec_node
{
public:
@@ -67,6 +69,7 @@ public:
void *mem_ctx;
};
+} /* unnamed namespace */
signature_entry *
ir_dead_functions_visitor::get_signature_entry(ir_function_signature *sig)
diff --git a/mesalib/src/glsl/opt_function_inlining.cpp b/mesalib/src/glsl/opt_function_inlining.cpp
index 4ff4d97d9..f9f5bd442 100644
--- a/mesalib/src/glsl/opt_function_inlining.cpp
+++ b/mesalib/src/glsl/opt_function_inlining.cpp
@@ -39,6 +39,8 @@ do_sampler_replacement(exec_list *instructions,
ir_variable *sampler,
ir_dereference *deref);
+namespace {
+
class ir_function_inlining_visitor : public ir_hierarchical_visitor {
public:
ir_function_inlining_visitor()
@@ -60,6 +62,7 @@ public:
bool progress;
};
+} /* unnamed namespace */
bool
do_function_inlining(exec_list *instructions)
diff --git a/mesalib/src/glsl/opt_if_simplification.cpp b/mesalib/src/glsl/opt_if_simplification.cpp
index 7e88208f7..e1a23d94a 100644
--- a/mesalib/src/glsl/opt_if_simplification.cpp
+++ b/mesalib/src/glsl/opt_if_simplification.cpp
@@ -30,6 +30,8 @@
#include "ir.h"
+namespace {
+
class ir_if_simplification_visitor : public ir_hierarchical_visitor {
public:
ir_if_simplification_visitor()
@@ -43,6 +45,8 @@ public:
bool made_progress;
};
+} /* unnamed namespace */
+
/* We only care about the top level "if" instructions, so don't
* descend into expressions.
*/
diff --git a/mesalib/src/glsl/opt_noop_swizzle.cpp b/mesalib/src/glsl/opt_noop_swizzle.cpp
index 0a906aaf1..693719e3d 100644
--- a/mesalib/src/glsl/opt_noop_swizzle.cpp
+++ b/mesalib/src/glsl/opt_noop_swizzle.cpp
@@ -35,6 +35,8 @@
#include "ir_print_visitor.h"
#include "glsl_types.h"
+namespace {
+
class ir_noop_swizzle_visitor : public ir_rvalue_visitor {
public:
ir_noop_swizzle_visitor()
@@ -46,6 +48,8 @@ public:
bool progress;
};
+} /* unnamed namespace */
+
void
ir_noop_swizzle_visitor::handle_rvalue(ir_rvalue **rvalue)
{
diff --git a/mesalib/src/glsl/opt_redundant_jumps.cpp b/mesalib/src/glsl/opt_redundant_jumps.cpp
index f350fa947..8606dcbb7 100644
--- a/mesalib/src/glsl/opt_redundant_jumps.cpp
+++ b/mesalib/src/glsl/opt_redundant_jumps.cpp
@@ -28,6 +28,8 @@
#include "ir.h"
+namespace {
+
class redundant_jumps_visitor : public ir_hierarchical_visitor {
public:
redundant_jumps_visitor()
@@ -42,6 +44,8 @@ public:
bool progress;
};
+} /* unnamed namespace */
+
/* We only care about the top level instructions, so don't descend
* into expressions.
*/
diff --git a/mesalib/src/glsl/opt_structure_splitting.cpp b/mesalib/src/glsl/opt_structure_splitting.cpp
index a21238dd0..60eec53b7 100644
--- a/mesalib/src/glsl/opt_structure_splitting.cpp
+++ b/mesalib/src/glsl/opt_structure_splitting.cpp
@@ -38,6 +38,8 @@
#include "ir_rvalue_visitor.h"
#include "glsl_types.h"
+namespace {
+
static bool debug = false;
// XXX using variable_entry2 here to avoid collision (MSVC multiply-defined
@@ -307,6 +309,8 @@ ir_structure_splitting_visitor::visit_leave(ir_assignment *ir)
return visit_continue;
}
+} /* unnamed namespace */
+
bool
do_structure_splitting(exec_list *instructions)
{
diff --git a/mesalib/src/glsl/opt_swizzle_swizzle.cpp b/mesalib/src/glsl/opt_swizzle_swizzle.cpp
index bc442fa86..7564c6b3b 100644
--- a/mesalib/src/glsl/opt_swizzle_swizzle.cpp
+++ b/mesalib/src/glsl/opt_swizzle_swizzle.cpp
@@ -32,6 +32,8 @@
#include "ir_optimization.h"
#include "glsl_types.h"
+namespace {
+
class ir_swizzle_swizzle_visitor : public ir_hierarchical_visitor {
public:
ir_swizzle_swizzle_visitor()
@@ -44,6 +46,8 @@ public:
bool progress;
};
+} /* unnamed namespace */
+
ir_visitor_status
ir_swizzle_swizzle_visitor::visit_enter(ir_swizzle *ir)
{
diff --git a/mesalib/src/glsl/opt_tree_grafting.cpp b/mesalib/src/glsl/opt_tree_grafting.cpp
index d86eab80e..25b18ea94 100644
--- a/mesalib/src/glsl/opt_tree_grafting.cpp
+++ b/mesalib/src/glsl/opt_tree_grafting.cpp
@@ -54,6 +54,8 @@
#include "ir_optimization.h"
#include "glsl_types.h"
+namespace {
+
static bool debug = false;
class ir_tree_grafting_visitor : public ir_hierarchical_visitor {
@@ -369,6 +371,8 @@ tree_grafting_basic_block(ir_instruction *bb_first,
}
}
+} /* unnamed namespace */
+
/**
* Does a copy propagation pass on the code present in the instruction stream.
*/
diff --git a/mesalib/src/mapi/glapi/gen/Makefile b/mesalib/src/mapi/glapi/gen/Makefile
index 5ca7050a9..75dbb1446 100644
--- a/mesalib/src/mapi/glapi/gen/Makefile
+++ b/mesalib/src/mapi/glapi/gen/Makefile
@@ -121,7 +121,7 @@ COMMON_GLX = $(COMMON) glX_API.xml glX_XML.py glX_proto_common.py
######################################################################
-all: mesa
+default: mesa
install: mesa
mesa: $(MESA_OUTPUTS)
diff --git a/mesalib/src/mesa/Android.gen.mk b/mesalib/src/mesa/Android.gen.mk
index 2a08184ae..2ea8cc433 100644
--- a/mesalib/src/mesa/Android.gen.mk
+++ b/mesalib/src/mesa/Android.gen.mk
@@ -28,16 +28,13 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES
endif
intermediates := $(call local-intermediates-dir)
+mydir := $(call my-dir)
sources := \
- main/api_exec_es1.c \
main/api_exec_es1_dispatch.h \
main/api_exec_es1_remap_helper.h \
- main/api_exec_es2.c \
main/api_exec_es2_dispatch.h \
- main/api_exec_es2_remap_helper.h \
- program/lex.yy.c \
- program/program_parse.tab.c
+ main/api_exec_es2_remap_helper.h
LOCAL_SRC_FILES := $(filter-out $(sources), $(LOCAL_SRC_FILES))
@@ -53,6 +50,7 @@ endif
sources += main/git_sha1.h
sources := $(addprefix $(intermediates)/, $(sources))
+
LOCAL_GENERATED_SOURCES += $(sources)
glapi := $(MESA_TOP)/src/mapi/glapi/gen
@@ -73,43 +71,31 @@ define es-gen
$(hide) $(PRIVATE_SCRIPT) $(1) $(PRIVATE_XML) > $@
endef
-define local-l-to-c
- @mkdir -p $(dir $@)
- @echo "Mesa Lex: $(PRIVATE_MODULE) <= $<"
- $(hide) $(LEX) -o$@ $<
-endef
-
-define local-y-to-c-and-h
- @mkdir -p $(dir $@)
- @echo "Mesa Yacc: $(PRIVATE_MODULE) <= $<"
- $(hide) $(YACC) -o $@ $<
+define generate-local
+ @echo "generate local sources"
+ $(hide) $(MESA_PYTHON2) $(glapi)/gl_enums.py -f $(glapi)/gl_and_es_API.xml > $(mydir)/main/enums.c
+ $(hide) $(MESA_PYTHON2) $(glapi)/gl_table.py -m remap_table -f $(glapi)/gl_and_es_API.xml > $(mydir)/main/dispatch.h
+ $(hide) $(MESA_PYTHON2) $(glapi)/remap_helper.py -f $(glapi)/gl_API.xml > $(mydir)/main/remap_helper.h
+ $(hide) $(MESA_PYTHON2) $(mydir)/main/es_generator.py -V GLES1.1 -S $(mydir)/main/APIspec.xml > $(mydir)/main/api_exec_es1.c
+ $(hide) $(MESA_PYTHON2) $(mydir)/main/es_generator.py -V GLES2.0 -S $(mydir)/main/APIspec.xml > $(mydir)/main/api_exec_es2.c
+
+ @echo "Mesa Lex : $(PRIVATE_MODULE)"
+ $(hide) $(LEX) -o $(mydir)/program/lex.yy.c $(mydir)/program/program_lexer.l
+ @echo "Mesa Yacc: $(PRIVATE_MODULE)"
+ $(hide) $(YACC) -d -o $(mydir)/program/program_parse.tab.c $(mydir)/program/program_parse.y
endef
-$(intermediates)/main/api_exec_%.c: PRIVATE_SCRIPT := $(MESA_PYTHON2) $(LOCAL_PATH)/main/es_generator.py
-$(intermediates)/main/api_exec_%.c: PRIVATE_XML := -S $(LOCAL_PATH)/main/APIspec.xml
$(intermediates)/main/api_exec_%_dispatch.h: PRIVATE_SCRIPT := $(MESA_PYTHON2) $(glapi)/gl_table.py
$(intermediates)/main/api_exec_%_dispatch.h: PRIVATE_XML := -f $(glapi)/gl_and_es_API.xml
$(intermediates)/main/api_exec_%_remap_helper.h: PRIVATE_SCRIPT := $(MESA_PYTHON2) $(glapi)/remap_helper.py
$(intermediates)/main/api_exec_%_remap_helper.h: PRIVATE_XML := -f $(glapi)/gl_and_es_API.xml
-$(intermediates)/main/api_exec_es1.c: $(es_src_deps)
- $(call es-gen,-V GLES1.1)
-
-$(intermediates)/main/api_exec_es2.c: $(es_src_deps)
- $(call es-gen,-V GLES2.0)
-
$(intermediates)/main/api_exec_%_dispatch.h: $(es_hdr_deps)
$(call es-gen, -c $* -m remap_table)
$(intermediates)/main/api_exec_%_remap_helper.h: $(es_hdr_deps)
$(call es-gen, -c $*)
-$(intermediates)/program/program_parse.tab.c: $(LOCAL_PATH)/program/program_parse.y
- $(local-y-to-c-and-h)
-
-$(intermediates)/program/lex.yy.c: $(LOCAL_PATH)/program/program_lexer.l
- $(local-l-to-c)
-
$(intermediates)/main/git_sha1.h:
@mkdir -p $(dir $@)
@echo "GIT-SHA1: $(PRIVATE_MODULE) <= git"
@@ -129,3 +115,4 @@ $(intermediates)/x86/matypes.h: $(matypes_deps)
@mkdir -p $(dir $@)
@echo "MATYPES: $(PRIVATE_MODULE) <= $(notdir $@)"
$(hide) $< > $@
+ $(call generate-local)
diff --git a/mesalib/src/mesa/Makefile b/mesalib/src/mesa/Makefile
index 05aea8d93..845b524e6 100644
--- a/mesalib/src/mesa/Makefile
+++ b/mesalib/src/mesa/Makefile
@@ -36,6 +36,23 @@ MESA_CXXFLAGS := $(LLVM_CFLAGS) $(CXXFLAGS)
# then convenience libs (.a) and finally the device drivers:
default: $(DEPENDS) asm_subdirs $(MESA_LIBS) driver_subdirs
+.PHONY: main/git_sha1.h.tmp
+main/git_sha1.h.tmp:
+ @touch main/git_sha1.h.tmp
+ @if test -d ../../.git; then \
+ if which git > /dev/null; then \
+ git log -n 1 --oneline | \
+ sed 's/^\([^ ]*\) .*/#define MESA_GIT_SHA1 "git-\1"/' \
+ > main/git_sha1.h.tmp ; \
+ fi \
+ fi
+
+main/git_sha1.h: main/git_sha1.h.tmp
+ @echo "updating main/git_sha1.h"
+ @if ! cmp -s main/git_sha1.h.tmp main/git_sha1.h; then \
+ mv main/git_sha1.h.tmp main/git_sha1.h ;\
+ fi
+
# include glapi_gen.mk for generating glapi headers for GLES
GLAPI := $(TOP)/src/mapi/glapi/gen
include $(GLAPI)/glapi_gen.mk
diff --git a/mesalib/src/mesa/main/bufferobj.c b/mesalib/src/mesa/main/bufferobj.c
index a6a269330..3f7db8605 100644
--- a/mesalib/src/mesa/main/bufferobj.c
+++ b/mesalib/src/mesa/main/bufferobj.c
@@ -848,6 +848,10 @@ _mesa_DeleteBuffersARB(GLsizei n, const GLuint *ids)
_mesa_BindBufferARB( GL_PIXEL_UNPACK_BUFFER_EXT, 0 );
}
+ if (ctx->Texture.BufferObject == bufObj) {
+ _mesa_BindBufferARB( GL_TEXTURE_BUFFER, 0 );
+ }
+
/* The ID is immediately freed for re-use */
_mesa_HashRemove(ctx->Shared->BufferObjects, ids[i]);
/* Make sure we do not run into the classic ABA problem on bind.
@@ -1360,6 +1364,12 @@ _mesa_CopyBufferSubData(GLenum readTarget, GLenum writeTarget,
return;
}
+ if (size < 0) {
+ _mesa_error(ctx, GL_INVALID_VALUE,
+ "glCopyBufferSubData(writeOffset = %d)", (int) size);
+ return;
+ }
+
if (readOffset + size > src->Size) {
_mesa_error(ctx, GL_INVALID_VALUE,
"glCopyBufferSubData(readOffset + size = %d)",
diff --git a/mesalib/src/mesa/main/dlist.c b/mesalib/src/mesa/main/dlist.c
index c1c65ea25..e04f7ae6b 100644
--- a/mesalib/src/mesa/main/dlist.c
+++ b/mesalib/src/mesa/main/dlist.c
@@ -10445,6 +10445,9 @@ _mesa_create_save_table(void)
/* GL_ARB_debug_output (no dlist support) */
_mesa_init_errors_dispatch(table);
+ /* GL_NV_primitive_restart */
+ SET_PrimitiveRestartIndexNV(table, _mesa_PrimitiveRestartIndex);
+
return table;
}
diff --git a/mesalib/src/mesa/sources.mak b/mesalib/src/mesa/sources.mak
index 63fbf58c6..608aa79ab 100644
--- a/mesalib/src/mesa/sources.mak
+++ b/mesalib/src/mesa/sources.mak
@@ -1,5 +1,7 @@
### Lists of source files, included by Makefiles
+SRCDIR ?= .
+
# this is part of MAIN_FILES
MAIN_ES_FILES = \
$(SRCDIR)/main/api_exec_es1.c \