kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

improve make -j detection to tolerate FS build being launched from within another make file

This commit is contained in:
Anthony Minessale 2014-02-20 18:47:34 -06:00
parent e209b1a0b7
commit 74f9ed5d0b
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile.am
View File

@ -481,17 +481,17 @@ libs/apr/Makefile: libs/apr/Makefile.in libs/apr/config.status libs/apr libs/apr
@$(TOUCH_TARGET)
libs/apr/libapr-1.la: libs/apr/Makefile libs/apr/.update
@if [ $(MAKELEVEL) = 0 ] ; then touch src/include/switch.h; cd libs/apr && $(MAKE) $(MFLAGS) && touch libapr-1.la; fi
@if [ $(MAKELEVEL) = 0 -o -z "`echo "$(MAKEARGS)" | grep "j"`" ] ; then touch src/include/switch.h; cd libs/apr && $(MAKE) $(MFLAGS) && touch libapr-1.la; fi
libs/apr-util/libaprutil-1.la: libs/apr/libapr-1.la libs/apr-util libs/apr-util/.update
@if [ $(MAKELEVEL) = 0 ] ; then touch src/include/switch.h; cd libs/apr-util && $(MAKE) $(MFLAGS) && touch libaprutil-1.la; fi
@if [ $(MAKELEVEL) = 0 -o -z "`echo "$(MAKEARGS)" | grep "j"`" ] ; then touch src/include/switch.h; cd libs/apr-util && $(MAKE) $(MFLAGS) && touch libaprutil-1.la; fi
libs/speex/libspeex/libspeex.la:
@echo
libs/speex/libspeex/libspeexdsp.la: libs/speex/.update
touch src/include/switch.h
@if [ $(MAKELEVEL) = 0 ] ; then cd libs/speex && $(MAKE) $(MFLAGS); fi
@if [ $(MAKELEVEL) = 0 -o -z "`echo "$(MAKEARGS)" | grep "j"`" ] ; then cd libs/speex && $(MAKE) $(MFLAGS); fi
@$(TOUCH_TARGET)
libs/sqlite/libsqlite3.la: libs/sqlite libs/sqlite/Makefile libs/sqlite/.update