Android Makefile changed to automatically update linphone version

diff --git a/build/android/common.mk b/build/android/common.mk
index c85318ee4ddf98896bea1e39a17f55c7311db02c..40742b95969bfef899669f7cb6fde88c3374e05d 100644 (file)
--- 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 235fb79b187ac514daf1af5ef09daf29485a35d3..8dbf90482d735da3097d8d42b000c655f7bd709e 100644 (file)
--- 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])