mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

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.

This commit is contained in:
cls%seawood.org 2000-09-07 02:13:37 +00:00
Родитель 35c44f7c1c
Коммит d05698e6ea
2 изменённых файлов: 38 добавлений и 20 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

29
htmlparser/src/Makefile.in
Просмотреть файл

@ -30,7 +30,25 @@ MODULE = htmlparser
LIBRARY_NAME = htmlpars LIBRARY_NAME = htmlpars
IS_COMPONENT = 1 IS_COMPONENT = 1
SHORT_LIBNAME = htmlpars 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 = \ CPPSRCS = \
@ -109,15 +127,6 @@ EXPORTS = \
EXPORTS := $(addprefix $(srcdir)/, $(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) EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS)
include $(topsrcdir)/config/rules.mk include $(topsrcdir)/config/rules.mk

29
parser/htmlparser/src/Makefile.in
Просмотреть файл

@ -30,7 +30,25 @@ MODULE = htmlparser
LIBRARY_NAME = htmlpars LIBRARY_NAME = htmlpars
IS_COMPONENT = 1 IS_COMPONENT = 1
SHORT_LIBNAME = htmlpars 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 = \ CPPSRCS = \
@ -109,15 +127,6 @@ EXPORTS = \
EXPORTS := $(addprefix $(srcdir)/, $(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) EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS)
include $(topsrcdir)/config/rules.mk include $(topsrcdir)/config/rules.mk