From: Uwe Hermann <redacted>
Date: Fri, 22 Nov 2013 15:18:46 +0000 (+0100)
Subject: Use common 3-digit package version number.
X-Git-Tag: libserialport-0.1.0~74
X-Git-Url: https://sigrok.org/gitweb/?p=libserialport.git;a=commitdiff_plain;h=7de20e391530026e9c7bce986dc5d212a48673e8

Use common 3-digit package version number.
---

diff --git a/configure.ac b/configure.ac
index 551ef70..50f8de4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -24,7 +24,8 @@ AC_PREREQ([2.63])
 # libserialport package version number (NOT the same as shared lib version!).
 m4_define([sp_package_version_major], [0])
 m4_define([sp_package_version_minor], [1])
-m4_define([sp_package_version], [sp_package_version_major.sp_package_version_minor])
+m4_define([sp_package_version_micro], [0])
+m4_define([sp_package_version], [sp_package_version_major.sp_package_version_minor.sp_package_version_micro])
 
 AC_INIT([libserialport], [sp_package_version], [martin-libserialport@earth.li],
 	[libserialport], [http://sigrok.org/wiki/Libserialport])
@@ -118,10 +119,12 @@ AC_SUBST(AM_LIBTOOLFLAGS, '--silent')
 
 SP_PACKAGE_VERSION_MAJOR=sp_package_version_major
 SP_PACKAGE_VERSION_MINOR=sp_package_version_minor
+SP_PACKAGE_VERSION_MICRO=sp_package_version_micro
 SP_PACKAGE_VERSION=sp_package_version
 
 AC_SUBST(SP_PACKAGE_VERSION_MAJOR)
 AC_SUBST(SP_PACKAGE_VERSION_MINOR)
+AC_SUBST(SP_PACKAGE_VERSION_MICRO)
 AC_SUBST(SP_PACKAGE_VERSION)
 
 AC_CONFIG_FILES([Makefile libserialport.h libserialport.pc])
@@ -131,7 +134,7 @@ AC_OUTPUT
 echo
 echo "libserialport configuration summary:"
 echo
-echo "  - Package version (major.minor):          $SP_PACKAGE_VERSION"
+echo "  - Package version (major.minor.micro):    $SP_PACKAGE_VERSION"
 echo "  - Library version (current:revision:age): $SP_LIB_VERSION"
 echo "  - Prefix: $prefix"
 echo "  - Building on: $build"
diff --git a/libserialport.h.in b/libserialport.h.in
index c24550e..6a76f98 100644
--- a/libserialport.h.in
+++ b/libserialport.h.in
@@ -78,6 +78,7 @@ extern "C" {
 /* Package version macros (e.g. for conditional compilation). */
 #define SP_PACKAGE_VERSION_MAJOR @SP_PACKAGE_VERSION_MAJOR@
 #define SP_PACKAGE_VERSION_MINOR @SP_PACKAGE_VERSION_MINOR@
+#define SP_PACKAGE_VERSION_MICRO @SP_PACKAGE_VERSION_MICRO@
 #define SP_PACKAGE_VERSION_STRING "@SP_PACKAGE_VERSION@"
 
 /* Library/libtool version macros (e.g. for conditional compilation). */