kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-04-14 08:05:37 +00:00
Code Issues Projects Releases Wiki Activity

attempt at fixing make -j build

Browse Source 
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@16304 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Michael Jerris 2010-01-14 05:44:20 +00:00
parent 14fb4a573a
commit 143050451d
4 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile.am
View File

@ -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
##

6
src/mod/Makefile.am
View File

@ -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

3
src/mod/languages/mod_spidermonkey/Makefile
View File

@ -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

3
src/mod/languages/mod_spidermonkey/sm.mak
View File

@ -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)