Comment the Debian-specific configurations.

18 files changed, 85 insertions, 10 deletions

diff --git a/configs/debian b/configs/debian
index b1437e2f048..f50a2c56168 100644
--- a/configs/debian
+++ b/configs/debian
@@ -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 @@ else
 	include $(TOP)/configs/debian-any
 endif
 
+# vim: ft=make
+
diff --git a/configs/debian-alpha b/configs/debian-alpha
index 7f482a08469..74df4e106bd 100644
--- a/configs/debian-alpha
+++ b/configs/debian-alpha
@@ -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
+
diff --git a/configs/debian-amd64 b/configs/debian-amd64
index f2e34167177..de1e495dab9 100644
--- a/configs/debian-amd64
+++ b/configs/debian-amd64
@@ -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
+
diff --git a/configs/debian-any b/configs/debian-any
index 0a50109402f..24d2510ef11 100644
--- a/configs/debian-any
+++ b/configs/debian-any
@@ -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
 
diff --git a/configs/debian-common b/configs/debian-common
index b059b328b7a..c45c42d75c3 100644
--- a/configs/debian-common
+++ b/configs/debian-common
@@ -1,6 +1,10 @@
+# Override defaults set by the Mesa configuration.
+
 include $(TOP)/configs/default
 
 CONFIG_NAME = debian-common
 
 override OPT_FLAGS = -O2 -g
 
+# vim: ft=make
+
diff --git a/configs/debian-dri b/configs/debian-dri
index 57034200667..339c537b31c 100644
--- a/configs/debian-dri
+++ b/configs/debian-dri
@@ -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 @@ else
 	include $(TOP)/configs/debian-dri-any
 endif
 
+# vim: ft=make
+
diff --git a/configs/debian-dri-any b/configs/debian-dri-any
index db8c74e68bb..8c67472e187 100644
--- a/configs/debian-dri-any
+++ b/configs/debian-dri-any
@@ -1,5 +1,10 @@
+# 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
 
 CONFIG_NAME = debian-dri
 
+# vim: ft=make
+
diff --git a/configs/debian-dri-common b/configs/debian-dri-common
index ef2cebd748d..178a601e2db 100644
--- a/configs/debian-dri-common
+++ b/configs/debian-dri-common
@@ -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 PROGRAM_DIRS =
 override DRI_DRIVER_INSTALL_DIR = $(INSTALL_DIR)/lib/dri
 override DRI_DRIVER_SEARCH_DIR = /usr/lib/dri
 
+# vim: ft=make
 
diff --git a/configs/debian-dri-i386 b/configs/debian-dri-i386
index 8156804ed55..985f163660a 100644
--- a/configs/debian-dri-i386
+++ b/configs/debian-dri-i386
@@ -1,5 +1,9 @@
+# Configuration for building the DRI drivers on i386.
+
 include $(TOP)/configs/debian-dri-common
 include $(TOP)/configs/linux-dri-x86
 
 CONFIG_NAME = debian-dri-i386
 
+# vim: ft=make
+
diff --git a/configs/debian-i386 b/configs/debian-i386
index 1cec231b183..1706dabd786 100644
--- a/configs/debian-i386
+++ b/configs/debian-i386
@@ -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
+
diff --git a/configs/debian-osmesa16 b/configs/debian-osmesa16
index 93b4cdfc78d..b87178785c0 100644
--- a/configs/debian-osmesa16
+++ b/configs/debian-osmesa16
@@ -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 PROGRAM_DIRS =
 
 override APP_LIB_DEPS = -lOSMesa16
 
+# vim: ft=make
+
diff --git a/configs/debian-osmesa16-static b/configs/debian-osmesa16-static
index 3057db7c2fa..eb507a20a76 100644
--- a/configs/debian-osmesa16-static
+++ b/configs/debian-osmesa16-static
@@ -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 @@ CONFIG_NAME = debian-osmesa16-static
 
 override OSMESA_LIB_NAME = lib$(OSMESA_LIB).a
 
+# vim: ft=make
+
diff --git a/configs/debian-osmesa32 b/configs/debian-osmesa32
index 5653c3b3313..a5d5216d6d4 100644
--- a/configs/debian-osmesa32
+++ b/configs/debian-osmesa32
@@ -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 PROGRAM_DIRS =
 
 override APP_LIB_DEPS = -lOSMesa32
 
+# vim: ft=make
+
diff --git a/configs/debian-osmesa32-static b/configs/debian-osmesa32-static
index f970db81b6a..21468edbf6f 100644
--- a/configs/debian-osmesa32-static
+++ b/configs/debian-osmesa32-static
@@ -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 @@ CONFIG_NAME = debian-osmesa32-static
 
 override OSMESA_LIB_NAME = lib$(OSMESA_LIB).a
 
+# vim: ft=make
+
diff --git a/configs/debian-powerpc b/configs/debian-powerpc
index 0771dd6dd40..b366d4a6fe2 100644
--- a/configs/debian-powerpc
+++ b/configs/debian-powerpc
@@ -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
+
diff --git a/configs/debian-ppc64 b/configs/debian-ppc64
index e4c63c8ba86..3a44a6d8f40 100644
--- a/configs/debian-ppc64
+++ b/configs/debian-ppc64
@@ -1,4 +1,8 @@
+# Configuration for building Mesa on ppc64.
+
 include $(TOP)/configs/debian-ppc
 
 CONFIG_NAME = debian-ppc64
 
+# vim: ft=make
+
diff --git a/configs/debian-sparc b/configs/debian-sparc
index 6c97c87ba14..38c89372104 100644
--- a/configs/debian-sparc
+++ b/configs/debian-sparc
@@ -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
+
diff --git a/configs/debian-static b/configs/debian-static
index 202b8b0788c..4253b270f45 100644
--- a/configs/debian-static
+++ b/configs/debian-static
@@ -1,6 +1,12 @@
+# 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
 
 override MKLIB_OPTIONS = -static
 
+# vim: ft=make
+