Make it possible to prefix mozilla dlls that conflict with system dlls.

2024-11-28 15:23:51 +00:00 · 1999-03-12 12:43:04 +00:00 · 1999-03-12 12:43:04 +00:00 · 8ce50ad7cf
commit 8ce50ad7cf
parent ab40be6afb
22 changed files with 45 additions and 41 deletions
--- a/base/tests/Makefile.in
+++ b/base/tests/Makefile.in
@ -42,7 +42,7 @@ LIBS		= \
 	$(TK_LIBS) \
 	-lpref \
 	-lsecfree \
-	-ljs \
+	-l$(MOZ_LIB_JS_PREFIX)js \
 	-lxp \
 	-lraptorbase \
 	-lxpcom \
--- a/config/autoconf.mk.in
+++ b/config/autoconf.mk.in
@ -21,6 +21,10 @@ MOZILLA_CLIENT	= 1
 NO_MDUPDATE	= 1
 MOZ_NATIVE_NSPR = 1

+MOZ_LIB_UTIL_PREFIX = moz
+MOZ_LIB_JS_PREFIX   = moz
+MOZ_LIB_DBM_PREFIX  = moz
+
 MOZ_TOOLKIT	= @MOZ_TOOLKIT@
 MOZ_SECURITY 	= @MOZ_SECURITY@
 MOZ_JAVA	= @MOZ_JAVA@
--- a/dbm/src/Makefile.in
+++ b/dbm/src/Makefile.in
@ -25,7 +25,7 @@ CSRCS = db.c	   \
 	nsres.c	   \
 	$(NULL)

-LIBRARY_NAME = mozdbm
+LIBRARY_NAME = $(MOZ_LIB_DBM_PREFIX)dbm

 LOCAL_INCLUDES = -I$(srcdir)/../include

--- a/dbm/tests/Makefile.in
+++ b/dbm/tests/Makefile.in
@ -28,10 +28,10 @@ CSRCS		= lots.c

 PROGRAM		= lots

-REQUIRES	= mozdbm
+#REQUIRES	= $(MOZ_LIB_DBM_PREFIX)dbm

 LIBS		= \
-	-lmozdbm \
+	-l$(MOZ_LIB_DBM_PREFIX)dbm \
 	$(NULL)

 include $(topsrcdir)/config/rules.mk
--- a/gfx/tests/Makefile.in
+++ b/gfx/tests/Makefile.in
@ -56,12 +56,12 @@ LIBS = \
 	-lxpcom \
 	-lreg \
 	-lpref \
-	-ljs \
+	-l$(MOZ_LIB_JS_PREFIX)js \
 	-lsecfree \
 	-limg \
 	$(JPEG_LIBS) \
 	$(PNG_LIBS) \
-	-lmozutil \
+	-l$(MOZ_LIB_UTIL_PREFIX)util \
 	-lxp \
 	$(NSPR_LIBS) \
 	$(ZLIB_LIBS) \
--- a/htmlparser/robot/Makefile.in
+++ b/htmlparser/robot/Makefile.in
@ -52,7 +52,7 @@ LIBS = \
 	-lsecfree \
 	-lpref \
 	-lxp \
-	-ljs \
+	-l$(MOZ_LIB_JS_PREFIX)js \
 	-lxpcom \
 	-lreg \
 	$(TK_LIBS) \
--- a/intl/strres/tests/Makefile.in
+++ b/intl/strres/tests/Makefile.in
@ -42,7 +42,7 @@ LIBS		= \
 	$(TK_LIBS) \
 	-lpref \
 	-lsecfree \
-	-ljs \
+	-l$(MOZ_LIB_JS_PREFIX)js \
 	-lxp \
 	-lraptorbase \
 	-lxpcom \
--- a/js/src/Makefile.in
+++ b/js/src/Makefile.in
@ -29,7 +29,7 @@ endif

 DIRS	+=	fdlibm

-LIBRARY_NAME	= js
+LIBRARY_NAME	= $(MOZ_LIB_JS_PREFIX)js

 ifeq ($(subst /,_,$(shell uname -s)),OS2)
 ifndef XCFLAGS
--- a/js/src/xpcom/Makefile.in
+++ b/js/src/xpcom/Makefile.in
@ -136,7 +136,7 @@ JSJAVA_CFLAGS	= -I$(DEPTH)/sun-java/md-include \
 		  $(JSJAVA_STUBHEADERS)

 # NSPR_LIBS abstracts nspr version, etc. nicely.
-LDFLAGS 	+= -L$(DIST)/bin -lxpcom -lreg -ljsxpcom -ljs $(NSPR_LIBS) -lm
+LDFLAGS 	+= -L$(DIST)/bin -lxpcom -lreg -ljsxpcom -l$(MOZ_LIB_JS_PREFIX)js $(NSPR_LIBS) -lm

 ifeq ($(OS_ARCH), OSF1)
 LDFLAGS += -lc_r
