From 4e70af6f3bcc68ff0631c149112bf4ca56e4af8b Mon Sep 17 00:00:00 2001
From: Jehan Monnier <jehan.monnier@linphone.org>
Date: Tue, 27 Nov 2012 11:04:45 +0100
Subject: [PATCH] optimize Makefile speed

---
 .gitignore    |   1 +
 Makefile      |  54 ++++++++++++++++++++++++++++++++++++--------------
 res/.DS_Store | Bin 12292 -> 0 bytes
 3 files changed, 40 insertions(+), 15 deletions(-)
 delete mode 100644 res/.DS_Store

diff --git a/.gitignore b/.gitignore
index 325ea56b0..403f5280f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ doc
 local.properties
 tests/*$py.class
 tests/build.xml
+res/.DS_Store
diff --git a/Makefile b/Makefile
index f5425d5d4..6c3f5159d 100644
--- a/Makefile
+++ b/Makefile
@@ -12,32 +12,56 @@ prepare-ffmpeg:
 ifeq ($(PATCH_FFMPEG),)
 	@patch -p0 < $(TOPDIR)/patches/ffmpeg_scalar_product_remove_alignment_hints.patch
 endif
+#libilbc
+LIBILBC_SRC_DIR=$(TOPDIR)/submodules/libilbc-rfc3951
+LIBILBC_BUILD_DIR=$(LIBILBC_SRC_DIR)
+$(LIBILBC_SRC_DIR)/configure:
+	cd $(LIBILBC_SRC_DIR) && ./autogen.sh
 
-prepare-ilbc:
-	@cd $(TOPDIR)/submodules/libilbc-rfc3951 && \
-	./autogen.sh && \
-	./configure && make \
+$(LIBILBC_BUILD_DIR)/Makefile: $(LIBILBC_SRC_DIR)/configure
+	cd $(LIBILBC_BUILD_DIR) && \
+	./configure \
+
+$(LIBILBC_BUILD_DIR)/src/iLBC_decode.c: $(LIBILBC_BUILD_DIR)/Makefile
+	cd $(LIBILBC_BUILD_DIR)/downloads && make \
 	|| ( echo "iLBC prepare stage failed" ; exit 1 )
-
-prepare-vpx:
-	@cd $(TOPDIR)/submodules/externals/libvpx && \
+	
+prepare-ilbc: $(LIBILBC_BUILD_DIR)/src/iLBC_decode.c
+#libvpx
+LIBVPX_SRC_DIR=$(TOPDIR)/submodules/externals/libvpx
+$(LIBVPX_SRC_DIR)/vp8/common/asm_com_offsets.c.S:
+	cd $(LIBVPX_SRC_DIR) \
 	./configure --target=armv7-android-gcc --sdk-path=$(NDK_PATH) --enable-error-concealment && \
-	make clean && \
 	make asm_com_offsets.asm \
 	|| ( echo "VP8 prepare stage failed." ; exit 1 )
+	
+prepare-vpx: $(LIBVPX_SRC_DIR)/vp8/common/asm_com_offsets.c.S
+#SILK
+LIBMSSILK_SRC_DIR=$(TOPDIR)/submodules/mssilk
+LIBMSSILK_BUILD_DIR=$(LIBMSSILK_SRC_DIR)
+$(LIBMSSILK_SRC_DIR)/configure:
+	cd $(LIBMSSILK_SRC_DIR) && ./autogen.sh
 
-prepare-silk:
-	@cd $(TOPDIR)/submodules/mssilk && \
-	./autogen.sh && \
-	./configure --host=arm-linux MEDIASTREAMER_CFLAGS=" " MEDIASTREAMER_LIBS=" " && \
-	cd sdk && make extract-sources \
+$(LIBMSSILK_BUILD_DIR)/Makefile: $(LIBMSSILK_SRC_DIR)/configure
+	cd $(LIBMSSILK_BUILD_DIR) && \
+	$(LIBMSSILK_SRC_DIR)/configure --host=arm-linux MEDIASTREAMER_CFLAGS=" " MEDIASTREAMER_LIBS=" " 
+
+#make sure to update this path if SILK sdk is changed
+$(LIBMSSILK_BUILD_DIR)/sdk/SILK_SDK_SRC_v1.0.8/SILK_SDK_SRC_ARM_v1.0.8/src/SKP_Silk_resampler.c: $(LIBMSSILK_BUILD_DIR)/Makefile
+	cd $(LIBMSSILK_BUILD_DIR)/sdk && \
+	make extract-sources \
 	|| ( echo "SILK audio plugin prepare state failed." ; exit 1 )
 
-prepare-srtp:
+prepare-silk: $(LIBMSSILK_BUILD_DIR)/sdk/SILK_SDK_SRC_v1.0.8/SILK_SDK_SRC_ARM_v1.0.8/src/SKP_Silk_resampler.c
+
+#srtp
+$(TOPDIR)/submodules/externals/srtp/config.h : $(TOPDIR)/submodules/externals/build/srtp/config.h
 	@cd $(TOPDIR)/submodules/externals/srtp/ && \
 	cp ../build/srtp/config.h . \
 	|| ( echo "SRTP prepare state failed." ; exit 1 )
 
+prepare-srtp: $(TOPDIR)/submodules/externals/srtp/config.h
+
 prepare-mediastreamer2:
 	@cd $(TOPDIR)/submodules/linphone/mediastreamer2/src/ && \
 	eval `cat Makefile.am | grep xxd | grep yuv2rgb.vs | sed 's/$$$$builddir/./'` && \
@@ -55,7 +79,7 @@ update-project:
 	touch default.properties
 
 generate-apk:
-	ant clean
+	rm  -f bin/Linphone.ap_ #work around to avoid aptbuilder failure
 	ant debug
 
 install-apk: generate-apk
diff --git a/res/.DS_Store b/res/.DS_Store
deleted file mode 100644
index 67c254cc5b9ec4ebc31afe3c3485fd4e210e2d2b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12292
zcmeHL&u<e)6n-ypQ-_dd36O>s)GfJ0B2*5DgaazZh0>^pL~&FSB@lMK6KB=Uj@ezu
z2~ogRFZ~bNd;fu6P|v+1j)+?i<<wIzJ*RJeIC1RcQVD^?d(zA|p7(wGW<Pm<%mM(G
z>cJ$yC;;TCDRc&?J0etGwXW!~GfIb~2k^j$2*gYzD_v}!U<cR%c7PpV2iSpk!2x<^
ztH>Yo+&5Y7*#UOoy>vj`A6#k*ix!&(^{s<Cy#*l5(X<X4(>_3JT#H4EO@mrW$27YK
zv{JNN3^a1eyNXU&wAeIg<bXyFXe*=Lp`fl#I#<&Hiw3!82iSpb2h_7a4*?{!cW<=s
z-~CAXlv9_}*VM+T;octgNAUedTC@D${8|*IS)uR}dwO#p^nIA8IJt5!j04#y$$A{5
z%jI?1D2IXYz2v?gXI@rMOJ1Tgb6&Pi89iQ*GNSQ{W#0>fY<<-^x3hDlFg@W;7N&M5
z+?~n7^wkOX+V!d3-F^z^_x#z5U)=a+!P|ZEwE2TxF`&I|z@YiP-~V{j`2=Yt@~N~E
zb(s@ZHtosc->sAV({Wm-+kax<<lsj`&Z*(kXU>j%JbLbvPtRW%{>)u<PWxWv`)Z;*
z_)11HDMfX$>I|ji#!N-VbBWjtMPo4&TUj}LOsU}x!Mq3_984{2*NAiGU_u}CZX!gy
zTus7Yc5N*c*`lgYNn{kw$u!JD885YEmsWK3Ol-`=YmzFe70lKYE&Wa;DPfm>amh;(
zFRqHx_Wj87MKl|iWR}T|#gNWIty~u<*Sty?SI2JtW4!JkE2{qx#r~9YFdQ=}N_GwM
z4(?Ab#4;9iq&dSHD}HO~dAJ0(pbRVU2%7LS{0h(D4|oB8!N0JFgE)d0@e)qpHT)8b
zID_-Ji~$O)Vh!uKiBHXOdRl*z&s)ndh(8eyc3viM8P;j82BG@k)po%=C-yIUI<&rz
zK8ks;4HD{*9l;%M;|{cQse)3*5FA$FJRP@Pm4gis#H)AkUUl$#&4qrL)$^c()d!nY
zHKNrDNIST%JGi~DMYW^DEPcypcR;;EG)YNlEavCGa)W~%czX`?n$n}{9pKLK-~Zp<
z0=Y6fzz)1|2QYWLe7i(tT5ms{71dtbrS_1T3dL(0)Dr6ScAPLr(<*Pb<9h7cxuV6U
zK`kY&mJ(_yp^@^30Ob+~JHQUG1MC1hzz(nj>;OB!4zL6406V}AumkJ>JMjM;_zz=V
BGUNaN