mirror of
https://github.com/asterisk/asterisk.git
synced 2025-10-22 12:52:33 +00:00
Fix how we build pjproject.
Allow parallel builds, better tolerate failures, build faster. This also stops running dependencies before top-level configure has been run. (closes issue ASTERISK-20815) Review: https://reviewboard.asterisk.org/r/2292/ ........ Merged revisions 380816 from http://svn.asterisk.org/svn/asterisk/branches/11 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@380817 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
24
res/Makefile
24
res/Makefile
@@ -67,21 +67,25 @@ endif
|
||||
ael/pval.o: ael/pval.c
|
||||
|
||||
clean::
|
||||
$(MAKE) -C pjproject realclean
|
||||
@if [ -f pjproject/build.mak ]; then $(MAKE) -C pjproject realclean; fi
|
||||
rm -f snmp/*.o snmp/*.i ael/*.o ael/*.i ais/*.o ais/*.i
|
||||
|
||||
pjproject/build.mak:
|
||||
cd pjproject && ./configure AR="" CFLAGS=-fPIC --disable-floating-point --disable-sound --disable-oss --disable-speex-aec --disable-l16-codec --disable-gsm-codec --disable-g722-codec --disable-g7221-codec --disable-speex-codec --disable-ilbc-codec --disable-g711-codec
|
||||
dist-clean::
|
||||
rm -f pjproject/build.mak
|
||||
|
||||
.PHONY : pjproject
|
||||
pjproject: pjproject/build.mak
|
||||
# Make sure we always build pjproject with a single job.
|
||||
$(MAKE) -j1 -C pjproject dep
|
||||
$(MAKE) -j1 -C pjproject
|
||||
pjproject/build.mak: pjproject/aconfigure
|
||||
(cd pjproject && CFLAGS="-fPIC" ./configure --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) --disable-floating-point --disable-sound --disable-oss --disable-speex-aec --disable-l16-codec --disable-gsm-codec --disable-g722-codec --disable-g7221-codec --disable-speex-codec --disable-ilbc-codec --disable-g711-codec)
|
||||
|
||||
include pjproject/build.mak
|
||||
ifneq ($(findstring $(MAKECMDGOALS),all),)
|
||||
-include pjproject/build.mak
|
||||
endif
|
||||
|
||||
.PHONY: FORCE
|
||||
FORCE:
|
||||
|
||||
$(PJ_LIB_FILES): FORCE
|
||||
$(MAKE) -C $(patsubst %/lib/,%,$(dir $@))/build/ ../lib/$(notdir $@)
|
||||
|
||||
$(PJ_LIB_FILES): pjproject
|
||||
res_rtp_asterisk.o: $(PJ_LIB_FILES)
|
||||
res_rtp_asterisk.o: _ASTCFLAGS+=$(PJ_CFLAGS)
|
||||
res_rtp_asterisk.so: _ASTLDFLAGS+=$(PJ_LDFLAGS)
|
||||
|
Reference in New Issue
Block a user