Necko changes (from Andreas)

1999-06-29 00:26:25 +00:00 · 1999-06-29 00:26:25 +00:00 · a78cd1e21b
--- a/gfx/tests/Makefile.in
+++ b/gfx/tests/Makefile.in
@ -37,19 +37,7 @@ INCLUDES+=-I$(srcdir)/../src -I$(PUBLIC)/raptor -I$(PUBLIC)/xpcom
 LIBS = \
 	-lraptorgfx \
 	-lgfx$(MOZ_TOOLKIT) \
-	-lnetlib \
-	-lhttpurl \
-	-lgophurl \
-	-labouturl \
-	-lremoturl \
-	-lfileurl \
-	-lftpurl \
-	-lnetwork \
-	-lsockstuburl \
-	-lmimetype \
-	-lnetcnvts \
-	-lnetcache \
-	-lpwcac \
+	-lgfxps \
 	$(TK_LIBS) \
 	-lxpcom \
 	-lreg \
@ -65,6 +53,29 @@ LIBS = \
 	$(ZLIB_LIBS) \
 	$(NULL)

+ifndef NECKO
+LIBS +=		\
+	-lnetlib \
+	-lhttpurl \
+	-lgophurl \
+	-labouturl \
+	-lremoturl \
+	-lfileurl \
+	-lftpurl \
+	-lnetwork \
+	-lsockstuburl \
+	-lmimetype \
+	-lnetcnvts \
+	-lnetcache \
+	-lpwcac \
+	$(NULL)
+else
+LIBS +=		\
+	-lneckoutil_s \
+	$(NULL)
+endif
+
+
 SIMPLE_PROGRAMS	= $(addprefix $(OBJDIR)/, $(CPPSRCS:.cpp=))

 include $(topsrcdir)/config/rules.mk
--- a/htmlparser/robot/Makefile.in
+++ b/htmlparser/robot/Makefile.in
@ -22,16 +22,24 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

+include $(topsrcdir)/config/config.mk
+
+ifndef NECKO
 PROGRAM		= htmlrobot
+else
+LIBRARY_NAME	= DebugRobot
+endif

 CPPSRCS		= nsDebugRobot.cpp nsRobotSink.cpp

-include $(topsrcdir)/config/config.mk
-
+ifndef NECKO
 LIBS		= \
 		-lraptorhtmlpars \
 		-lexpat \
 		-lxmltok \
+		-lsecfree \
+		-lpref \
+		-lxp \
 		-lnetlib \
 		-lftpurl \
 		-lfileurl \
@ -45,9 +53,6 @@ LIBS		= \
 		-lnetcache \
 		-lhttpurl \
 		-lpwcac \
-		-lsecfree \
-		-lpref \
-		-lxp \
 		-l$(MOZ_LIB_JS_PREFIX)js \
 		-lgfx$(MOZ_TOOLKIT) \
 		-lraptorgfx \
@ -64,5 +69,10 @@ LIBS		= \
 ifeq ($(OS_ARCH)$(OS_RELEASE),FreeBSD2)
 LIBS		+= -lpcap
 endif
+else
+DIRS = test
+endif
+
+

 include $(topsrcdir)/config/rules.mk
--- a/parser/htmlparser/robot/Makefile.in
+++ b/parser/htmlparser/robot/Makefile.in
@ -22,16 +22,24 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

+include $(topsrcdir)/config/config.mk
+
+ifndef NECKO
 PROGRAM		= htmlrobot
+else
+LIBRARY_NAME	= DebugRobot
+endif

 CPPSRCS		= nsDebugRobot.cpp nsRobotSink.cpp

-include $(topsrcdir)/config/config.mk
-
+ifndef NECKO
 LIBS		= \
 		-lraptorhtmlpars \
 		-lexpat \
 		-lxmltok \
+		-lsecfree \
+		-lpref \
+		-lxp \
 		-lnetlib \
 		-lftpurl \
 		-lfileurl \
@ -45,9 +53,6 @@ LIBS		= \
 		-lnetcache \
 		-lhttpurl \
 		-lpwcac \
-		-lsecfree \
-		-lpref \
-		-lxp \
 		-l$(MOZ_LIB_JS_PREFIX)js \
 		-lgfx$(MOZ_TOOLKIT) \
 		-lraptorgfx \
@ -64,5 +69,10 @@ LIBS		= \
 ifeq ($(OS_ARCH)$(OS_RELEASE),FreeBSD2)
 LIBS		+= -lpcap
 endif
