Fix make -j

diff --git a/Makefile.am b/Makefile.am
index a3eedbe2e8ef9727b084cb5e8a7eab30a3f3b480..cd8b1355c938ff8b5cb014964efd128545912059 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -475,18 +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
-       touch src/include/switch.h
-       @cd libs/apr && $(MAKE)
-       @$(TOUCH_TARGET)
+       @if [ $(MAKELEVEL) = 0 ] ; then touch src/include/switch.h; cd libs/apr && $(MAKE) $(MFLAGS) && touch libapr-1.la; fi
 
-libs/apr-util/libaprutil-1.la: libs/apr-util libs/apr-util/.update libs/apr/libapr-1.la
-       touch src/include/switch.h
-       @cd libs/apr-util && $(MAKE)
-       @$(TOUCH_TARGET)
+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
+
+libs/speex/libspeex/libspeex.la:
+       @echo 
 
 libs/speex/libspeex/libspeexdsp.la: libs/speex/.update
        touch src/include/switch.h
-       @cd libs/speex && $(MAKE)
+       @if [ $(MAKELEVEL) = 0 ] ; then cd libs/speex && $(MAKE) $(MFLAGS); fi
        @$(TOUCH_TARGET)
 
 libs/sqlite/libsqlite3.la: libs/sqlite libs/sqlite/Makefile libs/sqlite/.update
@@ -589,7 +588,7 @@ nodepends: .nodepends
 yesdepends:
        rm .nodepends
 
-core: $(switch_builddir)/modules.conf
+core: $(switch_builddir)/modules.conf src/include/switch_version.h
        $(MAKE) $(AM_MAKEFLAGS) libfreeswitch.la
 
 distclean: clean

diff --git a/src/mod/xml_int/mod_xml_rpc/Makefile b/src/mod/xml_int/mod_xml_rpc/Makefile
index bc7e4c1de41c20ed7dc96dbf49d2182a7fcb9c2f..7531ae5dea7b5a8f1df5d5c20bca08a5cad4b8d0 100644 (file)
--- a/src/mod/xml_int/mod_xml_rpc/Makefile
+++ b/src/mod/xml_int/mod_xml_rpc/Makefile
@@ -1,3 +1,4 @@
+MAKEFLAGS=-j1
 BASE=../../../..
 XMLRPC_DIR=$(BASE)/libs/xmlrpc-c