From db866e00abb38343c018f4df6e277b5715cb7741 Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Thu, 16 Jun 2011 16:18:41 +0200 Subject: [PATCH] add make veryclean target fix tcp incoming call update libilbc submodule --- submodules/build/Makefile | 5 ++++ submodules/build/builder-iphone-os.mk | 30 +++++++++++---------- submodules/build/builders.d/msamr.mk | 3 ++- submodules/build/builders.d/opencore-amr.mk | 4 +-- submodules/libilbc-rfc3951 | 2 +- submodules/linphone | 2 +- 6 files changed, 27 insertions(+), 19 deletions(-) diff --git a/submodules/build/Makefile b/submodules/build/Makefile index 0b6b48f02..9c2e11552 100644 --- a/submodules/build/Makefile +++ b/submodules/build/Makefile @@ -32,3 +32,8 @@ clean-makefile: make -f builder-iphone-simulator.mk clean-makefile \ && make -f builder-iphone-os.mk clean-makefile \ && make -f builder-iphone-os.mk host=armv7-apple-darwin clean-makefile + +veryclean: + make -f builder-iphone-simulator.mk veryclean \ + && make -f builder-iphone-os.mk veryclean \ + && make -f builder-iphone-os.mk host=armv7-apple-darwin veryclean diff --git a/submodules/build/builder-iphone-os.mk b/submodules/build/builder-iphone-os.mk index 89565a6ad..91bbfaf7d 100644 --- a/submodules/build/builder-iphone-os.mk +++ b/submodules/build/builder-iphone-os.mk @@ -77,7 +77,7 @@ init: mkdir -p $(prefix)/include mkdir -p $(prefix)/lib -veryclean: +veryclean: veryclean-linphone rm -rf $(BUILDER_BUILD_DIR) .NOTPARALLEL build-linphone: init build-openssl build-osip2 build-eXosip2 build-speex build-libgsm $(LINPHONE_BUILD_DIR)/Makefile @@ -86,9 +86,9 @@ veryclean: clean-linphone: clean-osip2 clean-eXosip2 clean-speex clean-libgsm clean-msilbc clean-libilbc clean-openssl clean-msamr cd $(LINPHONE_BUILD_DIR) && make clean -veryclean-linphone: clean-linphone veryclean-osip2 veryclean-eXosip2 veryclean-speex veryclean-libgsm veryclean-msilbc veryclean-libilbc veryclean-openssl veryclean-msamr - cd $(LINPHONE_BUILD_DIR) && make distclean - cd $(LINPHONE_SRC_DIR) && rm -f configure +veryclean-linphone: veryclean-osip2 veryclean-eXosip2 veryclean-speex veryclean-libgsm veryclean-msilbc veryclean-libilbc veryclean-openssl veryclean-msamr +#-cd $(LINPHONE_BUILD_DIR) && make distclean + -cd $(LINPHONE_SRC_DIR) && rm -f configure clean-makefile-linphone: clean-makefile-osip2 clean-makefile-eXosip2 clean-makefile-speex clean-makefile-libilbc clean-makefile-msilbc clean-makefile-openssl clean-makefile-msamr cd $(LINPHONE_BUILD_DIR) && rm -f Makefile && rm -f oRTP/Makefile && rm -f mediastreamer2/Makefile @@ -132,8 +132,8 @@ clean-osip2: cd $(BUILDER_BUILD_DIR)/$(osip_dir) && make clean veryclean-osip2: - cd $(BUILDER_BUILD_DIR)/$(osip_dir) && make distclean - cd $(BUILDER_SRC_DIR)/$(osip_dir) && rm -f configure +# -cd $(BUILDER_BUILD_DIR)/$(osip_dir) && make distclean + -cd $(BUILDER_SRC_DIR)/$(osip_dir) && rm -f configure clean-makefile-osip2: cd $(BUILDER_BUILD_DIR)/$(osip_dir) && rm -f Makefile @@ -157,7 +157,8 @@ clean-eXosip2: cd $(BUILDER_BUILD_DIR)/$(eXosip_dir) && make clean veryclean-eXosip2: - cd $(BUILDER_BUILD_DIR)/$(eXosip_dir) && make distclean +# -cd $(BUILDER_BUILD_DIR)/$(eXosip_dir) && make distclean + -rm -f $(BUILDER_SRC_DIR)/$(eXosip_dir)/configure clean-makefile-eXosip2: cd $(BUILDER_BUILD_DIR)/$(eXosip_dir) && rm -f Makefile @@ -181,7 +182,8 @@ clean-speex: cd $(BUILDER_BUILD_DIR)/$(speex_dir) && make clean veryclean-speex: - cd $(BUILDER_BUILD_DIR)/$(speex_dir) && make distclean +# -cd $(BUILDER_BUILD_DIR)/$(speex_dir) && make distclean + -rm -f $(BUILDER_SRC_DIR)/$(speex_dir)/configure clean-makefile-speex: cd $(BUILDER_BUILD_DIR)/$(speex_dir) && rm -f Makefile @@ -201,8 +203,8 @@ clean-libgsm: cd $(BUILDER_BUILD_DIR)/$(gsm_dir)\ && make clean -veryclean-libgsm: clean-libgsm - cd $(BUILDER_BUILD_DIR)/$(gsm_dir)) \ +veryclean-libgsm: + -cd $(BUILDER_BUILD_DIR)/$(gsm_dir) \ && make uninstall @@ -225,8 +227,8 @@ clean-msilbc: cd $(MSILBC_BUILD_DIR) && make clean veryclean-msilbc: - cd $(MSILBC_BUILD_DIR) && make distclean - cd $(MSILBC_BUILD_DIR) && rm configure +# -cd $(MSILBC_BUILD_DIR) && make distclean + -cd $(MSILBC_SRC_DIR) && rm configure clean-makefile-msilbc: cd $(MSILBC_BUILD_DIR) && rm -f Makefile @@ -249,8 +251,8 @@ clean-libilbc: cd $(LIBILBC_BUILD_DIR) && make clean veryclean-libilbc: - cd $(LIBILBC_BUILD_DIR) && make distclean - cd $(LIBILBC_BUILD_DIR) && rm -f configure +# -cd $(LIBILBC_BUILD_DIR) && make distclean + -cd $(MSILBC_SRC_DIR) && rm -f configure clean-makefile-libilbc: cd $(LIBILBC_BUILD_DIR) && rm -f Makefile diff --git a/submodules/build/builders.d/msamr.mk b/submodules/build/builders.d/msamr.mk index d251a01c7..47c4ef460 100644 --- a/submodules/build/builders.d/msamr.mk +++ b/submodules/build/builders.d/msamr.mk @@ -36,7 +36,8 @@ clean-msamr: clean-opencore-amr cd $(BUILDER_BUILD_DIR)/$(msamr_dir) && make clean veryclean-msamr: veryclean-opencore-amr - cd $(BUILDER_BUILD_DIR)/$(msamr_dir) && make distclean && rm -f configure + -cd $(BUILDER_BUILD_DIR)/$(msamr_dir) && make distclean + rm -rf $(BUILDER_BUILD_DIR)/$(msamr_dir) clean-makefile-msamr: clean-makefile-opencore-amr cd $(BUILDER_BUILD_DIR)/$(msamr_dir) && rm -f Makefile diff --git a/submodules/build/builders.d/opencore-amr.mk b/submodules/build/builders.d/opencore-amr.mk index 14eddd265..99eb76438 100644 --- a/submodules/build/builders.d/opencore-amr.mk +++ b/submodules/build/builders.d/opencore-amr.mk @@ -37,8 +37,8 @@ clean-opencore-amr: cd $(BUILDER_BUILD_DIR)/$(opencore-amr_dir) && make clean veryclean-opencore-amr: - cd $(BUILDER_BUILD_DIR)/$(opencore-amr_dir) && make distclean - cd $(BUILDER_SRC_DIR)/$(opencore-amr_dir) && rm -f configure + -cd $(BUILDER_BUILD_DIR)/$(opencore-amr_dir) && make distclean + -rm -rf $(BUILDER_BUILD_DIR)/$(opencore-amr_dir) clean-makefile-opencore-amr: cd $(BUILDER_BUILD_DIR)/$(opencore-amr_dir) && rm -f Makefile diff --git a/submodules/libilbc-rfc3951 b/submodules/libilbc-rfc3951 index 2f7640d57..8af11e23e 160000 --- a/submodules/libilbc-rfc3951 +++ b/submodules/libilbc-rfc3951 @@ -1 +1 @@ -Subproject commit 2f7640d571fa12f75d269eda59d91e2037f99c5d +Subproject commit 8af11e23e482c98a40e5661c16974b297a0d0396 diff --git a/submodules/linphone b/submodules/linphone index 9a2914c42..8ba552ab6 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 9a2914c429330ef06fadecd6691fccf55e3ade0a +Subproject commit 8ba552ab693cb648947defac468cd31c311dbad3