Fix for -lpref linking problems. Dont link with libpref, its not needed.

git-svn-id: svn://10.0.0.236/trunk@43431 18797224-902f-48f8-a5cc-f745e15eee43
1999-08-18 00:27:50 +00:00 · 1999-08-18 00:27:50 +00:00 · 2144a5f188
commit 2144a5f188
parent 9f37b5bbef
27 changed files with 3 additions and 42 deletions
--- a/mozilla/extensions/cookie/Makefile.in
+++ b/mozilla/extensions/cookie/Makefile.in
@ -58,7 +58,9 @@ PUBLIC=$(DEPTH)/netwerk/dist/include
 endif

 EXTRA_DSO_LDOPTS =\
-				-L$(DIST)/bin -lsecfree \
+				-L$(DIST)/bin \
+				-lsecfree \
+				-lpref \
 				$(NULL)

 include $(topsrcdir)/config/rules.mk
--- a/mozilla/gfx/tests/Makefile.in
+++ b/mozilla/gfx/tests/Makefile.in
@ -58,7 +58,6 @@ LIBS		= \
 		-lraptorgfx \
 		-lxpcom \
 		-lmozreg \
-		-lpref \
 		-lmozjs \
 		-limg \
 		$(JPEG_LIBS) \
--- a/mozilla/htmlparser/robot/Makefile.in
+++ b/mozilla/htmlparser/robot/Makefile.in
@ -34,7 +34,6 @@ endif

 ifndef NECKO
 LIBS		= \
-		-lpref \
 		-lxp \
 		-lnetlib \
 		-lftpurl \
@ -56,8 +55,6 @@ LIBS		= \
 		-lmozreg \
 		$(TIMER_LIBS) \
 		$(TK_LIBS) \
-		$(ZLIB_LIBS) \
-		$(NSPR_LIBS) \
 		$(NULL)

 # Needed to resolve __yylex (?)
--- a/mozilla/intl/strres/tests/Makefile.in
+++ b/mozilla/intl/strres/tests/Makefile.in
@ -57,7 +57,6 @@ NETLIB_LIBS	= -lneckoutil_s
 endif

 LIBS		= \
-		-lpref \
 		-lmozjs \
 		-limg \
 		-lmozutil \
--- a/mozilla/layout/base/tests/Makefile.in
+++ b/mozilla/layout/base/tests/Makefile.in
@ -45,7 +45,6 @@ LIBS		+= \
 		-lnetcache \
 		-lnetwork \
 		$(DIST)/bin/components/libraptorhtml.$(DLL_SUFFIX) \
-		-lpref \
 		-lraptorgfx \
 		-limg \
 		-lmozutil \
--- a/mozilla/layout/html/tests/Makefile.in
+++ b/mozilla/layout/html/tests/Makefile.in
@ -66,7 +66,6 @@ LIBS		= \
 		$(GECKO_LIBS) \
 		-limg \
 		-lmozutil \
-		-lpref \
 		-lmozjs \
 		-ljsdom \
 		-lraptorgfx \
--- a/mozilla/mailnews/compose/tests/compose/Makefile.in
+++ b/mozilla/mailnews/compose/tests/compose/Makefile.in
@ -32,7 +32,6 @@ LIBS = \
        -lxpcom \
        -lmozdbm        \
        -lxp    \
-        -lpref  \
        -lmozjs \
        -ljsdom \
        -ljsurl \
--- a/mozilla/mailnews/compose/tests/compose2/Makefile.in
+++ b/mozilla/mailnews/compose/tests/compose2/Makefile.in
@ -45,12 +45,9 @@ LIBS		= \
 		-lpwcac \
 		-lmozdbm \
 		-lxp \
-		-lpref \
 		-lmozjs \
 		-ljsdom \
 		-ljsurl \
-		$(ZLIB_LIBS) \
-		$(NSPR_LIBS) \
 		-lraptorgfx \
 		-limg \
 		-lmozutil \
--- a/mozilla/mailnews/compose/tests/geturl/Makefile.in
+++ b/mozilla/mailnews/compose/tests/geturl/Makefile.in
@ -30,8 +30,6 @@ CPPSRCS		= \
 		$(NULL)

 BASE_LIBS	= \
