From 8ce50ad7cf9fa99847a54b5cc16ef0a7711d4781 Mon Sep 17 00:00:00 2001 From: "ramiro%netscape.com" Date: Fri, 12 Mar 1999 12:43:04 +0000 Subject: [PATCH] Make it possible to prefix mozilla dlls that conflict with system dlls. --- base/tests/Makefile.in | 2 +- config/autoconf.mk.in | 4 ++++ dbm/src/Makefile.in | 2 +- dbm/tests/Makefile.in | 4 ++-- gfx/tests/Makefile.in | 4 ++-- htmlparser/robot/Makefile.in | 2 +- intl/strres/tests/Makefile.in | 2 +- js/src/Makefile.in | 2 +- js/src/xpcom/Makefile.in | 2 +- js/src/xpconnect/test/Makefile.in | 4 ++-- layout/base/tests/Makefile.in | 4 ++-- layout/html/tests/Makefile.in | 4 ++-- modules/libutil/src/Makefile.in | 2 +- network/cache/nu/tests/fftest/Makefile.in | 4 ++-- network/module/tests/Makefile.in | 4 ++-- parser/htmlparser/robot/Makefile.in | 2 +- webshell/tests/viewer/Makefile.in | 6 +++--- widget/tests/scribble/Makefile.in | 8 ++++---- widget/tests/widget/Makefile.in | 4 ++-- xpcom/tests/Makefile.in | 8 ++++---- xpfe/bootstrap/Makefile.in | 4 ++-- xpfe/xpviewer/src/Makefile.in | 8 ++++---- 22 files changed, 45 insertions(+), 41 deletions(-) diff --git a/base/tests/Makefile.in b/base/tests/Makefile.in index 2235d69d2ba1..9a758eeed5e7 100644 --- 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 \ diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in index a7839e08c307..6f5c47cbe414 100644 --- 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@ diff --git a/dbm/src/Makefile.in b/dbm/src/Makefile.in index c85d258cf53e..4627960450fa 100644 --- 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 diff --git a/dbm/tests/Makefile.in b/dbm/tests/Makefile.in index f806a0ed704f..8fe4ea51340d 100644 --- 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 diff --git a/gfx/tests/Makefile.in b/gfx/tests/Makefile.in index eae399d65f7c..b3baf0609a0e 100644 --- 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) \ diff --git a/htmlparser/robot/Makefile.in b/htmlparser/robot/Makefile.in index 7f854416c064..31800248d93e 100644 --- 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) \ diff --git a/intl/strres/tests/Makefile.in b/intl/strres/tests/Makefile.in index 1ff703388322..b50ea962c306 100644 --- 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 \ diff --git a/js/src/Makefile.in b/js/src/Makefile.in index 6f071b799d24..3306185e5b7b 100644 --- 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 diff --git a/js/src/xpcom/Makefile.in b/js/src/xpcom/Makefile.in index fdbaaf9ba3f3..457f8a78c33d 100644 --- 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 diff --git a/js/src/xpconnect/test/Makefile.in b/js/src/xpconnect/test/Makefile.in index 2e44652669e2..fb63c09d9449 100644 --- 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) diff --git a/layout/base/tests/Makefile.in b/layout/base/tests/Makefile.in index 72e64c591dac..6e31747036c9 100644 --- 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 \ diff --git a/layout/html/tests/Makefile.in b/layout/html/tests/Makefile.in index 0bebb2c59f31..e88306246ac0 100644 --- 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 \ diff --git a/modules/libutil/src/Makefile.in b/modules/libutil/src/Makefile.in index f1165ef8dff6..79acfb6a1c86 100644 --- 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 diff --git a/network/cache/nu/tests/fftest/Makefile.in b/network/cache/nu/tests/fftest/Makefile.in index d18bbbb604ef..529b0890871c 100644 --- 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 \ diff --git a/network/module/tests/Makefile.in b/network/module/tests/Makefile.in index 2269ce1af6b6..9ea17a7aff1c 100644 --- 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 \ diff --git a/parser/htmlparser/robot/Makefile.in b/parser/htmlparser/robot/Makefile.in index 7f854416c064..31800248d93e 100644 --- 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) \ diff --git a/webshell/tests/viewer/Makefile.in b/webshell/tests/viewer/Makefile.in index 60e7474f27b1..feea8467c9ca 100644 --- 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) diff --git a/widget/tests/scribble/Makefile.in b/widget/tests/scribble/Makefile.in index 39ae93d30db7..9fa7e7db103b 100644 --- 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) diff --git a/widget/tests/widget/Makefile.in b/widget/tests/widget/Makefile.in index 4edcf196580e..59725bdeb65b 100644 --- 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) \ diff --git a/xpcom/tests/Makefile.in b/xpcom/tests/Makefile.in index 2c48d0b1d81f..b5e24ae54106 100644 --- 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) diff --git a/xpfe/bootstrap/Makefile.in b/xpfe/bootstrap/Makefile.in index f25ad0d8d4b0..1468a8fdf3ce 100644 --- 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) \ diff --git a/xpfe/xpviewer/src/Makefile.in b/xpfe/xpviewer/src/Makefile.in index 2f73bd5dcafd..8fbad563a6bc 100644 --- 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