[mw-devel] [Git][arthur/mw][master] Fix the build for test to build the prereq of mozjs

[Justin Mitchell]

Justin Mitchell pushed to branch master at Justin Mitchell / mw


Commits:
d979a5a1 by Justin Mitchell at 2015-10-06T11:19:11Z
Fix the build for test to build the prereq of mozjs

- - - - -


3 changed files:

- Makefile.common
- mozjs17.0.0/Makefile
- src/Makefile


Changes:

=====================================
Makefile.common
=====================================
--- a/Makefile.common
+++ b/Makefile.common
@@ -1,3 +1,5 @@
+SHELL = /bin/bash
+
 SVNVER = $(shell git describe --always )
 
 VERSION_MAJOR = 2


=====================================
mozjs17.0.0/Makefile
=====================================
--- a/mozjs17.0.0/Makefile
+++ b/mozjs17.0.0/Makefile
@@ -11,6 +11,7 @@ INSTALLDIR=$(PWD)/mozjs
 
 mozjs:
 	echo "INSTALLDIR = $(INSTALLDIR)"
+	echo "PWD = $(PWD)"
 	cd js/src/ ; ./configure --enable-thread  --with-pthreads --prefix=/usr
 	make -C js/src/
 	/usr/bin/printenv


=====================================
src/Makefile
=====================================
--- a/src/Makefile
+++ b/src/Makefile
@@ -2,13 +2,16 @@ SRCROOT = $(CURDIR)/..
 DEPTH=../
 include ../Makefile.common
 
-build: libmw.a
+build: ../mozjs libmw.a
 	$(MAKE) -C server $@
 	$(MAKE) -C client $@
 	$(MAKE) -C webclient $@
 	$(MAKE) -C utils $@
 	ln -fs server/mwserv client/mw .
 
+../mozjs:
+	pushd $(SRCROOT) && $(MAKE) -C mozjs17.0.0 && popd
+
 libmw.a: $(CODE:.c=.o)
 	ar rcs libmw.a $^
 



View it on GitLab: https://projects.sucs.org/arthur/mw/commit/d979a5a1dd4a7468dc30c38f6c7617babe55b1d3
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.sucs.org/pipermail/mw-devel/attachments/20151006/a3e4a486/attachment.html>