Mass replace of -lmozjs with $(MOZ_JS_LIBS) needed for OS/2 and consistency.

2000-05-17 06:45:45 +00:00 · 2000-05-17 06:45:45 +00:00 · a8000b8bb5
--- 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)

--- 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
--- 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)
--- 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) \
--- 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)

--- 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
--- 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)
--- 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
--- 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) \
--- 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)
--- 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) \
--- 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)
--- 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) \
--- 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) \
--- 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) \
--- 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
--- 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) \
--- 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)
--- 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) \
--- 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) \
--- 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) \
--- 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) \
--- 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)
--- 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) \
--- 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) \
--- 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
--- 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)

--- 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)

--- 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)