mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-11-24 13:21:05 +00:00
Bug 273876 - libxul step 2 (everything through widget, except spidermonkey) r=darin; again, this should not affect non-xulrunner trees.
This commit is contained in:
parent
87c6dfa88f
commit
79241940e8
85
Makefile.in
85
Makefile.in
@ -142,15 +142,8 @@ tier_2_dirs = \
|
||||
xpcom/obsolete \
|
||||
$(NULL)
|
||||
|
||||
ifdef MOZ_ENABLE_LIBXUL
|
||||
tier_2_dirs += \
|
||||
toolkit/library \
|
||||
xpcom/stub \
|
||||
$(NULL)
|
||||
endif
|
||||
|
||||
ifdef NS_TRACE_MALLOC
|
||||
tier_2_dirs += tools/trace-malloc/lib tools/trace-malloc
|
||||
tier_2_dirs += tools/trace-malloc/lib
|
||||
endif
|
||||
|
||||
#
|
||||
@ -162,13 +155,6 @@ tier_9_dirs += \
|
||||
intl \
|
||||
$(NULL)
|
||||
|
||||
ifdef MOZ_OJI
|
||||
tier_9_dirs += \
|
||||
js/src/liveconnect \
|
||||
modules/oji \
|
||||
$(NULL)
|
||||
endif
|
||||
|
||||
ifdef MOZ_ENABLE_XLIB
|
||||
tier_9_dirs += gfx/src/xlibrgb widget/src/xlibxtbin
|
||||
endif
|
||||
@ -203,6 +189,16 @@ tier_9_dirs += \
|
||||
dom \
|
||||
view \
|
||||
widget \
|
||||
$(NULL)
|
||||
|
||||
ifdef MOZ_ENABLE_LIBXUL
|
||||
tier_9_dirs += \
|
||||
toolkit/library \
|
||||
xpcom/stub \
|
||||
$(NULL)
|
||||
endif
|
||||
|
||||
tier_9_dirs += \
|
||||
content \
|
||||
layout \
|
||||
db \
|
||||
@ -213,16 +209,11 @@ tier_9_dirs += \
|
||||
editor \
|
||||
$(NULL)
|
||||
|
||||
ifdef MOZ_THUNDERBIRD
|
||||
ifdef MOZ_USE_OFFICIAL_BRANDING
|
||||
tier_9_dirs += other-licenses/branding/thunderbird
|
||||
endif
|
||||
endif
|
||||
|
||||
ifdef MOZ_PHOENIX
|
||||
ifdef MOZ_USE_OFFICIAL_BRANDING
|
||||
tier_9_dirs += other-licenses/branding/firefox
|
||||
endif
|
||||
ifdef MOZ_OJI
|
||||
tier_9_dirs += \
|
||||
js/src/liveconnect \
|
||||
modules/oji \
|
||||
$(NULL)
|
||||
endif
|
||||
|
||||
tier_9_dirs += \
|
||||
@ -298,19 +289,8 @@ ifdef MOZ_XPINSTALL
|
||||
tier_50_dirs += xpinstall
|
||||
endif
|
||||
|
||||
# Many standalone tools/test can't be built until after libxul is available.
|
||||
ifdef MOZ_ENABLE_LIBXUL
|
||||
tier_50_dirs += xpcom/tools
|
||||
ifdef ENABLE_TESTS
|
||||
tier_50_dirs += \
|
||||
xpcom/tests \
|
||||
xpcom/sample \
|
||||
xpcom/typelib/xpt/tests \
|
||||
xpcom/reflect/xptinfo/tests \
|
||||
xpcom/reflect/xptcall/tests \
|
||||
xpcom/proxy/tests \
|
||||
$(NULL)
|
||||
endif
|
||||
ifdef NS_TRACE_MALLOC
|
||||
tier_50_dirs += tools/trace-malloc
|
||||
endif
|
||||
|
||||
#
|
||||
@ -348,6 +328,9 @@ endif
|
||||
endif
|
||||
|
||||
ifdef MOZ_PHOENIX
|
||||
ifdef MOZ_USE_OFFICIAL_BRANDING
|
||||
tier_99_dirs += other-licenses/branding/firefox
|
||||
endif
|
||||
tier_99_dirs += browser xpfe/bootstrap/init.d
|
||||
ifdef MOZ_USE_OFFICIAL_BRANDING
|
||||
tier_99_dirs += other-licenses/branding/firefox/content
|
||||
@ -359,6 +342,9 @@ tier_99_dirs += xulrunner
|
||||
endif
|
||||
|
||||
ifdef MOZ_THUNDERBIRD
|
||||
ifdef MOZ_USE_OFFICIAL_BRANDING
|
||||
tier_99_dirs += other-licenses/branding/thunderbird
|
||||
endif
|
||||
tier_99_dirs += mail xpfe/bootstrap/init.d
|
||||
ifdef MOZ_USE_OFFICIAL_BRANDING
|
||||
tier_99_dirs += other-licenses/branding/thunderbird/content
|
||||
@ -393,8 +379,10 @@ endif
|
||||
|
||||
# viewer
|
||||
ifneq (,$(ENABLE_TESTS))
|
||||
ifndef MOZ_ENABLE_LIBXUL
|
||||
tier_99_dirs += webshell/tests
|
||||
endif
|
||||
endif
|
||||
|
||||
# winembed, mfcembed
|
||||
ifeq ($(OS_ARCH),WINNT)
|
||||
@ -479,6 +467,27 @@ ifdef MOZ_LDAP_XPCOM
|
||||
$(MAKE) -C directory/c-sdk $@
|
||||
endif
|
||||
|
||||
ifdef MOZ_ENABLE_LIBXUL
|
||||
tier_50:
|
||||
@echo "tier_50: $(tier_50_dirs)"
|
||||
@$(EXIT_ON_ERROR) \
|
||||
for d in $(tier_50_dirs); do \
|
||||
$(UPDATE_TITLE) \
|
||||
$(MAKE) -C $$d export; \
|
||||
done ; \
|
||||
$(PERL) $(MOZILLA_DIR)/config/purge-old-headers.pl $(DIST)/include ;\
|
||||
for d in $(tier_50_dirs); do \
|
||||
$(UPDATE_TITLE) \
|
||||
$(MAKE) -C $$d libs; \
|
||||
done
|
||||
@echo "Building tools from tier 2/9/50"
|
||||
@$(EXIT_ON_ERROR) \
|
||||
for d in $(tier_2_dirs) $(tier_9_dirs) $(tier_50_dirs); do \
|
||||
$(UPDATE_TITLE) \
|
||||
$(MAKE) -C $$d tools; \
|
||||
done;
|
||||
endif
|
||||
|
||||
tier_%:
|
||||
@echo "$@: $($@_dirs)"
|
||||
@$(EXIT_ON_ERROR) \
|
||||
|
@ -591,6 +591,7 @@ xpcom/sample/Makefile
|
||||
xpcom/threads/Makefile
|
||||
xpcom/tools/Makefile
|
||||
xpcom/tools/registry/Makefile
|
||||
xpcom/stub/Makefile
|
||||
xpcom/windbgdlg/Makefile
|
||||
$MAKEFILES_libreg
|
||||
$MAKEFILES_libjar
|
||||
|
@ -48,6 +48,7 @@ EXPORT_LIBRARY = 1
|
||||
IS_COMPONENT = 1
|
||||
MODULE_NAME = nsSecurityManagerModule
|
||||
GRE_MODULE = 1
|
||||
LIBXUL_LIBRARY = 1
|
||||
|
||||
PACKAGE_FILE = caps.pkg
|
||||
|
||||
|
@ -335,7 +335,11 @@ ZLIB_LIBS = @ZLIB_LIBS@
|
||||
ZLIB_REQUIRES =
|
||||
else
|
||||
ZLIB_CFLAGS = @MOZ_ZLIB_CFLAGS@
|
||||
ZLIB_LIBS = @MOZ_ZLIB_LIBS@
|
||||
ifdef MOZ_ENABLE_LIBXUL
|
||||
MOZ_ZLIB_LIBS = @MOZ_ZLIB_LIBS@
|
||||
else
|
||||
ZLIB_LIBS = @MOZ_ZLIB_LIBS@
|
||||
endif
|
||||
ZLIB_REQUIRES = zlib
|
||||
endif
|
||||
|
||||
|
@ -413,6 +413,7 @@ endif
|
||||
EXPORT_LIBRARY=
|
||||
FORCE_STATIC_LIB=1
|
||||
_ENABLE_PIC=1
|
||||
SHORT_LIBNAME=
|
||||
endif
|
||||
endif
|
||||
|
||||
@ -459,6 +460,26 @@ ifdef MOZ_PROFILE_USE
|
||||
DSO_PIC_CFLAGS += $(PROFILE_USE_CFLAGS)
|
||||
endif
|
||||
|
||||
# Force XPCOM/widget/gfx methods to be _declspec(dllexport) when we're
|
||||
# building libxul libraries
|
||||
ifdef MOZ_ENABLE_LIBXUL
|
||||
ifdef LIBXUL_LIBRARY
|
||||
DEFINES += \
|
||||
-D_IMPL_NS_COM \
|
||||
-DEXPORT_XPT_API \
|
||||
-DEXPORT_XPTC_API \
|
||||
-DEXPORT_XPTI_API \
|
||||
-D_IMPL_NS_COM_OBSOLETE \
|
||||
-D_IMPL_NS_GFX \
|
||||
-D_IMPL_NS_WIDGET \
|
||||
$(NULL)
|
||||
|
||||
ifndef MOZ_NATIVE_ZLIB
|
||||
DEFINES += -DZLIB_INTERNAL
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
|
||||
# Force _all_ exported methods to be |_declspec(dllexport)| when we're
|
||||
# building them into the executable.
|
||||
ifeq ($(OS_ARCH),WINNT)
|
||||
|
@ -5457,7 +5457,6 @@ fi
|
||||
if test -n "$MOZ_ENABLE_LIBXUL"; then
|
||||
XPCOM_LIBS="$LIBXUL_LIBS"
|
||||
AC_DEFINE(MOZ_ENABLE_LIBXUL)
|
||||
MOZ_ZLIB_LIBS=
|
||||
else
|
||||
XPCOM_LIBS="$DYNAMIC_XPCOM_LIBS"
|
||||
fi
|
||||
|
@ -85,7 +85,7 @@ EXPORTS = \
|
||||
nsDocShellCID.h \
|
||||
$(NULL)
|
||||
|
||||
ifeq ($(OS_ARCH),WINNT)
|
||||
ifeq ($(OS_ARCH)$(MOZ_ENABLE_LIBXUL),WINNT)
|
||||
EXTRA_DSO_LIBS = gkgfx
|
||||
endif
|
||||
|
||||
|
@ -53,7 +53,9 @@ GRE_MODULE = 1
|
||||
|
||||
PACKAGE_FILE = editor.pkg
|
||||
|
||||
ifndef MOZ_ENABLE_LIBXUL
|
||||
EXTRA_DSO_LIBS = gkgfx
|
||||
endif
|
||||
|
||||
EXTRA_DSO_LDOPTS = \
|
||||
$(LIBS_DIR) \
|
||||
|
@ -46,7 +46,7 @@ MODULE = gfx
|
||||
DIRS = public idl src
|
||||
|
||||
ifdef ENABLE_TESTS
|
||||
DIRS += tests
|
||||
TOOL_DIRS += tests
|
||||
endif
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
@ -46,6 +46,7 @@ MODULE = gfx
|
||||
LIBRARY_NAME = gkgfx
|
||||
EXPORT_LIBRARY = 1
|
||||
GRE_MODULE = 1
|
||||
LIBXUL_LIBRARY = 1
|
||||
|
||||
PACKAGE_FILE = gfx.pkg
|
||||
|
||||
|
@ -48,6 +48,7 @@ EXPORT_LIBRARY = 1
|
||||
IS_COMPONENT = 1
|
||||
MODULE_NAME = nsGfxBeOSModule
|
||||
GRE_MODULE = 1
|
||||
LIBXUL_LIBRARY = 1
|
||||
|
||||
PACKAGE_FILE = gfxbeos.pkg
|
||||
|
||||
|
@ -49,6 +49,7 @@ EXPORT_LIBRARY = 1
|
||||
IS_COMPONENT = 1
|
||||
MODULE_NAME = nsGfxModule
|
||||
GRE_MODULE = 1
|
||||
LIBXUL_LIBRARY = 1
|
||||
|
||||
REQUIRES = xpcom \
|
||||
string \
|
||||
|
@ -49,6 +49,7 @@ EXPORT_LIBRARY = 1
|
||||
IS_COMPONENT = 1
|
||||
MODULE_NAME = nsGfxGTKModule
|
||||
GRE_MODULE = 1
|
||||
LIBXUL_LIBRARY = 1
|
||||
|
||||
REQUIRES = xpcom \
|
||||
string \
|
||||
|
@ -48,7 +48,8 @@ EXPORT_LIBRARY = 1
|
||||
MODULE = gfx
|
||||
IS_COMPONENT = 1
|
||||
MODULE_NAME = nsGfxMacModule
|
||||
GRE_MODULE = 1
|
||||
GRE_MODULE = 1
|
||||
LIBXUL_LIBRARY = 1
|
||||
|
||||
PACKAGE_FILE = gfxmac.pkg
|
||||
|
||||
|
@ -48,6 +48,7 @@ EXPORT_LIBRARY = 1
|
||||
IS_COMPONENT = 1
|
||||
MODULE_NAME = nsGfxOS2Module
|
||||
GRE_MODULE = 1
|
||||
LIBXUL_LIBRARY = 1
|
||||
|
||||
PACKAGE_FILE = gfxos2.pkg
|
||||
|
||||
|
@ -47,6 +47,7 @@ LIBRARY_NAME = gfx_photon
|
||||
EXPORT_LIBRARY = 1
|
||||
IS_COMPONENT = 1
|
||||
MODULE_NAME = nsGfxPhModule
|
||||
LIBXUL_LIBRARY = 1
|
||||
|
||||
PACKAGE_FILE = photon.pkg
|
||||
|
||||
|
@ -48,6 +48,7 @@ EXPORT_LIBRARY = 1
|
||||
IS_COMPONENT = 1
|
||||
MODULE_NAME = nsGfxPSModule
|
||||
GRE_MODULE = 1
|
||||
LIBXUL_LIBRARY = 1
|
||||
EXTRA_DSO_LIBS = mozutil_s
|
||||
REQUIRES = xpcom \
|
||||
string \
|
||||
|
@ -50,6 +50,7 @@ EXPORT_LIBRARY = 1
|
||||
GRE_MODULE = 1
|
||||
IS_COMPONENT = 1
|
||||
MODULE_NAME = nsGfxQtModule
|
||||
LIBXUL_LIBRARY = 1
|
||||
|
||||
REQUIRES = xpcom \
|
||||
string \
|
||||
|
@ -46,6 +46,7 @@ MODULE = gfx
|
||||
LIBRARY_NAME = gfxshared_s
|
||||
FORCE_STATIC_LIB=1
|
||||
EXPORT_LIBRARY=1
|
||||
LIBXUL_LIBRARY = 1
|
||||
|
||||
REQUIRES= \
|
||||
xpcom \
|
||||
|
@ -48,6 +48,7 @@ EXPORT_LIBRARY = 1
|
||||
IS_COMPONENT = 1
|
||||
MODULE_NAME = nsGfxModule
|
||||
GRE_MODULE = 1
|
||||
LIBXUL_LIBRARY = 1
|
||||
|
||||
REQUIRES = xpcom \
|
||||
string \
|
||||
|
@ -50,6 +50,7 @@ EXPORT_LIBRARY = 1
|
||||
IS_COMPONENT = 1
|
||||
MODULE_NAME = nsGfxXlibModule
|
||||
GRE_MODULE = 1
|
||||
LIBXUL_LIBRARY = 1
|
||||
|
||||
REQUIRES = xpcom \
|
||||
string \
|
||||
|
@ -46,6 +46,7 @@ MODULE = xlibrgb
|
||||
LIBRARY_NAME = xlibrgb
|
||||
EXPORT_LIBRARY = 1
|
||||
GRE_MODULE = 1
|
||||
LIBXUL_LIBRARY = 1
|
||||
|
||||
PACKAGE_FILE = xlibrgb.pkg
|
||||
|
||||
|
@ -49,6 +49,7 @@ EXPORT_LIBRARY = 1
|
||||
IS_COMPONENT = 1
|
||||
MODULE_NAME = nsGfxXprintModule
|
||||
GRE_MODULE = 1
|
||||
LIBXUL_LIBRARY = 1
|
||||
|
||||
EXTRA_DSO_LIBS = gfxshared_s gkgfx
|
||||
|
||||
|
@ -47,6 +47,7 @@ MODULE = xprintutil
|
||||
LIBRARY_NAME = xprintutil
|
||||
FORCE_STATIC_LIB= 1
|
||||
EXPORT_LIBRARY=1
|
||||
LIBXUL_LIBRARY = 1
|
||||
|
||||
CSRCS = \
|
||||
xprintutil.c \
|
||||
|
@ -47,6 +47,7 @@ EXPORT_LIBRARY = 1
|
||||
IS_COMPONENT = 1
|
||||
MODULE_NAME = nsI18nModule
|
||||
GRE_MODULE = 1
|
||||
LIBXUL_LIBRARY = 1
|
||||
|
||||
PACKAGE_FILE = intl.pkg
|
||||
PACKAGE_VARS = MOZ_MATHML
|
||||
|
@ -46,7 +46,7 @@ DIRS = public src
|
||||
|
||||
ifeq ($(OS_ARCH),WINNT)
|
||||
ifdef ENABLE_TESTS
|
||||
DIRS += tests
|
||||
TOOL_DIRS += tests
|
||||
endif
|
||||
endif
|
||||
|
||||
|
@ -45,6 +45,7 @@ include $(DEPTH)/config/autoconf.mk
|
||||
MODULE = chardet
|
||||
LIBRARY_NAME = chardet_s
|
||||
FORCE_STATIC_LIB = 1
|
||||
LIBXUL_LIBRARY = 1
|
||||
|
||||
REQUIRES = xpcom \
|
||||
string \
|
||||
|
@ -47,6 +47,7 @@ LIBRARY_NAME = intlcmpt
|
||||
EXPORT_LIBRARY = 1
|
||||
IS_COMPONENT = 1
|
||||
MODULE_NAME = I18nCompatibility
|
||||
LIBXUL_LIBRARY = 1
|
||||
|
||||
PACKAGE_FILE = intlcmpt.pkg
|
||||
|
||||
|
@ -44,6 +44,8 @@ include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
MODULE = locale
|
||||
LIBRARY_NAME = nslocale_s
|
||||
LIBXUL_LIBRARY = 1
|
||||
|
||||
REQUIRES = xpcom \
|
||||
gfx \
|
||||
string \
|
||||
|
@ -45,6 +45,7 @@ include $(DEPTH)/config/autoconf.mk
|
||||
MODULE = locale
|
||||
LIBRARY_NAME = platlocale_s
|
||||
FORCE_STATIC_LIB = 1
|
||||
LIBXUL_LIBRARY = 1
|
||||
|
||||
REQUIRES = xpcom \
|
||||
string \
|
||||
|
@ -46,6 +46,7 @@ MODULE = locale
|
||||
LIBRARY_NAME = platlocale_s
|
||||
EXPORT_LIBRARY = 1
|
||||
FORCE_STATIC_LIB = 1
|
||||
LIBXUL_LIBRARY = 1
|
||||
|
||||
REQUIRES = xpcom \
|
||||
string \
|
||||
|
@ -45,6 +45,7 @@ include $(DEPTH)/config/autoconf.mk
|
||||
MODULE = locale
|
||||
LIBRARY_NAME = platlocale_s
|
||||
FORCE_STATIC_LIB= 1
|
||||
LIBXUL_LIBRARY = 1
|
||||
|
||||
REQUIRES = xpcom \
|
||||
string \
|
||||
|
@ -45,6 +45,7 @@ include $(DEPTH)/config/autoconf.mk
|
||||
MODULE = locale
|
||||
LIBRARY_NAME = platlocale_s
|
||||
FORCE_STATIC_LIB = 1
|
||||
LIBXUL_LIBRARY = 1
|
||||
|
||||
REQUIRES = xpcom \
|
||||
string \
|
||||
|
@ -46,7 +46,7 @@ MODULE = lwbrk
|
||||
DIRS = idl public src
|
||||
|
||||
ifdef ENABLE_TESTS
|
||||
DIRS += tests
|
||||
TOOL_DIRS += tests
|
||||
endif
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
@ -45,6 +45,7 @@ include $(DEPTH)/config/autoconf.mk
|
||||
MODULE = lwbrk
|
||||
LIBRARY_NAME = lwbrk_s
|
||||
FORCE_STATIC_LIB = 1
|
||||
LIBXUL_LIBRARY = 1
|
||||
|
||||
REQUIRES = xpcom \
|
||||
string \
|
||||
|
@ -46,7 +46,7 @@ MODULE = intl
|
||||
DIRS = public src
|
||||
|
||||
ifdef ENABLE_TESTS
|
||||
DIRS += tests
|
||||
TOOL_DIRS = tests
|
||||
endif
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
@ -45,6 +45,7 @@ include $(DEPTH)/config/autoconf.mk
|
||||
MODULE = intl
|
||||
LIBRARY_NAME = strres_s
|
||||
FORCE_STATIC_LIB = 1
|
||||
LIBXUL_LIBRARY = 1
|
||||
|
||||
REQUIRES = xpcom \
|
||||
string \
|
||||
|
@ -71,7 +71,7 @@ endif
|
||||
|
||||
ifeq ($(OS_ARCH),WINNT)
|
||||
ifdef ENABLE_TESTS
|
||||
DIRS += tests
|
||||
TOOL_DIRS = tests
|
||||
endif
|
||||
endif
|
||||
|
||||
|
@ -46,6 +46,7 @@ MODULE = ucnative
|
||||
|
||||
LIBRARY_NAME = ucnative_s
|
||||
FORCE_STATIC_LIB=1
|
||||
LIBXUL_LIBRARY = 1
|
||||
|
||||
REQUIRES = xpcom \
|
||||
string \
|
||||
|
@ -48,7 +48,7 @@ EXPORT_LIBRARY = 1
|
||||
IS_COMPONENT = 1
|
||||
MODULE_NAME = nsUConvModule
|
||||
GRE_MODULE = 1
|
||||
|
||||
LIBXUL_LIBRARY = 1
|
||||
ifneq ($(OS_ARCH),WINNT)
|
||||
# To avoid conflict with OS/2 system uconv.dll
|
||||
SHORT_LIBNAME = mozuconv
|
||||
|
@ -45,7 +45,8 @@ include $(DEPTH)/config/autoconf.mk
|
||||
MODULE = ucvcn
|
||||
LIBRARY_NAME = ucvcn_s
|
||||
FORCE_STATIC_LIB=1
|
||||
MODULE_NAME = nsUCvCnModule
|
||||
LIBXUL_LIBRARY = 1
|
||||
|
||||
REQUIRES = xpcom \
|
||||
string \
|
||||
unicharutil \
|
||||
|
@ -46,7 +46,8 @@ include $(DEPTH)/config/autoconf.mk
|
||||
MODULE = ucvibm
|
||||
LIBRARY_NAME = ucvibm_s
|
||||
FORCE_STATIC_LIB = 1
|
||||
MODULE_NAME = nsUCvIBMModule
|
||||
LIBXUL_LIBRARY = 1
|
||||
|
||||
REQUIRES = xpcom \
|
||||
uconv \
|
||||
$(NULL)
|
||||
|
@ -45,10 +45,9 @@ include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
MODULE = ucvja
|
||||
LIBRARY_NAME = ucvja_s
|
||||
#EXPORT_LIBRARY = 1
|
||||
#IS_COMPONENT = 1
|
||||
FORCE_STATIC_LIB = 1
|
||||
MODULE_NAME = nsUCvJAModule
|
||||
LIBXUL_LIBRARY = 1
|
||||
|
||||
REQUIRES = xpcom \
|
||||
string \
|
||||
uconv \
|
||||
|
@ -45,7 +45,8 @@ include $(DEPTH)/config/autoconf.mk
|
||||
MODULE = ucvko
|
||||
LIBRARY_NAME = ucvko_s
|
||||
FORCE_STATIC_LIB=1
|
||||
MODULE_NAME = nsUCvKoModule
|
||||
LIBXUL_LIBRARY = 1
|
||||
|
||||
REQUIRES = xpcom \
|
||||
string \
|
||||
uconv \
|
||||
|
@ -45,7 +45,8 @@ include $(DEPTH)/config/autoconf.mk
|
||||
MODULE = ucvlatin
|
||||
LIBRARY_NAME = ucvlatin_s
|
||||
FORCE_STATIC_LIB = 1
|
||||
MODULE_NAME = nsUCvLatinModule
|
||||
LIBXUL_LIBRARY = 1
|
||||
|
||||
REQUIRES = xpcom \
|
||||
uconv \
|
||||
$(NULL)
|
||||
|
@ -49,6 +49,7 @@ EXPORT_LIBRARY = 1
|
||||
IS_COMPONENT = 1
|
||||
MODULE_NAME = nsUCvMathModule
|
||||
GRE_MODULE = 1
|
||||
LIBXUL_LIBRARY = 1
|
||||
|
||||
PACKAGE_FILE = ucvmath.pkg
|
||||
|
||||
|
@ -44,8 +44,9 @@ include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
MODULE = ucvtw
|
||||
LIBRARY_NAME = ucvtw_s
|
||||
MODULE_NAME = nsUCvTWModule
|
||||
FORCE_STATIC_LIB=1
|
||||
LIBXUL_LIBRARY = 1
|
||||
|
||||
REQUIRES = xpcom \
|
||||
uconv \
|
||||
$(NULL)
|
||||
|
@ -44,10 +44,9 @@ include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
MODULE = ucvtw2
|
||||
LIBRARY_NAME = ucvtw2_s
|
||||
#EXPORT_LIBRARY = 1
|
||||
#IS_COMPONENT = 1
|
||||
FORCE_STATIC_LIB=1
|
||||
MODULE_NAME = nsUCvTW2Module
|
||||
LIBXUL_LIBRARY = 1
|
||||
|
||||
REQUIRES = xpcom \
|
||||
uconv \
|
||||
$(NULL)
|
||||
|
@ -45,8 +45,9 @@ include $(DEPTH)/config/autoconf.mk
|
||||
MODULE = uconv
|
||||
LIBRARY_NAME = ucvutil_s
|
||||
EXPORT_LIBRARY = 1
|
||||
|
||||
FORCE_STATIC_LIB = 1
|
||||
LIBXUL_LIBRARY = 1
|
||||
|
||||
MODULE_NAME = nsUCUtil
|
||||
REQUIRES = xpcom \
|
||||
string \
|
||||
|
@ -47,7 +47,7 @@ MODULE = unicharutil
|
||||
DIRS = idl public util src tables
|
||||
|
||||
ifdef ENABLE_TESTS
|
||||
DIRS += tests
|
||||
TOOL_DIRS = tests
|
||||
endif
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
@ -45,6 +45,7 @@ include $(DEPTH)/config/autoconf.mk
|
||||
MODULE = unicharutil
|
||||
LIBRARY_NAME = ucharucomp_s
|
||||
FORCE_STATIC_LIB = 1
|
||||
LIBXUL_LIBRARY = 1
|
||||
|
||||
REQUIRES = xpcom \
|
||||
string \
|
||||
|
@ -40,23 +40,22 @@ topsrcdir = @top_srcdir@
|
||||
srcdir = @srcdir@
|
||||
VPATH = @srcdir@
|
||||
|
||||
MODULE=unicharutil
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
MODULE=unicharutil
|
||||
LIBRARY_NAME=unicharutil_s
|
||||
EXPORT_LIBRARY=1
|
||||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
REQUIRES=xpcom \
|
||||
string \
|
||||
uconv \
|
||||
$(NULL)
|
||||
|
||||
EXPORTS = \
|
||||
nsUnicharUtils.h \
|
||||
nsCompressedCharMap.h \
|
||||
$(NULL)
|
||||
|
||||
LIBRARY_NAME=unicharutil_s
|
||||
REQUIRES=xpcom \
|
||||
string \
|
||||
uconv \
|
||||
$(NULL)
|
||||
|
||||
CPPSRCS = \
|
||||
nsUnicharUtils.cpp \
|
||||
nsCompressedCharMap.cpp \
|
||||
|
@ -48,6 +48,7 @@ LIBRARY_NAME = ipcdc
|
||||
EXPORT_LIBRARY = 1
|
||||
IS_COMPONENT = 1
|
||||
MODULE_NAME = ipcdclient
|
||||
LIBXUL_LIBRARY = 1
|
||||
|
||||
REQUIRES = \
|
||||
xpcom \
|
||||
|
@ -47,7 +47,7 @@ MODULE = ipcd
|
||||
LIBRARY_NAME = ipcddconnect_s
|
||||
FORCE_STATIC_LIB = 1
|
||||
MODULE_NAME = ipcd
|
||||
|
||||
LIBXUL_LIBRARY = 1
|
||||
FORCE_USE_PIC = 1
|
||||
|
||||
REQUIRES = \
|
||||
|
@ -49,7 +49,7 @@ MODULE = ipcd
|
||||
LIBRARY_NAME = ipcdlock_s
|
||||
FORCE_STATIC_LIB = 1
|
||||
MODULE_NAME = ipcd
|
||||
|
||||
LIBXUL_LIBRARY = 1
|
||||
FORCE_USE_PIC = 1
|
||||
|
||||
REQUIRES = \
|
||||
|
@ -47,6 +47,7 @@ LIBRARY_NAME = transmngr_client
|
||||
EXPORT_LIBRARY = 1
|
||||
IS_COMPONENT = 1
|
||||
MODULE_NAME = transmngr
|
||||
LIBXUL_LIBRARY = 1
|
||||
|
||||
REQUIRES = ipcd \
|
||||
string \
|
||||
|
@ -50,15 +50,16 @@ ifdef MOZ_JSLOADER
|
||||
DIRS += loader
|
||||
endif
|
||||
|
||||
DIRS += src shell
|
||||
DIRS += src
|
||||
|
||||
TOOL_DIRS += shell
|
||||
|
||||
ifdef ENABLE_TESTS
|
||||
DIRS += tests
|
||||
TOOL_DIRS += tests
|
||||
endif
|
||||
|
||||
ifdef MOZ_XPCTOOLS
|
||||
DIRS += tools
|
||||
TOOL_DIRS += tools
|
||||
endif
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
|
@ -44,6 +44,8 @@ include $(DEPTH)/config/autoconf.mk
|
||||
MODULE = jsloader
|
||||
LIBRARY_NAME = jsloader_s
|
||||
FORCE_STATIC_LIB = 1
|
||||
LIBXUL_LIBRARY = 1
|
||||
|
||||
REQUIRES = xpcom \
|
||||
string \
|
||||
xpconnect \
|
||||
|
@ -51,10 +51,11 @@ SHORT_LIBNAME = xpconect
|
||||
IS_COMPONENT = 1
|
||||
MODULE_NAME = xpconnect
|
||||
GRE_MODULE = 1
|
||||
ifeq ($(OS_ARCH),WINNT)
|
||||
ifeq ($(OS_ARCH)$(MOZ_ENABLE_LIBXUL),WINNT)
|
||||
LIBRARY_NAME = xpc$(MOZ_BITS)$(VERSION_NUMBER)
|
||||
SHORT_LIBNAME = xpc$(MOZ_BITS)$(VERSION_NUMBER)
|
||||
endif
|
||||
LIBXUL_LIBRARY = 1
|
||||
|
||||
PACKAGE_FILE = xpconnect.pkg
|
||||
|
||||
|
@ -60,7 +60,9 @@ GRE_MODULE = 1
|
||||
PACKAGE_FILE = layout.pkg
|
||||
PACKAGE_VARS += MOZ_XUL
|
||||
|
||||
ifndef MOZ_ENABLE_LIBXUL
|
||||
EXTRA_DSO_LIBS = gkgfx
|
||||
endif
|
||||
ifdef MOZ_PERF_METRICS
|
||||
EXTRA_DSO_LIBS += mozutil_s
|
||||
endif
|
||||
|
@ -28,10 +28,10 @@ include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
MODULE = png
|
||||
LIBRARY_NAME = mozpng
|
||||
|
||||
ifeq ($(OS_ARCH),WINNT)
|
||||
LIBRARY_NAME = png
|
||||
endif
|
||||
LIBXUL_LIBRARY = 1
|
||||
|
||||
REQUIRES = $(ZLIB_REQUIRES) \
|
||||
$(NULL)
|
||||
|
@ -50,10 +50,12 @@ DIRS = standalone
|
||||
|
||||
# Make this a true dynamic component even in static builds because
|
||||
# this component is shared by installer
|
||||
ifndef MOZ_ENABLE_LIBXUL
|
||||
MOZ_STATIC_COMPONENT_LIBS=
|
||||
BUILD_STATIC_LIBS=
|
||||
BUILD_SHARED_LIBS=1
|
||||
endif
|
||||
endif
|
||||
|
||||
MODULE = jar
|
||||
LIBRARY_NAME = jar$(VERSION_NUMBER)
|
||||
@ -61,6 +63,7 @@ EXPORT_LIBRARY = 1
|
||||
IS_COMPONENT = 1
|
||||
MODULE_NAME = nsJarModule
|
||||
GRE_MODULE = 1
|
||||
LIBXUL_LIBRARY = 1
|
||||
|
||||
PACKAGE_FILE = libjar.pkg
|
||||
|
||||
|
@ -48,6 +48,7 @@ EXPORT_LIBRARY = 1
|
||||
IS_COMPONENT = 1
|
||||
MODULE_NAME = nsImageLib2Module
|
||||
GRE_MODULE = 1
|
||||
LIBXUL_LIBRARY = 1
|
||||
|
||||
PACKAGE_FILE = imglib2.pkg
|
||||
|
||||
|
@ -47,6 +47,7 @@ MODULE = imgbmp
|
||||
LIBRARY_NAME = imgbmp_s
|
||||
FORCE_STATIC_LIB = 1
|
||||
MODULE_NAME = nsBMPModule
|
||||
LIBXUL_LIBRARY = 1
|
||||
|
||||
REQUIRES = xpcom \
|
||||
gfx \
|
||||
|
@ -46,6 +46,7 @@ MODULE = imggif
|
||||
LIBRARY_NAME = imggif_s
|
||||
FORCE_STATIC_LIB = 1
|
||||
MODULE_NAME = nsGIFModule2
|
||||
LIBXUL_LIBRARY = 1
|
||||
|
||||
REQUIRES = xpcom \
|
||||
string \
|
||||
|
@ -48,6 +48,7 @@ EXPORT_LIBRARY = 1
|
||||
IS_COMPONENT = 1
|
||||
MODULE_NAME = nsIconDecoderModule
|
||||
GRE_MODULE = 1
|
||||
LIBXUL_LIBRARY = 1
|
||||
|
||||
PACKAGE_FILE = imgicon.pkg
|
||||
|
||||
|
@ -44,6 +44,7 @@ include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
MODULE = imgicon
|
||||
LIBRARY_NAME = imgicongtk_s
|
||||
LIBXUL_LIBRARY = 1
|
||||
|
||||
REQUIRES = xpcom \
|
||||
string \
|
||||
|
@ -44,6 +44,7 @@ include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
MODULE = imgicon
|
||||
LIBRARY_NAME = imgiconmac_s
|
||||
LIBXUL_LIBRARY = 1
|
||||
|
||||
REQUIRES = xpcom \
|
||||
string \
|
||||
|
@ -44,6 +44,7 @@ include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
MODULE = imgicon
|
||||
LIBRARY_NAME = imgiconos2_s
|
||||
LIBXUL_LIBRARY = 1
|
||||
|
||||
REQUIRES = xpcom \
|
||||
string \
|
||||
|
@ -44,6 +44,7 @@ include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
MODULE = imgicon
|
||||
LIBRARY_NAME = imgiconwin_s
|
||||
LIBXUL_LIBRARY = 1
|
||||
|
||||
REQUIRES = xpcom \
|
||||
string \
|
||||
|
@ -30,7 +30,7 @@ MODULE = imgjpeg
|
||||
LIBRARY_NAME = imgjpeg_s
|
||||
FORCE_STATIC_LIB = 1
|
||||
MODULE_NAME = nsJPEGDecoderModule
|
||||
|
||||
LIBXUL_LIBRARY = 1
|
||||
|
||||
REQUIRES = xpcom \
|
||||
string \
|
||||
|
@ -46,6 +46,7 @@ MODULE = imgpng
|
||||
LIBRARY_NAME = imgpng_s
|
||||
FORCE_STATIC_LIB = 1
|
||||
MODULE_NAME = nsPNGDecoderModule
|
||||
LIBXUL_LIBRARY = 1
|
||||
|
||||
EXTRA_DSO_LIBS = gkgfx
|
||||
|
||||
|
@ -47,6 +47,7 @@ MODULE = imgxbm
|
||||
LIBRARY_NAME = imgxbm_s
|
||||
FORCE_STATIC_LIB = 1
|
||||
MODULE_NAME = nsXBMModule
|
||||
LIBXUL_LIBRARY = 1
|
||||
|
||||
REQUIRES = xpcom \
|
||||
gfx \
|
||||
|
@ -47,6 +47,7 @@ LIBRARY_NAME = imglib2_s
|
||||
FORCE_STATIC_LIB = 1
|
||||
MODULE_NAME = nsImageLib2Module
|
||||
GRE_MODULE = 1
|
||||
LIBXUL_LIBRARY = 1
|
||||
|
||||
REQUIRES = xpcom \
|
||||
string \
|
||||
|
@ -31,10 +31,11 @@ LIBRARY_NAME = pref
|
||||
EXPORT_LIBRARY = 1
|
||||
IS_COMPONENT = 1
|
||||
MODULE_NAME = nsPrefModule
|
||||
ifeq ($(OS_ARCH),WINNT)
|
||||
ifeq ($(OS_ARCH)$(MOZ_ENABLE_LIBXUL),WINNT)
|
||||
LIBRARY_NAME = xppref$(MOZ_BITS)
|
||||
endif
|
||||
GRE_MODULE = 1
|
||||
LIBXUL_LIBRARY = 1
|
||||
|
||||
REQUIRES = xpcom \
|
||||
xpcom_obsolete \
|
||||
|
@ -49,6 +49,7 @@ EXPORT_LIBRARY = 1
|
||||
IS_COMPONENT = 1
|
||||
MODULE_NAME = nsPluginModule
|
||||
GRE_MODULE = 1
|
||||
LIBXUL_LIBRARY = 1
|
||||
|
||||
PACKAGE_FILE = plugin.pkg
|
||||
PACKAGE_VARS += MOZ_ENABLE_GTK
|
||||
|
@ -60,7 +60,7 @@ DIRS = \
|
||||
$(NULL)
|
||||
|
||||
ifdef ENABLE_TESTS
|
||||
DIRS += test
|
||||
TOOL_DIRS += test
|
||||
endif
|
||||
|
||||
EXPORTS = necko-config.h
|
||||
|
@ -44,6 +44,8 @@ include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
MODULE = necko
|
||||
LIBRARY_NAME = neckobase_s
|
||||
LIBXUL_LIBRARY = 1
|
||||
|
||||
REQUIRES = xpcom \
|
||||
string \
|
||||
mimetype \
|
||||
|
@ -48,6 +48,7 @@ EXPORT_LIBRARY = 1
|
||||
IS_COMPONENT = 1
|
||||
MODULE_NAME = necko_core_and_primary_protocols
|
||||
GRE_MODULE = 1
|
||||
LIBXUL_LIBRARY = 1
|
||||
|
||||
PACKAGE_FILE = necko.pkg
|
||||
|
||||
|
@ -54,6 +54,7 @@ EXPORT_LIBRARY = 1
|
||||
IS_COMPONENT = 1
|
||||
MODULE_NAME = necko_secondary_protocols
|
||||
GRE_MODULE = 1
|
||||
LIBXUL_LIBRARY = 1
|
||||
|
||||
PACKAGE_FILE = necko2.pkg
|
||||
|
||||
|
2
netwerk/cache/src/Makefile.in
vendored
2
netwerk/cache/src/Makefile.in
vendored
@ -46,6 +46,8 @@ include $(DEPTH)/config/autoconf.mk
|
||||
MODULE = nkcache
|
||||
LIBRARY_NAME = nkcache_s
|
||||
FORCE_STATIC_LIB = 1
|
||||
LIBXUL_LIBRARY = 1
|
||||
|
||||
REQUIRES = xpcom \
|
||||
string \
|
||||
necko \
|
||||
|
@ -44,6 +44,8 @@ include $(DEPTH)/config/autoconf.mk
|
||||
MODULE = necko
|
||||
LIBRARY_NAME = neckocookie_s
|
||||
FORCE_STATIC_LIB = 1
|
||||
LIBXUL_LIBRARY = 1
|
||||
|
||||
REQUIRES = \
|
||||
xpcom \
|
||||
string \
|
||||
|
@ -45,6 +45,8 @@ include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
MODULE = necko
|
||||
LIBRARY_NAME = neckodns_s
|
||||
LIBXUL_LIBRARY = 1
|
||||
|
||||
REQUIRES = xpcom \
|
||||
string \
|
||||
pref \
|
||||
|
@ -44,6 +44,8 @@ include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
MODULE = mimetype
|
||||
LIBRARY_NAME = nkmime_s
|
||||
LIBXUL_LIBRARY = 1
|
||||
|
||||
REQUIRES = xpcom \
|
||||
string \
|
||||
necko \
|
||||
|
@ -44,6 +44,8 @@ include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
MODULE = necko
|
||||
LIBRARY_NAME = nkabout_s
|
||||
LIBXUL_LIBRARY = 1
|
||||
|
||||
REQUIRES = xpcom \
|
||||
string \
|
||||
nkcache \
|
||||
|
@ -44,6 +44,8 @@ include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
MODULE = necko
|
||||
LIBRARY_NAME = nkdata_s
|
||||
LIBXUL_LIBRARY = 1
|
||||
|
||||
REQUIRES = xpcom \
|
||||
string \
|
||||
$(NULL)
|
||||
|
@ -44,6 +44,8 @@ include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
MODULE = necko
|
||||
LIBRARY_NAME = nkfile_s
|
||||
LIBXUL_LIBRARY = 1
|
||||
|
||||
REQUIRES = xpcom \
|
||||
string \
|
||||
mimetype \
|
||||
|
@ -44,6 +44,8 @@ include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
MODULE = necko
|
||||
LIBRARY_NAME = nkftp_s
|
||||
LIBXUL_LIBRARY = 1
|
||||
|
||||
REQUIRES = xpcom \
|
||||
string \
|
||||
mimetype \
|
||||
|
@ -45,12 +45,14 @@ include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
MODULE = necko2
|
||||
LIBRARY_NAME = nkgopher_s
|
||||
LIBXUL_LIBRARY = 1
|
||||
|
||||
REQUIRES = xpcom \
|
||||
necko \
|
||||
string \
|
||||
mimetype \
|
||||
pref \
|
||||
intl \
|
||||
intl \
|
||||
$(NULL)
|
||||
|
||||
CPPSRCS = \
|
||||
|
@ -44,6 +44,8 @@ include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
MODULE = necko
|
||||
LIBRARY_NAME = nkhttp_s
|
||||
LIBXUL_LIBRARY = 1
|
||||
|
||||
REQUIRES = xpcom \
|
||||
string \
|
||||
pref \
|
||||
|
@ -44,6 +44,8 @@ include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
MODULE = necko
|
||||
LIBRARY_NAME = nkkeyword_s
|
||||
LIBXUL_LIBRARY = 1
|
||||
|
||||
REQUIRES = xpcom \
|
||||
string \
|
||||
pref \
|
||||
|
@ -44,6 +44,8 @@ include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
MODULE = necko
|
||||
LIBRARY_NAME = nkres_s
|
||||
LIBXUL_LIBRARY = 1
|
||||
|
||||
REQUIRES = xpcom \
|
||||
string \
|
||||
uconv \
|
||||
|
@ -45,6 +45,8 @@ include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
MODULE = necko2
|
||||
LIBRARY_NAME = nkviewsource_s
|
||||
LIBXUL_LIBRARY = 1
|
||||
|
||||
REQUIRES = xpcom \
|
||||
string \
|
||||
necko \
|
||||
|
@ -46,6 +46,8 @@ include $(DEPTH)/config/autoconf.mk
|
||||
MODULE = necko
|
||||
XPIDL_MODULE = necko_socket
|
||||
LIBRARY_NAME = neckosocket_s
|
||||
LIBXUL_LIBRARY = 1
|
||||
|
||||
REQUIRES = xpcom \
|
||||
string \
|
||||
$(NULL)
|
||||
|
@ -45,7 +45,7 @@ include $(DEPTH)/config/autoconf.mk
|
||||
DIRS = public src converters
|
||||
|
||||
ifdef ENABLE_TESTS
|
||||
DIRS += test
|
||||
TOOL_DIRS += test
|
||||
endif
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
@ -44,6 +44,8 @@ include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
MODULE = necko
|
||||
LIBRARY_NAME = nkcnvts_s
|
||||
LIBXUL_LIBRARY = 1
|
||||
|
||||
REQUIRES = xpcom \
|
||||
string \
|
||||
mimetype \
|
||||
|
@ -44,6 +44,8 @@ include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
MODULE = necko
|
||||
LIBRARY_NAME = nkconv_s
|
||||
LIBXUL_LIBRARY = 1
|
||||
|
||||
REQUIRES = xpcom \
|
||||
string \
|
||||
$(NULL)
|
||||
|
@ -46,7 +46,7 @@ MODULE = htmlparser
|
||||
DIRS = public src
|
||||
|
||||
ifdef ENABLE_TESTS
|
||||
DIRS += robot tests
|
||||
TOOL_DIRS += robot tests
|
||||
endif
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
@ -48,6 +48,7 @@ IS_COMPONENT = 1
|
||||
MODULE_NAME = nsParserModule
|
||||
SHORT_LIBNAME = gkparser
|
||||
GRE_MODULE = 1
|
||||
LIBXUL_LIBRARY = 1
|
||||
|
||||
PACKAGE_FILE = parser.pkg
|
||||
|
||||
|
@ -46,7 +46,7 @@ MODULE = rdf
|
||||
DIRS = base util datasource resources build
|
||||
|
||||
ifdef ENABLE_TESTS
|
||||
DIRS += tests
|
||||
TOOL_DIRS += tests
|
||||
endif
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user