From a8000b8bb532209eb69a18882802bf42ee9d24cb Mon Sep 17 00:00:00 2001
From: "cls%seawood.org" <cls%seawood.org>
Date: Wed, 17 May 2000 06:45:45 +0000
Subject: [PATCH] Mass replace of -lmozjs with $(MOZ_JS_LIBS) needed for OS/2
and consistency.
---
caps/src/Makefile.in | 2 +-
editor/base/Makefile.in | 2 +-
extensions/xmlterm/geckoterm/Makefile.in | 2 +-
gfx/tests/coverage/Makefile.in | 2 +-
js/src/xpconnect/loader/Makefile.in | 4 ++--
js/src/xpconnect/src/Makefile.in | 2 +-
js/src/xpconnect/tests/Makefile.in | 2 +-
js/src/xpconnect/tests/components/Makefile.in | 2 +-
layout/base/tests/Makefile.in | 2 +-
mailnews/absync/build/Makefile.in | 2 +-
mailnews/local/tests/mailbox/Makefile.in | 2 +-
mailnews/local/tests/mboxParser/Makefile.in | 2 +-
mailnews/mime/tests/mimetest/Makefile.in | 2 +-
mailnews/news/tests/newsParser/Makefile.in | 2 +-
mailnews/news/tests/nntp/Makefile.in | 2 +-
modules/libpref/src/Makefile.in | 2 +-
netwerk/cache/filecache/test/Makefile.in | 2 +-
webshell/embed/gtk/lib/Makefile.in | 2 +-
webshell/embed/xlib/gtk/Makefile.in | 2 +-
webshell/embed/xlib/motif/Makefile.in | 2 +-
webshell/embed/xlib/qt/Makefile.in | 2 +-
webshell/embed/xlib/xt/Makefile.in | 2 +-
webshell/tests/viewer/Makefile.in | 2 +-
widget/tests/scribble/Makefile.in | 2 +-
widget/tests/widget/Makefile.in | 2 +-
xpfe/browser/src/Makefile.in | 2 +-
xpfe/components/autocomplete/src/Makefile.in | 2 +-
xpfe/components/search/src/Makefile.in | 2 +-
xpfe/components/ucth/src/Makefile.in | 2 +-
29 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/caps/src/Makefile.in b/caps/src/Makefile.in
index 9884025e0861..5658660494e7 100644
--- a/caps/src/Makefile.in
+++ b/caps/src/Makefile.in
@@ -46,7 +46,7 @@ EXTRA_DSO_LDOPTS = \
-L$(DIST)/lib \
$(ZLIB_LIBS) \
$(XPCOM_LIBS) \
- -lmozjs \
+ $(MOZ_JS_LIBS) \
$(NSPR_LIBS) \
$(NULL)
diff --git a/editor/base/Makefile.in b/editor/base/Makefile.in
index 83f288294e9c..217ff33531fe 100644
--- a/editor/base/Makefile.in
+++ b/editor/base/Makefile.in
@@ -77,7 +77,7 @@ CPPSRCS = \
EXTRA_DSO_LDOPTS = \
$(MOZ_NECKO_UTIL_LIBS) \
$(MOZ_COMPONENT_LIBS) \
- -lmozjs \
+ $(MOZ_JS_LIBS) \
$(NULL)
include $(topsrcdir)/config/rules.mk
diff --git a/extensions/xmlterm/geckoterm/Makefile.in b/extensions/xmlterm/geckoterm/Makefile.in
index f9e901adea50..3ddf536be125 100644
--- a/extensions/xmlterm/geckoterm/Makefile.in
+++ b/extensions/xmlterm/geckoterm/Makefile.in
@@ -70,7 +70,7 @@ GTK_GLUE = -lgtksuperwin
XP_DIST_LIBS = \
-lraptorgfx \
- -lmozjs \
+ $(MOZ_JS_LIBS) \
$(XPCOM_LIBS) \
$(JSJ_LIB) \
$(NULL)
diff --git a/gfx/tests/coverage/Makefile.in b/gfx/tests/coverage/Makefile.in
index 6eb8c4eb0645..f6a7785c1c25 100644
--- a/gfx/tests/coverage/Makefile.in
+++ b/gfx/tests/coverage/Makefile.in
@@ -35,7 +35,7 @@ CPPSRCS = \
LIBS = \
$(XPCOM_LIBS) \
- -lmozjs \
+ $(MOZ_JS_LIBS) \
$(MOZ_WIDGET_SUPPORT_LIBS) \
-lraptorgfx \
$(NSPR_LIBS) \
diff --git a/js/src/xpconnect/loader/Makefile.in b/js/src/xpconnect/loader/Makefile.in
index 3b2c30548bb0..234dab7ecd18 100644
--- a/js/src/xpconnect/loader/Makefile.in
+++ b/js/src/xpconnect/loader/Makefile.in
@@ -33,11 +33,11 @@ include $(topsrcdir)/config/rules.mk
DEFINES += -DJSFILE -DJS_THREADSAFE
ifneq ($(OS_ARCH),BeOS)
-LIBS += -lmozjs $(XPCOM_LIBS) $(NSPR_LIBS)
+LIBS += $(MOZ_JS_LIBS) $(XPCOM_LIBS) $(NSPR_LIBS)
endif
EXTRA_DSO_LDOPTS += \
$(MOZ_COMPONENT_LIBS) \
- -lmozjs \
+ $(MOZ_JS_LIBS) \
$(NULL)
diff --git a/js/src/xpconnect/src/Makefile.in b/js/src/xpconnect/src/Makefile.in
index 4abc6b2219f6..b1bda1e67456 100644
--- a/js/src/xpconnect/src/Makefile.in
+++ b/js/src/xpconnect/src/Makefile.in
@@ -84,7 +84,7 @@ endif
EXTRA_DSO_LDOPTS += \
$(MOZ_COMPONENT_LIBS) \
- -lmozjs \
+ $(MOZ_JS_LIBS) \
$(NULL)
include $(topsrcdir)/config/rules.mk
diff --git a/js/src/xpconnect/tests/Makefile.in b/js/src/xpconnect/tests/Makefile.in
index fd5b4e2d7f36..de9b48bbedb0 100644
--- a/js/src/xpconnect/tests/Makefile.in
+++ b/js/src/xpconnect/tests/Makefile.in
@@ -48,7 +48,7 @@ CPPSRCS = TestXPC.cpp
LIBS = \
-L$(DIST)/bin \
-L$(DIST)/lib \
- -lmozjs \
+ $(MOZ_JS_LIBS) \
$(XPCOM_LIBS) \
$(NSPR_LIBS) \
$(NULL)
diff --git a/js/src/xpconnect/tests/components/Makefile.in b/js/src/xpconnect/tests/components/Makefile.in
index ffd878487150..ca6253d60759 100644
--- a/js/src/xpconnect/tests/components/Makefile.in
+++ b/js/src/xpconnect/tests/components/Makefile.in
@@ -62,7 +62,7 @@ CPPSRCS = \
EXTRA_DSO_LDOPTS += \
$(MOZ_COMPONENT_LIBS) \
- -lmozjs \
+ $(MOZ_JS_LIBS) \
$(NULL)
include $(topsrcdir)/config/rules.mk
diff --git a/layout/base/tests/Makefile.in b/layout/base/tests/Makefile.in
index 9dcbe56bb797..7ac784f72f2f 100644
--- a/layout/base/tests/Makefile.in
+++ b/layout/base/tests/Makefile.in
@@ -35,7 +35,7 @@ LOCAL_INCLUDES = -I$(srcdir)/../src
LIBS += \
$(DIST)/lib/libraptorlayout_s.a \
-lraptorgfx \
- -lmozjs \
+ $(MOZ_JS_LIBS) \
$(XPCOM_LIBS) \
$(NSPR_LIBS) \
$(TK_LIBS) \
diff --git a/mailnews/absync/build/Makefile.in b/mailnews/absync/build/Makefile.in
index 22f0ecb55a8c..6f2f7e90c415 100644
--- a/mailnews/absync/build/Makefile.in
+++ b/mailnews/absync/build/Makefile.in
@@ -41,7 +41,7 @@ EXTRA_DSO_LDOPTS = \
-L$(DIST)/bin \
-L$(DIST)/lib \
$(XPCOM_LIBS) \
- -lmozjs \
+ $(MOZ_JS_LIBS) \
-lmsgbaseutil \
$(NSPR_LIBS) \
$(NULL)
diff --git a/mailnews/local/tests/mailbox/Makefile.in b/mailnews/local/tests/mailbox/Makefile.in
index dc4f675d6bb8..0e625302b0e6 100644
--- a/mailnews/local/tests/mailbox/Makefile.in
+++ b/mailnews/local/tests/mailbox/Makefile.in
@@ -48,7 +48,7 @@ LIBS = \
-lnetlib \
$(XPCOM_LIBS) \
-lpwcac \
- -lmozjs \
+ $(MOZ_JS_LIBS) \
-lmork \
-lmsgbaseutil \
$(NSPR_LIBS) \
diff --git a/mailnews/local/tests/mboxParser/Makefile.in b/mailnews/local/tests/mboxParser/Makefile.in
index 73b4e99d025e..ebb79a817cae 100644
--- a/mailnews/local/tests/mboxParser/Makefile.in
+++ b/mailnews/local/tests/mboxParser/Makefile.in
@@ -44,7 +44,7 @@ LIBS = \
-lnetlib \
$(XPCOM_LIBS) \
-lpwcac \
- -lmozjs \
+ $(MOZ_JS_LIBS) \
$(NSPR_LIBS) \
$(TK_LIBS) \
$(NULL)
diff --git a/mailnews/mime/tests/mimetest/Makefile.in b/mailnews/mime/tests/mimetest/Makefile.in
index 65a83edebead..0b65c6d22d19 100644
--- a/mailnews/mime/tests/mimetest/Makefile.in
+++ b/mailnews/mime/tests/mimetest/Makefile.in
@@ -31,7 +31,7 @@ CPPSRCS = mimetest.cpp
LIBS = \
-L$(DIST)/bin \
- -lmozjs \
+ $(MOZ_JS_LIBS) \
$(XPCOM_LIBS) \
$(NSPR_LIBS) \
$(TK_LIBS) \
diff --git a/mailnews/news/tests/newsParser/Makefile.in b/mailnews/news/tests/newsParser/Makefile.in
index e5b719136bab..b56b8147a24b 100644
--- a/mailnews/news/tests/newsParser/Makefile.in
+++ b/mailnews/news/tests/newsParser/Makefile.in
@@ -31,7 +31,7 @@ CPPSRCS = newsParserTest.cpp
LIBS = \
$(DIST)/lib/libmsgnews_s.a \
- -lmozjs \
+ $(MOZ_JS_LIBS) \
-lraptorgfx \
-lmsgbaseutil \
$(XPCOM_LIBS) \
diff --git a/mailnews/news/tests/nntp/Makefile.in b/mailnews/news/tests/nntp/Makefile.in
index 057c43a9aa49..4f699ae6b90b 100644
--- a/mailnews/news/tests/nntp/Makefile.in
+++ b/mailnews/news/tests/nntp/Makefile.in
@@ -33,7 +33,7 @@ LIBS = \
$(DIST)/lib/librdfbase_s.a \
-L$(DIST)/bin \
-lxpcom \
- -lmozjs \
+ $(MOZ_JS_LIBS) \
-lmsgbaseutil \
$(NSPR_LIBS) \
$(TK_LIBS) \
diff --git a/modules/libpref/src/Makefile.in b/modules/libpref/src/Makefile.in
index 420d3071f87e..49c2e5ab0ef8 100644
--- a/modules/libpref/src/Makefile.in
+++ b/modules/libpref/src/Makefile.in
@@ -70,7 +70,7 @@ EXTRA_DSO_LDOPTS = \
-L$(DIST)/bin \
$(NSPR_LIBS) \
$(XPCOM_LIBS) \
- -lmozjs \
+ $(MOZ_JS_LIBS) \
$(NULL)
include $(topsrcdir)/config/rules.mk
diff --git a/netwerk/cache/filecache/test/Makefile.in b/netwerk/cache/filecache/test/Makefile.in
index 14134898fe72..67c17f91bc1b 100644
--- a/netwerk/cache/filecache/test/Makefile.in
+++ b/netwerk/cache/filecache/test/Makefile.in
@@ -35,7 +35,7 @@ LOST_SYM_LIBS = -lxpcomds_s -lxptinfo -lmozreg_s
endif
LIBS = \
- -lmozjs \
+ $(MOZ_JS_LIBS) \
$(XPCOM_LIBS) \
-lmozdbm_s \
$(MOZ_NECKO_UTIL_LIBS) \
diff --git a/webshell/embed/gtk/lib/Makefile.in b/webshell/embed/gtk/lib/Makefile.in
index cb4535cd65b8..775783b8a1af 100644
--- a/webshell/embed/gtk/lib/Makefile.in
+++ b/webshell/embed/gtk/lib/Makefile.in
@@ -94,7 +94,7 @@ MOZILLA_INCLUDES = -I@MOZILLA_DIR@/include -I@NSPR_DIR@/include
NULL =
NSPR_LIBS = -L@NSPR_DIR@/lib -lplds$(NSPR_VERSION) -lplc$(NSPR_VERSION) -lnspr$(NSPR_VERSION) @LIBPTHREAD@
-BASE_LIBS = -lmozjs $(XPCOM_LIBS) $(NULL)
+BASE_LIBS = $(MOZ_JS_LIBS) $(XPCOM_LIBS) $(NULL)
GECKO_LIBS = -lraptorgfx $(NULL)
diff --git a/webshell/embed/xlib/gtk/Makefile.in b/webshell/embed/xlib/gtk/Makefile.in
index db105cf11a35..13cfcd6f6374 100644
--- a/webshell/embed/xlib/gtk/Makefile.in
+++ b/webshell/embed/xlib/gtk/Makefile.in
@@ -36,7 +36,7 @@ CPPSRCS = \
LIBS = \
-lraptorgfx \
$(NETLIB_LIBS) \
- -lmozjs \
+ $(MOZ_JS_LIBS) \
$(XPCOM_LIBS) \
$(JSJ_LIB) \
$(NSPR_LIBS) \
diff --git a/webshell/embed/xlib/motif/Makefile.in b/webshell/embed/xlib/motif/Makefile.in
index b883b0a7758c..101ffb11b576 100644
--- a/webshell/embed/xlib/motif/Makefile.in
+++ b/webshell/embed/xlib/motif/Makefile.in
@@ -38,7 +38,7 @@ CPPSRCS = \
LIBS = \
-lraptorgfx \
$(NETLIB_LIBS) \
- -lmozjs \
+ $(MOZ_JS_LIBS) \
$(XPCOM_LIBS) \
$(JSJ_LIB) \
$(NSPR_LIBS) \
diff --git a/webshell/embed/xlib/qt/Makefile.in b/webshell/embed/xlib/qt/Makefile.in
index ce57f03956c3..1b5991694294 100644
--- a/webshell/embed/xlib/qt/Makefile.in
+++ b/webshell/embed/xlib/qt/Makefile.in
@@ -45,7 +45,7 @@ CPPSRCS = \
LIBS = \
-lraptorgfx \
$(NETLIB_LIBS) \
- -lmozjs \
+ $(MOZ_JS_LIBS) \
$(XPCOM_LIBS) \
$(JSJ_LIB) \
$(NSPR_LIBS) \
diff --git a/webshell/embed/xlib/xt/Makefile.in b/webshell/embed/xlib/xt/Makefile.in
index a8e8d9ea6eed..f118799ee695 100644
--- a/webshell/embed/xlib/xt/Makefile.in
+++ b/webshell/embed/xlib/xt/Makefile.in
@@ -37,7 +37,7 @@ CPPSRCS = \
LIBS = \
-lraptorgfx \
$(NETLIB_LIBS) \
- -lmozjs \
+ $(MOZ_JS_LIBS) \
$(XPCOM_LIBS) \
$(JSJ_LIB) \
$(NSPR_LIBS) \
diff --git a/webshell/tests/viewer/Makefile.in b/webshell/tests/viewer/Makefile.in
index 8b55bddf7832..8a3fad5e7e4d 100644
--- a/webshell/tests/viewer/Makefile.in
+++ b/webshell/tests/viewer/Makefile.in
@@ -102,7 +102,7 @@ endif
XP_DIST_LIBS = \
-lraptorgfx \
- -lmozjs \
+ $(MOZ_JS_LIBS) \
$(XPCOM_LIBS) \
$(JSJ_LIB) \
$(NULL)
diff --git a/widget/tests/scribble/Makefile.in b/widget/tests/scribble/Makefile.in
index 2a4c41efabcd..25653bd54d3e 100644
--- a/widget/tests/scribble/Makefile.in
+++ b/widget/tests/scribble/Makefile.in
@@ -36,7 +36,7 @@ CPPSRCS = \
LIBS = \
$(MOZ_WIDGET_SUPPORT_LIBS) \
$(XPCOM_LIBS) \
- -lmozjs \
+ $(MOZ_JS_LIBS) \
-lraptorgfx \
$(NSPR_LIBS) \
$(TK_LIBS) \
diff --git a/widget/tests/widget/Makefile.in b/widget/tests/widget/Makefile.in
index e3da2e854759..a80f8399a725 100644
--- a/widget/tests/widget/Makefile.in
+++ b/widget/tests/widget/Makefile.in
@@ -36,7 +36,7 @@ CPPSRCS = \
LIBS = \
$(MOZ_WIDGET_SUPPORT_LIBS) \
$(XPCOM_LIBS) \
- -lmozjs \
+ $(MOZ_JS_LIBS) \
-lraptorgfx \
$(NSPR_LIBS) \
$(TK_LIBS) \
diff --git a/xpfe/browser/src/Makefile.in b/xpfe/browser/src/Makefile.in
index 4ffe918c635a..039f6bd63714 100644
--- a/xpfe/browser/src/Makefile.in
+++ b/xpfe/browser/src/Makefile.in
@@ -36,7 +36,7 @@ EXTRA_DSO_LDOPTS = \
-L$(DIST)/bin \
-L$(DIST)/lib \
$(MOZ_COMPONENT_LIBS) \
- -lmozjs \
+ $(MOZ_JS_LIBS) \
$(NULL)
include $(topsrcdir)/config/rules.mk
diff --git a/xpfe/components/autocomplete/src/Makefile.in b/xpfe/components/autocomplete/src/Makefile.in
index e477f9759618..2cc8248efbc8 100644
--- a/xpfe/components/autocomplete/src/Makefile.in
+++ b/xpfe/components/autocomplete/src/Makefile.in
@@ -36,7 +36,7 @@ EXTRA_DSO_LDOPTS = \
-L$(DIST)/bin \
-L$(DIST)/lib \
$(XPCOM_LIBS) \
- -lmozjs \
+ $(MOZ_JS_LIBS) \
$(NSPR_LIBS) \
$(NULL)
diff --git a/xpfe/components/search/src/Makefile.in b/xpfe/components/search/src/Makefile.in
index 41f93f6705e7..e2f312de57c9 100755
--- a/xpfe/components/search/src/Makefile.in
+++ b/xpfe/components/search/src/Makefile.in
@@ -39,7 +39,7 @@ CPPSRCS = \
EXTRA_DSO_LDOPTS = \
-L$(DIST)/bin \
$(XPCOM_LIBS) \
- -lmozjs \
+ $(MOZ_JS_LIBS) \
$(NSPR_LIBS) \
$(NULL)
diff --git a/xpfe/components/ucth/src/Makefile.in b/xpfe/components/ucth/src/Makefile.in
index dd3f7da1cc17..a47f64524913 100644
--- a/xpfe/components/ucth/src/Makefile.in
+++ b/xpfe/components/ucth/src/Makefile.in
@@ -36,7 +36,7 @@ EXTRA_DSO_LDOPTS = \
-L$(DIST)/bin \
-L$(DIST)/lib \
$(XPCOM_LIBS) \
- -lmozjs \
+ $(MOZ_JS_LIBS) \
$(NSPR_LIBS) \
$(NULL)