From 4cc02629c5c1ef7994a4e12a6f8284a19ae98873 Mon Sep 17 00:00:00 2001 From: "ramiro%netscape.com" Date: Tue, 17 Aug 1999 15:46:57 +0000 Subject: [PATCH] Link in secfree dynamically only where needed. git-svn-id: svn://10.0.0.236/trunk@43413 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/extensions/cookie/Makefile.in | 4 +++- mozilla/extensions/wallet/src/Makefile.in | 6 +++++- mozilla/gfx/tests/Makefile.in | 1 - mozilla/htmlparser/robot/Makefile.in | 2 -- mozilla/intl/strres/tests/Makefile.in | 1 - mozilla/layout/base/tests/Makefile.in | 2 -- mozilla/layout/html/tests/Makefile.in | 2 -- mozilla/mailnews/base/tests/identity/Makefile.in | 1 - mozilla/mailnews/compose/tests/compose/Makefile.in | 1 - mozilla/mailnews/compose/tests/compose2/Makefile.in | 1 - mozilla/mailnews/compose/tests/geturl/Makefile.in | 2 -- mozilla/mailnews/compose/tests/sendlater/Makefile.in | 1 - mozilla/mailnews/compose/tests/sendpage/Makefile.in | 1 - mozilla/mailnews/compose/tests/smtp/Makefile.in | 2 -- mozilla/mailnews/imap/tests/harness/Makefile.in | 1 - mozilla/mailnews/local/tests/mailbox/Makefile.in | 1 - mozilla/mailnews/local/tests/mboxParser/Makefile.in | 1 - mozilla/mailnews/local/tests/pop3/Makefile.in | 1 - mozilla/mailnews/mime/src/Makefile.in | 1 - mozilla/mailnews/mime/tests/mimetest/Makefile.in | 2 -- mozilla/mailnews/news/tests/newsParser/Makefile.in | 2 -- mozilla/mailnews/news/tests/nntp/Makefile.in | 2 -- mozilla/modules/libpref/src/Makefile.in | 4 ++++ mozilla/netwerk/test/Makefile.in | 1 - mozilla/parser/htmlparser/robot/Makefile.in | 2 -- mozilla/rdf/tests/rdfcat/Makefile.in | 1 - mozilla/rdf/tests/rdfpoll/Makefile.in | 1 - mozilla/webshell/tests/viewer/Makefile.in | 1 - mozilla/widget/tests/scribble/Makefile.in | 2 -- mozilla/widget/tests/widget/Makefile.in | 2 -- mozilla/xpcom/tests/Makefile.in | 1 - mozilla/xpfe/bootstrap/Makefile.in | 1 - 32 files changed, 12 insertions(+), 42 deletions(-) diff --git a/mozilla/extensions/cookie/Makefile.in b/mozilla/extensions/cookie/Makefile.in index 4c7cb945e87..80859808109 100644 --- a/mozilla/extensions/cookie/Makefile.in +++ b/mozilla/extensions/cookie/Makefile.in @@ -57,6 +57,8 @@ ifndef NECKO PUBLIC=$(DEPTH)/netwerk/dist/include endif -EXTRA_DSO_LDOPTS = -L$(DIST)/bin +EXTRA_DSO_LDOPTS =\ + -L$(DIST)/bin -lsecfree \ + $(NULL) include $(topsrcdir)/config/rules.mk diff --git a/mozilla/extensions/wallet/src/Makefile.in b/mozilla/extensions/wallet/src/Makefile.in index 7501cff78da..b54059f0fce 100644 --- a/mozilla/extensions/wallet/src/Makefile.in +++ b/mozilla/extensions/wallet/src/Makefile.in @@ -39,7 +39,11 @@ REQUIRES=wallet EXPORTS= $(NULL) EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS)) -EXTRA_DSO_LDOPTS = -L$(DIST)/bin -lxp +EXTRA_DSO_LDOPTS =\ + -L$(DIST)/bin \ + -lsecfree \ + -lxp \ + $(NULL) include $(topsrcdir)/config/rules.mk diff --git a/mozilla/gfx/tests/Makefile.in b/mozilla/gfx/tests/Makefile.in index d4b16b4d4c1..ff9497920ca 100644 --- a/mozilla/gfx/tests/Makefile.in +++ b/mozilla/gfx/tests/Makefile.in @@ -60,7 +60,6 @@ LIBS = \ -lmozreg \ -lpref \ -lmozjs \ - -lsecfree \ -limg \ $(JPEG_LIBS) \ $(PNG_LIBS) \ diff --git a/mozilla/htmlparser/robot/Makefile.in b/mozilla/htmlparser/robot/Makefile.in index 8d10cb7238d..bdc0e6e03e6 100644 --- a/mozilla/htmlparser/robot/Makefile.in +++ b/mozilla/htmlparser/robot/Makefile.in @@ -34,8 +34,6 @@ endif ifndef NECKO LIBS = \ - -lraptorhtmlpars \ - -lsecfree \ -lpref \ -lxp \ -lnetlib \ diff --git a/mozilla/intl/strres/tests/Makefile.in b/mozilla/intl/strres/tests/Makefile.in index 35d2def732e..38437f57448 100644 --- a/mozilla/intl/strres/tests/Makefile.in +++ b/mozilla/intl/strres/tests/Makefile.in @@ -58,7 +58,6 @@ endif LIBS = \ -lpref \ - -lsecfree \ -lmozjs \ -limg \ -lmozutil \ diff --git a/mozilla/layout/base/tests/Makefile.in b/mozilla/layout/base/tests/Makefile.in index af0b8a2df98..11780633e26 100644 --- a/mozilla/layout/base/tests/Makefile.in +++ b/mozilla/layout/base/tests/Makefile.in @@ -46,7 +46,6 @@ LIBS += \ -lnetwork \ $(DIST)/bin/components/libraptorhtml.$(DLL_SUFFIX) \ -lpref \ - -lsecfree \ -lraptorgfx \ -limg \ -lmozutil \ @@ -57,7 +56,6 @@ LIBS += \ -lxpcom \ -lmozreg \ -lxp \ - -lraptorhtmlpars \ -ljsurl \ -ljsdom \ $(ZLIB_LIBS) \ diff --git a/mozilla/layout/html/tests/Makefile.in b/mozilla/layout/html/tests/Makefile.in index 892bf39b820..dc9b7ae4e44 100644 --- a/mozilla/layout/html/tests/Makefile.in +++ b/mozilla/layout/html/tests/Makefile.in @@ -67,13 +67,11 @@ LIBS = \ -limg \ -lmozutil \ -lpref \ - -lsecfree \ -lmozjs \ -ljsdom \ -lraptorgfx \ -lxpcom \ -lxp \ - -lraptorhtmlpars \ -ljsurl \ $(TIMER_LIBS) \ $(TK_LIBS) \ diff --git a/mozilla/mailnews/base/tests/identity/Makefile.in b/mozilla/mailnews/base/tests/identity/Makefile.in index 11db3ed30b9..0d5296a2660 100644 --- a/mozilla/mailnews/base/tests/identity/Makefile.in +++ b/mozilla/mailnews/base/tests/identity/Makefile.in @@ -31,7 +31,6 @@ LIBS = \ -lxpcom \ -lmozreg \ -lmozjs \ - -lsecfree \ $(TIMER_LIBS) \ $(NSPR_LIBS) \ $(NULL) diff --git a/mozilla/mailnews/compose/tests/compose/Makefile.in b/mozilla/mailnews/compose/tests/compose/Makefile.in index 830b2893f72..ed7e82dfaeb 100644 --- a/mozilla/mailnews/compose/tests/compose/Makefile.in +++ b/mozilla/mailnews/compose/tests/compose/Makefile.in @@ -36,7 +36,6 @@ LIBS = \ -lmozjs \ -ljsdom \ -ljsurl \ - -lsecfree \ $(TIMER_LIBS) \ $(ZLIB_LIBS) \ $(NSPR_LIBS) \ diff --git a/mozilla/mailnews/compose/tests/compose2/Makefile.in b/mozilla/mailnews/compose/tests/compose2/Makefile.in index 22cbdc52f32..f482169231d 100644 --- a/mozilla/mailnews/compose/tests/compose2/Makefile.in +++ b/mozilla/mailnews/compose/tests/compose2/Makefile.in @@ -49,7 +49,6 @@ LIBS = \ -lmozjs \ -ljsdom \ -ljsurl \ - -lsecfree \ $(ZLIB_LIBS) \ $(NSPR_LIBS) \ -lraptorgfx \ diff --git a/mozilla/mailnews/compose/tests/geturl/Makefile.in b/mozilla/mailnews/compose/tests/geturl/Makefile.in index 6b91b14712d..7309eca89a8 100644 --- a/mozilla/mailnews/compose/tests/geturl/Makefile.in +++ b/mozilla/mailnews/compose/tests/geturl/Makefile.in @@ -35,12 +35,10 @@ BASE_LIBS = \ -lmozreg \ -lmozjs \ -lxpcom \ - -lsecfree \ -lmozutil \ $(NULL) GECKO_LIBS = \ - -lraptorhtmlpars \ -ljsdom \ -lraptorplugin \ $(NULL) diff --git a/mozilla/mailnews/compose/tests/sendlater/Makefile.in b/mozilla/mailnews/compose/tests/sendlater/Makefile.in index 8b9b4089bbc..3a9e7a71494 100644 --- a/mozilla/mailnews/compose/tests/sendlater/Makefile.in +++ b/mozilla/mailnews/compose/tests/sendlater/Makefile.in @@ -49,7 +49,6 @@ LIBS = \ -lmozjs \ -ljsdom \ -ljsurl \ - -lsecfree \ $(ZLIB_LIBS) \ $(NSPR_LIBS) \ -lraptorgfx \ diff --git a/mozilla/mailnews/compose/tests/sendpage/Makefile.in b/mozilla/mailnews/compose/tests/sendpage/Makefile.in index 0074e6ff663..8ae7451c1b3 100644 --- a/mozilla/mailnews/compose/tests/sendpage/Makefile.in +++ b/mozilla/mailnews/compose/tests/sendpage/Makefile.in @@ -49,7 +49,6 @@ LIBS = \ -lmozjs \ -ljsdom \ -ljsurl \ - -lsecfree \ $(ZLIB_LIBS) \ $(NSPR_LIBS) \ -lraptorgfx \ diff --git a/mozilla/mailnews/compose/tests/smtp/Makefile.in b/mozilla/mailnews/compose/tests/smtp/Makefile.in index 3257add109a..526128ae740 100644 --- a/mozilla/mailnews/compose/tests/smtp/Makefile.in +++ b/mozilla/mailnews/compose/tests/smtp/Makefile.in @@ -32,13 +32,11 @@ LIBS = \ -lxp \ -lpref \ -lmozjs \ - -lraptorhtmlpars \ -ljsdom \ -ljsurl \ -limg \ -lxp \ -lmozutil \ - -lsecfree \ -lmozreg \ $(TIMER_LIBS) \ $(ZLIB_LIBS) \ diff --git a/mozilla/mailnews/imap/tests/harness/Makefile.in b/mozilla/mailnews/imap/tests/harness/Makefile.in index 24a8d7cec93..cfced8b3b6b 100644 --- a/mozilla/mailnews/imap/tests/harness/Makefile.in +++ b/mozilla/mailnews/imap/tests/harness/Makefile.in @@ -36,7 +36,6 @@ LIBS = \ -lxp \ -lpref \ -lmozjs \ - -lsecfree \ -ljsdom \ -ljsurl \ -lraptorhtmlpars \ diff --git a/mozilla/mailnews/local/tests/mailbox/Makefile.in b/mozilla/mailnews/local/tests/mailbox/Makefile.in index 6423c4e588b..f22206e1b83 100644 --- a/mozilla/mailnews/local/tests/mailbox/Makefile.in +++ b/mozilla/mailnews/local/tests/mailbox/Makefile.in @@ -51,7 +51,6 @@ LIBS = \ -lmozjs \ -lmork \ -lmsgbaseutil \ - -lsecfree \ $(ZLIB_LIBS) \ $(NSPR_LIBS) \ $(TK_LIBS) \ diff --git a/mozilla/mailnews/local/tests/mboxParser/Makefile.in b/mozilla/mailnews/local/tests/mboxParser/Makefile.in index 96add91482c..474a7eeabf8 100644 --- a/mozilla/mailnews/local/tests/mboxParser/Makefile.in +++ b/mozilla/mailnews/local/tests/mboxParser/Makefile.in @@ -45,7 +45,6 @@ LIBS = \ -lxp \ -lpref \ -lmozjs \ - -lsecfree \ $(ZLIB_LIBS) \ $(NSPR_LIBS) \ $(TK_LIBS) \ diff --git a/mozilla/mailnews/local/tests/pop3/Makefile.in b/mozilla/mailnews/local/tests/pop3/Makefile.in index e4725a0d4c8..5979aeb2f48 100644 --- a/mozilla/mailnews/local/tests/pop3/Makefile.in +++ b/mozilla/mailnews/local/tests/pop3/Makefile.in @@ -36,7 +36,6 @@ LIBS = \ -lmozjs \ -ljsdom \ -ljsurl \ - -lsecfree \ $(TIMER_LIBS) \ $(ZLIB_LIBS) \ $(NSPR_LIBS) \ diff --git a/mozilla/mailnews/mime/src/Makefile.in b/mozilla/mailnews/mime/src/Makefile.in index 4a403167b4f..2195b406b19 100644 --- a/mozilla/mailnews/mime/src/Makefile.in +++ b/mozilla/mailnews/mime/src/Makefile.in @@ -97,7 +97,6 @@ EXTRA_DSO_LDOPTS = \ -L$(DIST)/bin \ -L$(DIST)/lib \ -lmozjs \ - -lsecfree \ -lxpcom \ -lmozreg \ $(NSPR_LIBS) \ diff --git a/mozilla/mailnews/mime/tests/mimetest/Makefile.in b/mozilla/mailnews/mime/tests/mimetest/Makefile.in index 391c59b86fd..e53e1c6bc0b 100644 --- a/mozilla/mailnews/mime/tests/mimetest/Makefile.in +++ b/mozilla/mailnews/mime/tests/mimetest/Makefile.in @@ -31,12 +31,10 @@ BASE_LIBS = \ -lmozreg \ -lmozjs \ -lxpcom \ - -lsecfree \ -lmozutil \ $(NULL) GECKO_LIBS = \ - -lraptorhtmlpars \ -ljsdom \ -lraptorplugin \ $(NULL) diff --git a/mozilla/mailnews/news/tests/newsParser/Makefile.in b/mozilla/mailnews/news/tests/newsParser/Makefile.in index f8eb02427c5..a54b2317fc3 100644 --- a/mozilla/mailnews/news/tests/newsParser/Makefile.in +++ b/mozilla/mailnews/news/tests/newsParser/Makefile.in @@ -44,10 +44,8 @@ LIBS = \ -lxp \ -lpref \ -lmozjs \ - -lsecfree \ -ljsdom \ -ljsurl \ - -lraptorhtmlpars \ -lraptorgfx \ -limg \ -lmozutil \ diff --git a/mozilla/mailnews/news/tests/nntp/Makefile.in b/mozilla/mailnews/news/tests/nntp/Makefile.in index 23375a0f5d5..2ba8f838754 100644 --- a/mozilla/mailnews/news/tests/nntp/Makefile.in +++ b/mozilla/mailnews/news/tests/nntp/Makefile.in @@ -32,8 +32,6 @@ LIBS = \ -lxp \ -lpref \ -lmozjs \ - -lsecfree \ - -lraptorhtmlpars \ -ljsdom \ -ljsurl \ -limg \ diff --git a/mozilla/modules/libpref/src/Makefile.in b/mozilla/modules/libpref/src/Makefile.in index b45a9234e79..c39d5fe92a0 100644 --- a/mozilla/modules/libpref/src/Makefile.in +++ b/mozilla/modules/libpref/src/Makefile.in @@ -59,6 +59,10 @@ CSRCS += prefapi.c CPPSRCS += nsPref.cpp +EXTRA_DSO_LDOPTS =\ + -L$(DIST)/bin -lsecfree \ + $(NULL) + include $(topsrcdir)/config/rules.mk #INCLUDES += -I$(srcdir)/unix -Iunix diff --git a/mozilla/netwerk/test/Makefile.in b/mozilla/netwerk/test/Makefile.in index bedd75da942..c6e43f4b558 100644 --- a/mozilla/netwerk/test/Makefile.in +++ b/mozilla/netwerk/test/Makefile.in @@ -44,7 +44,6 @@ LIBS = \ -lmozreg \ -lmozjs \ -lxpcom \ - -lsecfree \ -lmozutil \ -lxpcom \ -lneckoutil_s \ diff --git a/mozilla/parser/htmlparser/robot/Makefile.in b/mozilla/parser/htmlparser/robot/Makefile.in index 8d10cb7238d..bdc0e6e03e6 100644 --- a/mozilla/parser/htmlparser/robot/Makefile.in +++ b/mozilla/parser/htmlparser/robot/Makefile.in @@ -34,8 +34,6 @@ endif ifndef NECKO LIBS = \ - -lraptorhtmlpars \ - -lsecfree \ -lpref \ -lxp \ -lnetlib \ diff --git a/mozilla/rdf/tests/rdfcat/Makefile.in b/mozilla/rdf/tests/rdfcat/Makefile.in index 89f5e25e700..5186df1756b 100644 --- a/mozilla/rdf/tests/rdfcat/Makefile.in +++ b/mozilla/rdf/tests/rdfcat/Makefile.in @@ -31,7 +31,6 @@ BASE_LIBS = \ -lmozreg \ -lmozjs \ -lxpcom \ - -lsecfree \ -lmozutil \ $(NULL) diff --git a/mozilla/rdf/tests/rdfpoll/Makefile.in b/mozilla/rdf/tests/rdfpoll/Makefile.in index d105718d27c..f28f885e130 100644 --- a/mozilla/rdf/tests/rdfpoll/Makefile.in +++ b/mozilla/rdf/tests/rdfpoll/Makefile.in @@ -31,7 +31,6 @@ BASE_LIBS = \ -lmozreg \ -lmozjs \ -lxpcom \ - -lsecfree \ -lmozutil \ $(NULL) diff --git a/mozilla/webshell/tests/viewer/Makefile.in b/mozilla/webshell/tests/viewer/Makefile.in index c1aa2b5404b..ef9f0cd8826 100644 --- a/mozilla/webshell/tests/viewer/Makefile.in +++ b/mozilla/webshell/tests/viewer/Makefile.in @@ -94,7 +94,6 @@ BASE_LIBS = \ -lmozreg \ -lmozjs \ -lxpcom \ - -lsecfree \ -lmozutil \ $(NULL) diff --git a/mozilla/widget/tests/scribble/Makefile.in b/mozilla/widget/tests/scribble/Makefile.in index c5260b2e18f..5b858cd6ee9 100644 --- a/mozilla/widget/tests/scribble/Makefile.in +++ b/mozilla/widget/tests/scribble/Makefile.in @@ -53,7 +53,6 @@ endif LIBS = \ -lpref \ - -lsecfree \ -lmozutil \ -limg \ -lxpcom \ @@ -63,7 +62,6 @@ LIBS = \ -lraptorgfx \ $(MOZ_GFX_TOOLKIT_LDFLAGS) \ $(TIMER_LIBS) \ - -lraptorhtmlpars \ -ljsurl \ -ljsdom \ $(NET_LIBS) \ diff --git a/mozilla/widget/tests/widget/Makefile.in b/mozilla/widget/tests/widget/Makefile.in index 37d93e0cae7..06a6a5b41db 100644 --- a/mozilla/widget/tests/widget/Makefile.in +++ b/mozilla/widget/tests/widget/Makefile.in @@ -53,7 +53,6 @@ endif LIBS = \ -lpref \ - -lsecfree \ -lmozutil \ -limg \ -lxpcom \ @@ -63,7 +62,6 @@ LIBS = \ -lraptorgfx \ $(MOZ_GFX_TOOLKIT_LDFLAGS) \ $(TIMER_LIBS) \ - -lraptorhtmlpars \ -ljsurl \ -ljsdom \ $(NET_LIBS) \ diff --git a/mozilla/xpcom/tests/Makefile.in b/mozilla/xpcom/tests/Makefile.in index e6526d98010..c4583553aaa 100644 --- a/mozilla/xpcom/tests/Makefile.in +++ b/mozilla/xpcom/tests/Makefile.in @@ -89,7 +89,6 @@ LIBS += \ -lmozutil \ $(NETLIB_LIBS) \ -lpref \ - -lsecfree \ -lmozjs \ -lxp \ -lxpcom \ diff --git a/mozilla/xpfe/bootstrap/Makefile.in b/mozilla/xpfe/bootstrap/Makefile.in index 9b191820965..16c9265916d 100644 --- a/mozilla/xpfe/bootstrap/Makefile.in +++ b/mozilla/xpfe/bootstrap/Makefile.in @@ -73,7 +73,6 @@ LIBS += \ -lmozreg \ -ljsdom \ -ljsurl \ - -lsecfree \ -lmozjs \ $(OJI_LIBS) \ -lpref \