From 49af80fb2c142f61c0b0c251746184bfc213b803 Mon Sep 17 00:00:00 2001 From: "blizzard%redhat.com" Date: Thu, 29 Jul 1999 19:42:55 +0000 Subject: [PATCH] fix linux startup bustage. reviewed by sspitzer, approved by cyeh. git-svn-id: svn://10.0.0.236/trunk@41553 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/modules/plugin/base/src/Makefile.in | 4 ++++ mozilla/modules/plugin/nglsrc/Makefile.in | 4 ++++ mozilla/xpfe/components/related/src/Makefile.in | 1 + mozilla/xpfe/components/xfer/src/Makefile.in | 7 +------ mozilla/xpinstall/src/Makefile.in | 5 ++++- 5 files changed, 14 insertions(+), 7 deletions(-) diff --git a/mozilla/modules/plugin/base/src/Makefile.in b/mozilla/modules/plugin/base/src/Makefile.in index 60ce52137b9..2fbf8c4016a 100644 --- a/mozilla/modules/plugin/base/src/Makefile.in +++ b/mozilla/modules/plugin/base/src/Makefile.in @@ -44,6 +44,10 @@ EXPORTS = \ EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS)) +EXTRA_DSO_LDOPTS = \ + -L$(DIST)/lib \ + -lneckoutil_s + include $(topsrcdir)/config/rules.mk DEFINES += -D_IMPL_NS_PLUGIN diff --git a/mozilla/modules/plugin/nglsrc/Makefile.in b/mozilla/modules/plugin/nglsrc/Makefile.in index 60ce52137b9..2fbf8c4016a 100644 --- a/mozilla/modules/plugin/nglsrc/Makefile.in +++ b/mozilla/modules/plugin/nglsrc/Makefile.in @@ -44,6 +44,10 @@ EXPORTS = \ EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS)) +EXTRA_DSO_LDOPTS = \ + -L$(DIST)/lib \ + -lneckoutil_s + include $(topsrcdir)/config/rules.mk DEFINES += -D_IMPL_NS_PLUGIN diff --git a/mozilla/xpfe/components/related/src/Makefile.in b/mozilla/xpfe/components/related/src/Makefile.in index 78c0ad8ffa6..37738d957a2 100644 --- a/mozilla/xpfe/components/related/src/Makefile.in +++ b/mozilla/xpfe/components/related/src/Makefile.in @@ -31,6 +31,7 @@ CPPSRCS = nsRelatedLinksHandler.cpp EXTRA_DSO_LDOPTS = \ -L$(DIST)/bin \ -L$(DIST)/lib \ + -lneckoutil_s \ -lxpcom \ $(NSPR_LIBS) \ $(NULL) diff --git a/mozilla/xpfe/components/xfer/src/Makefile.in b/mozilla/xpfe/components/xfer/src/Makefile.in index f9f6fc8ff0d..f6f4ea48fb9 100644 --- a/mozilla/xpfe/components/xfer/src/Makefile.in +++ b/mozilla/xpfe/components/xfer/src/Makefile.in @@ -37,15 +37,10 @@ EXTRA_DSO_LDOPTS = \ -lxpcom \ -lmozreg \ -lmozjs \ + -lneckoutil_s \ $(ZLIB_LIBS) \ $(NSPR_LIBS) \ $(NULL) -ifdef NECKO -SHARED_LIBRARY_LIBS = $(DIST)/lib/libneckoutil_s.a -else -EXTRA_DSO_LDOPTS += -lnetlib -endif - include $(topsrcdir)/config/rules.mk diff --git a/mozilla/xpinstall/src/Makefile.in b/mozilla/xpinstall/src/Makefile.in index 4efe4fdd7af..038a658c928 100644 --- a/mozilla/xpinstall/src/Makefile.in +++ b/mozilla/xpinstall/src/Makefile.in @@ -65,7 +65,10 @@ CPPSRCS = \ LOCAL_INCLUDES += -I$(srcdir)/../public -EXTRA_DSO_LDOPTS = $(ZLIB_LIBS) +EXTRA_DSO_LDOPTS = \ + -L$(DIST)/lib \ + $(ZLIB_LIBS) \ + -lneckoutil_s include $(topsrcdir)/config/rules.mk