Cleanup zlib cruft.

1999-08-25 14:39:53 +00:00 · 1999-08-25 14:39:53 +00:00 · 6cec5c3abb
--- a/db/mork/build/Makefile.in
+++ b/db/mork/build/Makefile.in
@ -42,7 +42,6 @@ EXTRA_DSO_LDOPTS = \
 		-L$(DIST)/bin \
 		-L$(DIST)/lib \
 		-lxpcom \
-		-lxp \
 		-lmsgbaseutil \
 		$(NSPR_LIBS) \
 		$(NULL)
--- a/htmlparser/robot/Makefile.in
+++ b/htmlparser/robot/Makefile.in
@ -34,7 +34,6 @@ endif

 ifndef NECKO
 LIBS		= \
-		-lxp \
 		-lnetlib \
 		-lftpurl \
 		-lfileurl \
--- a/layout/html/tests/Makefile.in
+++ b/layout/html/tests/Makefile.in
@ -63,15 +63,11 @@ GECKO_LIBS = \
 LIBS		= \
 		$(GECKO_LIBS) \
 		-lmozjs \
-		-ljsdom \
 		-lraptorgfx \
 		-lxpcom \
-		-lxp \
-		-ljsurl \
 		$(MOZ_TIMER_LIBS) \
 		$(TK_LIBS) \
 		$(NET_LIBS) \
-		$(ZLIB_LIBS) \
 		$(NSPR_LIBS) \
 		$(NULL)

--- a/mailnews/compose/tests/compose/Makefile.in
+++ b/mailnews/compose/tests/compose/Makefile.in
@ -30,10 +30,8 @@ LIBS = \
 		-lmsgbaseutil \
        -lxpcom \
        -lmozdbm        \
-        -lxp    \
        -lmozjs \
 		$(MOZ_TIMER_LIBS) \
-        $(ZLIB_LIBS) \
        $(NSPR_LIBS) \
        $(TK_LIBS) \
        $(NULL)
--- a/mailnews/compose/tests/compose2/Makefile.in
+++ b/mailnews/compose/tests/compose2/Makefile.in
@ -43,7 +43,6 @@ LIBS		= \
 		-lxpcom \
 		-lpwcac \
 		-lmozdbm \
-		-lxp \
 		-lmozjs \
 		-lraptorgfx \
 		$(NULL)
--- a/mailnews/compose/tests/geturl/Makefile.in
+++ b/mailnews/compose/tests/geturl/Makefile.in
@ -31,7 +31,6 @@ CPPSRCS		= \

 BASE_LIBS	= \
 		-lmozjs \
-		-lxpcom \
 		$(NULL)

 GECKO_LIBS	= \
@ -51,8 +50,6 @@ NETLIB_LIBS	= \
 		-lnetcnvts \
 		-lnetlib \
 		-lnetwork \
-		-lxp \
-		-lmozdbm \
 		-lpwcac \
 		$(NULL)

--- a/mailnews/compose/tests/sendlater/Makefile.in
+++ b/mailnews/compose/tests/sendlater/Makefile.in
@ -42,10 +42,7 @@ LIBS		= \
 		$(MOZ_TIMER_LIBS) \
 		-lxpcom \
 		-lpwcac \
-		-lmozdbm \
-		-lxp \
 		-lmozjs \
-		$(ZLIB_LIBS) \
 		$(NSPR_LIBS) \
 		-lraptorgfx \
 		$(NULL)
--- a/mailnews/compose/tests/sendpage/Makefile.in
+++ b/mailnews/compose/tests/sendpage/Makefile.in
@ -29,8 +29,6 @@ CPPSRCS		= Test.cpp
 LIBS		= \
 		$(MOZ_TIMER_LIBS) \
 		-lxpcom \
-		-lmozdbm \
-		-lxp \
 		-lmozjs \
 		$(NSPR_LIBS) \
 		$(NULL)
--- a/mailnews/compose/tests/smtp/Makefile.in
+++ b/mailnews/compose/tests/smtp/Makefile.in
@ -29,11 +29,8 @@ CPPSRCS		= smtpTest.cpp
 LIBS = \
 	-lxpcom	\
 	-lmozdbm	\
