Merged,
Maxim.
On 06/30/16 23:23, Mike Holmes wrote:
On 30 June 2016 at 16:12, Anders Roxell <[email protected]> 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 <[email protected]>
Tested-and-Reviewed-by: Mike Holmes <[email protected]>
---
configure.ac | 6 +++++-
helper/Makefile.am | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac
index f3952db..c0eb207 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
@@ -272,7 +275,8 @@ AC_OUTPUT
AC_MSG_RESULT([
$PACKAGE $VERSION
- Library version: ${ODP_LIBSO_VERSION}
+ ODP Library version: ${ODP_LIBSO_VERSION}
+ Helper Library version: ${ODPHELPER_LIBSO_VERSION}
implementation_name: ${IMPLEMENTATION_NAME}
ARCH_DIR ${ARCH_DIR}
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
_______________________________________________
lng-odp mailing list
[email protected]
https://lists.linaro.org/mailman/listinfo/lng-odp
