kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-29 15:36:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "pjproject_bundled: Fix issue with libasteriskpj needing libresample"

Browse Source
This commit is contained in:
Joshua Colp
2016-11-07 10:40:14 -06:00
committed by Gerrit Code Review
parent 876c6b0c96 78dc6ceaf6
commit 15665daf46
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
third-party/pjproject/Makefile vendored
View File

@@ -103,7 +103,12 @@ source/pjlib/include/pj/%.h: patches/%.h
$(ECHO_PREFIX) Applying custom include file $< $(ECHO_PREFIX) Applying custom include file $<
$(CMD_PREFIX) cp -f $< source/pjlib/include/pj/ $(CMD_PREFIX) cp -f $< source/pjlib/include/pj/
source/build.mak: Makefile.rules source/version.mak source/user.mak $(addprefix source/pjlib/include/pj/,$(notdir $(wildcard 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) $(ECHO_PREFIX) Configuring with $(PJPROJECT_CONFIG_OPTS)
$(CMD_PREFIX) (cd source ; ./aconfigure $(QUIET_CONFIGURE) $(PJPROJECT_CONFIG_OPTS)) $(CMD_PREFIX) (cd source ; ./aconfigure $(QUIET_CONFIGURE) $(PJPROJECT_CONFIG_OPTS))
@@ -115,12 +120,7 @@ configure: source/build.mak
echo_cflags: source/build.mak echo_cflags: source/build.mak
@echo $(PJ_CFLAGS) @echo $(PJ_CFLAGS)
.rebuild_needed: ../../makeopts ../../menuselect.makeopts libpj%.a: source/build.mak
$(ECHO_PREFIX) Rebuilding
$(CMD_PREFIX) $(MAKE) clean $(REALLY_QUIET)
@touch .rebuild_needed
libpj%.a: .rebuild_needed 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 -@rm -rf .rebuild_needed

4
third-party/pjproject/Makefile.rules vendored
View File

@@ -28,6 +28,10 @@ PJPROJECT_CONFIG_OPTS = --prefix=/opt/pjproject \
--without-external-pa \ --without-external-pa \
--without-external-srtp --without-external-srtp
ifeq ($(findstring TEST_FRAMEWORK,$(MENUSELECT_CFLAGS)),)
PJPROJECT_CONFIG_OPTS += --disable-resample --disable-g711-codec
endif
ifeq ($(shell uname -s),Linux) ifeq ($(shell uname -s),Linux)
PJPROJECT_CONFIG_OPTS += --enable-epoll PJPROJECT_CONFIG_OPTS += --enable-epoll
endif endif