Commit d979a5a1 authored by Justin Mitchell's avatar Justin Mitchell
Browse files

Fix the build for test to build the prereq of mozjs

parent 7c36294a

Makefile.common

+2 −0
Original line number Diff line number Diff line 
SHELL = /bin/bash



SVNVER = $(shell git describe --always )



VERSION_MAJOR = 2

mozjs17.0.0/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -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

+4 −1
Original line number Diff line number Diff line
@@ -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 $^