mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-11-26 06:11:37 +00:00
Link expat and xmltok into the htmlparser statically. Not into the app.
This commit is contained in:
parent
e9bfac5dda
commit
04349cdd68
@ -22,7 +22,7 @@ VPATH = @srcdir@
|
||||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
LIBRARY_NAME = expat
|
||||
LIBRARY_NAME = expat_s
|
||||
|
||||
ifdef MOZ_STRIP_NOT_EXPORTED
|
||||
DEFINES += -DXMLPARSEAPI="__attribute__ ((dllexport))"
|
||||
@ -43,7 +43,11 @@ MODULE=expat
|
||||
|
||||
LOCAL_INCLUDES = -I$(srcdir)/../xmltok
|
||||
|
||||
include $(topsrcdir)/config/config.mk
|
||||
MKSHLIB :=
|
||||
|
||||
# We want only the static lib, not the shared lib
|
||||
override NO_SHARED_LIB=1
|
||||
override NO_STATIC_LIB=
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
|
@ -22,7 +22,7 @@ VPATH = @srcdir@
|
||||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
LIBRARY_NAME = xmltok
|
||||
LIBRARY_NAME = xmltok_s
|
||||
|
||||
ifdef MOZ_STRIP_NOT_EXPORTED
|
||||
DEFINES += -DXMLTOKAPI="__attribute__ ((dllexport))"
|
||||
@ -38,7 +38,11 @@ EXPORTS = \
|
||||
|
||||
EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
|
||||
|
||||
include $(topsrcdir)/config/config.mk
|
||||
MKSHLIB :=
|
||||
|
||||
# We want only the static lib, not the shared lib
|
||||
override NO_SHARED_LIB=1
|
||||
override NO_STATIC_LIB=
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
|
@ -35,8 +35,6 @@ endif
|
||||
ifndef NECKO
|
||||
LIBS = \
|
||||
-lraptorhtmlpars \
|
||||
-lexpat \
|
||||
-lxmltok \
|
||||
-lsecfree \
|
||||
-lpref \
|
||||
-lxp \
|
||||
|
@ -22,8 +22,6 @@ VPATH = .:@srcdir@
|
||||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
include $(topsrcdir)/config/config.mk
|
||||
|
||||
LIBRARY_NAME = raptorhtmlpars
|
||||
|
||||
DEFINES += -D_IMPL_NS_HTMLPARS -DXML_DTD
|
||||
@ -105,6 +103,12 @@ MODULE=htmlparser
|
||||
|
||||
REQUIRES = xpcom netlib raptor
|
||||
|
||||
EXTRA_DSO_LDOPTS =\
|
||||
-L$(DIST)/lib \
|
||||
-lexpat_s \
|
||||
-lxmltok_s \
|
||||
$(NULL)
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
INCLUDES += -I.
|
||||
|
@ -58,8 +58,6 @@ LIBS += \
|
||||
-lmozreg \
|
||||
-lxp \
|
||||
-lraptorhtmlpars \
|
||||
-lexpat \
|
||||
-lxmltok \
|
||||
-ljsurl \
|
||||
-ljsdom \
|
||||
$(ZLIB_LIBS) \
|
||||
|
@ -52,10 +52,19 @@ else
|
||||
NET_LIBS = -lneckoutil_s
|
||||
endif
|
||||
|
||||
GECKO_LIBS = \
|
||||
$(DIST)/lib/libraptorhtmlbase_s.a \
|
||||
$(DIST)/lib/libnglhtmlcon_s.a \
|
||||
$(DIST)/lib/libraptorhtmldoc_s.a \
|
||||
$(DIST)/lib/libraptorhtmlstyle_s.a \
|
||||
$(DIST)/lib/libraptorhtmltable_s.a \
|
||||
$(DIST)/lib/libraptorlayout_s.a \
|
||||
$(DIST)/lib/libraptorevents_s.a \
|
||||
$(NULL)
|
||||
|
||||
LIBS = \
|
||||
$(GECKO_LIBS) \
|
||||
-limg \
|
||||
$(PNG_LIBS) \
|
||||
$(JPEG_LIBS) \
|
||||
-lmozutil \
|
||||
-lpref \
|
||||
-lsecfree \
|
||||
@ -65,9 +74,6 @@ LIBS = \
|
||||
-lxpcom \
|
||||
-lxp \
|
||||
-lraptorhtmlpars \
|
||||
$(DIST)/bin/components/libraptorhtml.$(DLL_SUFFIX) \
|
||||
-lexpat \
|
||||
-lxmltok \
|
||||
-ljsurl \
|
||||
$(TIMER_LIBS) \
|
||||
$(TK_LIBS) \
|
||||
|
@ -41,8 +41,6 @@ BASE_LIBS = \
|
||||
|
||||
GECKO_LIBS = \
|
||||
-lraptorhtmlpars \
|
||||
-lexpat \
|
||||
-lxmltok \
|
||||
-ljsdom \
|
||||
-lraptorplugin \
|
||||
$(NULL)
|
||||
|
@ -33,8 +33,6 @@ LIBS = \
|
||||
-lpref \
|
||||
-lmozjs \
|
||||
-lraptorhtmlpars \
|
||||
-lexpat \
|
||||
-lxmltok \
|
||||
-ljsdom \
|
||||
-ljsurl \
|
||||
-limg \
|
||||
|
@ -40,8 +40,6 @@ LIBS = \
|
||||
-ljsdom \
|
||||
-ljsurl \
|
||||
-lraptorhtmlpars \
|
||||
-lexpat \
|
||||
-lxmltok \
|
||||
-limg \
|
||||
-lmozutil \
|
||||
-lmsgbaseutil \
|
||||
|
@ -37,8 +37,6 @@ BASE_LIBS = \
|
||||
|
||||
GECKO_LIBS = \
|
||||
-lraptorhtmlpars \
|
||||
-lexpat \
|
||||
-lxmltok \
|
||||
-ljsdom \
|
||||
-lraptorplugin \
|
||||
$(NULL)
|
||||
|
@ -48,8 +48,6 @@ LIBS = \
|
||||
-ljsdom \
|
||||
-ljsurl \
|
||||
-lraptorhtmlpars \
|
||||
-lexpat \
|
||||
-lxmltok \
|
||||
-lraptorgfx \
|
||||
-limg \
|
||||
-lmozutil \
|
||||
|
@ -34,8 +34,6 @@ LIBS = \
|
||||
-lmozjs \
|
||||
-lsecfree \
|
||||
-lraptorhtmlpars \
|
||||
-lexpat \
|
||||
-lxmltok \
|
||||
-ljsdom \
|
||||
-ljsurl \
|
||||
-limg \
|
||||
|
@ -22,7 +22,7 @@ VPATH = @srcdir@
|
||||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
LIBRARY_NAME = expat
|
||||
LIBRARY_NAME = expat_s
|
||||
|
||||
ifdef MOZ_STRIP_NOT_EXPORTED
|
||||
DEFINES += -DXMLPARSEAPI="__attribute__ ((dllexport))"
|
||||
@ -43,7 +43,11 @@ MODULE=expat
|
||||
|
||||
LOCAL_INCLUDES = -I$(srcdir)/../xmltok
|
||||
|
||||
include $(topsrcdir)/config/config.mk
|
||||
MKSHLIB :=
|
||||
|
||||
# We want only the static lib, not the shared lib
|
||||
override NO_SHARED_LIB=1
|
||||
override NO_STATIC_LIB=
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
|
@ -35,8 +35,6 @@ endif
|
||||
ifndef NECKO
|
||||
LIBS = \
|
||||
-lraptorhtmlpars \
|
||||
-lexpat \
|
||||
-lxmltok \
|
||||
-lsecfree \
|
||||
-lpref \
|
||||
-lxp \
|
||||
|
@ -22,8 +22,6 @@ VPATH = .:@srcdir@
|
||||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
include $(topsrcdir)/config/config.mk
|
||||
|
||||
LIBRARY_NAME = raptorhtmlpars
|
||||
|
||||
DEFINES += -D_IMPL_NS_HTMLPARS -DXML_DTD
|
||||
@ -105,6 +103,12 @@ MODULE=htmlparser
|
||||
|
||||
REQUIRES = xpcom netlib raptor
|
||||
|
||||
EXTRA_DSO_LDOPTS =\
|
||||
-L$(DIST)/lib \
|
||||
-lexpat_s \
|
||||
-lxmltok_s \
|
||||
$(NULL)
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
INCLUDES += -I.
|
||||
|
@ -105,8 +105,6 @@ GECKO_LIBS = \
|
||||
$(MOZ_GFX_TOOLKIT_LDFLAGS) \
|
||||
$(TIMER_LIBS) \
|
||||
-lraptorhtmlpars \
|
||||
-lexpat \
|
||||
-lxmltok \
|
||||
-ljsdom \
|
||||
$(NULL)
|
||||
|
||||
|
@ -56,8 +56,6 @@ LIBS = \
|
||||
-lsecfree \
|
||||
-lmozutil \
|
||||
-limg \
|
||||
$(PNG_LIBS) \
|
||||
$(JPEG_LIBS) \
|
||||
-lxpcom \
|
||||
-lmozreg \
|
||||
-lmozjs \
|
||||
@ -65,14 +63,10 @@ LIBS = \
|
||||
-lraptorgfx \
|
||||
$(MOZ_GFX_TOOLKIT_LDFLAGS) \
|
||||
$(TIMER_LIBS) \
|
||||
-lxp \
|
||||
-lraptorhtmlpars \
|
||||
-lexpat \
|
||||
-lxmltok \
|
||||
-ljsurl \
|
||||
-ljsdom \
|
||||
$(NET_LIBS) \
|
||||
$(ZLIB_LIBS) \
|
||||
$(NSPR_LIBS) \
|
||||
$(TK_LIBS) \
|
||||
$(NULL)
|
||||
|
@ -56,8 +56,6 @@ LIBS = \
|
||||
-lsecfree \
|
||||
-lmozutil \
|
||||
-limg \
|
||||
$(PNG_LIBS) \
|
||||
$(JPEG_LIBS) \
|
||||
-lxpcom \
|
||||
-lmozreg \
|
||||
-lmozjs \
|
||||
@ -65,14 +63,10 @@ LIBS = \
|
||||
-lraptorgfx \
|
||||
$(MOZ_GFX_TOOLKIT_LDFLAGS) \
|
||||
$(TIMER_LIBS) \
|
||||
-lxp \
|
||||
-lraptorhtmlpars \
|
||||
-lexpat \
|
||||
-lxmltok \
|
||||
-ljsurl \
|
||||
-ljsdom \
|
||||
$(NET_LIBS) \
|
||||
$(ZLIB_LIBS) \
|
||||
$(NSPR_LIBS) \
|
||||
$(TK_LIBS) \
|
||||
$(NULL)
|
||||
|
@ -73,8 +73,6 @@ LIBS += \
|
||||
-lmozreg \
|
||||
-lraptorwebwidget \
|
||||
-lraptorhtmlpars \
|
||||
-lexpat \
|
||||
-lxmltok \
|
||||
-ljsdom \
|
||||
-ljsurl \
|
||||
-lsecfree \
|
||||
|
Loading…
Reference in New Issue
Block a user