-	-lxp	\
 	-lmozjs	\
-	-lxp	\
 	$(MOZ_TIMER_LIBS) \
-	$(ZLIB_LIBS) \
 	$(DIST)/lib/librdfbase_s.a \
 	$(NSPR_LIBS) \
 	$(TK_LIBS) \
--- a/mailnews/db/mork/build/Makefile.in
+++ b/mailnews/db/mork/build/Makefile.in
@ -42,7 +42,6 @@ EXTRA_DSO_LDOPTS = \
 		-L$(DIST)/bin \
 		-L$(DIST)/lib \
 		-lxpcom \
-		-lxp \
 		-lmsgbaseutil \
 		$(NSPR_LIBS) \
 		$(NULL)
--- a/mailnews/db/msgdb/build/Makefile.in
+++ b/mailnews/db/msgdb/build/Makefile.in
@ -38,7 +38,6 @@ EXTRA_DSO_LDOPTS = \
 		-L$(DIST)/bin \
 		-L$(DIST)/lib \
 		-lxpcom \
-		-lxp \
 		-lmsgbaseutil \
 		$(NSPR_LIBS) \
 		$(NULL)
--- a/mailnews/imap/tests/harness/Makefile.in
+++ b/mailnews/imap/tests/harness/Makefile.in
@ -32,11 +32,9 @@ LIBS =	\
 		-L$(DIST)/bin			\
 		-lxpcom \
 		-lmozdbm \
-		-lxp \
 		-lmozjs \
 		-lmsgbaseutil \
 		$(MOZ_TIMER_LIBS) \
-		$(ZLIB_LIBS) \
 		$(NSPR_LIBS) \
 		$(TK_LIBS) \
 		$(NULL)
--- a/mailnews/local/tests/mailbox/Makefile.in
+++ b/mailnews/local/tests/mailbox/Makefile.in
@ -45,11 +45,9 @@ LIBS		= \
 		-lxpcom \
 		-lpwcac \
 		-lmozdbm \
-		-lxp \
 		-lmozjs \
 		-lmork \
 		-lmsgbaseutil \
-		$(ZLIB_LIBS) \
 		$(NSPR_LIBS) \
 		$(TK_LIBS) \
 		$(NULL)
--- a/mailnews/local/tests/mboxParser/Makefile.in
+++ b/mailnews/local/tests/mboxParser/Makefile.in
@ -41,9 +41,7 @@ LIBS		= \
 		-lxpcom \
 		-lpwcac \
 		-lmozdbm \
-		-lxp \
 		-lmozjs \
-		$(ZLIB_LIBS) \
 		$(NSPR_LIBS) \
 		$(TK_LIBS) \
 		$(NULL)
--- a/mailnews/local/tests/pop3/Makefile.in
+++ b/mailnews/local/tests/pop3/Makefile.in
@ -30,10 +30,8 @@ LIBS = \
 	-lmsgbaseutil \
 	-lxpcom	\
 	-lmozdbm	\
-	-lxp	\
 	-lmozjs	\
 	$(MOZ_TIMER_LIBS) \
-	$(ZLIB_LIBS) \
 	$(NSPR_LIBS) \
 	$(TK_LIBS) \
 	$(NULL)
--- a/mailnews/mime/abstatus/src/Makefile.in
+++ b/mailnews/mime/abstatus/src/Makefile.in
@ -36,7 +36,6 @@ CPPSRCS		= \
 EXTRA_DSO_LDOPTS = \
 		-L$(DIST)/bin \
 		-L$(DIST)/lib \
-		-lxp \
 		-lxpcom \
 		$(NULL)

--- a/mailnews/mime/cthandlers/calendar/Makefile.in
+++ b/mailnews/mime/cthandlers/calendar/Makefile.in
@ -36,7 +36,6 @@ CPPSRCS		= \
 EXTRA_DSO_LDOPTS = \
 		-L$(DIST)/bin \
 		-L$(DIST)/lib \
-		-lxp \
 		-lxpcom \
 		$(NSPR_LIBS) \
 		$(NULL)
