Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@78323 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
cls%seawood.org
2000-09-07 02:13:37 +00:00
parent b8f9b6c544
commit 5c0f116111
2 changed files with 38 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
mozilla/htmlparser/src/Makefile.in
View File

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

29
mozilla/parser/htmlparser/src/Makefile.in
View File

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