+else
+DIRS = test
+endif
+
+

 include $(topsrcdir)/config/rules.mk
--- a/rdf/tests/rdfcat/Makefile.in
+++ b/rdf/tests/rdfcat/Makefile.in
@ -78,6 +78,7 @@ NETLIB_LIBS =	      \
 	-ljsurl	      \
 	-l$(MOZ_LIB_DBM_PREFIX)dbm      \
 	-lpwcac	      \
+	$(NULL)
 else
 NETLIB_LIBS =	      \
 	-lneckoutil_s \
@ -86,7 +87,6 @@ NETLIB_LIBS =	      \
 	-l$(MOZ_LIB_DBM_PREFIX)dbm      \
 	$(NULL)
 endif
-	$(NULL)

 LIBS		= \
 	$(GECKO_LIBS) \
--- a/rdf/tests/rdfpoll/Makefile.in
+++ b/rdf/tests/rdfpoll/Makefile.in
@ -78,6 +78,7 @@ NETLIB_LIBS =	      \
 	-ljsurl	      \
 	-l$(MOZ_LIB_DBM_PREFIX)dbm      \
 	-lpwcac	      \
+	$(NULL)
 else
 NETLIB_LIBS =	      \
 	-lneckoutil_s \
@ -86,7 +87,6 @@ NETLIB_LIBS =	      \
 	-l$(MOZ_LIB_DBM_PREFIX)dbm      \
 	$(NULL)
 endif
-	$(NULL)

 LIBS		= \
 	$(GECKO_LIBS) \
--- a/webshell/tests/viewer/Makefile.in
+++ b/webshell/tests/viewer/Makefile.in
@ -144,6 +144,7 @@ NETLIB_LIBS =	      \
 	-lgophurl     \
 	-lhttpurl     \
 	-lremoturl    \
+ifndef NECKO
 	-lsockstuburl \
 	-lmimetype    \
 	-lnetcache    \
@ -162,6 +163,14 @@ LIBS =		       \
 	$(IMGLIB_LIBS) \
 	$(BASE_LIBS)   \
 	$(JSJ_LIB)     \
+else
+NETLIB_LIBS =	      \
+	-lneckoutil_s \
+	-lxp	      \
+	-ljsurl	      \
+	-l$(MOZ_LIB_DBM_PREFIX)dbm      \
+	$(NULL)
+endif
 	$(NSPR_LIBS)   \
 	$(TK_LIBS)     \
 	$(NULL)
--- a/widget/tests/widget/Makefile.in
+++ b/widget/tests/widget/Makefile.in
@ -40,19 +40,7 @@ CPPSRCS = \

 LIBS := \
 	-lraptorgfx \
-	-lnetlib \
-	-lremoturl \
-	-lnetcnvts \
-	-lgophurl \
-	-labouturl \
-	-lsockstuburl \
-	-lhttpurl \
-	-lmimetype \
-	-lfileurl \
-	-lftpurl \
-	-lpwcac \
-	-lnetwork \
-	-lnetcache \
+	-lgfxps \
 	-lpref \
 	-lsecfree \
 	-l$(MOZ_LIB_UTIL_PREFIX)util \
@ -75,6 +63,28 @@ LIBS := \
 	-lraptorgfx \
 	$(ZLIB_LIBS) \
 	$(NSPR_LIBS) \
+
+ifndef NECKO
+LIBS += 	\
+	-lnetlib \
+	-lremoturl \
+	-lnetcnvts \
+	-lgophurl \
+	-labouturl \
+	-lsockstuburl \
+	-lhttpurl \
+	-lmimetype \
+	-lfileurl \
+	-lftpurl \
+	-lpwcac \
+	-lnetwork \
+	-lnetcache \
+	$(NULL)
+else
+LIBS += 	\
+	-lneckoutil_s \
+	$(NULL)
+endif
 	$(NULL)


--- a/xpfe/bootstrap/Makefile.in
+++ b/xpfe/bootstrap/Makefile.in
@ -48,19 +48,6 @@ LIBS = \
 	-lraptorgfx	\
 	$(TOOLKIT_GFX_LIB)\
 	-lreg		\
