fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-09 04:38:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Set OSMESA_VERSION=8.

Browse source 
VERSION_NUMBER is not required anymore. So it will be removed.

Reviewed-by: Adam Jackson <ajax@redhat.com>
This commit is contained in:
Johannes Obermayr 2012-09-02 01:35:47 +02:00 • committed by Adam Jackson
parent 3433471e8b
commit 10a96f4a4d
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
configure.ac
View file

@ -26,6 +26,10 @@ m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
LT_PREREQ([2.2]) LT_PREREQ([2.2])
LT_INIT([disable-static]) LT_INIT([disable-static])
dnl Set internal versions
OSMESA_VERSION=8
AC_SUBST([OSMESA_VERSION])
dnl Versions for external dependencies dnl Versions for external dependencies
LIBDRM_REQUIRED=2.4.24 LIBDRM_REQUIRED=2.4.24
LIBDRM_RADEON_REQUIRED=2.4.39 LIBDRM_RADEON_REQUIRED=2.4.39
@ -1921,10 +1925,6 @@ AM_CONDITIONAL(HAVE_X86_ASM, echo "$DEFINES" | grep 'X86_ASM' >/dev/null 2>&1)
AM_CONDITIONAL(HAVE_X86_64_ASM, echo "$DEFINES" | grep 'X86_64_ASM' >/dev/null 2>&1) AM_CONDITIONAL(HAVE_X86_64_ASM, echo "$DEFINES" | grep 'X86_64_ASM' >/dev/null 2>&1)
AM_CONDITIONAL(HAVE_SPARC_ASM, echo "$DEFINES" | grep 'SPARC_ASM' >/dev/null 2>&1) AM_CONDITIONAL(HAVE_SPARC_ASM, echo "$DEFINES" | grep 'SPARC_ASM' >/dev/null 2>&1)
# To pass as an argument to libtool's -version-number flag
VERSION_NUMBER=`echo "$VERSION" | $SED 's/\./:/g'`
AC_SUBST([VERSION_NUMBER])
dnl prepend CORE_DIRS to SRC_DIRS dnl prepend CORE_DIRS to SRC_DIRS
SRC_DIRS="$CORE_DIRS $SRC_DIRS" SRC_DIRS="$CORE_DIRS $SRC_DIRS"

4
src/mesa/drivers/osmesa/Makefile.am
View file

@ -35,7 +35,7 @@ lib_LTLIBRARIES = lib@OSMESA_LIB@.la
lib@OSMESA_LIB@_la_SOURCES = osmesa.c lib@OSMESA_LIB@_la_SOURCES = osmesa.c
lib@OSMESA_LIB@_la_LDFLAGS = -module -version-number @VERSION_NUMBER@ -no-undefined lib@OSMESA_LIB@_la_LDFLAGS = -module -version-number @OSMESA_VERSION@ -no-undefined
lib@OSMESA_LIB@_la_LIBADD = \ lib@OSMESA_LIB@_la_LIBADD = \
$(top_builddir)/src/mesa/libmesa.la \ $(top_builddir)/src/mesa/libmesa.la \
$(top_builddir)/src/mapi/glapi/libglapi.la $(top_builddir)/src/mapi/glapi/libglapi.la
@ -46,7 +46,7 @@ if BUILD_SHARED
all-local: lib@OSMESA_LIB@.la all-local: lib@OSMESA_LIB@.la
$(MKDIR_P) $(top_builddir)/$(LIB_DIR); $(MKDIR_P) $(top_builddir)/$(LIB_DIR);
ln -f .libs/lib@OSMESA_LIB@.so $(top_builddir)/$(LIB_DIR)/lib@OSMESA_LIB@.so; ln -f .libs/lib@OSMESA_LIB@.so $(top_builddir)/$(LIB_DIR)/lib@OSMESA_LIB@.so;
ln -f .libs/lib@OSMESA_LIB@.so.@VERSION@ $(top_builddir)/$(LIB_DIR)/lib@OSMESA_LIB@.so.@VERSION@; ln -f .libs/lib@OSMESA_LIB@.so.@OSMESA_VERSION@ $(top_builddir)/$(LIB_DIR)/lib@OSMESA_LIB@.so.@OSMESA_VERSION@;
endif endif
pkgconfigdir = $(libdir)/pkgconfig pkgconfigdir = $(libdir)/pkgconfig

2
src/mesa/drivers/osmesa/osmesa.pc.in
View file

@ -6,7 +6,7 @@ includedir=@includedir@
Name: osmesa Name: osmesa
Description: Mesa Off-screen Rendering library Description: Mesa Off-screen Rendering library
Requires: @OSMESA_PC_REQ@ Requires: @OSMESA_PC_REQ@
Version: @PACKAGE_VERSION@ Version: @OSMESA_VERSION@
Libs: -L${libdir} -l@OSMESA_LIB@ Libs: -L${libdir} -l@OSMESA_LIB@
Libs.private: @OSMESA_PC_LIB_PRIV@ Libs.private: @OSMESA_PC_LIB_PRIV@
Cflags: -I${includedir} Cflags: -I${includedir}