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
1999-07-29 19:42:55 +00:00
parent 24830fc232
commit 49af80fb2c
5 changed files with 14 additions and 7 deletions
--- 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
--- 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
--- 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)
--- 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

--- 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