diff options
author | Julien Cristau <jcristau@debian.org> | 2009-01-10 21:55:19 +0100 |
---|---|---|
committer | Julien Cristau <jcristau@debian.org> | 2009-01-10 21:55:19 +0100 |
commit | 54885ff0ad9ba39a5e165dd19858d217826fc88f (patch) | |
tree | d40bd26f984a347dc6109d90c1a5cb333ed21852 | |
parent | 502fbe7cb3fc3d07ae8431787c94390f199ab64e (diff) |
Delete unused configs/debian-*, and install-source.sh script.
We've switched to using autoconf, and mesa-swx11-source is gone.
35 files changed, 2 insertions, 497 deletions
diff --git a/configs/debian-default b/configs/debian-default deleted file mode 100644 index 8d1b785ee0..0000000000 --- a/configs/debian-default +++ /dev/null @@ -1,17 +0,0 @@ -# Define Debian-specific defaults. - -CONFIG_NAME = debian-default - -OPT_FLAGS = -O2 -g - -# override settings in configs/linux-x86-64 -LIB_DIR = lib -EXTRA_LIB_PATH = - -SRC_DIRS = mesa -PROGRAM_DIRS = - -INSTALL_DIR = /usr - -# vim: ft=make - diff --git a/configs/debian-dri-amd64 b/configs/debian-dri-amd64 deleted file mode 100644 index ff4232b120..0000000000 --- a/configs/debian-dri-amd64 +++ /dev/null @@ -1,9 +0,0 @@ -# Configuration for building the DRI drivers on i386. - -include $(TOP)/configs/linux-dri-x86-64 -include $(TOP)/configs/debian-dri-default - -CONFIG_NAME = debian-dri-amd64 - -# vim: ft=make - diff --git a/configs/debian-dri-any b/configs/debian-dri-any deleted file mode 100644 index c4b65b0c48..0000000000 --- a/configs/debian-dri-any +++ /dev/null @@ -1,9 +0,0 @@ -# Configuration for building the DRI drivers on the build architecture. - -include $(TOP)/configs/linux-dri -include $(TOP)/configs/debian-dri-default - -CONFIG_NAME = debian-dri-any - -# vim: ft=make - diff --git a/configs/debian-dri-default b/configs/debian-dri-default deleted file mode 100644 index b42bfc3378..0000000000 --- a/configs/debian-dri-default +++ /dev/null @@ -1,36 +0,0 @@ -# Configuration defaults for building the DRI drivers and DRI/GLX-enabled -# libGL. - -include $(TOP)/configs/debian-default - -CONFIG_NAME = debian-dri-default - -SRC_DIRS = glx/x11 mesa progs -DRIVER_DIRS = dri -PROGRAM_DIRS = xdemos -PROGS = glxdemo \ - glxgears \ - glxheads \ - glxinfo - -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 ($(filter $(DEB_HOST_ARCH_CPU), $(ARCH_X86)),) - DRI_DIRS += i810 i915 i965 sis unichrome -endif - -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 b/configs/debian-dri-i386 deleted file mode 100644 index 7a0aaa487d..0000000000 --- a/configs/debian-dri-i386 +++ /dev/null @@ -1,9 +0,0 @@ -# Configuration for building the DRI drivers on i386. - -include $(TOP)/configs/linux-dri-x86 -include $(TOP)/configs/debian-dri-default - -CONFIG_NAME = debian-dri-i386 - -# vim: ft=make - diff --git a/configs/debian-dri-i386-i686 b/configs/debian-dri-i386-i686 deleted file mode 100644 index b15cd77a03..0000000000 --- a/configs/debian-dri-i386-i686 +++ /dev/null @@ -1,14 +0,0 @@ -# Configuration for building the DRI drivers on i386. - -include $(TOP)/configs/linux-dri-x86 -include $(TOP)/configs/debian-dri-optimized-default - -CONFIG_NAME = debian-dri-i386-i686 - -ARCH_FLAGS = -march=i686 -LIB_DIR = lib/glx/i686/cmov - -DRI_DRIVER_INSTALL_DIR = $(INSTALL_DIR)/lib/dri/i686/cmov - -# vim: ft=make - diff --git a/configs/debian-dri-optimized-default b/configs/debian-dri-optimized-default deleted file mode 100644 index 9c3f68dde7..0000000000 --- a/configs/debian-dri-optimized-default +++ /dev/null @@ -1,13 +0,0 @@ -# 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-indirect-default b/configs/debian-indirect-default deleted file mode 100644 index a6926c95fc..0000000000 --- a/configs/debian-indirect-default +++ /dev/null @@ -1,7 +0,0 @@ -# Configuration defaults for building GLX-enabled libGL. - -include $(TOP)/configs/debian-dri-default - -CONFIG_NAME = debian-indirect-default - -DRI_DIRS = diff --git a/configs/debian-indirect-hurd-i386 b/configs/debian-indirect-hurd-i386 deleted file mode 100644 index dd4bb07ca5..0000000000 --- a/configs/debian-indirect-hurd-i386 +++ /dev/null @@ -1,9 +0,0 @@ -# Configuration for building the DRI drivers on the build architecture. - -include $(TOP)/configs/linux-indirect -include $(TOP)/configs/debian-indirect-default - -CONFIG_NAME = debian-indirect-hurd-i386 - -# vim: ft=make - diff --git a/configs/debian-osmesa b/configs/debian-osmesa deleted file mode 100644 index 9b7fc7b2af..0000000000 --- a/configs/debian-osmesa +++ /dev/null @@ -1,9 +0,0 @@ -# Configuration for building only OSMesa on Debian. - -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 deleted file mode 100644 index ef5a5ba0c7..0000000000 --- a/configs/debian-osmesa-default +++ /dev/null @@ -1,10 +0,0 @@ -# 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 deleted file mode 100644 index 03fe8b5f20..0000000000 --- a/configs/debian-osmesa-static +++ /dev/null @@ -1,9 +0,0 @@ -# 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 deleted file mode 100644 index 0077930188..0000000000 --- a/configs/debian-osmesa16 +++ /dev/null @@ -1,10 +0,0 @@ -# Configuration for building OSMesa with support for 16 bits per color -# channel. - -include $(TOP)/configs/linux-osmesa16 -include $(TOP)/configs/debian-osmesa-default - -CONFIG_NAME = debian-osmesa16 - -# vim: ft=make - diff --git a/configs/debian-osmesa16-static b/configs/debian-osmesa16-static deleted file mode 100644 index 6ff399e627..0000000000 --- a/configs/debian-osmesa16-static +++ /dev/null @@ -1,10 +0,0 @@ -# Configuration for building a static version of OSMesa with support for 16 -# bits per color channel. - -include $(TOP)/configs/linux-osmesa16-static -include $(TOP)/configs/debian-osmesa-default - -CONFIG_NAME = debian-osmesa16-static - -# vim: ft=make - diff --git a/configs/debian-osmesa32 b/configs/debian-osmesa32 deleted file mode 100644 index de3b3277c2..0000000000 --- a/configs/debian-osmesa32 +++ /dev/null @@ -1,10 +0,0 @@ -# Configuration for building OSMesa with support for 32 bits per color -# channel. - -include $(TOP)/configs/linux-osmesa32 -include $(TOP)/configs/debian-osmesa-default - -CONFIG_NAME = debian-osmesa32 - -# vim: ft=make - diff --git a/configs/debian-osmesa32-static b/configs/debian-osmesa32-static deleted file mode 100644 index 7fdfcef401..0000000000 --- a/configs/debian-osmesa32-static +++ /dev/null @@ -1,10 +0,0 @@ -# Configuration for building a static version of OSMesa with support for 32 -# bits per color channel. - -include $(TOP)/configs/linux-osmesa32-static -include $(TOP)/configs/debian-osmesa-default - -CONFIG_NAME = debian-osmesa32-static - -# vim: ft=make - diff --git a/configs/debian-swx11+glu-alpha-ev5 b/configs/debian-swx11+glu-alpha-ev5 deleted file mode 100644 index fd16e49e37..0000000000 --- a/configs/debian-swx11+glu-alpha-ev5 +++ /dev/null @@ -1,12 +0,0 @@ -# Configuration for building Mesa (swx11 and GLU) on alpha (ev5 optimized). - -include $(TOP)/configs/linux-alpha -include $(TOP)/configs/debian-swx11+glu-default - -CONFIG_NAME = debian-swx11+glu-alpha-ev5 - -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 deleted file mode 100644 index 4bd7e51443..0000000000 --- a/configs/debian-swx11+glu-amd64 +++ /dev/null @@ -1,10 +0,0 @@ -# Configuration for building Mesa (swx11 and GLU) with runtime-detected -# assembler optimizations on amd64. - -include $(TOP)/configs/linux-x86-64 -include $(TOP)/configs/debian-swx11+glu-default - -CONFIG_NAME = debian-swx11+glu-amd64 - -# vim: ft=make - diff --git a/configs/debian-swx11+glu-any b/configs/debian-swx11+glu-any deleted file mode 100644 index 884c9f9f23..0000000000 --- a/configs/debian-swx11+glu-any +++ /dev/null @@ -1,9 +0,0 @@ -# Configuration for building Mesa (swx11 and GLU) on the build architecture. - -include $(TOP)/configs/linux -include $(TOP)/configs/debian-swx11+glu-default - -CONFIG_NAME = debian-swx11+glu-any - -# vim: ft=make - diff --git a/configs/debian-swx11+glu-default b/configs/debian-swx11+glu-default deleted file mode 100644 index ccf827639c..0000000000 --- a/configs/debian-swx11+glu-default +++ /dev/null @@ -1,14 +0,0 @@ -# Configuration defaults for building Mesa (swx11 and GLU). - -include $(TOP)/configs/debian-default - -CONFIG_NAME = debian-swx11+glu-default - -SRC_DIRS = mesa glu glw -DRIVER_DIRS = x11 - -GLW_SOURCES += GLwMDrawA.c -GLW_LIB_DEPS += -lXm - -# vim: ft=make - diff --git a/configs/debian-swx11+glu-i386 b/configs/debian-swx11+glu-i386 deleted file mode 100644 index 0b800c64bb..0000000000 --- a/configs/debian-swx11+glu-i386 +++ /dev/null @@ -1,10 +0,0 @@ -# Configuration for building Mesa (swx11 and GLU) with runtime-detected -# assembler optimizations on i386. - -include $(TOP)/configs/linux-x86 -include $(TOP)/configs/debian-swx11+glu-default - -CONFIG_NAME = debian-swx11+glu-i386 - -# vim: ft=make - diff --git a/configs/debian-swx11+glu-i386-i686 b/configs/debian-swx11+glu-i386-i686 deleted file mode 100644 index c6969b3f83..0000000000 --- a/configs/debian-swx11+glu-i386-i686 +++ /dev/null @@ -1,14 +0,0 @@ -# Configuration for building Mesa (swx11 and GLU) with runtime-detected -# assembler optimizations on i386 (i686 optimized). - -include $(TOP)/configs/linux-x86 -include $(TOP)/configs/debian-swx11+glu-default - -CONFIG_NAME = debian-swx11+glu-i386-i686 - -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 deleted file mode 100644 index 86b3580e38..0000000000 --- a/configs/debian-swx11+glu-powerpc-603 +++ /dev/null @@ -1,13 +0,0 @@ -# Configuration for building Mesa (swx11 and GLU) with runtime-detected -# assembler optimizations on powerpc (603 optimized). - -include $(TOP)/configs/linux-ppc -include $(TOP)/configs/debian-swx11+glu-default - -CONFIG_NAME = debian-swx11+glu-powerpc-603 - -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 deleted file mode 100644 index 67c59b6eef..0000000000 --- a/configs/debian-swx11+glu-ppc64 +++ /dev/null @@ -1,11 +0,0 @@ -# Configuration for building Mesa (swx11 and GLU) with runtime-detected -# assembler optimizations on ppc64. - -include $(TOP)/configs/debian-swx11+glu-any - -CONFIG_NAME = debian-swx11+glu-ppc64 - -LIB_DIR = lib64 - -# vim: ft=make - diff --git a/configs/debian-swx11+glu-sparc b/configs/debian-swx11+glu-sparc deleted file mode 100644 index 8854b40d4f..0000000000 --- a/configs/debian-swx11+glu-sparc +++ /dev/null @@ -1,10 +0,0 @@ -# Configuration for building Mesa (swx11 and GLU) with runtime-detected -# assembler optimizations on sparc. - -include $(TOP)/configs/linux-sparc -include $(TOP)/configs/debian-swx11+glu-default - -CONFIG_NAME = debian-swx11+glu-sparc - -# vim: ft=make - diff --git a/configs/debian-swx11+glu-sparc-ultrasparc b/configs/debian-swx11+glu-sparc-ultrasparc deleted file mode 100644 index 14e38018c4..0000000000 --- a/configs/debian-swx11+glu-sparc-ultrasparc +++ /dev/null @@ -1,13 +0,0 @@ -# Configuration for building Mesa (swx11 and GLU) with runtime-detected -# assembler optimizations on sparc (ultrasparc-optimized). - -include $(TOP)/configs/linux-ultrasparc -include $(TOP)/configs/debian-swx11+glu-default - -CONFIG_NAME = debian-swx11+glu-sparc-ultrasparc - -SRC_DIRS = mesa -LIB_DIR = lib/ultrasparc/cmov - -# vim: ft=make - diff --git a/configs/debian-swx11+glu-static-amd64 b/configs/debian-swx11+glu-static-amd64 deleted file mode 100644 index 2976fbe66f..0000000000 --- a/configs/debian-swx11+glu-static-amd64 +++ /dev/null @@ -1,10 +0,0 @@ -# Configuration for building static versions of the libraries (swx11 and GLU) -# on amd64. - -include $(TOP)/configs/linux-x86-64-static -include $(TOP)/configs/debian-swx11+glu-default - -CONFIG_NAME = debian-swx11+glu-static-amd64 - -# vim: ft=make - diff --git a/configs/debian-swx11+glu-static-any b/configs/debian-swx11+glu-static-any deleted file mode 100644 index 82f794d28d..0000000000 --- a/configs/debian-swx11+glu-static-any +++ /dev/null @@ -1,10 +0,0 @@ -# Configuration for building static versions of the libraries (swx11 and GLU) -# on the build architecture. - -include $(TOP)/configs/linux-static -include $(TOP)/configs/debian-swx11+glu-default - -CONFIG_NAME = debian-swx11+glu-static-any - -# vim: ft=make - diff --git a/configs/debian-swx11+glu-static-i386 b/configs/debian-swx11+glu-static-i386 deleted file mode 100644 index 62859e4254..0000000000 --- a/configs/debian-swx11+glu-static-i386 +++ /dev/null @@ -1,10 +0,0 @@ -# Configuration for building static versions of the libraries (swx11 and GLU) -# on i386. - -include $(TOP)/configs/linux-x86-static -include $(TOP)/configs/debian-swx11+glu-default - -CONFIG_NAME = debian-swx11+glu-static-i386 - -# vim: ft=make - diff --git a/configs/debian-swx11+glu-static-ppc64 b/configs/debian-swx11+glu-static-ppc64 deleted file mode 100644 index a9ea4a95b3..0000000000 --- a/configs/debian-swx11+glu-static-ppc64 +++ /dev/null @@ -1,11 +0,0 @@ -# Configuration for building static versions of the libraries (swx11 and GLU) -# on ppc64. - -include $(TOP)/configs/debian-swx11+glu-static-any - -CONFIG_NAME = debian-swx11+glu-static-ppc64 - -LIB_DIR = lib64 - -# vim: ft=make - diff --git a/configs/default-bp b/configs/default-bp deleted file mode 100644 index 29faceed81..0000000000 --- a/configs/default-bp +++ /dev/null @@ -1,75 +0,0 @@ -# Default/template configuration - -# This is included by other config files which may override some -# of these variables. - -CONFIG_NAME = default - -# Version info -MESA_MAJOR=6 -MESA_MINOR=3 -MESA_TINY=0 - -# external projects -#DRM_SOURCE_PATH=$(TOP)/../drm -DRM_SOURCE_PATH=/home/projects/DRI-freedesktop/drm - -# Compiler and flags -CC = cc -CXX = CC -CFLAGS = -O -CXXFLAGS = -O -GLU_CFLAGS = - -# Misc tools and flags -MKLIB_OPTIONS = -MKDEP = makedepend -MKDEP_OPTIONS = -fdepend -MAKE = make - -# Library names (base name) -GL_LIB = GL -GLU_LIB = GLU -GLUT_LIB = glut -GLW_LIB = GLw -OSMESA_LIB = OSMesa - - -# Library names (actual file names) -GL_LIB_NAME = lib$(GL_LIB).so -GLU_LIB_NAME = lib$(GLU_LIB).so -GLUT_LIB_NAME = lib$(GLUT_LIB).so -GLW_LIB_NAME = lib$(GLW_LIB).so -OSMESA_LIB_NAME = lib$(OSMesa).so - - -# Optional assembly language optimization files for libGL -ASM_SOURCES = - -# GLw widget sources (Append "GLwMDrawA.c" here and add -lXm to GLW_LIB_DEPS in -# order to build the Motif widget too) -GLW_SOURCES = GLwDrawA.c - - -# Directories -LIB_DIR = $(TOP)/lib -INSTALL_PREFIX = /usr/local -SRC_DIRS = mesa glu glut/glx glw -GLU_DIRS = sgi -DRIVER_DIRS = x11 osmesa -# Which subdirs under $(TOP)/progs/ to enter: -PROGRAM_DIRS = demos redbook samples xdemos - - -# Library/program dependencies -GL_LIB_DEPS = -lX11 -lXext -lm -lpthread -OSMESA_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -GLU_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -lm -GLUT_LIB_DEPS = -L$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -lX11 -lXmu -lXt -lXi -lm -GLW_LIB_DEPS = -L$(LIB_DIR) -l$(GL_LIB) -lXt -lX11 -APP_LIB_DEPS = -L$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm - - -# Shading language support (set to 0 or 1) -SHADING_LANGUAGE = 0 - diff --git a/configs/linux-osmesa-static b/configs/linux-osmesa-static deleted file mode 100644 index eb3575f424..0000000000 --- a/configs/linux-osmesa-static +++ /dev/null @@ -1,15 +0,0 @@ -# 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 -PIC_FLAGS = - -# Library names -OSMESA_LIB_NAME = lib$(OSMESA_LIB).a - diff --git a/configs/linux-osmesa32-static b/configs/linux-osmesa32-static deleted file mode 100644 index ecbb72ecfd..0000000000 --- a/configs/linux-osmesa32-static +++ /dev/null @@ -1,13 +0,0 @@ -# Configuration for 32 bits/channel OSMesa library on Linux - -include $(TOP)/configs/linux-osmesa32 - -CONFIG_NAME = linux-osmesa32-static - -# Compiler and flags -MKLIB_OPTIONS = -static -PIC_FLAGS = - -# Library names -OSMESA_LIB_NAME = lib$(OSMESA_LIB).a - diff --git a/debian/changelog b/debian/changelog index 192cfb35ec..e182e87323 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,6 +14,8 @@ mesa (7.3~rc1-1) UNRELEASED; urgency=low [ Julien Cristau ] * Require libdrm-dev 2.4.3. * Merge packaging changes from unstable, from 7.0.3-5 to 7.0.3-7. + * Delete unused configs/debian-*, and install-source.sh script. We've + switched to using autoconf, and mesa-swx11-source is gone. -- Timo Aaltonen <tjaalton@ubuntu.com> Tue, 09 Dec 2008 01:38:42 +0200 diff --git a/debian/scripts/install-source.sh b/debian/scripts/install-source.sh deleted file mode 100755 index 5b1dcfb057..0000000000 --- a/debian/scripts/install-source.sh +++ /dev/null @@ -1,46 +0,0 @@ -#!/bin/sh - -if [ -n "$1" ]; then - TOP="$1" -else - TOP=`pwd` -fi - -SOURCE_DIRS=' - include/GL/internal - src/glx/x11 - src/mesa/drivers/common - src/mesa/drivers/dri/common - src/mesa/drivers/dri/glcore - src/mesa/drivers/x11 - src/mesa/glapi - src/mesa/main - src/mesa/math - src/mesa/ppc - src/mesa/shader - src/mesa/sparc - src/mesa/swrast_setup - src/mesa/swrast - src/mesa/tnl_dd - src/mesa/tnl - src/mesa/vbo - src/mesa/x86-64 - src/mesa/x86 -' - -FILTER="-not -path '*/.svn*'" -TARGET=${TOP}/debian/tmp/usr/share/mesa-source - -( - find $SOURCE_DIRS $FILTER -name '*.[ch]'; - find include/GL $FILTER -name 'xmesa*.h'; -) | \ - while read x; do - DIRNAME=`dirname "$x"` - mkdir -p "$TARGET/$DIRNAME" - cp -lf "$x" "$TARGET/$DIRNAME" - done - -# fix permissions -find "$TARGET" -type f | xargs chmod 0644 - |