--- a/js/src/xpconnect/test/Makefile.in
+++ b/js/src/xpconnect/test/Makefile.in
@ -35,12 +35,12 @@ CFLAGS += -DJS_THREADSAFE -DJSFILE

 LDFLAGS		= 		\
 	-L$(DIST)/bin \
-	-ljs \
+	-l$(MOZ_LIB_JS_PREFIX)js \
 	-lxpcom       \
 	-lxpconnect \
 	-lxpcmd \
 	-lreg       \
-	-lmozutil    \
+	-l$(MOZ_LIB_UTIL_PREFIX)util    \
 	$(NSPR_LIBS) 	\
 	$(NULL)

--- a/layout/base/tests/Makefile.in
+++ b/layout/base/tests/Makefile.in
@ -50,10 +50,10 @@ LIBS = \
 	-lpref \
 	-lsecfree \
 	-limg \
-	-lmozutil \
+	-l$(MOZ_LIB_UTIL_PREFIX)util \
 	$(PNG_LIBS) \
 	$(JPEG_LIBS) \
-	-ljs \
+	-l$(MOZ_LIB_JS_PREFIX)js \
 	-lxpcom \
 	-lreg \
 	-lxp \
--- a/layout/html/tests/Makefile.in
+++ b/layout/html/tests/Makefile.in
@ -40,7 +40,7 @@ LIBS = \
 	-limg \
 	$(PNG_LIBS) \
 	$(JPEG_LIBS) \
-	-lmozutil \
+	-l$(MOZ_LIB_UTIL_PREFIX)util \
 	-lnetlib \
 	-lfileurl \
 	-lftpurl \
@ -60,7 +60,7 @@ LIBS = \
 	$(TK_LIBS) \
 	-lpref \
 	-lsecfree \
-	-ljs \
+	-l$(MOZ_LIB_JS_PREFIX)js \
 	-lxpcom \
 	-lreg \
 	-lxp \
--- a/modules/libutil/src/Makefile.in
+++ b/modules/libutil/src/Makefile.in
@ -23,7 +23,7 @@ srcdir		= @srcdir@
 include $(DEPTH)/config/autoconf.mk

 MODULE		= util
-LIBRARY_NAME	= mozutil
+LIBRARY_NAME	= $(MOZ_LIB_UTIL_PREFIX)util

 CSRCS		= obs.c

--- a/network/cache/nu/tests/fftest/Makefile.in
+++ b/network/cache/nu/tests/fftest/Makefile.in
@ -30,7 +30,7 @@ LOCAL_INCLUDES	+= -I../../include

 LIBS		= \
 	-lcache \
-	-lmozdbm \
+	-l$(MOZ_LIB_DBM_PREFIX)dbm \
 	-lnetlib \
 	-lraptorbase \
 	-lnetcache \
@ -49,7 +49,7 @@ LIBS		= \
 	-lgmbase$(MOZ_TOOLKIT) \
 	$(TK_LIBS) \
 	-lpref \
-	-ljs \
+	-l$(MOZ_LIB_JS_PREFIX)js \
 	-lsecfree \
 	-lxpcom \
 	-lxp \
--- a/network/module/tests/Makefile.in
+++ b/network/module/tests/Makefile.in
@ -49,10 +49,10 @@ LIBS = \
 	-lreg	\
 	-lxpcom	\
 	-lpwcac \
-	-lmozdbm	\
+	-l$(MOZ_LIB_DBM_PREFIX)dbm	\
 	-lxp	\
 	-lpref	\
-	-ljs	\
+	-l$(MOZ_LIB_JS_PREFIX)js	\
 	-lraptorbase \
 	-lgmbase$(MOZ_TOOLKIT) \
 	-lsecfree \
--- a/parser/htmlparser/robot/Makefile.in
+++ b/parser/htmlparser/robot/Makefile.in
@ -52,7 +52,7 @@ LIBS = \
 	-lsecfree \
 	-lpref \
 	-lxp \
-	-ljs \
+	-l$(MOZ_LIB_JS_PREFIX)js \
 	-lxpcom \
 	-lreg \
 	$(TK_LIBS) \
--- a/webshell/tests/viewer/Makefile.in
+++ b/webshell/tests/viewer/Makefile.in
@ -93,10 +93,10 @@ BASE_LIBS =	     \
 	-lpref	     \
 	$(ZLIB_LIBS) \
 	-lreg	     \
-	-ljs	     \
+	-l$(MOZ_LIB_JS_PREFIX)js	     \
 	-lxpcom	     \
 	-lsecfree    \
-	-lmozutil    \
+	-l$(MOZ_LIB_UTIL_PREFIX)util    \
 	$(NULL)

 GECKO_LIBS =		      \
@ -135,7 +135,7 @@ NETLIB_LIBS =	      \
 	-lnetwork     \
 	-lxp	      \
 	-ljsurl	      \
-	-lmozdbm      \
+	-l$(MOZ_LIB_DBM_PREFIX)dbm      \
 	-lpwcac	      \
 	$(NULL)