-		-lpref \
-		$(ZLIB_LIBS) \
 		-lmozreg \
 		-lmozjs \
 		-lxpcom \
--- a/mozilla/mailnews/compose/tests/sendlater/Makefile.in
+++ b/mozilla/mailnews/compose/tests/sendlater/Makefile.in
@ -45,7 +45,6 @@ LIBS		= \
 		-lpwcac \
 		-lmozdbm \
 		-lxp \
-		-lpref \
 		-lmozjs \
 		-ljsdom \
 		-ljsurl \
--- a/mozilla/mailnews/compose/tests/sendpage/Makefile.in
+++ b/mozilla/mailnews/compose/tests/sendpage/Makefile.in
@ -45,12 +45,9 @@ LIBS		= \
 		-lpwcac \
 		-lmozdbm \
 		-lxp \
-		-lpref \
 		-lmozjs \
 		-ljsdom \
 		-ljsurl \
-		$(ZLIB_LIBS) \
-		$(NSPR_LIBS) \
 		-lraptorgfx \
 		-limg \
 		-lmozutil \
--- a/mozilla/mailnews/compose/tests/smtp/Makefile.in
+++ b/mozilla/mailnews/compose/tests/smtp/Makefile.in
@ -30,7 +30,6 @@ LIBS = \
 	-lxpcom	\
 	-lmozdbm	\
 	-lxp	\
-	-lpref	\
 	-lmozjs	\
 	-ljsdom	\
 	-ljsurl	\
--- a/mozilla/mailnews/imap/tests/harness/Makefile.in
+++ b/mozilla/mailnews/imap/tests/harness/Makefile.in
@ -34,11 +34,9 @@ LIBS =	\
 		-lxpcom \
 		-lmozdbm \
 		-lxp \
-		-lpref \
 		-lmozjs \
 		-ljsdom \
 		-ljsurl \
-		-lraptorhtmlpars \
 		-limg \
 		-lmozutil \
 		-lmsgbaseutil \
--- a/mozilla/mailnews/local/tests/mailbox/Makefile.in
+++ b/mozilla/mailnews/local/tests/mailbox/Makefile.in
@ -47,7 +47,6 @@ LIBS		= \
 		-lpwcac \
 		-lmozdbm \
 		-lxp \
-		-lpref \
 		-lmozjs \
 		-lmork \
 		-lmsgbaseutil \
--- a/mozilla/mailnews/local/tests/mboxParser/Makefile.in
+++ b/mozilla/mailnews/local/tests/mboxParser/Makefile.in
@ -43,7 +43,6 @@ LIBS		= \
 		-lpwcac \
 		-lmozdbm \
 		-lxp \
-		-lpref \
 		-lmozjs \
 		$(ZLIB_LIBS) \
 		$(NSPR_LIBS) \
--- a/mozilla/mailnews/local/tests/pop3/Makefile.in
+++ b/mozilla/mailnews/local/tests/pop3/Makefile.in
@ -32,7 +32,6 @@ LIBS = \
 	-lxpcom	\
 	-lmozdbm	\
 	-lxp	\
-	-lpref	\
 	-lmozjs	\
 	-ljsdom	\
 	-ljsurl	\
--- a/mozilla/mailnews/mime/tests/mimetest/Makefile.in
+++ b/mozilla/mailnews/mime/tests/mimetest/Makefile.in
@ -26,8 +26,6 @@ PROGRAM		= mimetest
 CPPSRCS		= mimetest.cpp

 BASE_LIBS	= \
-		-lpref \
-		$(ZLIB_LIBS) \
 		-lmozreg \
 		-lmozjs \
 		-lxpcom \
@ -41,8 +39,6 @@ GECKO_LIBS	= \

 IMGLIB_LIBS	= \
 		-limg \
-		$(JPEG_LIBS) \
-		$(PNG_LIBS) \
 		$(NULL)

 NETLIB_LIBS	= \
