attempt at fixing make -j build

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@16304 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/Makefile.am b/Makefile.am
index c328259d2fa27fc3c666b879eed5314aa03ba8c3..09621aca1e3ca62d2678ed1fd3d81ddea845ec25 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -355,6 +355,11 @@ src/include/switch_version.h: src/include/switch_version.h.in .version $(libfree
          fi ; \
        fi ;
 
+JS_DIR=$(switch_srcdir)/libs/js
+JSLA=$(JS_DIR)/libjs.la
+$(JSLA): mod_spidermonkey-all
+mod_spidermonkey_curl-all mod_spidermonkey_teletone-all mod_spidermonkey_core_db-all mod_spidermonkey_socket-all mod_spidermonky_odbc-all mod_spidermonkey_curl-install mod_spidermonkey_teletone-install mod_spidermonkey_core_db-install mod_spidermonkey_socket-install mod_spidermonky_odbc-install: $(JSLA)
+
 ##
 ## Dependency targets
 ##

diff --git a/src/mod/Makefile.am b/src/mod/Makefile.am
index d478b0cd31035d11340ce3e9b476f8abe68a3552..f5146a820769596876046f6a2dfa0c0832b9ffd2 100644 (file)
--- a/src/mod/Makefile.am
+++ b/src/mod/Makefile.am
@@ -35,8 +35,12 @@ $(OUR_MODULES) $(OUR_CLEAN_MODULES) $(OUR_INSTALL_MODULES) $(OUR_UNINSTALL_MODUL
        fi; \
        test -z "$$fail" ;
 
+JS_DIR=$(switch_srcdir)/libs/js
+JSLA=$(JS_DIR)/libjs.la
+$(JSLA): mod_spidermonkey-all
+mod_spidermonkey_curl-all mod_spidermonkey_teletone-all mod_spidermonkey_core_db-all mod_spidermonkey_socket-all mod_spidermonky_odbc-all mod_spidermonkey_curl-install mod_spidermonkey_teletone-install mod_spidermonkey_core_db-install mod_spidermonkey_socket-install mod_spidermonky_odbc-install: $(JSLA)
+
 .DEFAULT:
        @if test -z "`echo $@ | grep all`"; then  $(MAKE) $(AM_MAKEFLAGS) $@-all ; else echo Unknown target `echo $@ | sed -e 's|-all||'`; exit 1; fi
 
 
-

diff --git a/src/mod/languages/mod_spidermonkey/Makefile b/src/mod/languages/mod_spidermonkey/Makefile
index 975b45d3e88e0dad08d656702f5bdb02c6903a81..f04a177f0d50522c93a2253f704ed586500d645f 100644 (file)
--- a/src/mod/languages/mod_spidermonkey/Makefile
+++ b/src/mod/languages/mod_spidermonkey/Makefile
@@ -9,6 +9,5 @@ include sm.mak
 depend_install: $(DESTDIR)$(libdir)/libjs.la
 
 $(DESTDIR)$(libdir)/libjs.la: $(JSLA)
-       cd $(JS_DIR)/nsprpub/ && $(MAKE) install
-       cd $(JS_DIR) && $(MAKE) install
+       cd $(JS_DIR)/nsprpub/ && $(MAKE) -j1 install && cd $(JS_DIR) && $(MAKE) -j1 install
 

diff --git a/src/mod/languages/mod_spidermonkey/sm.mak b/src/mod/languages/mod_spidermonkey/sm.mak
index 113c57f98768ba4d7f39ec98c41c8d5bb77279aa..25c64a4f3783e90610c6293887d8b7551880a177 100644 (file)
--- a/src/mod/languages/mod_spidermonkey/sm.mak
+++ b/src/mod/languages/mod_spidermonkey/sm.mak
@@ -9,6 +9,5 @@ LOCAL_LIBADD+=$(JSLA)
 include $(switch_srcdir)/build/modmake.rules
 
 $(JSLA): $(JS_DIR) $(JS_DIR)/.update
-       cd $(JS_DIR)/nsprpub && $(MAKE)
-       cd $(JS_DIR) && $(MAKE)
+       cd $(JS_DIR)/nsprpub && $(MAKE) -j1 && cd $(JS_DIR) && $(MAKE) -j1
        $(TOUCH_TARGET)