-	-labouturl	\
-	-lhttpurl	\
-	-lsockstuburl 	\
-	-lfileurl	\
-	-lgophurl	\
-	-lftpurl	\
-	-lremoturl	\
-	-lxp		\
-	-lnetcache	\
-	-lnetcnvts	\
-	-lmimetype	\
-	-lnetwork	\
-	-lnetlib	\
 	-lraptorwebwidget	\
 	-lraptorhtmlpars	\
 	-lexpat \
@ -77,10 +64,33 @@ LIBS = \
 	-lxpcom		\
 	$(ZLIB_LIBS)	\
 	$(NSPR_LIBS)	\
-	-lpwcac		\
 	$(TK_LIBS)	\
 	$(NULL)

+ifndef NECKO
+LIBS += 		\
+	-labouturl	\
+	-lhttpurl	\
+	-lsockstuburl 	\
+	-lfileurl	\
+	-lgophurl	\
+	-lftpurl	\
+	-lremoturl	\
+	-lxp		\
+	-lnetcache	\
+	-lnetcnvts	\
+	-lmimetype	\
+	-lnetwork	\
+	-lnetlib	\
+	-lpwcac		\
+	$(NULL)
+else
+LIBS += 		\
+	-lneckoutil_s	\
+	$(NULL)
+endif
+
+
 CPPSRCS = \
 	nsAppRunner.cpp 	\
 	nsSetupRegistry.cpp	\
--- a/xpfe/components/find/src/Makefile.in
+++ b/xpfe/components/find/src/Makefile.in
@ -34,11 +34,16 @@ CPPSRCS		= \
 EXTRA_DSO_LDOPTS = \
 		-L$(DIST)/bin	\
 		-L$(DIST)/lib	\
-		-lxpcom		\
-		-lreg		\
-		-lnetlib	\
+		-lxpcom			\
+		-lreg			\
 		$(ZLIB_LIBS)	\
 		$(NSPR_LIBS)	\
 		$(NULL)

+ifndef NECKO
+EXTRA_DSO_LDOPTS = \
+		-lnetlib 	\
+		$(NULL)
+endif
+
 include $(topsrcdir)/config/rules.mk
--- a/xpfe/components/prefwindow/src/Makefile.in
+++ b/xpfe/components/prefwindow/src/Makefile.in
@ -36,9 +36,14 @@ EXTRA_DSO_LDOPTS = \
 		-L$(DIST)/lib \
 		-lxpcom \
 		-lreg \
-		-lnetlib \
 		$(ZLIB_LIBS) \
 		$(NSPR_LIBS) \
 		$(NULL)

+ifndef NECKO
+EXTRA_DSO_LDOPTS += \
+		-lnetlib \
+		$(NULL)
+endif
+
 include $(topsrcdir)/config/rules.mk
--- a/xpfe/components/related/src/Makefile.in
+++ b/xpfe/components/related/src/Makefile.in
@ -32,8 +32,13 @@ EXTRA_DSO_LDOPTS = \
 		-L$(DIST)/bin \
 		-L$(DIST)/lib \
 		-lxpcom \
-		-lnetlib \
 		$(NSPR_LIBS) \
 		$(NULL)

+ifndef NECKO
+EXTRA_DSO_LDOPTS += \
+		-lnetlib \
+		$(NULL)
+endif
+
 include $(topsrcdir)/config/rules.mk
--- a/xpfe/components/ucth/src/Makefile.in
+++ b/xpfe/components/ucth/src/Makefile.in
@ -33,9 +33,14 @@ EXTRA_DSO_LDOPTS = \
 		-L$(DIST)/lib \
 		-lxpcom \
 		-lreg \
-		-lnetlib \
 		$(ZLIB_LIBS) \
 		$(NSPR_LIBS) \
 		$(NULL)

+ifndef NECKO
+EXTRA_DSO_LDOPTS += \
+		-lnetlib 	\
+		$(NULL)
+endif
+
 include $(topsrcdir)/config/rules.mk
--- a/xpfe/components/xfer/src/Makefile.in
+++ b/xpfe/components/xfer/src/Makefile.in
@ -36,9 +36,14 @@ EXTRA_DSO_LDOPTS = \
 		-L$(DIST)/lib \
 		-lxpcom \
 		-lreg \
-		-lnetlib \
 		$(ZLIB_LIBS) \
 		$(NSPR_LIBS) \
 		$(NULL)

+ifndef NECKO
+EXTRA_DSO_LDOPTS += \
+		-lnetlib \
+		$(NULL)
+endif
+
 include $(topsrcdir)/config/rules.mk