diff options
| author | Thierry Reding <thierry@gilfi.de> | 2006-10-15 00:49:41 +0000 |
|---|---|---|
| committer | Thierry Reding <thierry@gilfi.de> | 2006-10-15 00:49:41 +0000 |
| commit | 8d02f3c68a1852de6bfe8c0b58c325224fef9743 (patch) | |
| tree | 203f95f3229827a0d19a1d7843ade51517799b99 /configs | |
| parent | b1f8b49e8b17cffb68d8829ba7562479933bf70c (diff) | |
Add patch to fix upstream build system to correctly install libOSMesa and
variants. This patch also fixes the build system not to install libGL if only
the OSMesa library is built.
Update *.install files to install more files. Pretty much everything except
debugging and optimized libraries is now built and installed.
Enable building static libraries for inclusion in the -dev packages.
Diffstat (limited to 'configs')
| -rw-r--r-- | configs/debian-dri-default | 3 | ||||
| -rw-r--r-- | configs/debian-osmesa | 3 | ||||
| -rw-r--r-- | configs/debian-osmesa16 | 2 | ||||
| -rw-r--r-- | configs/debian-osmesa16-static | 2 | ||||
| -rw-r--r-- | configs/debian-osmesa32 | 2 | ||||
| -rw-r--r-- | configs/debian-osmesa32-static | 2 | ||||
| -rw-r--r-- | configs/debian-static | 8 |
7 files changed, 17 insertions, 5 deletions
diff --git a/configs/debian-dri-default b/configs/debian-dri-default index 553dfcecd1a..ba4ffd92089 100644 --- a/configs/debian-dri-default +++ b/configs/debian-dri-default @@ -4,10 +4,11 @@ include $(TOP)/configs/debian-common CONFIG_NAME = debian-dri-default +override LIB_DIR = libglx override SRC_DIRS = glx/x11 mesa override PROGRAM_DIRS = -override DRI_DRIVER_INSTALL_DIR = $(INSTALL_DIR)/lib/dri +override DRI_DRIVER_INSTALL_DIR = $(INSTALL_DIR)/$(LIB_DIR)/dri override DRI_DRIVER_SEARCH_DIR = /usr/lib/dri # vim: ft=make diff --git a/configs/debian-osmesa b/configs/debian-osmesa index 273f5a2eabf..a639d59895c 100644 --- a/configs/debian-osmesa +++ b/configs/debian-osmesa @@ -5,6 +5,9 @@ include $(TOP)/configs/linux-osmesa CONFIG_NAME = debian-osmesa +override SRC_DIRS = mesa +override PROGRAM_DIRS = + # vim: ft=make diff --git a/configs/debian-osmesa16 b/configs/debian-osmesa16 index 32747fac926..3019d49fa4e 100644 --- a/configs/debian-osmesa16 +++ b/configs/debian-osmesa16 @@ -6,5 +6,7 @@ include $(TOP)/configs/linux-osmesa16 CONFIG_NAME = debian-osmesa16 +override SRC_DIRS = mesa + # vim: ft=make diff --git a/configs/debian-osmesa16-static b/configs/debian-osmesa16-static index 78b202c72cb..74396404595 100644 --- a/configs/debian-osmesa16-static +++ b/configs/debian-osmesa16-static @@ -6,5 +6,7 @@ include $(TOP)/configs/linux-osmesa16-static CONFIG_NAME = debian-osmesa16-static +override SRC_DIRS = mesa + # vim: ft=make diff --git a/configs/debian-osmesa32 b/configs/debian-osmesa32 index 27171b87e3a..468045bd438 100644 --- a/configs/debian-osmesa32 +++ b/configs/debian-osmesa32 @@ -6,5 +6,7 @@ include $(TOP)/configs/linux-osmesa32 CONFIG_NAME = debian-osmesa32 +override SRC_DIRS = mesa + # vim: ft=make diff --git a/configs/debian-osmesa32-static b/configs/debian-osmesa32-static index 6cf3a03ae42..237a632b90d 100644 --- a/configs/debian-osmesa32-static +++ b/configs/debian-osmesa32-static @@ -6,5 +6,7 @@ include $(TOP)/configs/linux-osmesa32-static CONFIG_NAME = debian-osmesa32-static +override SRC_DIRS = mesa + # vim: ft=make diff --git a/configs/debian-static b/configs/debian-static index 4253b270f45..c3e7f05b030 100644 --- a/configs/debian-static +++ b/configs/debian-static @@ -1,12 +1,12 @@ -# Override options needed to build static versions of the libraries. -# -# This configuration cannot be used standalone. +# Configuration for building static versions of the libraries. include $(TOP)/configs/debian-common +include $(TOP)/configs/linux-static CONFIG_NAME = debian-static -override MKLIB_OPTIONS = -static +override SRC_DIRS = mesa glu +override PROGRAM_DIRS = # vim: ft=make |