From: Anthony Minessale <anthm@freeswitch.org>
Date: Fri, 21 Feb 2014 00:47:34 +0000 (-0600)
Subject: improve make -j detection to tolerate FS build being launched from within another... 
X-Git-Tag: v1.2.23~78
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5537898e00e5aef6499fb01e7f3a6f1b59acc1da;p=thirdparty%2Ffreeswitch.git

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

diff --git a/Makefile.am b/Makefile.am
index cd8b1355c9..b982b33e0f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -475,17 +475,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