X Strike Force X.Org X11 SVN commit: r3978 - in branches/experimental/mesa: configs debian
Author: beatle
Date: 2006-11-10 03:40:03 -0500 (Fri, 10 Nov 2006)
New Revision: 3978
Added:
branches/experimental/mesa/configs/debian-dri-optimized-default
Removed:
branches/experimental/mesa/configs/debian-utils
Modified:
branches/experimental/mesa/configs/debian-dri-default
branches/experimental/mesa/configs/debian-dri-i386-i686
branches/experimental/mesa/debian/rules
Log:
Build Mesa utility programs (glxdemo, glxgears, glxheads, glxinfo) together
with the DRI/GLX-enabled libGL. Don't build the utilities on CPU-optimized
configurations.
Modified: branches/experimental/mesa/configs/debian-dri-default
===================================================================
--- branches/experimental/mesa/configs/debian-dri-default 2006-11-10 01:49:10 UTC (rev 3977)
+++ branches/experimental/mesa/configs/debian-dri-default 2006-11-10 08:40:03 UTC (rev 3978)
@@ -7,8 +7,13 @@
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 @@
DRI_DIRS += ffb
endif
+APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB)
+
# vim: ft=make
Modified: branches/experimental/mesa/configs/debian-dri-i386-i686
===================================================================
--- branches/experimental/mesa/configs/debian-dri-i386-i686 2006-11-10 01:49:10 UTC (rev 3977)
+++ branches/experimental/mesa/configs/debian-dri-i386-i686 2006-11-10 08:40:03 UTC (rev 3978)
@@ -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
Added: branches/experimental/mesa/configs/debian-dri-optimized-default
===================================================================
--- branches/experimental/mesa/configs/debian-dri-optimized-default (rev 0)
+++ branches/experimental/mesa/configs/debian-dri-optimized-default 2006-11-10 08:40:03 UTC (rev 3978)
@@ -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
+
Deleted: branches/experimental/mesa/configs/debian-utils
===================================================================
--- branches/experimental/mesa/configs/debian-utils 2006-11-10 01:49:10 UTC (rev 3977)
+++ branches/experimental/mesa/configs/debian-utils 2006-11-10 08:40:03 UTC (rev 3978)
@@ -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
-
Modified: branches/experimental/mesa/debian/rules
===================================================================
--- branches/experimental/mesa/debian/rules 2006-11-10 01:49:10 UTC (rev 3977)
+++ branches/experimental/mesa/debian/rules 2006-11-10 08:40:03 UTC (rev 3978)
@@ -75,8 +75,7 @@
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))
Reply to: