[mw-devel] [Git][arthur/mw][master] Make 'make JSENGINE=duk' work from the top directory

[Andrew Price]

Andrew Price pushed to branch master at Justin Mitchell / mw


Commits:
feb65f5b by Andrew Price at 2017-07-09T15:58:08+01:00
Make 'make JSENGINE=duk' work from the top directory

- - - - -


2 changed files:

- Makefile
- src/client/Makefile


Changes:

=====================================
Makefile
=====================================
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,6 @@ SRCROOT = $(CURDIR)
 include Makefile.common
 
 build:
-	$(MAKE) -C mozjs
 	$(MAKE) -C src $@
 
 po:


=====================================
src/client/Makefile
=====================================
--- a/src/client/Makefile
+++ b/src/client/Makefile
@@ -23,7 +23,9 @@ JSFLAGS = $(JSFLAGS_$(JSENGINE))
 LDLIBS+= -lreadline -ltermcap -lcrypt -lsqlite3 -lcurl -lpthread -lcrypto -ljansson -lz -lm
 CFLAGS+= -I.. $(JSFLAGS)
 
-build: mw
+# Force build order as we need generated mozjs headers to build mw
+build: $(JSOBJ)
+	$(MAKE) mw
 
 $(JSOBJ):
 	$(MAKE) -C $(JSDIR)



View it on GitLab: https://projects.sucs.org/arthur/mw/commit/feb65f5be90bf3f51f64245cd2c0fd45f805ecc8

---
View it on GitLab: https://projects.sucs.org/arthur/mw/commit/feb65f5be90bf3f51f64245cd2c0fd45f805ecc8
You're receiving this email because of your account on projects.sucs.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.sucs.org/pipermail/mw-devel/attachments/20170709/8d57f5fd/attachment.html>