From ed4644930dd8a74bcf4d4a89298a907643bd5d30 Mon Sep 17 00:00:00 2001 From: Benny Prijono Date: Thu, 22 Mar 2012 09:56:52 +0000 Subject: Re: #1463 (Third party media support). Tnitial work and it works, tested on Linux. Details: * add PJSUA_MEDIA_HAS_PJMEDIA macro * move pjmedia specific implementation in pjsua_media.c and pjsua_call.c into pjsua_aud.c * add pjsip-apps/src/third_party_media sample containing: - alt_pjsua_aud.c - alt_pjsua_vid.c * moved pjmedia_vid_stream_info_from_sdp() into pjmedia/vid_stream_info.c * moved pjmedia_stream_info_from_sdp() into pjmedia/stream_info.c * misc: fixed mips_test.c if codecs are disabled git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@3982 74dad513-b988-da41-8d7b-12977e46ad98 --- Makefile | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index dcfe0b1f..6923e1c6 100644 --- a/Makefile +++ b/Makefile @@ -3,12 +3,24 @@ include build/host-$(HOST_NAME).mak -include user.mak include version.mak -DIRS = pjlib/build pjlib-util/build pjnath/build third_party/build pjmedia/build pjsip/build pjsip-apps/build $(EXTRA_DIRS) +LIB_DIRS = pjlib/build pjlib-util/build pjnath/build third_party/build pjmedia/build pjsip/build +DIRS = $(LIB_DIRS) pjsip-apps/build $(EXTRA_DIRS) ifdef MINSIZE MAKE_FLAGS := MINSIZE=1 endif +lib: + for dir in $(LIB_DIRS); do \ + if $(MAKE) $(MAKE_FLAGS) -C $$dir all; then \ + true; \ + else \ + exit 1; \ + fi; \ + done; \ + make -C pjsip-apps/src/third_party_media + + all clean dep depend distclean print realclean: for dir in $(DIRS); do \ if $(MAKE) $(MAKE_FLAGS) -C $$dir $@; then \ @@ -18,6 +30,8 @@ all clean dep depend distclean print realclean: fi; \ done +.PHONY: lib + doc: @if test \( ! "$(WWWDIR)" == "" \) -a \( ! -d $(WWWDIR)/pjlib/docs/html \) ; then \ echo 'Directory "$(WWWDIR)" does not look like a valid pjsip web directory'; \ -- cgit v1.2.3