Commit a72d756c354b445bb43c2e5009a65f4dfd7c17af
1 parent
887a2946
Change libtool versionning after discussion with Florian Forster
Showing
1 changed file
with
7 additions
and
5 deletions
configure.ac
| @@ -8,8 +8,8 @@ | @@ -8,8 +8,8 @@ | ||
| 8 | # After the release: | 8 | # After the release: |
| 9 | # - increase mb_version_minor to the next odd number | 9 | # - increase mb_version_minor to the next odd number |
| 10 | # | 10 | # |
| 11 | -# mb_version_ld increases at each new minor version because minor versions | ||
| 12 | -# are used to change API/ABI | 11 | +# Take care to update the libtool versioning when required (MB_LD_*). |
| 12 | +# http://www.gnu.org/software/libtool/manual/html_node/Libtool-versioning.html | ||
| 13 | # | 13 | # |
| 14 | m4_define([mb_version_major], [2]) | 14 | m4_define([mb_version_major], [2]) |
| 15 | m4_define([mb_version_minor], [1]) | 15 | m4_define([mb_version_minor], [1]) |
| @@ -20,7 +20,6 @@ m4_define([mb_release_status], | @@ -20,7 +20,6 @@ m4_define([mb_release_status], | ||
| 20 | [release])]) | 20 | [release])]) |
| 21 | 21 | ||
| 22 | m4_define([mb_version], [mb_version_major.mb_version_minor.mb_version_micro]) | 22 | m4_define([mb_version], [mb_version_major.mb_version_minor.mb_version_micro]) |
| 23 | -m4_define([mb_version_ld], [m4_eval(mb_version_major + mb_version_minor)]) | ||
| 24 | 23 | ||
| 25 | AC_PREREQ(2.63) | 24 | AC_PREREQ(2.63) |
| 26 | AC_INIT([libmodbus],[mb_version],[stephane.raimbault@gmail.com]) | 25 | AC_INIT([libmodbus],[mb_version],[stephane.raimbault@gmail.com]) |
| @@ -39,8 +38,11 @@ AC_SUBST(MB_VERSION_MINOR) | @@ -39,8 +38,11 @@ AC_SUBST(MB_VERSION_MINOR) | ||
| 39 | AC_SUBST(MB_VERSION_MICRO) | 38 | AC_SUBST(MB_VERSION_MICRO) |
| 40 | AC_SUBST(MB_VERSION) | 39 | AC_SUBST(MB_VERSION) |
| 41 | 40 | ||
| 42 | -MB_VERSION_LD=mb_version_ld | ||
| 43 | -MB_LT_LDFLAGS="-version-info $MB_VERSION_LD:0:0" | 41 | +# ABI version |
| 42 | +MB_LD_CURRENT=3 | ||
| 43 | +MB_LD_REVISION=0 | ||
| 44 | +MB_LD_AGE=0 | ||
| 45 | +MB_LT_LDFLAGS="-version-info $MB_LD_CURRENT:$MB_LD_REVISION:$MB_LD_AGE" | ||
| 44 | AC_SUBST(MB_LT_LDFLAGS) | 46 | AC_SUBST(MB_LT_LDFLAGS) |
| 45 | 47 | ||
| 46 | # Checks for programs. | 48 | # Checks for programs. |