From 65a0d1ce28ec59886c79ebf89815d99cfebcf046 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Thu, 13 Nov 2014 11:39:28 +0100 Subject: [PATCH] fix clean of vpx project --- Makefile | 4 +++- submodules/linphone | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 6af05efb5..b73c2a04d 100644 --- a/Makefile +++ b/Makefile @@ -306,6 +306,7 @@ $(LIBVPX_BUILD_DIR)/x86/libvpx.a: build-vpx: $(BUILD_VPX_DEPS) clean-vpx: + cd $(LIBVPX_SRC_DIR) && git clean -dfx && git reset --hard rm -rf submodules/externals/build/libvpx/arm && \ rm -rf submodules/externals/build/libvpx/x86 @@ -491,7 +492,7 @@ run-all-tests: $(MAKE) -C tests run-all-tests clean-ndk-build: - $(NDK_PATH)/ndk-build clean $(LIBLINPHONE_OPTIONS) + - $(NDK_PATH)/ndk-build clean $(LIBLINPHONE_OPTIONS) ant clean @if [ -f $(TOPDIR)/submodules/linphone/mediastreamer2/java/project.properties ]; then \ cd $(TOPDIR)/submodules/linphone/mediastreamer2/java && ant clean; \ @@ -499,6 +500,7 @@ clean-ndk-build: .NOTPARALLEL clean-native: clean-ndk-build clean-ffmpeg clean-x264 clean-openh264 clean-vpx + java-clean: ant clean diff --git a/submodules/linphone b/submodules/linphone index 8a6a2e4cc..48a5ba6d9 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 8a6a2e4ccacc4f1c9c7d410eecfd5998e02bc453 +Subproject commit 48a5ba6d98756ac4a916fef6f89ecd171253fc8e