From ddf48e2045fa155ef5242d9d7dcec27f8c5ed873 Mon Sep 17 00:00:00 2001 From: sauwming Date: Thu, 19 Mar 2020 15:35:26 +0800 Subject: [PATCH] Fix parallel build failure (#2306) Re #2300: * Fix parallel build failure when building pjsua2 due to typo in pjsip's Makefile * Fix parallel build failure for swig component --- pjsip-apps/src/swig/Makefile | 4 ++-- pjsip/build/Makefile | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pjsip-apps/src/swig/Makefile b/pjsip-apps/src/swig/Makefile index abb317b7c..8ca2e2a18 100644 --- a/pjsip-apps/src/swig/Makefile +++ b/pjsip-apps/src/swig/Makefile @@ -24,9 +24,9 @@ all clean dep depend distclean print realclean install uninstall: $(LANG) java python csharp: ifeq ($(CMD_is_lang),) - $(MAKE) $(MAKE_FLAGS) -C $@ $(MAKECMDGOALS) + $(MAKE) $(MAKE_FLAGS) --no-print-directory -C $@ $(MAKECMDGOALS) else - $(MAKE) $(MAKE_FLAGS) -C $@ + $(MAKE) $(MAKE_FLAGS) --no-print-directory -C $@ endif symbols.i: symbols.lst diff --git a/pjsip/build/Makefile b/pjsip/build/Makefile index 66ad9bd28..b19d5d7e3 100644 --- a/pjsip/build/Makefile +++ b/pjsip/build/Makefile @@ -262,7 +262,7 @@ $(PJSUA_LIB_LIB) $(PJSUA_LIB_SONAME): $(PJSIP_LIB) $(PJSIP_SONAME) $(PJSIP_SIMPL pjsua2-lib: $(PJSUA2_LIB_LIB) $(PJSUA2_LIB_SONAME): $(PJSUA2_LIB_LIB) -$(PJSUA2_LIB_LIB) $(PJSUA2_LIB_SONAME): $(PJSUA_LIB) $(PSJUA_LIB_SONAME) $(PJSIP_LIB) $(PJSIP_SONAME) $(PJSIP_SIMPLE_LIB) $(PJSIP_SIMPLE_SONAME) $(PJSIP_UA_LIB) $(PJSIP_UA_SONAME) +$(PJSUA2_LIB_LIB) $(PJSUA2_LIB_SONAME): $(PJSUA_LIB) $(PJSUA_LIB_SONAME) $(PJSIP_LIB) $(PJSIP_SONAME) $(PJSIP_SIMPLE_LIB) $(PJSIP_SIMPLE_SONAME) $(PJSIP_UA_LIB) $(PJSIP_UA_SONAME) $(MAKE) -f $(RULES_MAK) APP=PJSUA2_LIB app=pjsua2-lib $(subst /,$(HOST_PSEP),$(LIBDIR)/$@) pjsip-test: $(TEST_EXE) -- 2.25.1