From 5f2640d57a48e122cb14ffa2df23304103e3d6a9 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Thu, 2 Aug 2012 12:45:15 +0200 Subject: [PATCH] Android Makefile changed to automatically update linphone version --- build/android/common.mk | 6 +++++- configure.ac | 4 +++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/build/android/common.mk b/build/android/common.mk index c85318ee..40742b95 100644 --- a/build/android/common.mk +++ b/build/android/common.mk @@ -50,13 +50,17 @@ ifndef MY_LOG_DOMAIN MY_LOG_DOMAIN = \"Linphone\" endif +ifndef LINPHONE_VERSION +LINPHONE_VERSION = \"Devel\" +endif + LOCAL_CFLAGS += \ -D_BYTE_ORDER=_LITTLE_ENDIAN \ -DORTP_INET6 \ -DINET6 \ -DOSIP_MT \ -DENABLE_TRACE \ - -DLINPHONE_VERSION=\"3.4.0\" \ + -DLINPHONE_VERSION=\"$(LINPHONE_VERSION)\" \ -DLINPHONE_PLUGINS_DIR=\"\\tmp\" \ -DLOG_DOMAIN=$(MY_LOG_DOMAIN) diff --git a/configure.ac b/configure.ac index 235fb79b..8dbf9048 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,8 @@ dnl Process this file with autoconf to produce a configure script. +dnl Keep this line, it is parsed by Android Makefile +LINPHONE_VERSION=3.5.2 -AC_INIT([linphone],[3.5.2],[linphone-developers@nongnu.org]) +AC_INIT([linphone],[$LINPHONE_VERSION],[linphone-developers@nongnu.org]) AC_CANONICAL_SYSTEM AC_CONFIG_SRCDIR([coreapi/linphonecore.c]) -- 2.39.2