From 26219402484510f5778592b1fc413ed0647e6f78 Mon Sep 17 00:00:00 2001 From: "gagan%netscape.com" Date: Tue, 29 Jun 1999 00:26:25 +0000 Subject: [PATCH] Necko changes (from Andreas) git-svn-id: svn://10.0.0.236/trunk@37299 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/gfx/tests/Makefile.in | 37 +++++++++++------- mozilla/htmlparser/robot/Makefile.in | 20 +++++++--- mozilla/parser/htmlparser/robot/Makefile.in | 20 +++++++--- mozilla/rdf/tests/rdfcat/Makefile.in | 2 +- mozilla/rdf/tests/rdfpoll/Makefile.in | 2 +- mozilla/webshell/tests/viewer/Makefile.in | 9 +++++ mozilla/widget/tests/widget/Makefile.in | 36 +++++++++++------- mozilla/xpfe/bootstrap/Makefile.in | 38 ++++++++++++------- mozilla/xpfe/components/find/src/Makefile.in | 11 ++++-- .../components/prefwindow/src/Makefile.in | 7 +++- .../xpfe/components/related/src/Makefile.in | 7 +++- mozilla/xpfe/components/ucth/src/Makefile.in | 7 +++- mozilla/xpfe/components/xfer/src/Makefile.in | 7 +++- 13 files changed, 144 insertions(+), 59 deletions(-) diff --git a/mozilla/gfx/tests/Makefile.in b/mozilla/gfx/tests/Makefile.in index 89e92953299..4e52d6fc0b2 100644 --- a/mozilla/gfx/tests/Makefile.in +++ b/mozilla/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 diff --git a/mozilla/htmlparser/robot/Makefile.in b/mozilla/htmlparser/robot/Makefile.in index 9b8aacc76d5..135d54ca66d 100644 --- a/mozilla/htmlparser/robot/Makefile.in +++ b/mozilla/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 diff --git a/mozilla/parser/htmlparser/robot/Makefile.in b/mozilla/parser/htmlparser/robot/Makefile.in index 9b8aacc76d5..135d54ca66d 100644 --- a/mozilla/parser/htmlparser/robot/Makefile.in +++ b/mozilla/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 diff --git a/mozilla/rdf/tests/rdfcat/Makefile.in b/mozilla/rdf/tests/rdfcat/Makefile.in index 9a2ad362ce6..c45165e2561 100644 --- a/mozilla/rdf/tests/rdfcat/Makefile.in +++ b/mozilla/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) \ diff --git a/mozilla/rdf/tests/rdfpoll/Makefile.in b/mozilla/rdf/tests/rdfpoll/Makefile.in index cad8a9e4f82..f6a014855cf 100644 --- a/mozilla/rdf/tests/rdfpoll/Makefile.in +++ b/mozilla/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) \ diff --git a/mozilla/webshell/tests/viewer/Makefile.in b/mozilla/webshell/tests/viewer/Makefile.in index 76370c5850d..d59ca2bcd29 100644 --- a/mozilla/webshell/tests/viewer/Makefile.in +++ b/mozilla/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) diff --git a/mozilla/widget/tests/widget/Makefile.in b/mozilla/widget/tests/widget/Makefile.in index 95890bf9ccf..d96d8bb4e58 100644 --- a/mozilla/widget/tests/widget/Makefile.in +++ b/mozilla/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) diff --git a/mozilla/xpfe/bootstrap/Makefile.in b/mozilla/xpfe/bootstrap/Makefile.in index 8176f18fc7e..db8c5265ada 100644 --- a/mozilla/xpfe/bootstrap/Makefile.in +++ b/mozilla/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 \ diff --git a/mozilla/xpfe/components/find/src/Makefile.in b/mozilla/xpfe/components/find/src/Makefile.in index bda732feb05..db9afef1f5e 100644 --- a/mozilla/xpfe/components/find/src/Makefile.in +++ b/mozilla/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 diff --git a/mozilla/xpfe/components/prefwindow/src/Makefile.in b/mozilla/xpfe/components/prefwindow/src/Makefile.in index d8ef4c4bbb4..383ce9e6803 100644 --- a/mozilla/xpfe/components/prefwindow/src/Makefile.in +++ b/mozilla/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 diff --git a/mozilla/xpfe/components/related/src/Makefile.in b/mozilla/xpfe/components/related/src/Makefile.in index 77e680cb5ad..78c0ad8ffa6 100644 --- a/mozilla/xpfe/components/related/src/Makefile.in +++ b/mozilla/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 diff --git a/mozilla/xpfe/components/ucth/src/Makefile.in b/mozilla/xpfe/components/ucth/src/Makefile.in index 933b28eb15f..27c123847ce 100644 --- a/mozilla/xpfe/components/ucth/src/Makefile.in +++ b/mozilla/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 diff --git a/mozilla/xpfe/components/xfer/src/Makefile.in b/mozilla/xpfe/components/xfer/src/Makefile.in index 91388276bc0..823923807b5 100644 --- a/mozilla/xpfe/components/xfer/src/Makefile.in +++ b/mozilla/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