From 202e970483af52c11fe613c49f3d27e8f7d465f5 Mon Sep 17 00:00:00 2001 From: "briano%netscape.com" Date: Thu, 9 Sep 1999 00:21:43 +0000 Subject: [PATCH] Removed the obsolete non-NECKO leftovers. --- widget/tests/scribble/Makefile.in | 21 --------------------- widget/tests/widget/Makefile.in | 21 --------------------- xpfe/components/find/src/Makefile.in | 6 +----- xpfe/components/prefwindow/src/Makefile.in | 6 +----- xpfe/components/related/src/Makefile.in | 9 ++------- xpfe/components/ucth/src/Makefile.in | 6 +----- 6 files changed, 5 insertions(+), 64 deletions(-) diff --git a/widget/tests/scribble/Makefile.in b/widget/tests/scribble/Makefile.in index e630841f50bc..c34c7dcbc008 100644 --- a/widget/tests/scribble/Makefile.in +++ b/widget/tests/scribble/Makefile.in @@ -29,33 +29,12 @@ CPPSRCS = \ main.cpp \ $(NULL) -include $(topsrcdir)/config/config.mk - -ifndef NECKO -NET_LIBS = \ - -lnetlib \ - -lremoturl \ - -lnetcnvts \ - -lgophurl \ - -labouturl \ - -lsockstuburl \ - -lhttpurl \ - -lmimetype \ - -lfileurl \ - -lftpurl \ - -lpwcac \ - -lnetwork \ - -lnetcache \ - $(NULL) -endif - LIBS = \ -lxpcom \ -lmozjs \ -lwidgetsupport_s \ -lraptorgfx \ $(MOZ_TIMER_LIBS) \ - $(NET_LIBS) \ $(NSPR_LIBS) \ $(TK_LIBS) \ $(NULL) diff --git a/widget/tests/widget/Makefile.in b/widget/tests/widget/Makefile.in index 13558e597c2e..c94f23f21ebc 100644 --- a/widget/tests/widget/Makefile.in +++ b/widget/tests/widget/Makefile.in @@ -29,33 +29,12 @@ CPPSRCS = \ nsWidgetTest.cpp \ $(NULL) -include $(topsrcdir)/config/config.mk - -ifndef NECKO -NET_LIBS = \ - -lnetlib \ - -lremoturl \ - -lnetcnvts \ - -lgophurl \ - -labouturl \ - -lsockstuburl \ - -lhttpurl \ - -lmimetype \ - -lfileurl \ - -lftpurl \ - -lpwcac \ - -lnetwork \ - -lnetcache \ - $(NULL) -endif - LIBS = \ -lxpcom \ -lmozjs \ -lwidgetsupport_s \ -lraptorgfx \ $(MOZ_TIMER_LIBS) \ - $(NET_LIBS) \ $(NSPR_LIBS) \ $(TK_LIBS) \ $(NULL) diff --git a/xpfe/components/find/src/Makefile.in b/xpfe/components/find/src/Makefile.in index c7712a2d8d74..1697515141ba 100644 --- a/xpfe/components/find/src/Makefile.in +++ b/xpfe/components/find/src/Makefile.in @@ -17,8 +17,8 @@ DEPTH = ../../../.. topsrcdir = @top_srcdir@ -VPATH = @srcdir@ srcdir = @srcdir@ +VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk @@ -36,9 +36,5 @@ EXTRA_DSO_LDOPTS = \ $(NSPR_LIBS) \ $(NULL) -ifndef NECKO -EXTRA_DSO_LDOPTS += -lnetlib -endif - include $(topsrcdir)/config/rules.mk diff --git a/xpfe/components/prefwindow/src/Makefile.in b/xpfe/components/prefwindow/src/Makefile.in index b716a71edc7b..c9b6bfe2d8c5 100644 --- a/xpfe/components/prefwindow/src/Makefile.in +++ b/xpfe/components/prefwindow/src/Makefile.in @@ -17,8 +17,8 @@ DEPTH = ../../../.. topsrcdir = @top_srcdir@ -VPATH = @srcdir@ srcdir = @srcdir@ +VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk @@ -38,9 +38,5 @@ EXTRA_DSO_LDOPTS = \ $(NSPR_LIBS) \ $(NULL) -ifndef NECKO -EXTRA_DSO_LDOPTS += -lnetlib -endif - include $(topsrcdir)/config/rules.mk diff --git a/xpfe/components/related/src/Makefile.in b/xpfe/components/related/src/Makefile.in index 37738d957a2c..d4d0e6ce1ab4 100644 --- a/xpfe/components/related/src/Makefile.in +++ b/xpfe/components/related/src/Makefile.in @@ -31,15 +31,10 @@ CPPSRCS = nsRelatedLinksHandler.cpp EXTRA_DSO_LDOPTS = \ -L$(DIST)/bin \ -L$(DIST)/lib \ - -lneckoutil_s \ + -lneckoutil_s \ -lxpcom \ $(NSPR_LIBS) \ $(NULL) -ifndef NECKO -EXTRA_DSO_LDOPTS += \ - -lnetlib \ - $(NULL) -endif - include $(topsrcdir)/config/rules.mk + diff --git a/xpfe/components/ucth/src/Makefile.in b/xpfe/components/ucth/src/Makefile.in index 367c9731e054..36bddbd92c77 100644 --- a/xpfe/components/ucth/src/Makefile.in +++ b/xpfe/components/ucth/src/Makefile.in @@ -17,8 +17,8 @@ DEPTH = ../../../.. topsrcdir = @top_srcdir@ -VPATH = @srcdir@ srcdir = @srcdir@ +VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk @@ -36,9 +36,5 @@ EXTRA_DSO_LDOPTS = \ $(NSPR_LIBS) \ $(NULL) -ifndef NECKO -EXTRA_DSO_LDOPTS += -lnetlib -endif - include $(topsrcdir)/config/rules.mk