Diff
Modified: freeswitch/trunk/Makefile.am (16303 => 16304)
--- freeswitch/trunk/Makefile.am 2010-01-14 05:16:38 UTC (rev 16303)
+++ freeswitch/trunk/Makefile.am 2010-01-14 05:44:20 UTC (rev 16304)
@@ -355,6 +355,11 @@
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
##
Modified: freeswitch/trunk/src/mod/Makefile.am (16303 => 16304)
--- freeswitch/trunk/src/mod/Makefile.am 2010-01-14 05:16:38 UTC (rev 16303)
+++ freeswitch/trunk/src/mod/Makefile.am 2010-01-14 05:44:20 UTC (rev 16304)
@@ -35,8 +35,12 @@
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
-
Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/Makefile (16303 => 16304)
--- freeswitch/trunk/src/mod/languages/mod_spidermonkey/Makefile 2010-01-14 05:16:38 UTC (rev 16303)
+++ freeswitch/trunk/src/mod/languages/mod_spidermonkey/Makefile 2010-01-14 05:44:20 UTC (rev 16304)
@@ -9,6 +9,5 @@
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
Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/sm.mak (16303 => 16304)
--- freeswitch/trunk/src/mod/languages/mod_spidermonkey/sm.mak 2010-01-14 05:16:38 UTC (rev 16303)
+++ freeswitch/trunk/src/mod/languages/mod_spidermonkey/sm.mak 2010-01-14 05:44:20 UTC (rev 16304)
@@ -9,6 +9,5 @@
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)