Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove duplicated "prepare-sources" task

Browse source
This commit is contained in:
Gautier Pelloux-Prayer 2014-09-18 15:07:23 +02:00
parent 8cd0dc0842
commit 4eebc8e386
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Makefile
View file

@ -18,7 +18,7 @@ X86_SYSROOT=$(shell find "${NDK_PATH}" -name arch-x86 -print | \
print $$0 " " b[2]}' | \ print $$0 " " b[2]}' | \
sort -g -k 2 | \ sort -g -k 2 | \
awk '{ print $$1 }' | tail -1) awk '{ print $$1 }' | tail -1)
NUMCPUS=$(shell grep -c '^processor' /proc/cpuinfo 2>/dev/null || echo "4" ) NUMCPUS=1
TOPDIR=$(shell pwd) TOPDIR=$(shell pwd)
LIBLINPHONE_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) LINPHONE_ANDROID_DEBUG_VERSION=$(shell git describe --always)
@ -79,7 +79,7 @@ else
HTTPS_CA_DIR=$(OPENSSL_DIR) HTTPS_CA_DIR=$(OPENSSL_DIR)
endif endif
all: update-project prepare-sources generate-apk all: update-project generate-apk
ifeq ($(ENABLE_GPL_THIRD_PARTIES),1) ifeq ($(ENABLE_GPL_THIRD_PARTIES),1)
@echo "***************************************************************************" @echo "***************************************************************************"
@echo "***** CAUTION, this liblinphone SDK is built using 3rd party GPL code *****" @echo "***** CAUTION, this liblinphone SDK is built using 3rd party GPL code *****"