From 10a96f4a4d3d3166fa6907d4b302e01ece5ccd7e Mon Sep 17 00:00:00 2001 From: Johannes Obermayr Date: Sun, 2 Sep 2012 01:35:47 +0200 Subject: Set OSMESA_VERSION=8. VERSION_NUMBER is not required anymore. So it will be removed. Reviewed-by: Adam Jackson --- src/mesa/drivers/osmesa/Makefile.am | 4 ++-- src/mesa/drivers/osmesa/osmesa.pc.in | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/mesa/drivers/osmesa') diff --git a/src/mesa/drivers/osmesa/Makefile.am b/src/mesa/drivers/osmesa/Makefile.am index db1d14fe80e..6d087f27653 100644 --- a/src/mesa/drivers/osmesa/Makefile.am +++ b/src/mesa/drivers/osmesa/Makefile.am @@ -35,7 +35,7 @@ lib_LTLIBRARIES = lib@OSMESA_LIB@.la 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 = \ $(top_builddir)/src/mesa/libmesa.la \ $(top_builddir)/src/mapi/glapi/libglapi.la @@ -46,7 +46,7 @@ if BUILD_SHARED all-local: lib@OSMESA_LIB@.la $(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.@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 pkgconfigdir = $(libdir)/pkgconfig diff --git a/src/mesa/drivers/osmesa/osmesa.pc.in b/src/mesa/drivers/osmesa/osmesa.pc.in index 307255ffc99..cd77fd7656f 100644 --- a/src/mesa/drivers/osmesa/osmesa.pc.in +++ b/src/mesa/drivers/osmesa/osmesa.pc.in @@ -6,7 +6,7 @@ includedir=@includedir@ Name: osmesa Description: Mesa Off-screen Rendering library Requires: @OSMESA_PC_REQ@ -Version: @PACKAGE_VERSION@ +Version: @OSMESA_VERSION@ Libs: -L${libdir} -l@OSMESA_LIB@ Libs.private: @OSMESA_PC_LIB_PRIV@ Cflags: -I${includedir} -- cgit v1.2.3