diff options
| author | Antonin Descampe <antonin@gmail.com> | 2011-03-10 17:08:50 +0000 |
|---|---|---|
| committer | Antonin Descampe <antonin@gmail.com> | 2011-03-10 17:08:50 +0000 |
| commit | 6bda73eeb2134963f64c3d67fdd11c1304cb14f9 (patch) | |
| tree | 5a55301366762d39dda92af2f22aad84e8d833a7 | |
| parent | 9f349b0988d86591c5cbd488df9c569188adabd3 (diff) | |
fixed lt_version in configure.ac
| -rw-r--r-- | CHANGES | 3 | ||||
| -rw-r--r-- | configure.ac | 19 | ||||
| -rw-r--r-- | jp3d/libjp3dvm/Makefile.am | 2 |
3 files changed, 20 insertions, 4 deletions
@@ -5,6 +5,9 @@ What's New for OpenJPEG ! : changed + : added +March 10, 2011 +* [antonin] fixed lt_version in configure.ac + March 5, 2011 ! [antonin] cosmetic change for status report of ./configure diff --git a/configure.ac b/configure.ac index e52fefe4..18da967a 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,10 @@ +# According to http://www.gnu.org/software/libtool/manual/libtool.html#Updating-version-info : +# +# 1) when bugs are fixed or internal code is changed: increase MICRO +# 2) if API is added, increase MINOR and set MICRO to 0 +# 3) if API or ABI is broken (this case should (must) never happen as it's very bad for a library), or a new designed library, increase MAJOR and set MINOR and MICRO to 0 + m4_define([OPJ_MAJOR], [1]) m4_define([OPJ_MINOR], [4]) m4_define([OPJ_MICRO], [0]) @@ -7,10 +13,14 @@ m4_define([JP3D_MAJOR], [1]) m4_define([JP3D_MINOR], [3]) m4_define([JP3D_MICRO], [0]) -m4_define([lt_rev], m4_eval(OPJ_MAJOR + OPJ_MINOR)) -m4_define([lt_cur], OPJ_MICRO) +m4_define([lt_cur], m4_eval(OPJ_MAJOR + OPJ_MINOR)) +m4_define([lt_rev], OPJ_MICRO) m4_define([lt_age], OPJ_MINOR) +m4_define([lt_cur_jp3d], m4_eval(JP3D_MAJOR + JP3D_MINOR)) +m4_define([lt_rev_jp3d], JP3D_MICRO) +m4_define([lt_age_jp3d], JP3D_MINOR) + AC_PREREQ([2.62]) AC_INIT([OpenJPEG], [OPJ_MAJOR.OPJ_MINOR.OPJ_MICRO], @@ -44,9 +54,12 @@ AC_SUBST(JP3D_MICRO_NR) LT_PREREQ([2.0]) LT_INIT([win32-dll]) -lt_version=lt_rev:lt_cur:lt_age +lt_version=lt_cur:lt_rev:lt_age AC_SUBST(lt_version) +lt_version_jp3d=lt_cur_jp3d:lt_rev_jp3d:lt_age_jp3d +AC_SUBST(lt_version_jp3d) + ### Needed information diff --git a/jp3d/libjp3dvm/Makefile.am b/jp3d/libjp3dvm/Makefile.am index 2e533e6d..ccf72efa 100644 --- a/jp3d/libjp3dvm/Makefile.am +++ b/jp3d/libjp3dvm/Makefile.am @@ -5,7 +5,7 @@ lib_LTLIBRARIES = libopenjp3dvm.la includesdir = ${includedir}/openjpeg3d-@JP3D_MAJOR_NR@.@JP3D_MINOR_NR@ includes_HEADERS = openjpeg3d.h -libopenjp3dvm_la_LDFLAGS = -no-undefined -version-info @lt_version@ +libopenjp3dvm_la_LDFLAGS = -no-undefined -version-info @lt_version_jp3d@ libopenjp3dvm_la_CPPFLAGS = \ -I. \ |