Drop the libgl1-mesa-swx11-dbg package until there's a decision as to whether

it is really needed.

Allow more than one type of optimization libraries to be built for any given
architecture. Currently optimization configurations are provided for i386
[i686], alpha [ev5], amd64, powerpc [603], ppc64 and sparc [ultrasparc].
However, only i686 and amd64 are enabled for now for safety.

Add the libgl1-mesa-swx11-i686 for i686 optimized libraries.

Drop the debian-common configuration because it is no longer used.

Don't build libGLU in all configurations, only when needed.

14 files changed, 16 insertions, 27 deletions

diff --git a/configs/debian-alpha b/configs/debian-alpha-ev5
index 74df4e106bd..a7a79d18352 100644
--- a/configs/debian-alpha
+++ b/configs/debian-alpha-ev5
@@ -5,5 +5,7 @@ include $(TOP)/configs/linux-alpha
 
 CONFIG_NAME = debian-alpha
 
+override LIB_DIR = lib/ev5/cmov
+
 # vim: ft=make
 
diff --git a/configs/debian-amd64 b/configs/debian-amd64
index de1e495dab9..74f815efbc1 100644
--- a/configs/debian-amd64
+++ b/configs/debian-amd64
@@ -5,5 +5,7 @@ include $(TOP)/configs/linux-x86-64
 
 CONFIG_NAME = debian-amd64
 
+override LIB_DIR = lib64
+
 # vim: ft=make
 
diff --git a/configs/debian-common b/configs/debian-common
deleted file mode 100644
index 98796f6cf9f..00000000000
--- a/configs/debian-common
+++ /dev/null
@@ -1,6 +0,0 @@
-# Override defaults set by the Mesa configuration.
-
-CONFIG_NAME = debian-common
-
-# vim: ft=make
-
diff --git a/configs/debian-default b/configs/debian-default
index 8ae6b10c681..4c2a09127cd 100644
--- a/configs/debian-default
+++ b/configs/debian-default
@@ -1,14 +1,8 @@
-# Debian-specific defaults for the default Mesa configuration.
-#
-# Yes, this is somewhat confusing: this is different from debian-common in
-# that debian-common only sets general compilation flags while this file
-# overrides the directories that are actually built by default.
-
-include $(TOP)/configs/debian-common
+# Define Debian-specific defaults.
 
 CONFIG_NAME = debian-default
 
-override SRC_DIRS = mesa glu
+override SRC_DIRS = mesa
 override PROGRAM_DIRS =
 
 override INSTALL_DIR = $(DESTDIR)/usr
diff --git a/configs/debian-i386 b/configs/debian-i386-i686
index 9d56e4a4f4f..35fe0b5b87f 100644
--- a/configs/debian-i386
+++ b/configs/debian-i386-i686
@@ -5,8 +5,7 @@ include $(TOP)/configs/linux-x86
 
 CONFIG_NAME = debian-i386
 
-OPT_FLAGS += -march=i686
-
+override ARCH_FLAGS += -mcpu=i686
 override LIB_DIR = lib/i686/cmov
 
 # vim: ft=make
diff --git a/configs/debian-osmesa b/configs/debian-osmesa
index ebace88c7b1..bfd55198c09 100644
--- a/configs/debian-osmesa
+++ b/configs/debian-osmesa
@@ -5,8 +5,6 @@ include $(TOP)/configs/linux-osmesa
 
 CONFIG_NAME = debian-osmesa
 
-override SRC_DIRS = mesa
-
 # vim: ft=make
 
 
diff --git a/configs/debian-osmesa16 b/configs/debian-osmesa16
index bfe906ce160..b232e4e81a2 100644
--- a/configs/debian-osmesa16
+++ b/configs/debian-osmesa16
@@ -6,7 +6,5 @@ include $(TOP)/configs/linux-osmesa16
 
 CONFIG_NAME = debian-osmesa16
 
-override SRC_DIRS = mesa
-
 # vim: ft=make
 
diff --git a/configs/debian-osmesa16-static b/configs/debian-osmesa16-static
index 4d1cf89ce26..c3728fe7636 100644
--- a/configs/debian-osmesa16-static
+++ b/configs/debian-osmesa16-static
@@ -6,7 +6,5 @@ include $(TOP)/configs/linux-osmesa16-static
 
 CONFIG_NAME = debian-osmesa16-static
 
-override SRC_DIRS = mesa
-
 # vim: ft=make
 
diff --git a/configs/debian-osmesa32 b/configs/debian-osmesa32
index 6ac31292c32..0cd0261ebe2 100644
--- a/configs/debian-osmesa32
+++ b/configs/debian-osmesa32
@@ -6,7 +6,5 @@ include $(TOP)/configs/linux-osmesa32
 
 CONFIG_NAME = debian-osmesa32
 
-override SRC_DIRS = mesa
-
 # vim: ft=make
 
diff --git a/configs/debian-osmesa32-static b/configs/debian-osmesa32-static
index 46fd1e4194f..2c210e05608 100644
--- a/configs/debian-osmesa32-static
+++ b/configs/debian-osmesa32-static
@@ -6,7 +6,5 @@ include $(TOP)/configs/linux-osmesa32-static
 
 CONFIG_NAME = debian-osmesa32-static
 
-override SRC_DIRS = mesa
-
 # vim: ft=make
 
diff --git a/configs/debian-powerpc b/configs/debian-powerpc-603
index b366d4a6fe2..aaa7e588207 100644
--- a/configs/debian-powerpc
+++ b/configs/debian-powerpc-603
@@ -5,5 +5,7 @@ include $(TOP)/configs/linux-ppc
 
 CONFIG_NAME = debian-powerpc
 
+override LIB_DIR = lib/603/cmov
+
 # vim: ft=make
 
diff --git a/configs/debian-ppc64 b/configs/debian-ppc64
index 3a44a6d8f40..69d2872f411 100644
--- a/configs/debian-ppc64
+++ b/configs/debian-ppc64
@@ -4,5 +4,7 @@ include $(TOP)/configs/debian-ppc
 
 CONFIG_NAME = debian-ppc64
 
+override LIB_DIR = lib64
+
 # vim: ft=make
 
diff --git a/configs/debian-sparc b/configs/debian-sparc-ultrasparc
index 38c89372104..9832914e5ee 100644
--- a/configs/debian-sparc
+++ b/configs/debian-sparc-ultrasparc
@@ -5,5 +5,7 @@ include $(TOP)/configs/linux-sparc
 
 CONFIG_NAME = debian-sparc
 
+override LIB_DIR = lib/ultrasparc/cmov
+
 # vim: ft=make
 
diff --git a/configs/debian b/configs/debian-swx11+glu
index 68b7a613288..86b7f013b16 100644
--- a/configs/debian
+++ b/configs/debian-swx11+glu
@@ -1,9 +1,11 @@
-# Configuration for building Mesa on the build architecture.
+# Configuration for building Mesa (swx11 and GLU) on the build architecture.
 
 include $(TOP)/configs/debian-default
 include $(TOP)/configs/linux
 
 CONFIG_NAME = debian
 
+override SRC_DIRS = mesa glu
+
 # vim: ft=make