summaryrefslogtreecommitdiff
path: root/configs
diff options
context:
space:
mode:
authorThierry Reding <thierry@gilfi.de>2006-10-20 07:43:50 +0000
committerThierry Reding <thierry@gilfi.de>2006-10-20 07:43:50 +0000
commit24ff74bdcba2508bf5f7d97041a620fe0071d0de (patch)
tree9e3b0a4f4e4d613d3a54b0034328f983c14f5544 /configs
parent230e79916f877f87bcf7bc6b2a3eca014e54249d (diff)
Add configurations to build static versions of the default OSMesa library.
In all Debian-specific configurations, include the Debian defaults configuration after the Mesa configurations and drop the 'override' for all variables because it is no longer needed.
Diffstat (limited to 'configs')
-rw-r--r--configs/debian-default6
-rw-r--r--configs/debian-dri-amd642
-rw-r--r--configs/debian-dri-any2
-rw-r--r--configs/debian-dri-default21
-rw-r--r--configs/debian-dri-i3862
-rw-r--r--configs/debian-osmesa5
-rw-r--r--configs/debian-osmesa-default10
-rw-r--r--configs/debian-osmesa-static9
-rw-r--r--configs/debian-osmesa162
-rw-r--r--configs/debian-osmesa16-static2
-rw-r--r--configs/debian-osmesa322
-rw-r--r--configs/debian-osmesa32-static2
-rw-r--r--configs/debian-swx11+glu-alpha-ev56
-rw-r--r--configs/debian-swx11+glu-amd642
-rw-r--r--configs/debian-swx11+glu-any2
-rw-r--r--configs/debian-swx11+glu-default3
-rw-r--r--configs/debian-swx11+glu-i3862
-rw-r--r--configs/debian-swx11+glu-i386-i6868
-rw-r--r--configs/debian-swx11+glu-powerpc-6036
-rw-r--r--configs/debian-swx11+glu-ppc644
-rw-r--r--configs/debian-swx11+glu-sparc2
-rw-r--r--configs/debian-swx11+glu-sparc-ultrasparc6
-rw-r--r--configs/debian-swx11+glu-static2
-rw-r--r--configs/linux-osmesa-static14
24 files changed, 80 insertions, 42 deletions
diff --git a/configs/debian-default b/configs/debian-default
index 4c2a09127cd..1fd065ee5ce 100644
--- a/configs/debian-default
+++ b/configs/debian-default
@@ -2,10 +2,10 @@
CONFIG_NAME = debian-default
-override SRC_DIRS = mesa
-override PROGRAM_DIRS =
+SRC_DIRS = mesa
+PROGRAM_DIRS =
-override INSTALL_DIR = $(DESTDIR)/usr
+INSTALL_DIR = $(DESTDIR)/usr
# vim: ft=make
diff --git a/configs/debian-dri-amd64 b/configs/debian-dri-amd64
index 26cae1627ef..ff4232b1200 100644
--- a/configs/debian-dri-amd64
+++ b/configs/debian-dri-amd64
@@ -1,7 +1,7 @@
# Configuration for building the DRI drivers on i386.
-include $(TOP)/configs/debian-dri-default
include $(TOP)/configs/linux-dri-x86-64
+include $(TOP)/configs/debian-dri-default
CONFIG_NAME = debian-dri-amd64
diff --git a/configs/debian-dri-any b/configs/debian-dri-any
index 6e888d52b72..c4b65b0c482 100644
--- a/configs/debian-dri-any
+++ b/configs/debian-dri-any
@@ -1,7 +1,7 @@
# Configuration for building the DRI drivers on the build architecture.
-include $(TOP)/configs/debian-dri-default
include $(TOP)/configs/linux-dri
+include $(TOP)/configs/debian-dri-default
CONFIG_NAME = debian-dri-any
diff --git a/configs/debian-dri-default b/configs/debian-dri-default
index 845acd81142..5fe6d787b33 100644
--- a/configs/debian-dri-default
+++ b/configs/debian-dri-default
@@ -1,25 +1,30 @@
-# Override defaults for the DRI drivers build.
+# Configuration defaults for building the DRI drivers and DRI/GLX-enabled
+# libGL.
include $(TOP)/configs/debian-default
CONFIG_NAME = debian-dri-default
-override LIB_DIR = lib/glx
-override SRC_DIRS = glx/x11 mesa
+OPT_FLAGS = -O3 -g
-override DRI_DRIVER_INSTALL_DIR = $(INSTALL_DIR)/lib/dri
-override DRI_DRIVER_SEARCH_DIR = /usr/lib/dri
+SRC_DIRS = glx/x11 mesa
+DRIVER_DIRS = dri
-override DRI_DIRS = mach64 mga r128 r200 r300 radeon s3v savage tdfx trident
+LIB_DIR = lib/glx
+
+DRI_DRIVER_INSTALL_DIR = $(INSTALL_DIR)/lib/dri
+DRI_DRIVER_SEARCH_DIR = /usr/lib/dri
+
+DRI_DIRS = mach64 mga r128 r200 r300 radeon s3v savage tdfx trident
ARCH_X86 = i386 amd64
ifneq ($(findstring $(DEB_BUILD_ARCH), $(ARCH_X86)),)
- override DRI_DIRS += i810 i915 i965 sis unichrome
+ DRI_DIRS += i810 i915 i965 sis unichrome
endif
ifeq ($(DEB_BUILD_ARCH), sparc)
- override DRI_DIRS += ffb
+ DRI_DIRS += ffb
endif
# vim: ft=make
diff --git a/configs/debian-dri-i386 b/configs/debian-dri-i386
index 2bf52eb58b6..7a0aaa487d2 100644
--- a/configs/debian-dri-i386
+++ b/configs/debian-dri-i386
@@ -1,7 +1,7 @@
# Configuration for building the DRI drivers on i386.
-include $(TOP)/configs/debian-dri-default
include $(TOP)/configs/linux-dri-x86
+include $(TOP)/configs/debian-dri-default
CONFIG_NAME = debian-dri-i386
diff --git a/configs/debian-osmesa b/configs/debian-osmesa
index bfd55198c09..9b7fc7b2afd 100644
--- a/configs/debian-osmesa
+++ b/configs/debian-osmesa
@@ -1,10 +1,9 @@
-# Configuration for building OSMesa on Debian.
+# Configuration for building only OSMesa on Debian.
-include $(TOP)/configs/debian-default
include $(TOP)/configs/linux-osmesa
+include $(TOP)/configs/debian-osmesa-default
CONFIG_NAME = debian-osmesa
# vim: ft=make
-
diff --git a/configs/debian-osmesa-default b/configs/debian-osmesa-default
new file mode 100644
index 00000000000..ef5a5ba0c7c
--- /dev/null
+++ b/configs/debian-osmesa-default
@@ -0,0 +1,10 @@
+# Configuration defaults for building OSMesa.
+
+include $(TOP)/configs/debian-default
+
+CONFIG_NAME = debian-osmesa-default
+
+DRIVER_DIRS = osmesa
+
+# vim: ft=make
+
diff --git a/configs/debian-osmesa-static b/configs/debian-osmesa-static
new file mode 100644
index 00000000000..03fe8b5f20e
--- /dev/null
+++ b/configs/debian-osmesa-static
@@ -0,0 +1,9 @@
+# Configuration for building only OSMesa (static version) on Debian.
+
+include $(TOP)/configs/linux-osmesa-static
+include $(TOP)/configs/debian-osmesa-default
+
+CONFIG_NAME = debian-osmesa-static
+
+# vim: ft=make
+
diff --git a/configs/debian-osmesa16 b/configs/debian-osmesa16
index b232e4e81a2..0077930188f 100644
--- a/configs/debian-osmesa16
+++ b/configs/debian-osmesa16
@@ -1,8 +1,8 @@
# Configuration for building OSMesa with support for 16 bits per color
# channel.
-include $(TOP)/configs/debian-default
include $(TOP)/configs/linux-osmesa16
+include $(TOP)/configs/debian-osmesa-default
CONFIG_NAME = debian-osmesa16
diff --git a/configs/debian-osmesa16-static b/configs/debian-osmesa16-static
index c3728fe7636..6ff399e627c 100644
--- a/configs/debian-osmesa16-static
+++ b/configs/debian-osmesa16-static
@@ -1,8 +1,8 @@
# Configuration for building a static version of OSMesa with support for 16
# bits per color channel.
-include $(TOP)/configs/debian-default
include $(TOP)/configs/linux-osmesa16-static
+include $(TOP)/configs/debian-osmesa-default
CONFIG_NAME = debian-osmesa16-static
diff --git a/configs/debian-osmesa32 b/configs/debian-osmesa32
index 0cd0261ebe2..de3b3277c21 100644
--- a/configs/debian-osmesa32
+++ b/configs/debian-osmesa32
@@ -1,8 +1,8 @@
# Configuration for building OSMesa with support for 32 bits per color
# channel.
-include $(TOP)/configs/debian-default
include $(TOP)/configs/linux-osmesa32
+include $(TOP)/configs/debian-osmesa-default
CONFIG_NAME = debian-osmesa32
diff --git a/configs/debian-osmesa32-static b/configs/debian-osmesa32-static
index 2c210e05608..7fdfcef4013 100644
--- a/configs/debian-osmesa32-static
+++ b/configs/debian-osmesa32-static
@@ -1,8 +1,8 @@
# Configuration for building a static version of OSMesa with support for 32
# bits per color channel.
-include $(TOP)/configs/debian-default
include $(TOP)/configs/linux-osmesa32-static
+include $(TOP)/configs/debian-osmesa-default
CONFIG_NAME = debian-osmesa32-static
diff --git a/configs/debian-swx11+glu-alpha-ev5 b/configs/debian-swx11+glu-alpha-ev5
index d47b10b0fd6..fd16e49e374 100644
--- a/configs/debian-swx11+glu-alpha-ev5
+++ b/configs/debian-swx11+glu-alpha-ev5
@@ -1,12 +1,12 @@
# Configuration for building Mesa (swx11 and GLU) on alpha (ev5 optimized).
-include $(TOP)/configs/debian-swx11+glu-default
include $(TOP)/configs/linux-alpha
+include $(TOP)/configs/debian-swx11+glu-default
CONFIG_NAME = debian-swx11+glu-alpha-ev5
-override SRC_DIRS = mesa
-override LIB_DIR = lib/ev5/cmov
+SRC_DIRS = mesa
+LIB_DIR = lib/ev5/cmov
# vim: ft=make
diff --git a/configs/debian-swx11+glu-amd64 b/configs/debian-swx11+glu-amd64
index e3659ae972a..4bd7e51443a 100644
--- a/configs/debian-swx11+glu-amd64
+++ b/configs/debian-swx11+glu-amd64
@@ -1,8 +1,8 @@
# Configuration for building Mesa (swx11 and GLU) with runtime-detected
# assembler optimizations on amd64.
-include $(TOP)/configs/debian-swx11+glu-default
include $(TOP)/configs/linux-x86-64
+include $(TOP)/configs/debian-swx11+glu-default
CONFIG_NAME = debian-swx11+glu-amd64
diff --git a/configs/debian-swx11+glu-any b/configs/debian-swx11+glu-any
index 5b6e49fc9fb..884c9f9f23e 100644
--- a/configs/debian-swx11+glu-any
+++ b/configs/debian-swx11+glu-any
@@ -1,7 +1,7 @@
# Configuration for building Mesa (swx11 and GLU) on the build architecture.
-include $(TOP)/configs/debian-swx11+glu-default
include $(TOP)/configs/linux
+include $(TOP)/configs/debian-swx11+glu-default
CONFIG_NAME = debian-swx11+glu-any
diff --git a/configs/debian-swx11+glu-default b/configs/debian-swx11+glu-default
index a931dbe361f..d94b5edf8c9 100644
--- a/configs/debian-swx11+glu-default
+++ b/configs/debian-swx11+glu-default
@@ -4,7 +4,8 @@ include $(TOP)/configs/debian-default
CONFIG_NAME = debian-swx11+glu-default
-override SRC_DIRS = mesa glu
+SRC_DIRS = mesa glu
+DRIVER_DIRS = x11
# vim: ft=make
diff --git a/configs/debian-swx11+glu-i386 b/configs/debian-swx11+glu-i386
index 1892d0b144a..0b800c64bba 100644
--- a/configs/debian-swx11+glu-i386
+++ b/configs/debian-swx11+glu-i386
@@ -1,8 +1,8 @@
# Configuration for building Mesa (swx11 and GLU) with runtime-detected
# assembler optimizations on i386.
-include $(TOP)/configs/debian-swx11+glu-default
include $(TOP)/configs/linux-x86
+include $(TOP)/configs/debian-swx11+glu-default
CONFIG_NAME = debian-swx11+glu-i386
diff --git a/configs/debian-swx11+glu-i386-i686 b/configs/debian-swx11+glu-i386-i686
index 5f0d8ec8942..c6969b3f830 100644
--- a/configs/debian-swx11+glu-i386-i686
+++ b/configs/debian-swx11+glu-i386-i686
@@ -1,14 +1,14 @@
# Configuration for building Mesa (swx11 and GLU) with runtime-detected
# assembler optimizations on i386 (i686 optimized).
-include $(TOP)/configs/debian-swx11+glu-default
include $(TOP)/configs/linux-x86
+include $(TOP)/configs/debian-swx11+glu-default
CONFIG_NAME = debian-swx11+glu-i386-i686
-override ARCH_FLAGS += -march=i686
-override SRC_DIRS = mesa
-override LIB_DIR = lib/i686/cmov
+ARCH_FLAGS += -march=i686
+SRC_DIRS = mesa
+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 e0e3cdb03a7..86b3580e380 100644
--- a/configs/debian-swx11+glu-powerpc-603
+++ b/configs/debian-swx11+glu-powerpc-603
@@ -1,13 +1,13 @@
# Configuration for building Mesa (swx11 and GLU) with runtime-detected
# assembler optimizations on powerpc (603 optimized).
-include $(TOP)/configs/debian-swx11+glu-default
include $(TOP)/configs/linux-ppc
+include $(TOP)/configs/debian-swx11+glu-default
CONFIG_NAME = debian-swx11+glu-powerpc-603
-override SRC_DIRS = mesa
-override LIB_DIR = lib/603/cmov
+SRC_DIRS = mesa
+LIB_DIR = lib/603/cmov
# vim: ft=make
diff --git a/configs/debian-swx11+glu-ppc64 b/configs/debian-swx11+glu-ppc64
index 77fa2994313..67c59b6eef2 100644
--- a/configs/debian-swx11+glu-ppc64
+++ b/configs/debian-swx11+glu-ppc64
@@ -1,11 +1,11 @@
# Configuration for building Mesa (swx11 and GLU) with runtime-detected
# assembler optimizations on ppc64.
-include $(TOP)/configs/debian-ppc
+include $(TOP)/configs/debian-swx11+glu-any
CONFIG_NAME = debian-swx11+glu-ppc64
-override LIB_DIR = lib64
+LIB_DIR = lib64
# vim: ft=make
diff --git a/configs/debian-swx11+glu-sparc b/configs/debian-swx11+glu-sparc
index fcc264f9d01..8854b40d4fc 100644
--- a/configs/debian-swx11+glu-sparc
+++ b/configs/debian-swx11+glu-sparc
@@ -1,8 +1,8 @@
# Configuration for building Mesa (swx11 and GLU) with runtime-detected
# assembler optimizations on sparc.
-include $(TOP)/configs/debian-swx11+glu-default
include $(TOP)/configs/linux-sparc
+include $(TOP)/configs/debian-swx11+glu-default
CONFIG_NAME = debian-swx11+glu-sparc
diff --git a/configs/debian-swx11+glu-sparc-ultrasparc b/configs/debian-swx11+glu-sparc-ultrasparc
index 0894195edbd..14e38018c46 100644
--- a/configs/debian-swx11+glu-sparc-ultrasparc
+++ b/configs/debian-swx11+glu-sparc-ultrasparc
@@ -1,13 +1,13 @@
# Configuration for building Mesa (swx11 and GLU) with runtime-detected
# assembler optimizations on sparc (ultrasparc-optimized).
-include $(TOP)/configs/debian-swx11+glu-default
include $(TOP)/configs/linux-ultrasparc
+include $(TOP)/configs/debian-swx11+glu-default
CONFIG_NAME = debian-swx11+glu-sparc-ultrasparc
-override SRC_DIRS = mesa
-override LIB_DIR = lib/ultrasparc/cmov
+SRC_DIRS = mesa
+LIB_DIR = lib/ultrasparc/cmov
# vim: ft=make
diff --git a/configs/debian-swx11+glu-static b/configs/debian-swx11+glu-static
index 7e2d00cc9b6..a819311d4b4 100644
--- a/configs/debian-swx11+glu-static
+++ b/configs/debian-swx11+glu-static
@@ -1,7 +1,7 @@
# Configuration for building static versions of the libraries (swx11 and GLU).
-include $(TOP)/configs/debian-swx11+glu-default
include $(TOP)/configs/linux-static
+include $(TOP)/configs/debian-swx11+glu-default
CONFIG_NAME = debian-swx11+glu-static
diff --git a/configs/linux-osmesa-static b/configs/linux-osmesa-static
new file mode 100644
index 00000000000..465f83ca058
--- /dev/null
+++ b/configs/linux-osmesa-static
@@ -0,0 +1,14 @@
+# Configuration for building only libOSMesa on Linux, no Xlib driver
+# This doesn't really have any Linux dependencies, so it should be usable
+# on other (gcc-based) systems.
+
+include $(TOP)/configs/linux-osmesa
+
+CONFIG_NAME = linux-osmesa-static
+
+# Compiler and flags
+MKLIB_OPTIONS = -static
+
+# Library names
+OSMESA_LIB_NAME = libOSMesa.a
+