[PATCHv2] configure: split up libodphelper SO-version from libodp

Message ID 1467119022-1786-1-git-send-email-anders.roxell@linaro.org
State New
Headers show

Commit Message

Anders Roxell June 28, 2016, 1:03 p.m.
The libodphelper and libopd need to track their evolving ABI
independently and so there needs to be two separate version numbers.

Signed-off-by: Anders Roxell <anders.roxell@linaro.org>
---
 configure.ac       | 3 +++
 helper/Makefile.am | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

Comments

Mike Holmes June 30, 2016, 8:17 p.m. | #1
Looks good but the configure.ac only prints up the one verion number

opendataplane 1.10.1.0.git35.ge184b36.dirty

Library version: 110:0:1


We should add the helper version number as well

Mike

On 28 June 2016 at 09:03, Anders Roxell <anders.roxell@linaro.org> wrote:

> The libodphelper and libopd need to track their evolving ABI
> independently and so there needs to be two separate version numbers.
>
> Signed-off-by: Anders Roxell <anders.roxell@linaro.org>
> ---
>  configure.ac       | 3 +++
>  helper/Makefile.am | 2 +-
>  2 files changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/configure.ac b/configure.ac
> index c87755b..afa4079 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -15,6 +15,9 @@ AM_SILENT_RULES([yes])
>  ODP_LIBSO_VERSION=110:0:1
>  AC_SUBST(ODP_LIBSO_VERSION)
>
> +ODPHELPER_LIBSO_VERSION=110:0:1
> +AC_SUBST(ODPHELPER_LIBSO_VERSION)
> +
>  # Checks for programs.
>  AC_PROG_CC
>  AM_PROG_CC_C_O
> diff --git a/helper/Makefile.am b/helper/Makefile.am
> index aa58e8c..a82a11a 100644
> --- a/helper/Makefile.am
> +++ b/helper/Makefile.am
> @@ -8,7 +8,7 @@ AM_CFLAGS  = -I$(srcdir)/include
>  AM_CFLAGS += -I$(top_srcdir)/platform/@with_platform@/include
>  AM_CFLAGS += -I$(top_srcdir)/include
>
> -AM_LDFLAGS += -version-number '$(ODP_LIBSO_VERSION)'
> +AM_LDFLAGS += -version-number '$(ODPHELPER_LIBSO_VERSION)'
>
>  helperincludedir = $(includedir)/odp/helper/
>  helperinclude_HEADERS = \
> --
> 2.1.4
>
>

Patch

diff --git a/configure.ac b/configure.ac
index c87755b..afa4079 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15,6 +15,9 @@  AM_SILENT_RULES([yes])
 ODP_LIBSO_VERSION=110:0:1
 AC_SUBST(ODP_LIBSO_VERSION)
 
+ODPHELPER_LIBSO_VERSION=110:0:1
+AC_SUBST(ODPHELPER_LIBSO_VERSION)
+
 # Checks for programs.
 AC_PROG_CC
 AM_PROG_CC_C_O
diff --git a/helper/Makefile.am b/helper/Makefile.am
index aa58e8c..a82a11a 100644
--- a/helper/Makefile.am
+++ b/helper/Makefile.am
@@ -8,7 +8,7 @@  AM_CFLAGS  = -I$(srcdir)/include
 AM_CFLAGS += -I$(top_srcdir)/platform/@with_platform@/include
 AM_CFLAGS += -I$(top_srcdir)/include
 
-AM_LDFLAGS += -version-number '$(ODP_LIBSO_VERSION)'
+AM_LDFLAGS += -version-number '$(ODPHELPER_LIBSO_VERSION)'
 
 helperincludedir = $(includedir)/odp/helper/
 helperinclude_HEADERS = \