From b96d50da8b56010a040c93027b4c4eb35f922d51 Mon Sep 17 00:00:00 2001
From: Jakob Bornecrantz <jakob@vmware.com>
Date: Tue, 10 Feb 2009 13:59:35 +0100
Subject: [PATCH] Revert "mesa: added new linux-gallium and linux-gallium-debug
 configs"

This reverts commit abbe96cb6e7581a52652030e40442b943a482840.

It only reverts parts of the commit the other parts where related to
libmesagallium changes.
---
 Makefile                    |  2 --
 configs/default             | 12 ++++++++++--
 configs/linux-gallium       | 22 ----------------------
 configs/linux-gallium-debug |  8 --------
 4 files changed, 10 insertions(+), 34 deletions(-)
 delete mode 100644 configs/linux-gallium
 delete mode 100644 configs/linux-gallium-debug

diff --git a/Makefile b/Makefile
index 24cfbe59227..c79fb1cb28b 100644
--- a/Makefile
+++ b/Makefile
@@ -115,8 +115,6 @@ linux-dri-x86-64 \
 linux-dri-ppc \
 linux-dri-xcb \
 linux-egl \
-linux-gallium \
-linux-gallium-debug \
 linux-indirect \
 linux-fbdev \
 linux-glide \
diff --git a/configs/default b/configs/default
index ec8d51ccfed..13bda58f188 100644
--- a/configs/default
+++ b/configs/default
@@ -79,16 +79,24 @@ MOTIF_CFLAGS = -I/usr/include/Motif1.2
 
 # Directories to build
 LIB_DIR = lib
-SRC_DIRS = mesa egl glu glut/glx glew glw
+SRC_DIRS = mesa gallium egl gallium/winsys glu glut/glx glew glw
 GLU_DIRS = sgi
-DRIVER_DIRS = x11 osmesa
+DRIVER_DIRS = 
 # Which subdirs under $(TOP)/progs/ to enter:
 PROGRAM_DIRS = demos redbook samples glsl xdemos
 
 # EGL directories
 EGL_DRIVERS_DIRS = demo
 
+# Gallium directories and 
+GALLIUM_AUXILIARY_DIRS = draw translate cso_cache pipebuffer tgsi sct rtasm util indices
+GALLIUM_AUXILIARIES = $(foreach DIR,$(GALLIUM_AUXILIARY_DIRS),$(TOP)/src/gallium/auxiliary/$(DIR)/lib$(DIR).a)
+GALLIUM_DRIVER_DIRS = softpipe i915simple i965simple nv04 nv10 nv20 nv30 nv40 nv50 failover trace
+GALLIUM_DRIVERS = $(foreach DIR,$(GALLIUM_DRIVER_DIRS),$(TOP)/src/gallium/drivers/$(DIR)/lib$(DIR).a)
+GALLIUM_WINSYS_DIRS = xlib egl_xlib
 
+
+# Library dependencies
 #EXTRA_LIB_PATH ?=
 GL_LIB_DEPS     = $(EXTRA_LIB_PATH) -lX11 -lXext -lm -lpthread
 OSMESA_LIB_DEPS = $(EXTRA_LIB_PATH) -L$(TOP)/$(LIB_DIR) -l$(GL_LIB)
diff --git a/configs/linux-gallium b/configs/linux-gallium
deleted file mode 100644
index b046f248ecb..00000000000
--- a/configs/linux-gallium
+++ /dev/null
@@ -1,22 +0,0 @@
-# Configuration for Linux / Gallium
-
-include $(TOP)/configs/linux
-
-CONFIG_NAME = linux-gallium
-
-
-# Directories to build (adds gallium to SRC_DIRS)
-SRC_DIRS = mesa gallium egl gallium/winsys glu glut/glx glew glw
-
-
-# don't build old/conventional Mesa drivers
-DRIVER_DIRS =
-
-
-# Gallium directories and 
-GALLIUM_AUXILIARY_DIRS = draw translate cso_cache pipebuffer tgsi sct rtasm util indices
-GALLIUM_AUXILIARIES = $(foreach DIR,$(GALLIUM_AUXILIARY_DIRS),$(TOP)/src/gallium/auxiliary/$(DIR)/lib$(DIR).a)
-GALLIUM_DRIVER_DIRS = softpipe i915simple i965simple nv04 nv10 nv20 nv30 nv40 nv50 failover trace
-GALLIUM_DRIVERS = $(foreach DIR,$(GALLIUM_DRIVER_DIRS),$(TOP)/src/gallium/drivers/$(DIR)/lib$(DIR).a)
-GALLIUM_WINSYS_DIRS = xlib egl_xlib
-
diff --git a/configs/linux-gallium-debug b/configs/linux-gallium-debug
deleted file mode 100644
index 111c43b8848..00000000000
--- a/configs/linux-gallium-debug
+++ /dev/null
@@ -1,8 +0,0 @@
-# Configuration for Linux / Gallium for debug
-
-include $(TOP)/configs/linux-gallium
-
-CONFIG_NAME = linux-gallium-debug
-
-OPT_FLAGS = -g -ansi -pedantic
-DEFINES += -DDEBUG -DDEBUG_MATH