Build Mesa utility programs (glxdemo, glxgears, glxheads, glxinfo) together

with the DRI/GLX-enabled libGL. Don't build the utilities on CPU-optimized
configurations.

5 files changed, 23 insertions, 21 deletions

diff --git a/configs/debian-dri-default b/configs/debian-dri-default
index 5fe6d787b33..31e90479c4a 100644
--- a/configs/debian-dri-default
+++ b/configs/debian-dri-default
@@ -7,8 +7,13 @@ CONFIG_NAME = debian-dri-default
 
 OPT_FLAGS = -O3 -g
 
-SRC_DIRS = glx/x11 mesa
+SRC_DIRS = glx/x11 mesa progs
 DRIVER_DIRS = dri
+PROGRAM_DIRS = xdemos
+PROGS = glxdemo \
+        glxgears \
+        glxheads \
+        glxinfo
 
 LIB_DIR = lib/glx
 
@@ -27,5 +32,7 @@ ifeq ($(DEB_BUILD_ARCH), sparc)
 	DRI_DIRS += ffb
 endif
 
+APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB)
+
 # vim: ft=make
 
diff --git a/configs/debian-dri-i386-i686 b/configs/debian-dri-i386-i686
index 02a0321abb9..b15cd77a03d 100644
--- a/configs/debian-dri-i386-i686
+++ b/configs/debian-dri-i386-i686
@@ -1,7 +1,7 @@
 # Configuration for building the DRI drivers on i386.
 
 include $(TOP)/configs/linux-dri-x86
-include $(TOP)/configs/debian-dri-default
+include $(TOP)/configs/debian-dri-optimized-default
 
 CONFIG_NAME = debian-dri-i386-i686
 
diff --git a/configs/debian-dri-optimized-default b/configs/debian-dri-optimized-default
new file mode 100644
index 00000000000..9c3f68dde7a
--- /dev/null
+++ b/configs/debian-dri-optimized-default
@@ -0,0 +1,13 @@
+# Configuration defaults for CPU-optimized builds of the DRI drivers and
+# DRI/GLX-enabled libGL.
+
+include $(TOP)/configs/debian-dri-default
+
+CONFIG_NAME = debian-dri-optimized-default
+
+# override so that the utility programs are not rebuilt with CPU-specific
+# optimizations
+SRC_DIRS = glx/x11 mesa
+
+# vim: ft=make
+
diff --git a/configs/debian-utils b/configs/debian-utils
deleted file mode 100644
index 1705802c79e..00000000000
--- a/configs/debian-utils
+++ /dev/null
@@ -1,17 +0,0 @@
-# Configuration defaults for building Mesa (swx11 and GLU).
-
-include $(TOP)/configs/debian-default
-
-CONFIG_NAME = debian-utils
-
-SRC_DIRS =
-PROGRAM_DIRS = xdemos
-PROGS = glxdemo \
-        glxgears \
-        glxheads \
-        glxinfo
-
-APP_LIB_DEPS = -lGL
-
-# vim: ft=make
-
diff --git a/debian/rules b/debian/rules
index bb2f35c061d..307088a54de 100755
--- a/debian/rules
+++ b/debian/rules
@@ -75,8 +75,7 @@ CONFIGS = $(SWX11_GLU_CONFIGS) \
           debian-osmesa16 \
           debian-osmesa16-static \
           debian-osmesa32 \
-          debian-osmesa32-static \
-          debian-utils
+          debian-osmesa32-static
 
 STAMP = $(STAMP_DIR)/$(DEB_BUILD_GNU_TYPE)
 BUILD_STAMPS = $(addprefix $(STAMP)-build-, $(CONFIGS))