kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-14 00:24:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "pjproject_bundled: Make build single threaded" into 13

Browse Source
This commit is contained in:
Joshua Colp
2016-12-20 05:31:15 -06:00
committed by Gerrit Code Review
parent 2a94c2c97e 815f755155
commit bc6fc3ab4d
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
third-party/pjproject/Makefile vendored
View File

@@ -1,5 +1,7 @@
.PHONY: _all all _install install clean distclean echo_cflags configure .PHONY: _all all _install install clean distclean echo_cflags configure
.NOTPARALLEL:
include ../versions.mak include ../versions.mak
export PJDIR := $(shell pwd -P)/source export PJDIR := $(shell pwd -P)/source
@@ -139,7 +141,6 @@ source/pjlib/include/pj/%.h: patches/%.h
.rebuild_needed: $(wildcard ../../makeopts) $(wildcard ../../menuselect.makeopts) .rebuild_needed: $(wildcard ../../makeopts) $(wildcard ../../menuselect.makeopts)
$(ECHO_PREFIX) Rebuilding $(ECHO_PREFIX) Rebuilding
$(CMD_PREFIX) $(MAKE) clean $(REALLY_QUIET) $(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 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) $(ECHO_PREFIX) Configuring with $(PJPROJECT_CONFIG_OPTS)
@@ -156,13 +157,11 @@ echo_cflags: source/build.mak
libpj%.a: source/build.mak libpj%.a: source/build.mak
$(ECHO_PREFIX) Compiling lib $(@F) $(ECHO_PREFIX) Compiling lib $(@F)
$(CMD_PREFIX) $(MAKE) -C $(dir $(shell dirname $@))/build $(@F) $(REALLY_QUIET) $(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 # 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) $(ECHO_PREFIX) Compiling lib $(@F)
$(CMD_PREFIX) $(MAKE) -C $(dir $(shell dirname $@))/build/resample all $(REALLY_QUIET) $(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 # We need to compile pjlib, then pjlib-util, then the rest
# so we separate them out and create the dependencies # so we separate them out and create the dependencies