--- a/widget/tests/scribble/Makefile.in
+++ b/widget/tests/scribble/Makefile.in
@ -66,7 +66,7 @@ LIBS := \
 	-limg \
 	$(PNG_LIBS) \
 	$(JPEG_LIBS) \
-	-ljs \
+	-l$(MOZ_LIB_JS_PREFIX)js \
 	-ljsdom \
 	-ljsurl \
 	$(DIST)/lib/libjsdomcore_s.a \
@ -83,16 +83,16 @@ LIBS := \
 	-lremoturl \
 	-lsecfree \
 	-ltestdynamic \
-	-lmozutil \
+	-l$(MOZ_LIB_UTIL_PREFIX)util \
 	-lxp \
 	-lxpcom \
-	-lmozutil \
+	-l$(MOZ_LIB_UTIL_PREFIX)util \
 	-lxp \
 	-lxpcom \
 	-lreg \
 	$(ZLIB_LIBS) \
 	-lraptorplugin \
-	-lmozdbm \
+	-l$(MOZ_LIB_DBM_PREFIX)dbm \
 	$(TK_LIBS) \
 	$(NSPR_LIBS) \
 	$(NULL)
--- a/widget/tests/widget/Makefile.in
+++ b/widget/tests/widget/Makefile.in
@ -58,14 +58,14 @@ LIBS := \
 	-lpref \
 	-lsecfree \
 	-lnetutil \
-	-lmozutil \
+	-l$(MOZ_LIB_UTIL_PREFIX)util \
 	-limg \
 	$(PNG_LIBS) \
 	$(JPEG_LIBS) \
 	-lraptorbase \
 	-lxpcom \
 	-lreg \
-	-ljs \
+	-l$(MOZ_LIB_JS_PREFIX)js \
 	-lwidget$(MOZ_TOOLKIT) \
 	-lxp \
 	$(ZLIB_LIBS) \
--- a/xpcom/tests/Makefile.in
+++ b/xpcom/tests/Makefile.in
@ -46,13 +46,13 @@ NETLIB_LIBS =	      \
 	-lnetwork     \
 	-lxp	      \
 	-ljsurl	      \
-	-lmozdbm      \
+	-l$(MOZ_LIB_DBM_PREFIX)dbm      \
 	-lpwcac	      \
 	$(NULL)

 LIBS		= \
 	-lpref \
-	-ljs \
+	-l$(MOZ_LIB_JS_PREFIX)js \
 	-lsecfree \
 	-lxp \
 	-labouturl    \
@ -73,14 +73,14 @@ LIBS		= \
 	-lxpcom       \
 	-lreg       \
 	-ljsurl	      \
-	-lmozdbm      \
+	-l$(MOZ_LIB_DBM_PREFIX)dbm      \
 	-lpwcac	      \
 	-lgmbase$(MOZ_TOOLKIT) \
 	$(TK_LIBS) \
 	-limg	     \
 	$(JPEG_LIBS) \
 	$(PNG_LIBS)  \
-	-lmozutil    \
+	-l$(MOZ_LIB_UTIL_PREFIX)util    \
 	$(ZLIB_LIBS) \
 	$(NSPR_LIBS) \
 	$(NULL)
--- a/xpfe/bootstrap/Makefile.in
+++ b/xpfe/bootstrap/Makefile.in
@ -65,13 +65,13 @@ LIBS = \
 	-ljsurl		\
 	-lraptorbase	\
 	-lsecfree	\
-	-ljs		\
+	-l$(MOZ_LIB_JS_PREFIX)js		\
 	$(JSJ_LIB)	\
 	-lpref		\
 	-limg		\
 	$(JPEG_LIBS)	\
 	$(PNG_LIBS)	\
-	-lmozutil	\
+	-l$(MOZ_LIB_UTIL_PREFIX)util	\
 	-lxp		\
 	-lxpcom		\
 	$(ZLIB_LIBS)	\
--- a/xpfe/xpviewer/src/Makefile.in
+++ b/xpfe/xpviewer/src/Makefile.in
@ -74,7 +74,7 @@ LIBS := \
 	-limg \
 	$(JPEG_LIBS) \
 	$(PNG_LIBS) \
-	-ljs \
+	-l$(MOZ_LIB_JS_PREFIX)js \
 	-ljsdom \
 	-ljsurl \
 	$(DIST)/lib/libjsdomcore_s.a \
@ -93,15 +93,15 @@ LIBS := \
 	-lstubnj \
 	-lstubsj \
 	-ltestdynamic \
-	-lmozutil \
+	-l$(MOZ_LIB_UTIL_PREFIX)util \
 	-lxp \
 	-lxpcom \
-	-lmozutil \
+	-l$(MOZ_LIB_UTIL_PREFIX)util \
 	-lxp \
 	-lxpcom \
 	$(ZLIB_LIBS) \
 	-lraptorplugin \
-	-lmozdbm \
+	-l$(MOZ_LIB_DBM_PREFIX)dbm \
 	$(NULL)

 include $(topsrcdir)/config/config.mk