--- a/mailnews/mime/emitters/src/Makefile.in
+++ b/mailnews/mime/emitters/src/Makefile.in
@ -46,7 +46,6 @@ CPPSRCS		= \
 EXTRA_DSO_LDOPTS = \
 		-L$(DIST)/bin \
 		-L$(DIST)/lib \
-		-lxp \
 		-lxpcom \
 		$(NULL)

--- a/mailnews/mime/tests/mimetest/Makefile.in
+++ b/mailnews/mime/tests/mimetest/Makefile.in
@ -47,7 +47,6 @@ NETLIB_LIBS	= \
 		-lnetcnvts \
 		-lnetlib \
 		-lnetwork \
-		-lxp \
 		-lmozdbm \
 		-lpwcac \
 		$(NULL)
--- a/mailnews/news/src/Makefile.in
+++ b/mailnews/news/src/Makefile.in
@ -59,7 +59,6 @@ CPPSRCS = \

 EXTRA_DSO_LDOPTS =	\
 	-L$(DIST)/bin	\
-	-lxp	\
 	-lxpcom	\
 	-lmsgbaseutil	\
 	$(NSPR_LIBS) \
--- a/mailnews/news/tests/newsParser/Makefile.in
+++ b/mailnews/news/tests/newsParser/Makefile.in
@ -40,16 +40,12 @@ LIBS		= \
 		-lnetlib \
 		-lpwcac \
 		-lmozdbm \
-		-lxp \
 		-lmozjs \
 		-lraptorgfx \
 		$(DIST)/lib/libmsgnews_s.a \
 		-lmsgbaseutil \
 		$(MOZ_TIMER_LIBS) \
 		-lxpcom \
-		$(JPEG_LIBS) \
-		$(PNG_LIBS) \
-		$(ZLIB_LIBS) \
 		$(NSPR_LIBS) \
 		$(NULL)

--- a/mailnews/news/tests/nntp/Makefile.in
+++ b/mailnews/news/tests/nntp/Makefile.in
@ -28,11 +28,9 @@ CPPSRCS		= nntpTest.cpp
 LIBS = \
 	-lxpcom	\
 	-lmozdbm	\
-	-lxp	\
 	-lmozjs	\
 	-lmsgbaseutil \
 	$(MOZ_TIMER_LIBS) \
-	$(ZLIB_LIBS) \
 	$(DIST)/lib/librdfbase_s.a \
 	$(NSPR_LIBS) \
 	$(TK_LIBS) \
--- a/modules/libimg/Makefile.in
+++ b/modules/libimg/Makefile.in
@ -28,6 +28,4 @@ endif

 DIRS += public public_com src gifcom pngcom jpgcom

-EXTRA_LIBS = $(PNG_LIBS) $(ZLIB_LIBS)
-
 include $(topsrcdir)/config/rules.mk
--- a/modules/libimg/src/Makefile.in
+++ b/modules/libimg/src/Makefile.in
@ -28,8 +28,7 @@ include $(DEPTH)/config/autoconf.mk
 MODULE		= img
 LIBRARY_NAME	= img_s

-LOCAL_INCLUDES	= -I$(srcdir) $(PNG_CFLAGS) $(ZLIB_CFLAGS)
-EXTRA_LIBS	= $(PNG_LIBS) $(ZLIB_LIBS)
+LOCAL_INCLUDES	= -I$(srcdir)

 CPPSRCS		= \
 	ilNetReader.cpp \
@ -48,9 +47,6 @@ CPPSRCS		+= xpcompat.cpp \

 REQUIRES	+= util img xpcom

-EXTRA_LIBS	+= $(NSPR_LIBS)
-
-
 EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))

 MKSHLIB :=
--- a/modules/libjar/Makefile.in
+++ b/modules/libjar/Makefile.in
@ -40,6 +40,10 @@ EXPORTS = zipfile.h

 EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))

-EXTRA_DSO_LDOPTS = $(ZLIB_LIBS) -L$(DIST)/bin -lxp
+EXTRA_DSO_LDOPTS =\
+		-L$(DIST)/bin \
+		-lxp \
+		$(ZLIB_LIBS) \
+		$(NULL)

 include $(topsrcdir)/config/rules.mk
