diff options
author | Joshua Colp <jcolp@digium.com> | 2016-12-20 05:31:04 -0600 |
---|---|---|
committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2016-12-20 05:31:04 -0600 |
commit | 500c6af9dbc049d4e608e322f45778072e6508ec (patch) | |
tree | c50a817569898514baafd429523ed80585dd9397 | |
parent | fb914762eeb261d1a5125d29348e26797531dfdc (diff) | |
parent | d29eb3b99d749a25827b47e6940a734441c5ba4b (diff) |
Merge "pjproject_bundled: Make build single threaded"
-rw-r--r-- | third-party/pjproject/Makefile | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/third-party/pjproject/Makefile b/third-party/pjproject/Makefile index e24a5df67..645e7c4fb 100644 --- a/third-party/pjproject/Makefile +++ b/third-party/pjproject/Makefile @@ -1,5 +1,7 @@ .PHONY: _all all _install install clean distclean echo_cflags configure +.NOTPARALLEL: + include ../versions.mak export PJDIR := $(shell pwd -P)/source @@ -139,7 +141,6 @@ source/pjlib/include/pj/%.h: patches/%.h .rebuild_needed: $(wildcard ../../makeopts) $(wildcard ../../menuselect.makeopts) $(ECHO_PREFIX) Rebuilding $(CMD_PREFIX) $(MAKE) clean $(REALLY_QUIET) - @touch .rebuild_needed source/build.mak: Makefile.rules source/version.mak source/user.mak $(addprefix source/pjlib/include/pj/,$(notdir $(wildcard patches/*.h))) .rebuild_needed $(ECHO_PREFIX) Configuring with $(PJPROJECT_CONFIG_OPTS) @@ -156,13 +157,11 @@ echo_cflags: source/build.mak libpj%.a: source/build.mak $(ECHO_PREFIX) Compiling lib $(@F) $(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 +libresample%.a: 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 |