diff options
| author | zuul <zuul@gerrit.asterisk.org> | 2016-11-01 21:15:08 -0500 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2016-11-01 21:15:08 -0500 |
| commit | de2c964e8671531ba70844cc302eb2bf1d4aa603 (patch) | |
| tree | 5389a78e2ebf74337416091aad74c26f6b1c3b47 /third-party/pjproject/Makefile | |
| parent | f0236b2d871369bf38ff24675a9f10b5ffe9e370 (diff) | |
| parent | f27f837a9f5fae97af6e86d7d5f1f645e7c12186 (diff) | |
Merge "pjproject_bundled: Fix compile of pjsua so it handles audio"
Diffstat (limited to 'third-party/pjproject/Makefile')
| -rw-r--r-- | third-party/pjproject/Makefile | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/third-party/pjproject/Makefile b/third-party/pjproject/Makefile index 07a6c9cd6..209e681cd 100644 --- a/third-party/pjproject/Makefile +++ b/third-party/pjproject/Makefile @@ -125,11 +125,17 @@ libpj%.a: .rebuild_needed source/build.mak $(CMD_PREFIX) $(MAKE) -C $(dir $(shell dirname $@))/build $(@F) $(REALLY_QUIET) -@rm -rf .rebuild_needed +# pjsua needs resample and g711 to successfully run the testsuite +libresample%.a: .rebuild_needed source/build.mak + $(ECHO_PREFIX) Compiling lib $(@F) + $(CMD_PREFIX) $(MAKE) -C $(dir $(shell dirname $@))/build/resample all $(REALLY_QUIET) + -@rm -rf .rebuild_needed + # We need to compile pjlib, then pjlib-util, then the rest # so we separate them out and create the dependencies PJLIB_LIB_FILES = $(foreach lib,$(PJ_LIB_FILES),$(if $(findstring libpj-,$(lib)),$(lib),)) PJLIB_UTIL_LIB_FILES = $(foreach lib,$(PJ_LIB_FILES),$(if $(findstring libpjlib-util,$(lib)),$(lib),)) -PJSIP_LIB_FILES = $(filter-out $(PJLIB_LIB_FILES) $(PJLIB_UTIL_LIB_FILES),$(PJ_LIB_FILES)) +PJSIP_LIB_FILES = $(filter-out $(PJLIB_LIB_FILES) $(PJLIB_UTIL_LIB_FILES) $(APP_THIRD_PARTY_LIB_FILES),$(PJ_LIB_FILES)) ALL_LIB_FILES = $(PJLIB_LIB_FILES) $(PJLIB_UTIL_LIB_FILES) $(PJSIP_LIB_FILES) $(PJLIB_UTIL_LIB_FILES): $(PJLIB_LIB_FILES) @@ -152,7 +158,7 @@ source/pjsip-apps/lib/libasterisk_malloc_debug.a: source/pjsip-apps/lib/asterisk $(CMD_PREFIX) ar qs $@ $< >/dev/null 2>&1 $(apps): APP = $(filter pj%,$(subst -, ,$(notdir $@))) -$(apps): pjproject.symbols +$(apps): pjproject.symbols $(APP_THIRD_PARTY_LIB_FILES) $(ECHO_PREFIX) Compiling $(APP) $(CMD_PREFIX) +$(MAKE) -C source/pjsip-apps/build $(filter pj%,$(subst -, ,$(notdir $@))) $(REALLY_QUIET) |