[Pkg-mozext-commits] [adblock-plus] 24/464: Minor building updates
David Prévot
taffit at moszumanska.debian.org
Tue Jul 22 20:43:58 UTC 2014
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch master
in repository adblock-plus.
commit f885a3bce0fa00684a4e64bc2d5fb73b21528dfa
Author: Joshua Cranmer <Pidgeot18 at gmail.com>
Date: Fri Apr 24 19:15:21 2009 -0400
Minor building updates
---
Makefile | 13 +++----------
autotest/test_globals.js | 2 +-
2 files changed, 4 insertions(+), 11 deletions(-)
diff --git a/Makefile b/Makefile
index 5d9dba3..317bc96 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,6 @@
# You'll need to change the below to match your setup
+# If you're doing a raw spidermonkey build, the two paths should be the same,
+# pointing to the directory that contains js/ from mozilla-central.
MOZ_OBJDIR := /src/build/trunk/browser
MOZ_SRCDIR := /src/trunk/mozilla
@@ -7,17 +9,8 @@ INCLUDE := -I$(MOZ_OBJDIR)/dist/include/js/ \
-I$(MOZ_SRCDIR)/js/src/
LINK := -L$(MOZ_OBJDIR)/dist/lib -lnspr4 -lm
-OBJS := jsapi.o jsarena.o jsarray.o jsatom.o jsbool.o jscntxt.o jsdate.o \
- jsdbgapi.o jsdhash.o jsdtoa.o jsemit.o jsexn.o jsfun.o jsgc.o jshash.o \
- jsinterp.o jsinvoke.o jsiter.o jslock.o jslog2.o jslong.o jsmath.o jsnum.o \
- jsobj.o json.o jsopcode.o jsparse.o jsprf.o jsregexp.o jsscan.o jsscope.o \
- jsscript.o jsstr.o jsutil.o jsxdrapi.o jsxml.o prmjtime.o jstracer.o \
- Assembler.o Fragmento.o LIR.o RegAlloc.o avmplus.o Nativei386.o jsbuiltins.o
-
-OBJS := $(addprefix $(MOZ_OBJDIR)/js/src/, $(OBJS))
-
jshydra: jshydra.o jshydra_funcs.o jshydra_bridge.o
- g++ -o jshydra jshydra.o jshydra_funcs.o jshydra_bridge.o $(OBJS) $(LINK)
+ g++ -o jshydra jshydra.o jshydra_funcs.o jshydra_bridge.o $(MOZ_OBJDIR)/js/src/libjs_static.a $(LINK)
jshydra.o: jshydra.cpp
g++ -o jshydra.o -g $(INCLUDE) -c jshydra.cpp
diff --git a/autotest/test_globals.js b/autotest/test_globals.js
index 4e2508e..c06739c 100644
--- a/autotest/test_globals.js
+++ b/autotest/test_globals.js
@@ -1,7 +1,7 @@
// Arguments: test_globals.js
// Name: Global information test
-include("../scripts/cleanast.js");
+include("../utils/cleanast.js");
var glob = this;
const LS = "foobar";
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/adblock-plus.git
More information about the Pkg-mozext-commits
mailing list