--- a/parser/htmlparser/robot/Makefile.in
+++ b/parser/htmlparser/robot/Makefile.in
@ -34,7 +34,6 @@ endif

 ifndef NECKO
 LIBS		= \
-		-lxp \
 		-lnetlib \
 		-lftpurl \
 		-lfileurl \
--- a/rdf/tests/rdfcat/Makefile.in
+++ b/rdf/tests/rdfcat/Makefile.in
@ -44,9 +44,6 @@ NETLIB_LIBS	= \
 		-lnetcnvts \
 		-lnetlib \
 		-lnetwork \
-		-lxp \
-		-ljsurl \
-		-lmozdbm \
 		-lpwcac \
 		$(NULL)
 else
--- a/rdf/tests/rdfpoll/Makefile.in
+++ b/rdf/tests/rdfpoll/Makefile.in
@ -44,9 +44,6 @@ NETLIB_LIBS	= \
 		-lnetcnvts \
 		-lnetlib \
 		-lnetwork \
-		-lxp \
-		-ljsurl \
-		-lmozdbm \
 		-lpwcac \
 		$(NULL)
 else
--- a/webshell/tests/viewer/Makefile.in
+++ b/webshell/tests/viewer/Makefile.in
@ -113,9 +113,6 @@ NETLIB_LIBS		= \
 			-lnetcnvts \
 			-lnetlib \
 			-lnetwork \
-			-lxp \
-			-ljsurl \
-			-lmozdbm \
 			-lpwcac \
 			$(NULL)
 endif
--- a/xpcom/tests/Makefile.in
+++ b/xpcom/tests/Makefile.in
@ -86,7 +86,6 @@ endif

 LIBS		+= \
 		-lmozjs \
-		-lxp \
 		-lxpcom \
 		$(NETLIB_LIBS) \
 		$(MOZ_TIMER_LIBS) \
--- a/xpfe/bootstrap/Makefile.in
+++ b/xpfe/bootstrap/Makefile.in
@ -39,7 +39,6 @@ LIBS		= \
 		-lgophurl \
 		-lftpurl \
 		-lremoturl \
-		-lxp \
 		-lnetcache \
 		-lnetcnvts \
 		-lmimetype \
--- a/xpfe/components/find/src/Makefile.in
+++ b/xpfe/components/find/src/Makefile.in
@ -33,7 +33,6 @@ EXTRA_DSO_LDOPTS = \
 		-L$(DIST)/lib \
 		-lxpcom \
 		-lmozjs \
-		$(ZLIB_LIBS) \
 		$(NSPR_LIBS) \
 		$(NULL)

--- a/xpfe/components/prefwindow/src/Makefile.in
+++ b/xpfe/components/prefwindow/src/Makefile.in
@ -35,7 +35,6 @@ EXTRA_DSO_LDOPTS = \
 		-L$(DIST)/bin \
 		-L$(DIST)/lib \
 		-lxpcom \
-		$(ZLIB_LIBS) \
 		$(NSPR_LIBS) \
 		$(NULL)

--- a/xpfe/components/sample/src/Makefile.in
+++ b/xpfe/components/sample/src/Makefile.in
@ -33,7 +33,6 @@ EXTRA_DSO_LDOPTS = \
 		-L$(DIST)/lib \
 		-lxpcom \
 		-lnetlib \
-		$(ZLIB_LIBS) \
 		$(NSPR_LIBS) \
 		$(NULL)

--- a/xpfe/components/ucth/src/Makefile.in
+++ b/xpfe/components/ucth/src/Makefile.in
@ -33,7 +33,6 @@ EXTRA_DSO_LDOPTS = \
 		-L$(DIST)/lib \
 		-lxpcom \
 		-lmozjs	\
-		$(ZLIB_LIBS) \
 		$(NSPR_LIBS) \
 		$(NULL)

--- a/xpfe/components/xfer/src/Makefile.in
+++ b/xpfe/components/xfer/src/Makefile.in
@ -37,7 +37,6 @@ EXTRA_DSO_LDOPTS = \
 		-lxpcom \
 		-lmozjs \
 		-lneckoutil_s \
-		$(ZLIB_LIBS) \
 		$(NSPR_LIBS) \
 		$(NULL)