提交 14305045 authored 作者: Michael Jerris's avatar Michael Jerris

attempt at fixing make -j build

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@16304 d0543943-73ff-0310-b7d9-9358b9ac24b2
上级 14fb4a57
...@@ -355,6 +355,11 @@ src/include/switch_version.h: src/include/switch_version.h.in .version $(libfree ...@@ -355,6 +355,11 @@ src/include/switch_version.h: src/include/switch_version.h.in .version $(libfree
fi ; \ fi ; \
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 ## Dependency targets
## ##
......
...@@ -35,8 +35,12 @@ $(OUR_MODULES) $(OUR_CLEAN_MODULES) $(OUR_INSTALL_MODULES) $(OUR_UNINSTALL_MODUL ...@@ -35,8 +35,12 @@ $(OUR_MODULES) $(OUR_CLEAN_MODULES) $(OUR_INSTALL_MODULES) $(OUR_UNINSTALL_MODUL
fi; \ fi; \
test -z "$$fail" ; 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: .DEFAULT:
@if test -z "`echo $@ | grep all`"; then $(MAKE) $(AM_MAKEFLAGS) $@-all ; else echo Unknown target `echo $@ | sed -e 's|-all||'`; exit 1; fi @if test -z "`echo $@ | grep all`"; then $(MAKE) $(AM_MAKEFLAGS) $@-all ; else echo Unknown target `echo $@ | sed -e 's|-all||'`; exit 1; fi
...@@ -9,6 +9,5 @@ include sm.mak ...@@ -9,6 +9,5 @@ include sm.mak
depend_install: $(DESTDIR)$(libdir)/libjs.la depend_install: $(DESTDIR)$(libdir)/libjs.la
$(DESTDIR)$(libdir)/libjs.la: $(JSLA) $(DESTDIR)$(libdir)/libjs.la: $(JSLA)
cd $(JS_DIR)/nsprpub/ && $(MAKE) install cd $(JS_DIR)/nsprpub/ && $(MAKE) -j1 install && cd $(JS_DIR) && $(MAKE) -j1 install
cd $(JS_DIR) && $(MAKE) install
...@@ -9,6 +9,5 @@ LOCAL_LIBADD+=$(JSLA) ...@@ -9,6 +9,5 @@ LOCAL_LIBADD+=$(JSLA)
include $(switch_srcdir)/build/modmake.rules include $(switch_srcdir)/build/modmake.rules
$(JSLA): $(JS_DIR) $(JS_DIR)/.update $(JSLA): $(JS_DIR) $(JS_DIR)/.update
cd $(JS_DIR)/nsprpub && $(MAKE) cd $(JS_DIR)/nsprpub && $(MAKE) -j1 && cd $(JS_DIR) && $(MAKE) -j1
cd $(JS_DIR) && $(MAKE)
$(TOUCH_TARGET) $(TOUCH_TARGET)
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论