Build libGLU by default for swx11+glu configurations but not in the

configurations targetting specific CPU's because it is unlikely to result in
an increase in performance.

9 files changed, 22 insertions, 8 deletions

diff --git a/configs/debian-swx11+glu-alpha-ev5 b/configs/debian-swx11+glu-alpha-ev5
index dd20e9266af..d47b10b0fd6 100644
--- a/configs/debian-swx11+glu-alpha-ev5
+++ b/configs/debian-swx11+glu-alpha-ev5
@@ -1,10 +1,11 @@
 # Configuration for building Mesa (swx11 and GLU) on alpha (ev5 optimized).
 
-include $(TOP)/configs/debian-default
+include $(TOP)/configs/debian-swx11+glu-default
 include $(TOP)/configs/linux-alpha
 
 CONFIG_NAME = debian-swx11+glu-alpha-ev5
 
+override SRC_DIRS = mesa
 override LIB_DIR = lib/ev5/cmov
 
 # vim: ft=make
diff --git a/configs/debian-swx11+glu-amd64 b/configs/debian-swx11+glu-amd64
index 080af7c357e..e3659ae972a 100644
--- a/configs/debian-swx11+glu-amd64
+++ b/configs/debian-swx11+glu-amd64
@@ -1,7 +1,7 @@
 # Configuration for building Mesa (swx11 and GLU) with runtime-detected
 # assembler optimizations on amd64.
 
-include $(TOP)/configs/debian-default
+include $(TOP)/configs/debian-swx11+glu-default
 include $(TOP)/configs/linux-x86-64
 
 CONFIG_NAME = debian-swx11+glu-amd64
diff --git a/configs/debian-swx11+glu-any b/configs/debian-swx11+glu-any
index 1269656d3ec..5b6e49fc9fb 100644
--- a/configs/debian-swx11+glu-any
+++ b/configs/debian-swx11+glu-any
@@ -1,6 +1,6 @@
 # Configuration for building Mesa (swx11 and GLU) on the build architecture.
 
-include $(TOP)/configs/debian-default
+include $(TOP)/configs/debian-swx11+glu-default
 include $(TOP)/configs/linux
 
 CONFIG_NAME = debian-swx11+glu-any
diff --git a/configs/debian-swx11+glu-default b/configs/debian-swx11+glu-default
new file mode 100644
index 00000000000..a931dbe361f
--- /dev/null
+++ b/configs/debian-swx11+glu-default
@@ -0,0 +1,10 @@
+# Configuration defaults for building Mesa (swx11 and GLU).
+
+include $(TOP)/configs/debian-default
+
+CONFIG_NAME = debian-swx11+glu-default
+
+override SRC_DIRS = mesa glu
+
+# vim: ft=make
+
diff --git a/configs/debian-swx11+glu-i386 b/configs/debian-swx11+glu-i386
index 22242254695..1892d0b144a 100644
--- a/configs/debian-swx11+glu-i386
+++ b/configs/debian-swx11+glu-i386
@@ -1,7 +1,7 @@
 # Configuration for building Mesa (swx11 and GLU) with runtime-detected
 # assembler optimizations on i386.
 
-include $(TOP)/configs/debian-default
+include $(TOP)/configs/debian-swx11+glu-default
 include $(TOP)/configs/linux-x86
 
 CONFIG_NAME = debian-swx11+glu-i386
diff --git a/configs/debian-swx11+glu-i386-i686 b/configs/debian-swx11+glu-i386-i686
index 062079f0e08..a1fcf4d4b69 100644
--- a/configs/debian-swx11+glu-i386-i686
+++ b/configs/debian-swx11+glu-i386-i686
@@ -1,12 +1,13 @@
 # Configuration for building Mesa (swx11 and GLU) with runtime-detected
 # assembler optimizations on i386 (i686 optimized).
 
-include $(TOP)/configs/debian-default
+include $(TOP)/configs/debian-swx11+glu-default
 include $(TOP)/configs/linux-x86
 
 CONFIG_NAME = debian-swx11+glu-i386-i686
 
 override ARCH_FLAGS += -mcpu=i686
+override SRC_DIRS = mesa
 override LIB_DIR = lib/i686/cmov
 
 # vim: ft=make
diff --git a/configs/debian-swx11+glu-powerpc-603 b/configs/debian-swx11+glu-powerpc-603
index a3cdaa9ab65..e0e3cdb03a7 100644
--- a/configs/debian-swx11+glu-powerpc-603
+++ b/configs/debian-swx11+glu-powerpc-603
@@ -1,11 +1,12 @@
 # Configuration for building Mesa (swx11 and GLU) with runtime-detected
 # assembler optimizations on powerpc (603 optimized).
 
-include $(TOP)/configs/debian-default
+include $(TOP)/configs/debian-swx11+glu-default
 include $(TOP)/configs/linux-ppc
 
 CONFIG_NAME = debian-swx11+glu-powerpc-603
 
+override SRC_DIRS = mesa
 override LIB_DIR = lib/603/cmov
 
 # vim: ft=make
diff --git a/configs/debian-swx11+glu-sparc b/configs/debian-swx11+glu-sparc
index db74ab4cf6d..fcc264f9d01 100644
--- a/configs/debian-swx11+glu-sparc
+++ b/configs/debian-swx11+glu-sparc
@@ -1,7 +1,7 @@
 # Configuration for building Mesa (swx11 and GLU) with runtime-detected
 # assembler optimizations on sparc.
 
-include $(TOP)/configs/debian-default
+include $(TOP)/configs/debian-swx11+glu-default
 include $(TOP)/configs/linux-sparc
 
 CONFIG_NAME = debian-swx11+glu-sparc
diff --git a/configs/debian-swx11+glu-sparc-ultrasparc b/configs/debian-swx11+glu-sparc-ultrasparc
index 3dd0d4e08b0..0894195edbd 100644
--- a/configs/debian-swx11+glu-sparc-ultrasparc
+++ b/configs/debian-swx11+glu-sparc-ultrasparc
@@ -1,11 +1,12 @@
 # Configuration for building Mesa (swx11 and GLU) with runtime-detected
 # assembler optimizations on sparc (ultrasparc-optimized).
 
-include $(TOP)/configs/debian-default
+include $(TOP)/configs/debian-swx11+glu-default
 include $(TOP)/configs/linux-ultrasparc
 
 CONFIG_NAME = debian-swx11+glu-sparc-ultrasparc
 
+override SRC_DIRS = mesa
 override LIB_DIR = lib/ultrasparc/cmov
 
 # vim: ft=make