diff options
| author | Jason Parker <jparker@digium.com> | 2013-02-04 19:52:14 +0000 |
|---|---|---|
| committer | Jason Parker <jparker@digium.com> | 2013-02-04 19:52:14 +0000 |
| commit | eb61bb96b7fcc79ef41bcb548331fe1991ed1f51 (patch) | |
| tree | aaba1a46b54b1792262454dd26462099765c321b /res/Makefile | |
| parent | 8bb9aa2f6d1b6aa5d0565609c96415625a88f021 (diff) | |
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
Diffstat (limited to 'res/Makefile')
| -rw-r--r-- | res/Makefile | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/res/Makefile b/res/Makefile index 3258867c1..c4692a665 100644 --- a/res/Makefile +++ b/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) |