Improved Makefile

This commit is contained in:
Sylvain Berfini 2012-12-03 13:11:47 +01:00
parent 28c428dfa0
commit c3654e947f
3 changed files with 5 additions and 2 deletions

1
.gitignore vendored
View file

@ -4,6 +4,7 @@ gen
bin
doc
local.properties
project.properties
tests/*$py.class
tests/build.xml
res/.DS_Store

View file

@ -5,6 +5,7 @@ NUMCPUS=$(shell grep -c '^processor' /proc/cpuinfo || echo "4" )
TOPDIR=$(shell pwd)
PATCH_FFMPEG=$(shell cd submodules/externals/ffmpeg && git status | grep neon)
LINPHONE_VERSION=$(shell cd submodules/linphone && git describe)
ANDROID_MOST_RECENT_TARGET=$(shell android list target -c | grep android | sort | tail -n1)
BUILD_X264=0
BUILD_AMRNB=light
@ -85,7 +86,7 @@ generate-libs:
$(NDK_PATH)/ndk-build LINPHONE_VERSION=$(LINPHONE_VERSION) BUILD_X264=$(BUILD_X264) BUILD_AMRNB=$(BUILD_AMRNB) BUILD_AMRWB=$(BUILD_AMRWB) BUILD_GPLV3_ZRTP=$(BUILD_GPLV3_ZRTP) BUILD_SILK=$(BUILD_SILK) BUILD_G729=$(BUILD_G729) BUILD_TUNNEL=$(BUILD_TUNNEL) BUILD_WEBRTC_AECM=$(BUILD_WEBRTC_AECM) USE_JAVAH=$(USE_JAVAH) -j$(NUMCPUS)
update-project:
$(SDK_PATH)/android update project --path .
$(SDK_PATH)/android update project --path . --target $(ANDROID_MOST_RECENT_TARGET)
touch default.properties
generate-apk:
@ -106,6 +107,7 @@ run-tests:
$(SDK_PLATFORM_TOOLS_PATH)/adb uninstall org.linphone
@cd $(TOPDIR)/tests/ && \
$(SDK_PATH)/android update test-project --path . -m ../ && \
ant partial-clean && \
ant debug && \
ant installd && \
ant test

2
README
View file

@ -2,7 +2,7 @@
****************************
To build liblinphone for Android, you must:
0) download the Android sdk with platform-tools >= 13, tools >= 20 (20.0.3 for linux) and sdk platform >= 16, then add both 'tools' and 'platform-tools' folders in your path.
0) download the Android sdk with platform-tools >= 13, tools >= 20 (20.0.3 for linux), then add both 'tools' and 'platform-tools' folders in your path.
1) download the Android ndk (>=r8b) from google and add it to your path.
2) install the autotools: autoconf, automake, aclocal, libtoolize pkgconfig
2bis) on some 64 bits systems you'll need the ia32-libs package