From: Gábor Gombás <[email protected]>
The version of the software should never be used with -version-info or
-version-number, so use -release instead. Long term it would be
desirable to have proper shared library versioning that follows the ABI
changes instead of the package's version.
---
Makefile.incl | 2 --
api/Makefile.am | 4 ++--
configure.ac | 2 --
lib/Makefile.am | 6 +++---
sched/Makefile.am | 4 ++--
5 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/Makefile.incl b/Makefile.incl
index 51067e7..f1baf00 100644
--- a/Makefile.incl
+++ b/Makefile.incl
@@ -6,8 +6,6 @@
# ignore any LIBS set by configure
LIBS=
-LIBBOINC_VERSION = @LIBBOINC_VERSION@
-
MYSQL_LIBS = @MYSQL_LIBS@
MYSQL_CFLAGS = @MYSQL_CFLAGS@
PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
diff --git a/api/Makefile.am b/api/Makefile.am
index 2b42fd6..155e41a 100644
--- a/api/Makefile.am
+++ b/api/Makefile.am
@@ -35,12 +35,12 @@ endif
lib_LTLIBRARIES = libboinc_api.la
libboinc_api_la_SOURCES = $(api_files)
-libboinc_api_la_LDFLAGS = -rpath $(libdir) -version-number $(LIBBOINC_VERSION)
+libboinc_api_la_LDFLAGS = -rpath $(libdir) -release $(PACKAGE_VERSION)
if BUILD_GRAPHICS_API
lib_LTLIBRARIES += libboinc_graphics2.la
libboinc_graphics2_la_SOURCES = $(graphics2_files)
libboinc_graphics2_la_CPPFLAGS = -I$(top_srcdir)/lib
-libboinc_graphics2_la_LDFLAGS = -rpath $(libdir) -version-number
$(LIBBOINC_VERSION)
+libboinc_graphics2_la_LDFLAGS = -rpath $(libdir) -release $(PACKAGE_VERSION)
endif #BUILD_GRAPHICS_API
if INSTALL_HEADERS
diff --git a/configure.ac b/configure.ac
index 8d39e78..8048781 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8,8 +8,6 @@ AC_PREREQ(2.58)
dnl Set the BOINC version here. You can also use the set-version script.
AC_INIT(BOINC, 6.11.0)
AC_CONFIG_MACRO_DIR([m4])
-LIBBOINC_VERSION=`echo ${PACKAGE_VERSION} | sed 's/\./:/g'`
-AC_SUBST([LIBBOINC_VERSION])
AC_CANONICAL_TARGET
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 6c2a1bd..5ce65ad 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -133,13 +133,13 @@ lib_LTLIBRARIES = libboinc.la libboinc_crypt.la
libboinc_la_SOURCES = $(generic_sources) $(mac_sources)
libboinc_la_CFLAGS = $(AM_CFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS)
libboinc_la_CXXFLAGS = $(AM_CXXFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS)
-libboinc_la_LDFLAGS = -rpath $(libdir) -version-number $(LIBBOINC_VERSION)
+libboinc_la_LDFLAGS = -rpath $(libdir) -release $(PACKAGE_VERSION)
libboinc_la_LIBADD =
libboinc_crypt_la_SOURCES = crypt.cpp
libboinc_crypt_la_CFLAGS = $(AM_CFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS)
libboinc_crypt_la_CXXFLAGS = $(AM_CXXFLAGS) $(PICFLAGS) $(PTHREAD_CFLAGS)
-libboinc_crypt_la_LDFLAGS = -rpath $(libdir) -version-number
$(LIBBOINC_VERSION)
+libboinc_crypt_la_LDFLAGS = -rpath $(libdir) -release $(PACKAGE_VERSION)
libboinc_crypt_la_LIBADD =
@@ -148,7 +148,7 @@ lib_LTLIBRARIES += libboinc_fcgi.la
libboinc_fcgi_la_SOURCES = $(libfcgi_sources) $(mac_sources)
libboinc_fcgi_la_CFLAGS = -D_USING_FCGI_ $(AM_CFLAGS) $(PICFLAGS)
$(PTHREAD_CFLAGS)
libboinc_fcgi_la_CXXFLAGS = -D_USING_FCGI_ $(AM_CXXFLAGS) $(PICFLAGS)
$(PTHREAD_CFLAGS)
-libboinc_fcgi_la_LDFLAGS = -rpath $(libdir) -version-number $(LIBBOINC_VERSION)
+libboinc_fcgi_la_LDFLAGS = -rpath $(libdir) -release $(PACKAGE_VERSION)
libboinc_fcgi_la_LIBADD =
endif
# end of "if ENABLE_FCGI"
diff --git a/sched/Makefile.am b/sched/Makefile.am
index 3c5ec6f..7d36d37 100644
--- a/sched/Makefile.am
+++ b/sched/Makefile.am
@@ -23,7 +23,7 @@ lib_LTLIBRARIES = libsched.la
libsched_la_SOURCES = $(libsched_sources)
libsched_la_CFLAGS = $(AM_CPPFLAGS)
libsched_la_CXXFLAGS = $(AM_CPPFLAGS)
-libsched_la_LDFLAGS = -rpath $(libdir) -version-number $(LIBBOINC_VERSION)
+libsched_la_LDFLAGS = -rpath $(libdir) -release $(PACKAGE_VERSION)
libsched_la_LIBADD= $(SSL_LIBS)
## install only headers that are meant for exporting the API !!
@@ -43,7 +43,7 @@ lib_LTLIBRARIES += libsched_fcgi.la
libsched_fcgi_la_SOURCES = $(libsched_sources)
libsched_fcgi_la_CFLAGS = -D_USING_FCGI_ $(AM_CPPFLAGS)
libsched_fcgi_la_CXXFLAGS = -D_USING_FCGI_ $(AM_CPPFLAGS)
-libsched_fcgi_la_LDFLAGS = -rpath $(libdir) -version-number $(LIBBOINC_VERSION)
+libsched_fcgi_la_LDFLAGS = -rpath $(libdir) -release $(PACKAGE_VERSION)
libsched_fcgi_la_LIBADD=
endif
--
1.6.4.3
_______________________________________________
boinc_dev mailing list
[email protected]
http://lists.ssl.berkeley.edu/mailman/listinfo/boinc_dev
To unsubscribe, visit the above URL and
(near bottom of page) enter your email address.
