From 4ee5c411cad72003a2ccbc957cce17960fe0291f Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Mon, 1 Sep 2014 18:34:26 +0200 Subject: [PATCH] fix LIBLINPHONE_VERSION --- Makefile | 4 ++-- submodules/linphone | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index a987e64cf..acb0140da 100644 --- a/Makefile +++ b/Makefile @@ -20,7 +20,7 @@ X86_SYSROOT=$(shell find "${NDK_PATH}" -name arch-x86 -print | \ awk '{ print $$1 }' | tail -1) NUMCPUS=$(shell grep -c '^processor' /proc/cpuinfo 2>/dev/null || echo "4" ) TOPDIR=$(shell pwd) -LINPHONE_VERSION=$(shell cd submodules/linphone && git describe --always) +LIBLINPHONE_VERSION=$(shell cd submodules/linphone && git describe --always) LINPHONE_ANDROID_DEBUG_VERSION=$(shell git describe --always) BELLESIP_VERSION_SCRIPT:=cat submodules/belle-sip/configure.ac | grep "AC_INIT(" | sed -e "s/.*belle-sip\]//" | sed -e "s/].*//" | sed -e "s/.*\[//" BELLESIP_VERSION=$(shell $(BELLESIP_VERSION_SCRIPT)) @@ -475,7 +475,7 @@ GENERATE_OPTIONS = NDK_DEBUG=$(NDK_DEBUG) BUILD_FOR_X86=$(BUILD_FOR_X86) \ LIBLINPHONE_OPTIONS = $(GENERATE_OPTIONS) \ - LINPHONE_VERSION=$(LINPHONE_VERSION) BELLESIP_VERSION=$(BELLESIP_VERSION) USE_JAVAH=$(USE_JAVAH) \ + LIBLINPHONE_VERSION=$(LIBLINPHONE_VERSION) BELLESIP_VERSION=$(BELLESIP_VERSION) USE_JAVAH=$(USE_JAVAH) \ BUILD_TUNNEL=$(BUILD_TUNNEL) BUILD_TLS=$(BUILD_TLS) BUILD_SQLITE=$(BUILD_SQLITE) \ BUILD_CONTACT_HEADER=$(BUILD_CONTACT_HEADER) BUILD_RTP_MAP=$(BUILD_RTP_MAP) \ LIBLINPHONE_EXTENDED_SRC_FILES="$(LIBLINPHONE_EXTENDED_SRC_FILES)" \ diff --git a/submodules/linphone b/submodules/linphone index c9c23c231..def9a9537 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit c9c23c2318beff45f16c0304732e4e32f5a71020 +Subproject commit def9a953779f987e1b29be623a863aaec8949c14