From 5c0f116111c33ab437d04234dd2c6a497a52db69 Mon Sep 17 00:00:00 2001
From: "cls%seawood.org" <cls%seawood.org@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Thu, 7 Sep 2000 02:13:37 +0000
Subject: [PATCH] Ok, how many times to we have to go over this?  If you want
 to link a static archive into a shared library, YOU MUST USE the
 SHARED_LIBRARY_LIBS variable!  Hopefully, this will put an end to the
 problems of orange builds because htmlpars is all of a sudden "missing" a
 symbol.

git-svn-id: svn://10.0.0.236/trunk@78323 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/htmlparser/src/Makefile.in        | 29 +++++++++++++++--------
 mozilla/parser/htmlparser/src/Makefile.in | 29 +++++++++++++++--------
 2 files changed, 38 insertions(+), 20 deletions(-)

diff --git a/mozilla/htmlparser/src/Makefile.in b/mozilla/htmlparser/src/Makefile.in
index a3ad5a7441d..819114e2a3f 100644
--- a/mozilla/htmlparser/src/Makefile.in
+++ b/mozilla/htmlparser/src/Makefile.in
@@ -30,7 +30,25 @@ MODULE		= htmlparser
 LIBRARY_NAME	= htmlpars
 IS_COMPONENT	= 1
 SHORT_LIBNAME	= htmlpars
-EXTRA_DSO_LIBS	= expat_s xmltok_s mozutil_s
+
+ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
+EXTRA_DSO_LIBS	= expat_s xmltok_s 
+
+ifdef MOZ_PERF_METRICS
+EXTRA_DSO_LIBS	+= mozutil_s
+endif
+
+else
+SHARED_LIBRARY_LIBS = \
+		$(DIST)/lib/libexpat_s.$(LIB_SUFFIX) \
+		$(DIST)/lib/libxmltok_s.$(LIB_SUFFIX) \
+		$(NULL)
+
+ifdef MOZ_PERF_METRICS
+SHARED_LIBRARY_LIBS += $(DIST)/lib/libmozutil_s.$(LIB_SUFFIX)
+endif
+
+endif
 
 
 CPPSRCS		= \
@@ -109,15 +127,6 @@ EXPORTS		= \
 
 EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
 
-EXTRA_DSO_LDOPTS = \
-		$(DIST)/lib/libexpat_s.$(LIB_SUFFIX) \
-		$(DIST)/lib/libxmltok_s.$(LIB_SUFFIX) \
-		$(NULL)
-
-ifdef MOZ_PERF_METRICS
-SHARED_LIBRARY_LIBS += $(DIST)/lib/libmozutil_s.$(LIB_SUFFIX)
-endif
-
 EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS)
 
 include $(topsrcdir)/config/rules.mk
diff --git a/mozilla/parser/htmlparser/src/Makefile.in b/mozilla/parser/htmlparser/src/Makefile.in
index a3ad5a7441d..819114e2a3f 100644
--- a/mozilla/parser/htmlparser/src/Makefile.in
+++ b/mozilla/parser/htmlparser/src/Makefile.in
@@ -30,7 +30,25 @@ MODULE		= htmlparser
 LIBRARY_NAME	= htmlpars
 IS_COMPONENT	= 1
 SHORT_LIBNAME	= htmlpars
-EXTRA_DSO_LIBS	= expat_s xmltok_s mozutil_s
+
+ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
+EXTRA_DSO_LIBS	= expat_s xmltok_s 
+
+ifdef MOZ_PERF_METRICS
+EXTRA_DSO_LIBS	+= mozutil_s
+endif
+
+else
+SHARED_LIBRARY_LIBS = \
+		$(DIST)/lib/libexpat_s.$(LIB_SUFFIX) \
+		$(DIST)/lib/libxmltok_s.$(LIB_SUFFIX) \
+		$(NULL)
+
+ifdef MOZ_PERF_METRICS
+SHARED_LIBRARY_LIBS += $(DIST)/lib/libmozutil_s.$(LIB_SUFFIX)
+endif
+
+endif
 
 
 CPPSRCS		= \
@@ -109,15 +127,6 @@ EXPORTS		= \
 
 EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
 
-EXTRA_DSO_LDOPTS = \
-		$(DIST)/lib/libexpat_s.$(LIB_SUFFIX) \
-		$(DIST)/lib/libxmltok_s.$(LIB_SUFFIX) \
-		$(NULL)
-
-ifdef MOZ_PERF_METRICS
-SHARED_LIBRARY_LIBS += $(DIST)/lib/libmozutil_s.$(LIB_SUFFIX)
-endif
-
 EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS)
 
 include $(topsrcdir)/config/rules.mk