--- a/mozilla/mailnews/news/tests/newsParser/Makefile.in
+++ b/mozilla/mailnews/news/tests/newsParser/Makefile.in
@ -42,7 +42,6 @@ LIBS		= \
 		-lpwcac \
 		-lmozdbm \
 		-lxp \
-		-lpref \
 		-lmozjs \
 		-ljsdom \
 		-ljsurl \
--- a/mozilla/mailnews/news/tests/nntp/Makefile.in
+++ b/mozilla/mailnews/news/tests/nntp/Makefile.in
@ -30,7 +30,6 @@ LIBS = \
 	-lxpcom	\
 	-lmozdbm	\
 	-lxp	\
-	-lpref	\
 	-lmozjs	\
 	-ljsdom	\
 	-ljsurl	\
--- a/mozilla/parser/htmlparser/robot/Makefile.in
+++ b/mozilla/parser/htmlparser/robot/Makefile.in
@ -34,7 +34,6 @@ endif

 ifndef NECKO
 LIBS		= \
-		-lpref \
 		-lxp \
 		-lnetlib \
 		-lftpurl \
@ -56,8 +55,6 @@ LIBS		= \
 		-lmozreg \
 		$(TIMER_LIBS) \
 		$(TK_LIBS) \
-		$(ZLIB_LIBS) \
-		$(NSPR_LIBS) \
 		$(NULL)

 # Needed to resolve __yylex (?)
--- a/mozilla/rdf/tests/rdfcat/Makefile.in
+++ b/mozilla/rdf/tests/rdfcat/Makefile.in
@ -26,7 +26,6 @@ PROGRAM		= rdfcat
 CPPSRCS		= rdfcat.cpp

 BASE_LIBS	= \
-		-lpref \
 		$(ZLIB_LIBS) \
 		-lmozreg \
 		-lmozjs \
--- a/mozilla/rdf/tests/rdfpoll/Makefile.in
+++ b/mozilla/rdf/tests/rdfpoll/Makefile.in
@ -26,7 +26,6 @@ PROGRAM		= rdfpoll
 CPPSRCS		= rdfpoll.cpp

 BASE_LIBS	= \
-		-lpref \
 		$(ZLIB_LIBS) \
 		-lmozreg \
 		-lmozjs \
--- a/mozilla/webshell/tests/viewer/Makefile.in
+++ b/mozilla/webshell/tests/viewer/Makefile.in
@ -90,8 +90,6 @@ JSJ_LIB			= -ljsj
 endif

 BASE_LIBS		= \
-			-lpref \
-			-lsecfree \
 			-lmozreg \
 			-lmozjs \
 			-lxpcom \
--- a/mozilla/widget/tests/scribble/Makefile.in
+++ b/mozilla/widget/tests/scribble/Makefile.in
@ -52,7 +52,6 @@ NET_LIBS	= -lneckoutil_s
 endif

 LIBS		= \
-		-lpref \
 		-lmozutil \
 		-limg \
 		-lxpcom \
--- a/mozilla/widget/tests/widget/Makefile.in
+++ b/mozilla/widget/tests/widget/Makefile.in
@ -52,7 +52,6 @@ NET_LIBS	= -lneckoutil_s
 endif

 LIBS		= \
-		-lpref \
 		-lmozutil \
 		-limg \
 		-lxpcom \
--- a/mozilla/xpcom/tests/Makefile.in
+++ b/mozilla/xpcom/tests/Makefile.in
@ -88,7 +88,6 @@ LIBS		+= \
 		-limg \
 		-lmozutil \
 		$(NETLIB_LIBS) \
-		-lpref \
 		-lmozjs \
 		-lxp \
 		-lxpcom \
--- a/mozilla/xpfe/bootstrap/Makefile.in
+++ b/mozilla/xpfe/bootstrap/Makefile.in
@ -75,11 +75,9 @@ LIBS		+= \
 		-ljsurl \
 		-lmozjs \
 		$(OJI_LIBS) \
-		-lpref \
 		-limg \
 		-lmozutil \
 		-lxpcom \
-		-lsecfree \
 		$(NSPR_LIBS) \
 		$(MONOLITHIC_TK_FLAGS) \
 		$(NULL)