X Strike Force X.Org X11 SVN commit: r3789 - branches/experimental/mesa/configs
Author: beatle
Date: 2006-10-14 12:25:30 -0400 (Sat, 14 Oct 2006)
New Revision: 3789
Modified:
branches/experimental/mesa/configs/debian
branches/experimental/mesa/configs/debian-alpha
branches/experimental/mesa/configs/debian-amd64
branches/experimental/mesa/configs/debian-any
branches/experimental/mesa/configs/debian-common
branches/experimental/mesa/configs/debian-dri
branches/experimental/mesa/configs/debian-dri-any
branches/experimental/mesa/configs/debian-dri-common
branches/experimental/mesa/configs/debian-dri-i386
branches/experimental/mesa/configs/debian-i386
branches/experimental/mesa/configs/debian-osmesa16
branches/experimental/mesa/configs/debian-osmesa16-static
branches/experimental/mesa/configs/debian-osmesa32
branches/experimental/mesa/configs/debian-osmesa32-static
branches/experimental/mesa/configs/debian-powerpc
branches/experimental/mesa/configs/debian-ppc64
branches/experimental/mesa/configs/debian-sparc
branches/experimental/mesa/configs/debian-static
Log:
Comment the Debian-specific configurations.
Modified: branches/experimental/mesa/configs/debian
===================================================================
--- branches/experimental/mesa/configs/debian 2006-10-14 16:24:57 UTC (rev 3788)
+++ branches/experimental/mesa/configs/debian 2006-10-14 16:25:30 UTC (rev 3789)
@@ -1,4 +1,4 @@
-#DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
+# Select the correct configuration depending on the build architecture.
ifneq ($(wildcard $(TOP)/configs/debian-$(DEB_BUILD_ARCH)),)
include $(TOP)/configs/debian-$(DEB_BUILD_ARCH)
@@ -6,3 +6,5 @@
include $(TOP)/configs/debian-any
endif
+# vim: ft=make
+
Modified: branches/experimental/mesa/configs/debian-alpha
===================================================================
--- branches/experimental/mesa/configs/debian-alpha 2006-10-14 16:24:57 UTC (rev 3788)
+++ branches/experimental/mesa/configs/debian-alpha 2006-10-14 16:25:30 UTC (rev 3789)
@@ -1,5 +1,9 @@
-include $(TOP)/configs/debian-common
+# Configuration for building Mesa on alpha.
+
+include $(TOP)/configs/debian-default
include $(TOP)/configs/linux-alpha
CONFIG_NAME = debian-alpha
+# vim: ft=make
+
Modified: branches/experimental/mesa/configs/debian-amd64
===================================================================
--- branches/experimental/mesa/configs/debian-amd64 2006-10-14 16:24:57 UTC (rev 3788)
+++ branches/experimental/mesa/configs/debian-amd64 2006-10-14 16:25:30 UTC (rev 3789)
@@ -1,5 +1,9 @@
-include $(TOP)/configs/debian-common
+# Configuration for building Mesa on amd64.
+
+include $(TOP)/configs/debian-default
include $(TOP)/configs/linux-x86-64
CONFIG_NAME = debian-amd64
+# vim: ft=make
+
Modified: branches/experimental/mesa/configs/debian-any
===================================================================
--- branches/experimental/mesa/configs/debian-any 2006-10-14 16:24:57 UTC (rev 3788)
+++ branches/experimental/mesa/configs/debian-any 2006-10-14 16:25:30 UTC (rev 3789)
@@ -1,8 +1,10 @@
-include $(TOP)/configs/debian-common
+# Fallback configuration for building Mesa on architectures for which no
+# architecture-specific configuration is provided.
+
+include $(TOP)/configs/debian-default
include $(TOP)/configs/linux
CONFIG_NAME = debian
-override SRC_DIRS = mesa glu
-override PROGRAM_DIRS =
+# vim: ft=make
Modified: branches/experimental/mesa/configs/debian-common
===================================================================
--- branches/experimental/mesa/configs/debian-common 2006-10-14 16:24:57 UTC (rev 3788)
+++ branches/experimental/mesa/configs/debian-common 2006-10-14 16:25:30 UTC (rev 3789)
@@ -1,3 +1,5 @@
+# Override defaults set by the Mesa configuration.
+
include $(TOP)/configs/default
CONFIG_NAME = debian-common
@@ -4,3 +6,5 @@
override OPT_FLAGS = -O2 -g
+# vim: ft=make
+
Modified: branches/experimental/mesa/configs/debian-dri
===================================================================
--- branches/experimental/mesa/configs/debian-dri 2006-10-14 16:24:57 UTC (rev 3788)
+++ branches/experimental/mesa/configs/debian-dri 2006-10-14 16:25:30 UTC (rev 3789)
@@ -1,4 +1,5 @@
-#DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
+# Select the correct configuration for building the DRI drivers depending on
+# the build architecture.
ifneq ($(wildcard $(TOP)/configs/debian-dri-$(DEB_BUILD_ARCH)),)
include $(TOP)/configs/debian-dri-$(DEB_BUILD_ARCH)
@@ -6,3 +7,5 @@
include $(TOP)/configs/debian-dri-any
endif
+# vim: ft=make
+
Modified: branches/experimental/mesa/configs/debian-dri-any
===================================================================
--- branches/experimental/mesa/configs/debian-dri-any 2006-10-14 16:24:57 UTC (rev 3788)
+++ branches/experimental/mesa/configs/debian-dri-any 2006-10-14 16:25:30 UTC (rev 3789)
@@ -1,3 +1,6 @@
+# Fallback configuration for building the DRI drivers on architectures for
+# which no architecture-specific configuration is provided.
+
include $(TOP)/configs/debian-dri-common
include $(TOP)/configs/linux-dri
@@ -3,2 +6,4 @@
CONFIG_NAME = debian-dri
+# vim: ft=make
+
Modified: branches/experimental/mesa/configs/debian-dri-common
===================================================================
--- branches/experimental/mesa/configs/debian-dri-common 2006-10-14 16:24:57 UTC (rev 3788)
+++ branches/experimental/mesa/configs/debian-dri-common 2006-10-14 16:25:30 UTC (rev 3789)
@@ -1,3 +1,5 @@
+# Override defaults for the DRI drivers build.
+
include $(TOP)/configs/debian-common
CONFIG_NAME = debian-dri-common
@@ -8,4 +10,5 @@
override DRI_DRIVER_INSTALL_DIR = $(INSTALL_DIR)/lib/dri
override DRI_DRIVER_SEARCH_DIR = /usr/lib/dri
+# vim: ft=make
Modified: branches/experimental/mesa/configs/debian-dri-i386
===================================================================
--- branches/experimental/mesa/configs/debian-dri-i386 2006-10-14 16:24:57 UTC (rev 3788)
+++ branches/experimental/mesa/configs/debian-dri-i386 2006-10-14 16:25:30 UTC (rev 3789)
@@ -1,3 +1,5 @@
+# Configuration for building the DRI drivers on i386.
+
include $(TOP)/configs/debian-dri-common
include $(TOP)/configs/linux-dri-x86
@@ -3,2 +5,4 @@
CONFIG_NAME = debian-dri-i386
+# vim: ft=make
+
Modified: branches/experimental/mesa/configs/debian-i386
===================================================================
--- branches/experimental/mesa/configs/debian-i386 2006-10-14 16:24:57 UTC (rev 3788)
+++ branches/experimental/mesa/configs/debian-i386 2006-10-14 16:25:30 UTC (rev 3789)
@@ -1,5 +1,9 @@
-include $(TOP)/configs/debian-common
+# Configuration for building Mesa on i386.
+
+include $(TOP)/configs/debian-default
include $(TOP)/configs/linux-x86
CONFIG_NAME = debian-i386
+# vim: ft=make
+
Modified: branches/experimental/mesa/configs/debian-osmesa16
===================================================================
--- branches/experimental/mesa/configs/debian-osmesa16 2006-10-14 16:24:57 UTC (rev 3788)
+++ branches/experimental/mesa/configs/debian-osmesa16 2006-10-14 16:25:30 UTC (rev 3789)
@@ -1,4 +1,8 @@
+# Configuration for building OSMesa with support for 16 bits per color
+# channel.
+
include $(TOP)/configs/debian-common
+include $(TOP)/configs/linux-osmesa
CONFIG_NAME = debian-osmesa16
@@ -13,3 +17,5 @@
override APP_LIB_DEPS = -lOSMesa16
+# vim: ft=make
+
Modified: branches/experimental/mesa/configs/debian-osmesa16-static
===================================================================
--- branches/experimental/mesa/configs/debian-osmesa16-static 2006-10-14 16:24:57 UTC (rev 3788)
+++ branches/experimental/mesa/configs/debian-osmesa16-static 2006-10-14 16:25:30 UTC (rev 3789)
@@ -1,3 +1,6 @@
+# Configuration for building a static version of OSMesa with support for 16
+# bits per color channel.
+
include $(TOP)/configs/debian-static
include $(TOP)/configs/debian-osmesa16
@@ -5,3 +8,5 @@
override OSMESA_LIB_NAME = lib$(OSMESA_LIB).a
+# vim: ft=make
+
Modified: branches/experimental/mesa/configs/debian-osmesa32
===================================================================
--- branches/experimental/mesa/configs/debian-osmesa32 2006-10-14 16:24:57 UTC (rev 3788)
+++ branches/experimental/mesa/configs/debian-osmesa32 2006-10-14 16:25:30 UTC (rev 3789)
@@ -1,4 +1,8 @@
+# Configuration for building OSMesa with support for 32 bits per color
+# channel.
+
include $(TOP)/configs/debian-common
+include $(TOP)/configs/linux-osmesa
CONFIG_NAME = debian-osmesa32
@@ -13,3 +17,5 @@
override APP_LIB_DEPS = -lOSMesa32
+# vim: ft=make
+
Modified: branches/experimental/mesa/configs/debian-osmesa32-static
===================================================================
--- branches/experimental/mesa/configs/debian-osmesa32-static 2006-10-14 16:24:57 UTC (rev 3788)
+++ branches/experimental/mesa/configs/debian-osmesa32-static 2006-10-14 16:25:30 UTC (rev 3789)
@@ -1,3 +1,6 @@
+# Configuration for building a static version of OSMesa with support for 32
+# bits per color channel.
+
include $(TOP)/configs/debian-static
include $(TOP)/configs/debian-osmesa32
@@ -5,3 +8,5 @@
override OSMESA_LIB_NAME = lib$(OSMESA_LIB).a
+# vim: ft=make
+
Modified: branches/experimental/mesa/configs/debian-powerpc
===================================================================
--- branches/experimental/mesa/configs/debian-powerpc 2006-10-14 16:24:57 UTC (rev 3788)
+++ branches/experimental/mesa/configs/debian-powerpc 2006-10-14 16:25:30 UTC (rev 3789)
@@ -1,5 +1,9 @@
-include $(TOP)/configs/debian-common
+# Configuration for building Mesa on powerpc.
+
+include $(TOP)/configs/debian-default
include $(TOP)/configs/linux-ppc
CONFIG_NAME = debian-powerpc
+# vim: ft=make
+
Modified: branches/experimental/mesa/configs/debian-ppc64
===================================================================
--- branches/experimental/mesa/configs/debian-ppc64 2006-10-14 16:24:57 UTC (rev 3788)
+++ branches/experimental/mesa/configs/debian-ppc64 2006-10-14 16:25:30 UTC (rev 3789)
@@ -1,3 +1,5 @@
+# Configuration for building Mesa on ppc64.
+
include $(TOP)/configs/debian-ppc
CONFIG_NAME = debian-ppc64
@@ -2 +4,3 @@
+# vim: ft=make
+
Modified: branches/experimental/mesa/configs/debian-sparc
===================================================================
--- branches/experimental/mesa/configs/debian-sparc 2006-10-14 16:24:57 UTC (rev 3788)
+++ branches/experimental/mesa/configs/debian-sparc 2006-10-14 16:25:30 UTC (rev 3789)
@@ -1,5 +1,9 @@
-include $(TOP)/configs/debian-common
+# Configuration for building Mesa on sparc.
+
+include $(TOP)/configs/debian-default
include $(TOP)/configs/linux-sparc
CONFIG_NAME = debian-sparc
+# vim: ft=make
+
Modified: branches/experimental/mesa/configs/debian-static
===================================================================
--- branches/experimental/mesa/configs/debian-static 2006-10-14 16:24:57 UTC (rev 3788)
+++ branches/experimental/mesa/configs/debian-static 2006-10-14 16:25:30 UTC (rev 3789)
@@ -1,3 +1,7 @@
+# Override options needed to build static versions of the libraries.
+#
+# This configuration cannot be used standalone.
+
include $(TOP)/configs/debian-common
CONFIG_NAME = debian-static
@@ -4,3 +8,5 @@
override MKLIB_OPTIONS = -static
+# vim: ft=make
+
Reply to: