mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Bug 1047267 - Move remaining OS_LIBS and EXTRA_LIBS to moz.build. r=gps
* * * Bug 1047267 - To fold with "Move remaining OS_LIBS and EXTRA_LIBS to moz.build"
This commit is contained in:
Mike Hommey
parent
19e8ecfce2
commit
0f4c5d9244
@ -22,10 +22,9 @@ if not CONFIG['LIBXUL_SDK']:
|
||||
# a console application.
|
||||
WIN32_EXE_LDFLAGS += ['-ENTRY:wmainCRTStartup']
|
||||
|
||||
if not CONFIG['MOZ_NATIVE_ZLIB'] and not CONFIG['ZLIB_IN_MOZCONFIG']:
|
||||
USE_LIBS += [
|
||||
'mozz',
|
||||
]
|
||||
USE_LIBS += [
|
||||
'zlib',
|
||||
]
|
||||
|
||||
DEFINES['XPCOM_GLUE'] = True
|
||||
|
||||
@ -53,11 +52,6 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
|
||||
'display',
|
||||
'mozpng',
|
||||
]
|
||||
if not CONFIG['MOZ_NATIVE_ZLIB']:
|
||||
USE_LIBS += [
|
||||
'mozz',
|
||||
]
|
||||
|
||||
OS_LIBS += [
|
||||
'ui',
|
||||
'EGL',
|
||||
|
||||
@ -2,10 +2,6 @@
|
||||
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
|
||||
EXTRA_LIBS += \
|
||||
$(NSPR_LIBS) \
|
||||
$(NULL)
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
# Ensure that we don't embed a manifest referencing the CRT.
|
||||
|
||||
@ -26,6 +26,7 @@ LOCAL_INCLUDES += [
|
||||
|
||||
USE_LIBS += [
|
||||
'mozalloc',
|
||||
'nspr',
|
||||
'xpcomglue_s',
|
||||
'xul',
|
||||
]
|
||||
|
||||
@ -88,34 +88,19 @@ if test -n "$ENABLE_INTL_API"; then
|
||||
if test -n "$MOZ_DEBUG" -a -z "$MOZ_NO_DEBUG_RTL"; then
|
||||
MOZ_ICU_DBG_SUFFIX=d
|
||||
fi
|
||||
if test -n "$MOZ_SHARED_ICU"; then
|
||||
MOZ_ICU_LIBS='$(foreach lib,$(ICU_LIB_NAMES),$(DEPTH)/intl/icu/target/lib/$(LIB_PREFIX)$(lib)$(MOZ_ICU_DBG_SUFFIX).$(LIB_SUFFIX))'
|
||||
fi
|
||||
;;
|
||||
Darwin)
|
||||
Darwin|Linux|DragonFly|FreeBSD|NetBSD|OpenBSD|GNU/kFreeBSD)
|
||||
ICU_LIB_NAMES="icui18n icuuc icudata"
|
||||
if test -n "$MOZ_SHARED_ICU"; then
|
||||
MOZ_ICU_LIBS='$(foreach lib,$(ICU_LIB_NAMES),$(DEPTH)/intl/icu/target/lib/$(DLL_PREFIX)$(lib).$(MOZ_ICU_VERSION)$(DLL_SUFFIX))'
|
||||
fi
|
||||
;;
|
||||
Linux|DragonFly|FreeBSD|NetBSD|OpenBSD|GNU/kFreeBSD)
|
||||
ICU_LIB_NAMES="icui18n icuuc icudata"
|
||||
if test -n "$MOZ_SHARED_ICU"; then
|
||||
MOZ_ICU_LIBS='$(foreach lib,$(ICU_LIB_NAMES),$(DEPTH)/intl/icu/target/lib/$(DLL_PREFIX)$(lib)$(DLL_SUFFIX).$(MOZ_ICU_VERSION))'
|
||||
fi
|
||||
;;
|
||||
*)
|
||||
AC_MSG_ERROR([ECMAScript Internationalization API is not yet supported on this platform])
|
||||
esac
|
||||
if test -z "$MOZ_SHARED_ICU"; then
|
||||
MOZ_ICU_LIBS='$(call EXPAND_LIBNAME_PATH,$(addsuffix $(MOZ_ICU_DBG_SUFFIX),$(ICU_LIB_NAMES)),$(DEPTH)/intl/icu/target/lib)'
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
AC_SUBST(MOZ_ICU_DBG_SUFFIX)
|
||||
AC_SUBST(ENABLE_INTL_API)
|
||||
AC_SUBST(ICU_LIB_NAMES)
|
||||
AC_SUBST_LIST(ICU_LIB_NAMES)
|
||||
|
||||
if test -n "$ENABLE_INTL_API" -a -z "$MOZ_NATIVE_ICU"; then
|
||||
dnl We build ICU as a static library for non-shared js builds and as a shared library for shared js builds.
|
||||
|
||||
@ -88,6 +88,7 @@ _MOZBUILD_EXTERNAL_VARIABLES := \
|
||||
MODULE \
|
||||
MSVC_ENABLE_PGO \
|
||||
NO_DIST_INSTALL \
|
||||
OS_LIBS \
|
||||
PARALLEL_DIRS \
|
||||
PROGRAM \
|
||||
PYTHON_UNIT_TESTS \
|
||||
@ -109,6 +110,7 @@ _MOZBUILD_EXTERNAL_VARIABLES := \
|
||||
_DEPRECATED_VARIABLES := \
|
||||
ANDROID_RESFILES \
|
||||
EXPORT_LIBRARY \
|
||||
EXTRA_LIBS \
|
||||
HOST_LIBS \
|
||||
LIBXUL_LIBRARY \
|
||||
MOCHITEST_A11Y_FILES \
|
||||
|
||||
8
config/external/ffi/Makefile.in
vendored
8
config/external/ffi/Makefile.in
vendored
@ -2,5 +2,11 @@
|
||||
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
|
||||
target::
|
||||
ifndef MOZ_NATIVE_FFI
|
||||
|
||||
include $(topsrcdir)/config/config.mk
|
||||
|
||||
$(STATIC_LIBS):
|
||||
$(MAKE) -C $(DEPTH)/js/src/ctypes/libffi
|
||||
|
||||
endif
|
||||
|
||||
13
config/external/ffi/moz.build
vendored
13
config/external/ffi/moz.build
vendored
@ -3,3 +3,16 @@
|
||||
# This Source Code Form is subject to the terms of the Mozilla Public
|
||||
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
|
||||
LIBRARY_NAME = 'ffi'
|
||||
|
||||
if CONFIG['MOZ_NATIVE_FFI']:
|
||||
OS_LIBS += CONFIG['MOZ_FFI_LIBS']
|
||||
else:
|
||||
if CONFIG['OS_ARCH'] == 'WINNT':
|
||||
prefix = 'lib'
|
||||
else:
|
||||
prefix = ''
|
||||
USE_LIBS += [
|
||||
'static:/js/src/ctypes/libffi/.libs/%sffi' % prefix,
|
||||
]
|
||||
|
||||
8
config/external/freetype2/Makefile.in
vendored
8
config/external/freetype2/Makefile.in
vendored
@ -2,5 +2,11 @@
|
||||
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
|
||||
target::
|
||||
ifdef MOZ_TREE_FREETYPE
|
||||
|
||||
include $(topsrcdir)/config/config.mk
|
||||
|
||||
$(STATIC_LIBS):
|
||||
$(MAKE) -C $(DEPTH)/modules/freetype2
|
||||
|
||||
endif
|
||||
|
||||
9
config/external/freetype2/moz.build
vendored
9
config/external/freetype2/moz.build
vendored
@ -3,3 +3,12 @@
|
||||
# This Source Code Form is subject to the terms of the Mozilla Public
|
||||
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
|
||||
LIBRARY_NAME = 'freetype'
|
||||
|
||||
if CONFIG['MOZ_TREE_FREETYPE']:
|
||||
USE_LIBS += [
|
||||
'static:/modules/freetype2/.libs/freetype',
|
||||
]
|
||||
else:
|
||||
OS_LIBS += CONFIG['FT2_LIBS']
|
||||
|
||||
1
config/external/icu/Makefile.in
vendored
1
config/external/icu/Makefile.in
vendored
@ -43,6 +43,7 @@ include $(topsrcdir)/config/rules.mk
|
||||
ifdef ENABLE_INTL_API
|
||||
ifndef MOZ_NATIVE_ICU
|
||||
target:: buildicu
|
||||
$(STATIC_LIBS): buildicu
|
||||
|
||||
# - Force ICU to use the standard suffix for object files because expandlibs
|
||||
# will discard all files with a non-standard suffix (bug 857450).
|
||||
|
||||
13
config/external/icu/moz.build
vendored
13
config/external/icu/moz.build
vendored
@ -3,3 +3,16 @@
|
||||
# This Source Code Form is subject to the terms of the Mozilla Public
|
||||
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
|
||||
LIBRARY_NAME = 'icu'
|
||||
|
||||
if CONFIG['MOZ_NATIVE_ICU']:
|
||||
OS_LIBS += CONFIG['MOZ_ICU_LIBS']
|
||||
else:
|
||||
USE_LIBS += sorted(
|
||||
'%s/intl/icu/target/lib/%s%s' % (
|
||||
'static:' if not CONFIG['MOZ_SHARED_ICU'] else '',
|
||||
l,
|
||||
CONFIG['MOZ_ICU_DBG_SUFFIX']
|
||||
) for l in CONFIG['ICU_LIB_NAMES']
|
||||
)
|
||||
|
||||
5
config/external/moz.build
vendored
5
config/external/moz.build
vendored
@ -5,9 +5,10 @@
|
||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
|
||||
external_dirs = []
|
||||
if not CONFIG['MOZ_NATIVE_SQLITE']:
|
||||
external_dirs += ['db/sqlite3/src']
|
||||
|
||||
DIRS += [
|
||||
'sqlite',
|
||||
]
|
||||
if not CONFIG['MOZ_NATIVE_JPEG']:
|
||||
external_dirs += ['media/libjpeg']
|
||||
|
||||
|
||||
6
config/external/nspr/Makefile.in
vendored
6
config/external/nspr/Makefile.in
vendored
@ -8,9 +8,7 @@ include $(topsrcdir)/config/rules.mk
|
||||
ifdef LIBXUL_SDK
|
||||
$(error config/external/nspr/Makefile.in is not compatible with --enable-libxul-sdk=)
|
||||
endif
|
||||
ifdef MOZ_NATIVE_NSPR
|
||||
$(error config/external/nspr/Makefile.in is not compatible with MOZ_NATIVE_NSPR)
|
||||
endif
|
||||
ifdef MOZ_BUILD_NSPR
|
||||
|
||||
# Copy NSPR to the SDK
|
||||
ABS_DIST = $(abspath $(DIST))
|
||||
@ -46,3 +44,5 @@ ifneq (,$(filter WINNT,$(OS_ARCH))) # {
|
||||
else # } {
|
||||
$(RM) -f $(DIST)/sdk/lib/$(LIB_PREFIX)nspr4.$(LIB_SUFFIX) $(DIST)/sdk/lib/$(LIB_PREFIX)plc4.$(LIB_SUFFIX) $(DIST)/sdk/lib/$(LIB_PREFIX)plds4.$(LIB_SUFFIX)
|
||||
endif # }
|
||||
|
||||
endif
|
||||
|
||||
15
config/external/nspr/moz.build
vendored
15
config/external/nspr/moz.build
vendored
@ -4,3 +4,18 @@
|
||||
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
|
||||
LIBRARY_NAME = 'nspr'
|
||||
|
||||
if CONFIG['MOZ_FOLD_LIBS']:
|
||||
# When folding libraries, nspr is actually in the nss library.
|
||||
USE_LIBS += [
|
||||
'nss',
|
||||
]
|
||||
elif CONFIG['MOZ_BUILD_NSPR']:
|
||||
USE_LIBS += [
|
||||
'/nsprpub/lib/ds/plds4',
|
||||
'/nsprpub/lib/libc/src/plc4',
|
||||
'/nsprpub/pr/src/nspr4',
|
||||
]
|
||||
else:
|
||||
OS_LIBS += CONFIG['NSPR_LIBS']
|
||||
|
||||
19
config/external/nss/Makefile.in
vendored
19
config/external/nss/Makefile.in
vendored
@ -3,6 +3,8 @@
|
||||
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
|
||||
ifndef MOZ_NATIVE_NSS
|
||||
|
||||
CC_WRAPPER =
|
||||
CXX_WRAPPER =
|
||||
|
||||
@ -320,19 +322,8 @@ NSS_SDK_LIB_TARGET := target
|
||||
INSTALL_TARGETS += NSS_SDK_LIB
|
||||
|
||||
ifdef MOZ_FOLD_LIBS
|
||||
ifeq (WINNT,$(OS_TARGET))
|
||||
SUFFIX = _s.$(LIB_SUFFIX)
|
||||
else
|
||||
SUFFIX = .$(LIB_SUFFIX)
|
||||
endif
|
||||
|
||||
# Fold NSPR libs
|
||||
EXTRA_LIBS += $(DEPTH)/nsprpub/pr/src/$(LIB_PREFIX)nspr4$(SUFFIX)
|
||||
EXTRA_LIBS += $(DEPTH)/nsprpub/lib/ds/$(LIB_PREFIX)plds4$(SUFFIX)
|
||||
EXTRA_LIBS += $(DEPTH)/nsprpub/lib/libc/src/$(LIB_PREFIX)plc4$(SUFFIX)
|
||||
|
||||
# Add all static libraries for nss, smime, ssl and nssutil
|
||||
EXTRA_LIBS += $(addprefix $(DEPTH)/security/,$(NSS_STATIC_LIBS))
|
||||
STATIC_LIBS += $(addprefix $(DEPTH)/security/,$(NSS_STATIC_LIBS))
|
||||
|
||||
nss_def_file := $(srcdir)/nss.def
|
||||
|
||||
@ -419,7 +410,7 @@ libs-nss/lib/freebl: $(DIST)/lib/$(IMPORT_PREFIX)nssutil3$(IMPORT_SUFFIX) $(NSPR
|
||||
# to only build static libraries.
|
||||
$(addprefix libs-,$(NSS_STATIC_DIRS)): DEFAULT_GMAKE_FLAGS += SHARED_LIBRARY= IMPORT_LIBRARY=
|
||||
else
|
||||
$(NSS_DIST_DLL_FILES) $(NSS_SDK_LIB_FILES): libs-nss/lib
|
||||
$(STATIC_LIBS) $(NSS_DIST_DLL_FILES) $(NSS_SDK_LIB_FILES): libs-nss/lib
|
||||
endif # MOZ_FOLD_LIBS
|
||||
|
||||
ifeq ($(NSINSTALL_PY),$(NSINSTALL))
|
||||
@ -469,3 +460,5 @@ endif # MOZ_FOLD_LIBS
|
||||
# Work around NSS build system race condition creating certdata.c in
|
||||
# security/nss/lib/ckfw/builtins. See bug #836220.
|
||||
libs-nss/lib$(if $(MOZ_FOLD_LIBS),/ckfw): $(call mkdir_deps,$(DEPTH)/security/nss/lib/ckfw/builtins)
|
||||
|
||||
endif
|
||||
|
||||
20
config/external/nss/crmf/moz.build
vendored
Normal file
20
config/external/nss/crmf/moz.build
vendored
Normal file
@ -0,0 +1,20 @@
|
||||
# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
|
||||
# vim: set filetype=python:
|
||||
# This Source Code Form is subject to the terms of the Mozilla Public
|
||||
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
|
||||
LIBRARY_NAME = 'crmf'
|
||||
|
||||
if CONFIG['MOZ_NATIVE_NSS']:
|
||||
OS_LIBS += [l for l in CONFIG['NSS_LIBS'] if l.startswith('-L')]
|
||||
OS_LIBS += '-lcrmf'
|
||||
else:
|
||||
USE_LIBS += [
|
||||
# The dependency on nss is not real, but is required to force the
|
||||
# parent directory being built before this one. This has no
|
||||
# practical effect on linkage, since the only thing linking crmf
|
||||
# will need nss anyways.
|
||||
'nss',
|
||||
'static:/security/nss/lib/crmf/crmf',
|
||||
]
|
||||
39
config/external/nss/moz.build
vendored
39
config/external/nss/moz.build
vendored
@ -4,23 +4,44 @@
|
||||
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
|
||||
if CONFIG['MOZ_FOLD_LIBS']:
|
||||
LIBRARY_NAME = 'nss'
|
||||
|
||||
DIRS += ['crmf']
|
||||
|
||||
if CONFIG['MOZ_NATIVE_NSS']:
|
||||
OS_LIBS += CONFIG['NSS_LIBS']
|
||||
elif CONFIG['MOZ_FOLD_LIBS']:
|
||||
# TODO: The library name can be changed when bug 845217 is fixed.
|
||||
LIBRARY_NAME = 'nss3'
|
||||
SHARED_LIBRARY_NAME = 'nss3'
|
||||
|
||||
FORCE_SHARED_LIB = True
|
||||
SDK_LIBRARY = True
|
||||
|
||||
# Normally, there should be /something/ to ensure nspr is built
|
||||
# before this directory, but since nspr is built during "export",
|
||||
# it actually doesn't matter.
|
||||
if CONFIG['OS_TARGET'] == 'WINNT':
|
||||
suffix = '_s'
|
||||
else:
|
||||
suffix = ''
|
||||
USE_LIBS += [
|
||||
'mozsqlite3',
|
||||
'static:/nsprpub/lib/ds/plds4%s' % suffix,
|
||||
'static:/nsprpub/lib/libc/src/plc4%s' % suffix,
|
||||
'static:/nsprpub/pr/src/nspr4%s' % suffix,
|
||||
]
|
||||
|
||||
OS_LIBS += CONFIG['REALTIME_LIBS']
|
||||
|
||||
if CONFIG['OS_TARGET'] == 'WINNT':
|
||||
DEFFILE = 'nss3.def'
|
||||
if CONFIG['OS_TARGET'] == 'WINNT':
|
||||
DEFFILE = 'nss3.def'
|
||||
|
||||
if CONFIG['OS_ARCH'] == 'Linux' and \
|
||||
CONFIG['MOZ_FOLD_LIBS'] and \
|
||||
CONFIG['GCC_USE_GNU_LD']:
|
||||
LD_VERSION_SCRIPT = 'nss3.def'
|
||||
if CONFIG['OS_ARCH'] == 'Linux' and CONFIG['GCC_USE_GNU_LD']:
|
||||
LD_VERSION_SCRIPT = 'nss3.def'
|
||||
else:
|
||||
USE_LIBS += [
|
||||
'/security/nss/lib/nss/nss3',
|
||||
'/security/nss/lib/smime/smime3',
|
||||
'/security/nss/lib/ssl/ssl3',
|
||||
'/security/nss/lib/util/nssutil3',
|
||||
'sqlite',
|
||||
]
|
||||
|
||||
2
config/external/nss/nss.def
vendored
2
config/external/nss/nss.def
vendored
@ -635,7 +635,9 @@ SSL_ForceHandshake
|
||||
SSL_GetChannelInfo
|
||||
SSL_GetCipherSuiteInfo
|
||||
SSL_GetClientAuthDataHook
|
||||
SSL_GetImplementedCiphers
|
||||
SSL_GetNextProto
|
||||
SSL_GetNumImplementedCiphers
|
||||
SSL_GetSRTPCipher
|
||||
SSL_HandshakeCallback
|
||||
SSL_HandshakeNegotiatedExtension
|
||||
|
||||
35
config/external/sqlite/Makefile.in
vendored
Normal file
35
config/external/sqlite/Makefile.in
vendored
Normal file
@ -0,0 +1,35 @@
|
||||
# This Source Code Form is subject to the terms of the Mozilla Public
|
||||
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
|
||||
LIB_IS_C_ONLY = 1
|
||||
|
||||
include $(topsrcdir)/config/config.mk
|
||||
|
||||
ifeq ($(OS_ARCH),WINNT)
|
||||
# This needs to stay there for now
|
||||
DEFFILE = $(DEPTH)/db/sqlite3/src/sqlite-processed.def
|
||||
|
||||
else
|
||||
ifndef MOZ_FOLD_LIBS
|
||||
ifdef GCC_USE_GNU_LD
|
||||
|
||||
GARBAGE += \
|
||||
$(LD_VERSION_SCRIPT) \
|
||||
$(NULL)
|
||||
|
||||
# Convert to the format we need for ld.
|
||||
$(LD_VERSION_SCRIPT): $(topsrcdir)/db/sqlite3/src/sqlite.def
|
||||
@$(call py_action,convert_def_file, \
|
||||
$(DEFINES) $(ACDEFINES) $(XULPPFLAGS) -o $@ $^)
|
||||
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
|
||||
|
||||
ifeq (Darwin,$(OS_TARGET))
|
||||
# On OSX, with jemalloc enabled, having sqlite linked against mozglue
|
||||
# causes crashes in NSS standalone tools.
|
||||
MOZ_GLUE_LDFLAGS =
|
||||
endif
|
||||
23
config/external/sqlite/moz.build
vendored
Normal file
23
config/external/sqlite/moz.build
vendored
Normal file
@ -0,0 +1,23 @@
|
||||
# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
|
||||
# vim: set filetype=python:
|
||||
# This Source Code Form is subject to the terms of the Mozilla Public
|
||||
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
|
||||
LIBRARY_NAME = 'sqlite'
|
||||
|
||||
if CONFIG['MOZ_NATIVE_SQLITE']:
|
||||
OS_LIBS += CONFIG['SQLITE_LIBS']
|
||||
else:
|
||||
DIRS += ['../../../db/sqlite3/src']
|
||||
if CONFIG['MOZ_FOLD_LIBS']:
|
||||
# When folding libraries, sqlite is actually in the nss library.
|
||||
USE_LIBS += [
|
||||
'nss',
|
||||
]
|
||||
else:
|
||||
FORCE_SHARED_LIB = True
|
||||
SHARED_LIBRARY_NAME = 'mozsqlite3'
|
||||
|
||||
if CONFIG['OS_ARCH'] == 'Linux' and CONFIG['GCC_USE_GNU_LD']:
|
||||
LD_VERSION_SCRIPT = 'sqlite-processed.def'
|
||||
21
config/external/zlib/moz.build
vendored
Normal file
21
config/external/zlib/moz.build
vendored
Normal file
@ -0,0 +1,21 @@
|
||||
# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
|
||||
# vim: set filetype=python:
|
||||
# This Source Code Form is subject to the terms of the Mozilla Public
|
||||
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
|
||||
LIBRARY_NAME = 'zlib'
|
||||
|
||||
if CONFIG['MOZ_NATIVE_ZLIB']:
|
||||
OS_LIBS += CONFIG['MOZ_ZLIB_LIBS']
|
||||
else:
|
||||
if CONFIG['ZLIB_IN_MOZGLUE']:
|
||||
# Can't do this until mozglue is handled by moz.build instead of
|
||||
# config/rules.mk.
|
||||
# USE_LIBS += [
|
||||
# 'mozglue'
|
||||
# ]
|
||||
pass
|
||||
DIRS += [
|
||||
'../../../modules/zlib',
|
||||
]
|
||||
@ -82,7 +82,6 @@ ifdef COMPILE_ENVIRONMENT
|
||||
# which stuff links.
|
||||
SIMPLE_PROGRAMS += $(CPP_UNIT_TESTS)
|
||||
INCLUDES += -I$(DIST)/include/testing
|
||||
EXTRA_LIBS += $(NSPR_LIBS)
|
||||
|
||||
ifndef MOZ_PROFILE_GENERATE
|
||||
CPP_UNIT_TESTS_FILES = $(CPP_UNIT_TESTS)
|
||||
@ -565,7 +564,8 @@ everything::
|
||||
$(MAKE) clean
|
||||
$(MAKE) all
|
||||
|
||||
STATIC_LIBS_DEPS := $(wildcard $(addsuffix .$(LIBS_DESC_SUFFIX),$(STATIC_LIBS)))
|
||||
STATIC_LIB_DEP = $(if $(wildcard $(1).$(LIBS_DESC_SUFFIX)),$(1).$(LIBS_DESC_SUFFIX),$(1))
|
||||
STATIC_LIBS_DEPS := $(foreach l,$(STATIC_LIBS),$(call STATIC_LIB_DEP,$(l)))
|
||||
|
||||
# Dependencies which, if modified, should cause everything to rebuild
|
||||
GLOBAL_DEPS += Makefile $(DEPTH)/config/autoconf.mk $(topsrcdir)/config/config.mk
|
||||
|
||||
@ -6124,7 +6124,6 @@ if test -n "$MOZ_TREE_FREETYPE"; then
|
||||
FT_FONT_FEATURE="#define CAIRO_HAS_FT_FONT 1"
|
||||
FT2_CFLAGS='-I$(topsrcdir)/modules/freetype2/include'
|
||||
CAIRO_FT_CFLAGS='-I$(topsrcdir)/modules/freetype2/include'
|
||||
FT2_LIBS='$(call EXPAND_LIBNAME_PATH,freetype,$(DEPTH)/modules/freetype2/.libs)'
|
||||
CAIRO_FT_OSLIBS=''
|
||||
AC_DEFINE(HAVE_FT_BITMAP_SIZE_Y_PPEM)
|
||||
AC_DEFINE(HAVE_FT_GLYPHSLOT_EMBOLDEN)
|
||||
|
||||
@ -43,6 +43,7 @@ BROWSER_CHROME_MANIFESTS += ['browser.ini']
|
||||
|
||||
USE_LIBS += [
|
||||
'mozalloc',
|
||||
'nspr',
|
||||
'xpcomglue_s',
|
||||
'xul',
|
||||
]
|
||||
|
||||
@ -18,6 +18,7 @@ LOCAL_INCLUDES += [
|
||||
|
||||
USE_LIBS += [
|
||||
'mozalloc',
|
||||
'nspr',
|
||||
'xpcomglue_s',
|
||||
'xul',
|
||||
]
|
||||
|
||||
@ -18,6 +18,7 @@ LOCAL_INCLUDES += [
|
||||
|
||||
USE_LIBS += [
|
||||
'mozalloc',
|
||||
'nspr',
|
||||
'xpcomglue_s',
|
||||
'xul',
|
||||
]
|
||||
|
||||
@ -3,8 +3,6 @@
|
||||
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
|
||||
LIB_IS_C_ONLY = 1
|
||||
|
||||
include $(topsrcdir)/config/config.mk
|
||||
|
||||
ifeq ($(OS_ARCH),WINNT)
|
||||
@ -19,28 +17,6 @@ GARBAGE += \
|
||||
$(DEFFILE): sqlite.def
|
||||
@$(call py_action,preprocessor,$(DEFINES) $(XULPPFLAGS) \
|
||||
$(srcdir)/sqlite.def -o $(DEFFILE))
|
||||
|
||||
else
|
||||
ifndef MOZ_FOLD_LIBS
|
||||
ifdef GCC_USE_GNU_LD
|
||||
|
||||
GARBAGE += \
|
||||
$(LD_VERSION_SCRIPT) \
|
||||
$(NULL)
|
||||
|
||||
# Convert to the format we need for ld.
|
||||
$(LD_VERSION_SCRIPT): $(srcdir)/sqlite.def
|
||||
@$(call py_action,convert_def_file, \
|
||||
$(DEFINES) $(ACDEFINES) $(XULPPFLAGS) -o $@ $^)
|
||||
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
|
||||
ifeq (Darwin,$(OS_TARGET))
|
||||
# On OSX, with jemalloc enabled, having sqlite linked against mozglue
|
||||
# causes crashes in NSS standalone tools.
|
||||
MOZ_GLUE_LDFLAGS =
|
||||
endif
|
||||
|
||||
# XXX Force -O2 optimisation on Mac because using the default -O3 causes
|
||||
@ -54,5 +30,3 @@ endif
|
||||
ifeq ($(OS_ARCH),WINNT)
|
||||
MODULE_OPTIMIZE_FLAGS = -O2
|
||||
endif
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
@ -9,17 +9,17 @@ EXPORTS += [
|
||||
'sqlite3.h',
|
||||
]
|
||||
|
||||
LIBRARY_NAME = 'mozsqlite3'
|
||||
if CONFIG['MOZ_FOLD_LIBS']:
|
||||
# When folding libraries, sqlite is actually in the nss library.
|
||||
FINAL_LIBRARY = 'nss'
|
||||
else:
|
||||
# The final library is in config/external/sqlite
|
||||
FINAL_LIBRARY = 'sqlite'
|
||||
|
||||
SOURCES += [
|
||||
'sqlite3.c',
|
||||
]
|
||||
|
||||
if CONFIG['MOZ_FOLD_LIBS']:
|
||||
FORCE_STATIC_LIB = True
|
||||
else:
|
||||
FORCE_SHARED_LIB = True
|
||||
|
||||
# -DSQLITE_SECURE_DELETE=1 will cause SQLITE to 0-fill delete data so we
|
||||
# don't have to vacuum to make sure the data is not visible in the file.
|
||||
# -DSQLITE_ENABLE_FTS3=1 enables the full-text index module.
|
||||
@ -70,11 +70,6 @@ if CONFIG['OS_ARCH'] == 'WINNT' and CONFIG['MOZ_MEMORY']:
|
||||
if CONFIG['SOLARIS_SUNPRO_CC']:
|
||||
NO_PGO = True
|
||||
|
||||
if CONFIG['OS_ARCH'] == 'Linux' and \
|
||||
not CONFIG['MOZ_FOLD_LIBS'] and \
|
||||
CONFIG['GCC_USE_GNU_LD']:
|
||||
LD_VERSION_SCRIPT = 'sqlite-processed.def'
|
||||
|
||||
# Suppress warnings in third-party code.
|
||||
if CONFIG['GNU_CC']:
|
||||
CFLAGS += [
|
||||
|
||||
@ -19,6 +19,7 @@ FAIL_ON_WARNINGS = True
|
||||
|
||||
USE_LIBS += [
|
||||
'mozalloc',
|
||||
'nspr',
|
||||
'xpcomglue_s',
|
||||
'xul',
|
||||
]
|
||||
|
||||
@ -18,6 +18,7 @@ LOCAL_INCLUDES += [
|
||||
|
||||
USE_LIBS += [
|
||||
'mozalloc',
|
||||
'nspr',
|
||||
'xpcomglue_s',
|
||||
'xul',
|
||||
]
|
||||
|
||||
@ -14,6 +14,7 @@ FAIL_ON_WARNINGS = True
|
||||
|
||||
USE_LIBS += [
|
||||
'mozalloc',
|
||||
'nspr',
|
||||
'xpcomglue_s',
|
||||
'xul',
|
||||
]
|
||||
|
||||
@ -1,8 +0,0 @@
|
||||
# vim:set ts=8 sw=8 sts=8 noet:
|
||||
# This Source Code Form is subject to the terms of the Mozilla Public
|
||||
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
|
||||
EXTRA_LIBS += \
|
||||
$(NSPR_LIBS) \
|
||||
$(NULL)
|
||||
@ -18,6 +18,7 @@ IS_COMPONENT = True
|
||||
|
||||
USE_LIBS += [
|
||||
'mozalloc',
|
||||
'nspr',
|
||||
'xpcomglue_s',
|
||||
'xul',
|
||||
]
|
||||
|
||||
@ -16,6 +16,7 @@ LOCAL_INCLUDES += [
|
||||
|
||||
USE_LIBS += [
|
||||
'mozalloc',
|
||||
'nspr',
|
||||
'xpcomglue_s',
|
||||
'xul',
|
||||
]
|
||||
|
||||
@ -1,8 +0,0 @@
|
||||
#
|
||||
# This Source Code Form is subject to the terms of the Mozilla Public
|
||||
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
|
||||
EXTRA_LIBS += \
|
||||
$(NSPR_LIBS) \
|
||||
$(NULL)
|
||||
@ -23,6 +23,7 @@ USE_STATIC_LIBS = True
|
||||
|
||||
USE_LIBS += [
|
||||
'mozalloc',
|
||||
'nspr',
|
||||
'unicharutil_external_s',
|
||||
'xul',
|
||||
]
|
||||
|
||||
@ -8,10 +8,6 @@ endif
|
||||
|
||||
ifeq (android,$(MOZ_WIDGET_TOOLKIT))
|
||||
WRAP_LDFLAGS =
|
||||
else
|
||||
EXTRA_LIBS += \
|
||||
$(NSPR_LIBS) \
|
||||
$(NULL)
|
||||
endif
|
||||
|
||||
ifndef MOZ_WINCONSOLE
|
||||
|
||||
@ -17,6 +17,7 @@ else:
|
||||
]
|
||||
USE_LIBS += [
|
||||
'mozalloc',
|
||||
'nspr',
|
||||
'xul',
|
||||
]
|
||||
|
||||
|
||||
@ -3,7 +3,3 @@
|
||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
|
||||
NSDISTMODE = copy
|
||||
|
||||
EXTRA_LIBS += \
|
||||
$(NSPR_LIBS) \
|
||||
$(NULL)
|
||||
|
||||
@ -21,6 +21,7 @@ if CONFIG['_MSC_VER']:
|
||||
|
||||
USE_LIBS += [
|
||||
'mozalloc',
|
||||
'nspr',
|
||||
'xpcomglue_s',
|
||||
'xul',
|
||||
]
|
||||
|
||||
@ -15,7 +15,6 @@ endif
|
||||
TOPLEVEL_BUILD := 1
|
||||
|
||||
run_for_side_effects := $(shell echo 'MAKE: $(MAKE)')
|
||||
EXTRA_LIBS += $(NSPR_LIBS)
|
||||
|
||||
DIST_INSTALL = 1
|
||||
NO_EXPAND_LIBS = 1
|
||||
@ -25,14 +24,6 @@ ifdef MOZ_NATIVE_FFI
|
||||
LOCAL_INCLUDES = $(MOZ_FFI_CFLAGS)
|
||||
endif
|
||||
|
||||
ifdef MOZ_NATIVE_FFI
|
||||
OS_LIBS += $(MOZ_FFI_LIBS)
|
||||
else
|
||||
EXTRA_LIBS += \
|
||||
ctypes/libffi/.libs/libffi.$(LIB_SUFFIX) \
|
||||
$(NULL)
|
||||
endif
|
||||
|
||||
# Windows needs this to be linked with a static library.
|
||||
ifndef MOZ_NATIVE_FFI
|
||||
DEFINES += -DFFI_BUILDING
|
||||
@ -194,16 +185,8 @@ DIST_GARBAGE = config.cache config.log config.status* \
|
||||
distclean::
|
||||
$(RM) $(DIST_GARBAGE)
|
||||
|
||||
ifneq ($(findstring -L,$(NSPR_LIBS)),)
|
||||
NSPR_STATIC_PATH = $(subst -L,,$(findstring -L,$(NSPR_LIBS)))
|
||||
else
|
||||
NSPR_STATIC_PATH = $(DIST)/lib
|
||||
endif
|
||||
|
||||
CFLAGS += $(MOZ_ZLIB_CFLAGS)
|
||||
|
||||
EXTRA_LIBS += $(MOZ_ICU_LIBS)
|
||||
|
||||
# Silence warnings on AIX/HP-UX from non-GNU compilers
|
||||
ifndef GNU_CC
|
||||
ifeq ($(OS_ARCH),AIX)
|
||||
|
||||
@ -4,14 +4,6 @@
|
||||
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
|
||||
EXTRA_LIBS += $(NSPR_LIBS)
|
||||
|
||||
ifdef MOZ_SHARED_ICU
|
||||
OS_LIBS += $(MOZ_ICU_LIBS)
|
||||
endif
|
||||
|
||||
OS_LIBS += $(MOZ_FFI_LIBS)
|
||||
|
||||
# Place a GDB Python auto-load file next to the gdb-tests executable, both
|
||||
# in the build directory and in the dist/bin directory.
|
||||
PP_TARGETS += GDB_AUTOLOAD
|
||||
|
||||
@ -4,14 +4,6 @@
|
||||
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
|
||||
EXTRA_LIBS += $(NSPR_LIBS)
|
||||
|
||||
ifdef MOZ_SHARED_ICU
|
||||
OS_LIBS += $(MOZ_ICU_LIBS)
|
||||
endif
|
||||
|
||||
OS_LIBS += $(MOZ_FFI_LIBS)
|
||||
|
||||
ifdef QEMU_EXE
|
||||
MOZ_POST_PROGRAM_COMMAND = $(topsrcdir)/build/qemu-wrap --qemu $(QEMU_EXE) --libdir $(CROSS_LIB)
|
||||
endif
|
||||
|
||||
@ -438,11 +438,21 @@ if CONFIG['JS_SHARED_LIBRARY']:
|
||||
FORCE_STATIC_LIB = True
|
||||
STATIC_LIBRARY_NAME = 'js_static'
|
||||
|
||||
if not CONFIG['MOZ_NATIVE_ZLIB'] and not CONFIG['ZLIB_IN_MOZGLUE']:
|
||||
if CONFIG['JS_HAS_CTYPES']:
|
||||
USE_LIBS += [
|
||||
'mozz',
|
||||
'ffi',
|
||||
]
|
||||
|
||||
if CONFIG['ENABLE_INTL_API']:
|
||||
USE_LIBS += [
|
||||
'icu',
|
||||
]
|
||||
|
||||
USE_LIBS += [
|
||||
'nspr',
|
||||
'zlib',
|
||||
]
|
||||
|
||||
if CONFIG['MOZ_ETW']:
|
||||
GENERATED_FILES = [
|
||||
'ETWProvider.h',
|
||||
@ -487,8 +497,6 @@ if CONFIG['OS_ARCH'] not in ('WINNT', 'HP-UX'):
|
||||
'm',
|
||||
]
|
||||
|
||||
OS_LIBS += CONFIG['MOZ_ZLIB_LIBS']
|
||||
|
||||
if CONFIG['OS_ARCH'] == 'FreeBSD':
|
||||
OS_LIBS += [
|
||||
'-pthread',
|
||||
|
||||
@ -4,14 +4,6 @@
|
||||
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
|
||||
EXTRA_LIBS += $(NSPR_LIBS)
|
||||
ifdef MOZ_NATIVE_FFI
|
||||
OS_LIBS += $(MOZ_FFI_LIBS)
|
||||
endif
|
||||
ifdef MOZ_SHARED_ICU
|
||||
OS_LIBS += $(MOZ_ICU_LIBS)
|
||||
endif
|
||||
|
||||
ifeq ($(OS_ARCH),Darwin)
|
||||
ifeq ($(TARGET_CPU),x86_64)
|
||||
DARWIN_EXE_LDFLAGS += -pagezero_size 10000 -image_base 100000000
|
||||
|
||||
@ -5,6 +5,4 @@
|
||||
|
||||
SDK_BINARY = $(PROGRAM)
|
||||
|
||||
EXTRA_LIBS += $(NSPR_LIBS)
|
||||
|
||||
NSDISTMODE = copy
|
||||
|
||||
@ -38,6 +38,7 @@ if CONFIG['OS_ARCH'] == 'WINNT':
|
||||
|
||||
USE_LIBS += [
|
||||
'mozalloc',
|
||||
'nspr',
|
||||
'xpcomglue_s',
|
||||
'xul',
|
||||
]
|
||||
|
||||
@ -1,8 +0,0 @@
|
||||
#
|
||||
# This Source Code Form is subject to the terms of the Mozilla Public
|
||||
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
|
||||
EXTRA_LIBS += \
|
||||
$(NSPR_LIBS) \
|
||||
$(NULL)
|
||||
@ -9,10 +9,6 @@ MANIFEST = xpctest.manifest
|
||||
MANIFEST_PATH = $(testxpcobjdir)/$(componentdir)
|
||||
PP_TARGETS += MANIFEST
|
||||
|
||||
EXTRA_LIBS += \
|
||||
$(NSPR_LIBS) \
|
||||
$(NULL)
|
||||
|
||||
LIB_FILES = $(SHARED_LIBRARY)
|
||||
LIB_DEST = $(testxpcobjdir)/$(componentdir)
|
||||
INSTALL_TARGETS += LIB
|
||||
|
||||
@ -26,6 +26,7 @@ FAIL_ON_WARNINGS = True
|
||||
|
||||
USE_LIBS += [
|
||||
'mozalloc',
|
||||
'nspr',
|
||||
'xpcomglue_s',
|
||||
'xul',
|
||||
]
|
||||
|
||||
@ -17,6 +17,7 @@ XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
|
||||
|
||||
USE_LIBS += [
|
||||
'mozalloc',
|
||||
'nspr',
|
||||
'xpcomglue_s',
|
||||
'xul',
|
||||
]
|
||||
|
||||
@ -3,10 +3,6 @@
|
||||
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
|
||||
ifeq (WINNT,$(OS_TARGET))
|
||||
EXTRA_LIBS += $(NSPR_LIBS)
|
||||
endif
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
ifeq (WINNT,$(OS_TARGET))
|
||||
|
||||
@ -10,6 +10,7 @@ if CONFIG['GKMEDIAS_SHARED_LIBRARY']:
|
||||
FORCE_SHARED_LIB = True
|
||||
USE_LIBS += [
|
||||
'mozalloc',
|
||||
'nspr',
|
||||
]
|
||||
|
||||
if CONFIG['MOZ_WEBRTC']:
|
||||
|
||||
@ -48,6 +48,7 @@ else:
|
||||
|
||||
USE_LIBS += [
|
||||
'mozalloc',
|
||||
'nspr',
|
||||
'xpcomglue_s',
|
||||
'xul',
|
||||
]
|
||||
|
||||
@ -3,21 +3,6 @@
|
||||
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
|
||||
EXTRA_LIBS += \
|
||||
$(NSPR_LIBS) \
|
||||
$(NULL)
|
||||
|
||||
ifdef MOZ_NATIVE_NSS
|
||||
EXTRA_LIBS += $(NSS_LIBS)
|
||||
else
|
||||
# Statically linking NSS libssl ensures that we can debug NSS too
|
||||
EXTRA_LIBS += \
|
||||
$(DEPTH)/dist/lib/$(LIB_PREFIX)ssl.$(LIB_SUFFIX) \
|
||||
$(DEPTH)/dist/lib/$(LIB_PREFIX)nss3.$(LIB_SUFFIX) \
|
||||
$(DEPTH)/dist/lib/$(LIB_PREFIX)nssutil3.$(LIB_SUFFIX) \
|
||||
$(NULL)
|
||||
endif
|
||||
|
||||
ifeq ($(OS_TARGET), Android)
|
||||
CPPFLAGS += \
|
||||
$(STLPORT_CPPFLAGS) \
|
||||
|
||||
@ -89,10 +89,18 @@ USE_LIBS += [
|
||||
'mtransport_s',
|
||||
'nicer',
|
||||
'nrappkit',
|
||||
'nspr',
|
||||
'nss',
|
||||
'xpcomglue_s',
|
||||
'xul',
|
||||
]
|
||||
|
||||
if not CONFIG['MOZ_NATIVE_NSS'] and not CONFIG['MOZ_FOLD_LIBS']:
|
||||
USE_LIBS += [
|
||||
# Statically linking NSS libssl ensures that we can debug NSS too
|
||||
'static:/security/nss/lib/ssl/ssl',
|
||||
]
|
||||
|
||||
if CONFIG['MOZ_SCTP']:
|
||||
USE_LIBS += [
|
||||
'nksctp_s',
|
||||
|
||||
@ -2,11 +2,6 @@
|
||||
# License, v. 2.0. If a copy of the MPL was not distributed with this file,
|
||||
# You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
EXTRA_LIBS += \
|
||||
$(NSPR_LIBS) \
|
||||
$(NSS_LIBS) \
|
||||
$(NULL)
|
||||
|
||||
ifeq ($(OS_TARGET),Android)
|
||||
CPPFLAGS += \
|
||||
$(STLPORT_CPPFLAGS) \
|
||||
|
||||
@ -101,10 +101,13 @@ USE_LIBS += [
|
||||
'mozalloc',
|
||||
'mtransport_s',
|
||||
'nksrtp_s',
|
||||
'nspr',
|
||||
'nss',
|
||||
'webrtc',
|
||||
'xpcomglue_s',
|
||||
'xul',
|
||||
'yuv',
|
||||
'zlib',
|
||||
]
|
||||
|
||||
if CONFIG['BUILD_ARM_NEON']:
|
||||
@ -112,11 +115,6 @@ if CONFIG['BUILD_ARM_NEON']:
|
||||
'yuv_neon',
|
||||
]
|
||||
|
||||
if not CONFIG['MOZ_NATIVE_ZLIB'] and not CONFIG['ZLIB_IN_MOZGLUE']:
|
||||
USE_LIBS += [
|
||||
'mozz',
|
||||
]
|
||||
|
||||
if CONFIG['JS_SHARED_LIBRARY']:
|
||||
USE_LIBS += [
|
||||
'js',
|
||||
@ -147,7 +145,9 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk2':
|
||||
|
||||
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk3':
|
||||
OS_LIBS += CONFIG['MOZ_GTK3_LIBS']
|
||||
OS_LIBS += CONFIG['FT2_LIBS']
|
||||
USE_LIBS += [
|
||||
'freetype',
|
||||
]
|
||||
|
||||
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'qt':
|
||||
OS_LIBS += CONFIG['XLIBS']
|
||||
@ -160,6 +160,3 @@ if CONFIG['OS_TARGET'] in ('Linux', 'DragonFly', 'FreeBSD', 'NetBSD',
|
||||
|
||||
if CONFIG['OS_TARGET'] == 'Darwin':
|
||||
OS_LIBS += CONFIG['TK_LIBS']
|
||||
|
||||
if CONFIG['MOZ_NATIVE_ZLIB']:
|
||||
OS_LIBS += CONFIG['MOZ_ZLIB_LIBS']
|
||||
|
||||
@ -12,6 +12,7 @@ SOURCES += sorted('%s.cpp' % t for t in CPP_UNIT_TESTS)
|
||||
|
||||
USE_LIBS += [
|
||||
'mozalloc',
|
||||
'nspr',
|
||||
'xpcomglue_s',
|
||||
'xul',
|
||||
]
|
||||
|
||||
@ -10,8 +10,3 @@
|
||||
MOZ_GLUE_PROGRAM_LDFLAGS=
|
||||
MOZ_GLUE_LDFLAGS =
|
||||
WRAP_LDFLAGS=
|
||||
|
||||
# Prevent those tests linking against libxpcom, libxul, and nspr.
|
||||
NSPR_LIBS=
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
@ -17,17 +17,6 @@ HOST_CFLAGS += \
|
||||
$(DEFINES) \
|
||||
$(NULL)
|
||||
|
||||
ifdef MOZ_ENABLE_SIGNMAR
|
||||
# Please don't remove the following comment, because it does some magic:
|
||||
# We don't want to use NSS_LIBS, presumably to avoid useless dependencies
|
||||
# on parts of nss that don't matter.
|
||||
EXTRA_LIBS += \
|
||||
$(DIST)/lib/$(LIB_PREFIX)nss3.$(LIB_SUFFIX) \
|
||||
$(DIST)/lib/$(LIB_PREFIX)nssutil3.$(LIB_SUFFIX) \
|
||||
$(NSPR_LIBS) \
|
||||
$(NULL)
|
||||
endif
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
ifdef CROSS_COMPILE
|
||||
|
||||
@ -28,7 +28,12 @@ if CONFIG['MOZ_ENABLE_SIGNMAR']:
|
||||
for var in ('MAR_CHANNEL_ID', 'MOZ_APP_VERSION'):
|
||||
DEFINES[var] = '"%s"' % CONFIG[var]
|
||||
|
||||
if not CONFIG['MOZ_ENABLE_SIGNMAR']:
|
||||
if CONFIG['MOZ_ENABLE_SIGNMAR']:
|
||||
USE_LIBS += [
|
||||
'nspr',
|
||||
'nss',
|
||||
]
|
||||
else:
|
||||
DEFINES['NO_SIGN_VERIFY'] = True
|
||||
|
||||
if CONFIG['OS_ARCH'] == 'WINNT':
|
||||
|
||||
@ -10,7 +10,12 @@ EXPORTS += [
|
||||
'zlib.h',
|
||||
]
|
||||
|
||||
LIBRARY_NAME = 'mozz'
|
||||
if CONFIG['ZLIB_IN_MOZGLUE']:
|
||||
FINAL_LIBRARY = 'mozglue'
|
||||
DEFINES['IMPL_MFBT'] = True
|
||||
else:
|
||||
# The final library is in config/external/zlib
|
||||
FINAL_LIBRARY = 'zlib'
|
||||
|
||||
SOURCES += [
|
||||
'adler32.c',
|
||||
@ -29,6 +34,3 @@ SOURCES += [
|
||||
'uncompr.c',
|
||||
'zutil.c',
|
||||
]
|
||||
|
||||
if CONFIG['ZLIB_IN_MOZGLUE']:
|
||||
DEFINES['IMPL_MFBT'] = True
|
||||
|
||||
22
moz.build
22
moz.build
@ -24,8 +24,7 @@ if not CONFIG['JS_STANDALONE']:
|
||||
if not CONFIG['LIBXUL_SDK']:
|
||||
add_tier_dir('base', ['mfbt'])
|
||||
|
||||
if not CONFIG['MOZ_NATIVE_ZLIB']:
|
||||
add_tier_dir('base', ['modules/zlib'])
|
||||
add_tier_dir('base', ['config/external/zlib'])
|
||||
|
||||
if not CONFIG['JS_STANDALONE']:
|
||||
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android':
|
||||
@ -41,23 +40,16 @@ if not CONFIG['JS_STANDALONE']:
|
||||
add_tier_dir('precompile', 'xpcom/xpidl')
|
||||
|
||||
if CONFIG['COMPILE_ENVIRONMENT'] and not CONFIG['LIBXUL_SDK']:
|
||||
if CONFIG['MOZ_BUILD_NSPR']:
|
||||
add_tier_dir('nspr', 'config/external/nspr', trigger='NSPR_LIBS')
|
||||
add_tier_dir('nspr', 'config/external/nspr')
|
||||
|
||||
if not CONFIG['JS_STANDALONE']:
|
||||
add_tier_dir('external', 'config/external')
|
||||
if not CONFIG['MOZ_NATIVE_NSS']:
|
||||
# We want security/build to be built before anything using
|
||||
# NSPR_LIBS when MOZ_FOLD_LIBS is set, because that's where NSPR
|
||||
# actually ends up being linked. All places using NSS_LIBS also
|
||||
# use NSPR_LIBS so it's safe to use the latter.
|
||||
add_tier_dir('nss', 'config/external/nss',
|
||||
trigger='NSPR_LIBS' if CONFIG['MOZ_FOLD_LIBS'] else 'NSS_LIBS')
|
||||
add_tier_dir('nss', 'config/external/nss')
|
||||
|
||||
if CONFIG['BUILD_CTYPES'] and not CONFIG['MOZ_NATIVE_FFI']:
|
||||
add_tier_dir('js', ['config/external/ffi'], trigger='MOZ_FFI_LIBS')
|
||||
if CONFIG['ENABLE_INTL_API'] and not CONFIG['MOZ_NATIVE_ICU']:
|
||||
add_tier_dir('js', ['config/external/icu'], trigger='MOZ_ICU_LIBS')
|
||||
if CONFIG['BUILD_CTYPES']:
|
||||
add_tier_dir('js', ['config/external/ffi'])
|
||||
if CONFIG['ENABLE_INTL_API']:
|
||||
add_tier_dir('js', ['config/external/icu'])
|
||||
add_tier_dir('js', ['js/src'])
|
||||
|
||||
if not CONFIG['JS_STANDALONE']:
|
||||
|
||||
@ -10,12 +10,6 @@ include $(topsrcdir)/config/config.mk
|
||||
|
||||
MOZ_GLUE_LDFLAGS = # Don't link against ourselves
|
||||
|
||||
ifneq (,$(ZLIB_IN_MOZGLUE)$(MOZ_LINKER))
|
||||
ifdef MOZ_NATIVE_ZLIB
|
||||
EXTRA_LIBS += $(MOZ_ZLIB_LIBS)
|
||||
endif
|
||||
endif
|
||||
|
||||
ifeq (WINNT,$(OS_TARGET))
|
||||
mozglue.def: mozglue.def.in $(GLOBAL_DEPS)
|
||||
$(call py_action,preprocessor,$(if $(MOZ_REPLACE_MALLOC),-DMOZ_REPLACE_MALLOC) $(ACDEFINES) $< -o $@)
|
||||
|
||||
@ -75,9 +75,9 @@ USE_LIBS += [
|
||||
'mfbt',
|
||||
]
|
||||
|
||||
if CONFIG['ZLIB_IN_MOZGLUE'] and not CONFIG['MOZ_NATIVE_ZLIB']:
|
||||
if CONFIG['MOZ_LINKER']:
|
||||
USE_LIBS += [
|
||||
'mozz',
|
||||
'zlib',
|
||||
]
|
||||
|
||||
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
|
||||
|
||||
@ -1,10 +0,0 @@
|
||||
#
|
||||
# This Source Code Form is subject to the terms of the Mozilla Public
|
||||
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
|
||||
EXTRA_LIBS += \
|
||||
$(NSPR_LIBS) \
|
||||
$(NULL)
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
@ -22,6 +22,7 @@ if CONFIG['OS_ARCH'] == 'WINNT':
|
||||
|
||||
USE_LIBS += [
|
||||
'mozalloc',
|
||||
'nspr',
|
||||
'xpcomglue_s',
|
||||
'xul',
|
||||
]
|
||||
|
||||
@ -4,12 +4,6 @@
|
||||
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
|
||||
|
||||
|
||||
EXTRA_LIBS += \
|
||||
$(NSPR_LIBS) \
|
||||
$(NULL)
|
||||
|
||||
DEFINES += $(TK_CFLAGS)
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
@ -65,6 +65,7 @@ RESOURCE_FILES += [
|
||||
|
||||
USE_LIBS += [
|
||||
'mozalloc',
|
||||
'nspr',
|
||||
'xpcomglue_s',
|
||||
'xul',
|
||||
]
|
||||
|
||||
@ -1,8 +0,0 @@
|
||||
#
|
||||
# This Source Code Form is subject to the terms of the Mozilla Public
|
||||
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
|
||||
EXTRA_LIBS += \
|
||||
$(NSPR_LIBS) \
|
||||
$(NULL)
|
||||
@ -12,6 +12,7 @@ SOURCES += [
|
||||
|
||||
USE_LIBS += [
|
||||
'mozalloc',
|
||||
'nspr',
|
||||
'xpcomglue_s',
|
||||
'xul',
|
||||
]
|
||||
|
||||
@ -1,8 +0,0 @@
|
||||
#
|
||||
# This Source Code Form is subject to the terms of the Mozilla Public
|
||||
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
|
||||
EXTRA_LIBS += \
|
||||
$(NSPR_LIBS) \
|
||||
$(NULL)
|
||||
@ -12,6 +12,7 @@ SOURCES += [
|
||||
|
||||
USE_LIBS += [
|
||||
'mozalloc',
|
||||
'nspr',
|
||||
'xpcomglue_s',
|
||||
'xul',
|
||||
]
|
||||
|
||||
@ -1,8 +0,0 @@
|
||||
#
|
||||
# This Source Code Form is subject to the terms of the Mozilla Public
|
||||
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
|
||||
EXTRA_LIBS += \
|
||||
$(NSPR_LIBS) \
|
||||
$(NULL)
|
||||
@ -12,6 +12,7 @@ SOURCES += [
|
||||
|
||||
USE_LIBS += [
|
||||
'mozalloc',
|
||||
'nspr',
|
||||
'xpcomglue_s',
|
||||
'xul',
|
||||
]
|
||||
|
||||
@ -103,3 +103,7 @@ DEFINES['SSL_DISABLE_DEPRECATED_CIPHER_SUITE_NAMES'] = 'True'
|
||||
DEFINES['NSS_ENABLE_ECC'] = 'True'
|
||||
for var in ('DLL_PREFIX', 'DLL_SUFFIX'):
|
||||
DEFINES[var] = '"%s"' % CONFIG[var]
|
||||
|
||||
USE_LIBS += [
|
||||
'crmf',
|
||||
]
|
||||
|
||||
@ -12,6 +12,7 @@ SOURCES += sorted('%s.cpp' % t for t in CPP_UNIT_TESTS)
|
||||
|
||||
USE_LIBS += [
|
||||
'mozalloc',
|
||||
'nspr',
|
||||
'xpcomglue_s',
|
||||
'xul',
|
||||
]
|
||||
|
||||
@ -1,12 +0,0 @@
|
||||
# vim: noexpandtab ts=8 sw=8
|
||||
#
|
||||
# This Source Code Form is subject to the terms of the Mozilla Public
|
||||
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
|
||||
include $(topsrcdir)/config/config.mk
|
||||
|
||||
EXTRA_LIBS += \
|
||||
$(NSPR_LIBS) \
|
||||
$(NSS_LIBS) \
|
||||
$(NULL)
|
||||
@ -23,6 +23,8 @@ LOCAL_INCLUDES += [
|
||||
USE_LIBS += [
|
||||
'mozalloc',
|
||||
'mozillapkix',
|
||||
'nspr',
|
||||
'nss',
|
||||
'pkixtestutil',
|
||||
'tlsserver',
|
||||
]
|
||||
|
||||
@ -3,7 +3,3 @@
|
||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
#
|
||||
MOZ_GLUE_LDFLAGS =
|
||||
|
||||
EXTRA_LIBS += \
|
||||
$(NSPR_LIBS) \
|
||||
$(NULL)
|
||||
|
||||
@ -7,6 +7,7 @@
|
||||
LIBRARY_NAME = 'sandboxbroker'
|
||||
|
||||
USE_LIBS += [
|
||||
'nspr',
|
||||
'sandbox_s',
|
||||
]
|
||||
|
||||
|
||||
@ -1,6 +0,0 @@
|
||||
#
|
||||
# This Source Code Form is subject to the terms of the Mozilla Public
|
||||
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
|
||||
EXTRA_LIBS += $(NSPR_LIBS)
|
||||
@ -17,6 +17,7 @@ EXTRA_COMPONENTS += [
|
||||
|
||||
USE_LIBS += [
|
||||
'mozalloc',
|
||||
'nspr',
|
||||
'xpcomglue_s',
|
||||
'xul',
|
||||
]
|
||||
|
||||
@ -1,8 +0,0 @@
|
||||
#
|
||||
# This Source Code Form is subject to the terms of the Mozilla Public
|
||||
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
|
||||
EXTRA_LIBS += \
|
||||
$(NSPR_LIBS) \
|
||||
$(NULL)
|
||||
@ -38,13 +38,8 @@ FAIL_ON_WARNINGS = True
|
||||
|
||||
USE_LIBS += [
|
||||
'mozalloc',
|
||||
'nspr',
|
||||
'sqlite',
|
||||
'xpcomglue_s',
|
||||
'xul',
|
||||
]
|
||||
|
||||
if not CONFIG['MOZ_NATIVE_SQLITE'] and not CONFIG['MOZ_FOLD_LIBS']:
|
||||
USE_LIBS += [
|
||||
'mozsqlite3',
|
||||
]
|
||||
|
||||
OS_LIBS += CONFIG['SQLITE_LIBS']
|
||||
|
||||
@ -1,9 +0,0 @@
|
||||
#
|
||||
# This Source Code Form is subject to the terms of the Mozilla Public
|
||||
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
|
||||
EXTRA_LIBS += \
|
||||
$(NSPR_LIBS) \
|
||||
$(NSS_LIBS) \
|
||||
$(NULL)
|
||||
@ -12,6 +12,8 @@ SOURCES += [
|
||||
|
||||
USE_LIBS += [
|
||||
'mozalloc',
|
||||
'nspr',
|
||||
'nss',
|
||||
]
|
||||
|
||||
# This isn't XPCOM code, but it wants to use STL, so disable the STL
|
||||
|
||||
@ -14,6 +14,7 @@ FAIL_ON_WARNINGS = True
|
||||
|
||||
USE_LIBS += [
|
||||
'mozalloc',
|
||||
'nspr',
|
||||
'xpcomglue_s',
|
||||
'xul',
|
||||
]
|
||||
|
||||
@ -3,8 +3,6 @@
|
||||
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
|
||||
EXTRA_LIBS += $(NSPR_LIBS)
|
||||
|
||||
UNIT_FILES = $(SHARED_LIBRARY) CrashTestUtils.jsm
|
||||
UNIT_DEST = $(DEPTH)/_tests/xpcshell/$(relativesrcdir)/unit/
|
||||
INSTALL_TARGETS += UNIT
|
||||
|
||||
@ -41,6 +41,7 @@ include('/toolkit/crashreporter/crashreporter.mozbuild')
|
||||
|
||||
USE_LIBS += [
|
||||
'mozalloc',
|
||||
'nspr',
|
||||
'xpcomglue_s',
|
||||
'xul',
|
||||
]
|
||||
|
||||
@ -3,9 +3,6 @@
|
||||
# You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
|
||||
include $(topsrcdir)/toolkit/library/libxul.mk
|
||||
# Please don't remove the following comment, because it does some magic:
|
||||
# libxul.mk adds FT2_LIBS, NSS_LIBS and NSPR_LIBS, but we want to have the
|
||||
# string in this file to trigger a dependency on freetype2, nss and nspr.
|
||||
|
||||
ifeq (WINNT_1,$(OS_TARGET)_$(MOZ_PROFILE_USE))
|
||||
# Wrap linker to measure peak virtual memory usage.
|
||||
|
||||
@ -16,20 +16,6 @@ EXTRA_DEPS += symverscript
|
||||
endif
|
||||
endif
|
||||
|
||||
EXTRA_LIBS += \
|
||||
$(NSS_LIBS) \
|
||||
$(NULL)
|
||||
|
||||
ifdef ENABLE_INTL_API
|
||||
ifneq (,$(JS_SHARED_LIBRARY)$(MOZ_NATIVE_ICU))
|
||||
OS_LIBS += $(MOZ_ICU_LIBS)
|
||||
endif
|
||||
endif
|
||||
|
||||
ifdef MOZ_NATIVE_FFI
|
||||
OS_LIBS += $(MOZ_FFI_LIBS)
|
||||
endif
|
||||
|
||||
ifdef MOZ_WEBRTC
|
||||
ifeq (WINNT,$(OS_TARGET))
|
||||
ifndef MOZ_HAS_WINSDK_WITH_D3D
|
||||
@ -40,12 +26,6 @@ endif
|
||||
endif
|
||||
endif
|
||||
|
||||
EXTRA_LIBS += $(NSPR_LIBS)
|
||||
|
||||
ifdef MOZ_TREE_FREETYPE
|
||||
OS_LIBS += $(FT2_LIBS)
|
||||
endif
|
||||
|
||||
# Generate GDB pretty printer-autoload files only on Linux. OSX's GDB is
|
||||
# too old to support Python pretty-printers; if this changes, we could make
|
||||
# this 'ifdef GNU_CC'.
|
||||
|
||||
@ -60,21 +60,20 @@ if CONFIG['MOZ_DMD']:
|
||||
'dmd',
|
||||
]
|
||||
|
||||
if not CONFIG['MOZ_NATIVE_ZLIB'] and not CONFIG['ZLIB_IN_MOZGLUE']:
|
||||
USE_LIBS += [
|
||||
'mozz',
|
||||
]
|
||||
|
||||
if not CONFIG['MOZ_NATIVE_SQLITE'] and not CONFIG['MOZ_FOLD_LIBS']:
|
||||
USE_LIBS += [
|
||||
'mozsqlite3',
|
||||
]
|
||||
|
||||
USE_LIBS += [
|
||||
'gkmedias',
|
||||
'mozalloc',
|
||||
'nspr',
|
||||
'nss',
|
||||
'sqlite',
|
||||
'zlib',
|
||||
]
|
||||
|
||||
if CONFIG['ENABLE_INTL_API']:
|
||||
USE_LIBS += [
|
||||
'icu',
|
||||
]
|
||||
|
||||
if CONFIG['MOZ_WIDGET_GTK'] and CONFIG['MOZ_ENABLE_GTK3']:
|
||||
USE_LIBS += [
|
||||
'mozgtk_stub',
|
||||
@ -85,8 +84,11 @@ if CONFIG['MOZ_JPROF']:
|
||||
'jprof',
|
||||
]
|
||||
|
||||
# This needs to be last
|
||||
USE_LIBS += ['StaticXULComponentsEnd']
|
||||
if CONFIG['MOZ_WIDGET_GTK'] or CONFIG['MOZ_WIDGET_TOOLKIT'] == 'qt' or \
|
||||
CONFIG['MOZ_TREE_FREETYPE']:
|
||||
USE_LIBS += [
|
||||
'freetype',
|
||||
]
|
||||
|
||||
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
|
||||
CXXFLAGS += CONFIG['TK_CFLAGS']
|
||||
@ -163,7 +165,6 @@ if CONFIG['OS_ARCH'] == 'Linux' and CONFIG['OS_TARGET'] != 'Android':
|
||||
OS_LIBS += CONFIG['MOZ_CAIRO_OSLIBS']
|
||||
OS_LIBS += CONFIG['MOZ_WEBRTC_X11_LIBS']
|
||||
OS_LIBS += CONFIG['MOZ_APP_EXTRA_LIBS']
|
||||
OS_LIBS += CONFIG['SQLITE_LIBS']
|
||||
|
||||
if CONFIG['MOZ_NATIVE_JPEG']:
|
||||
OS_LIBS += CONFIG['MOZ_JPEG_LIBS']
|
||||
@ -171,9 +172,6 @@ if CONFIG['MOZ_NATIVE_JPEG']:
|
||||
if CONFIG['MOZ_NATIVE_PNG']:
|
||||
OS_LIBS += CONFIG['MOZ_PNG_LIBS']
|
||||
|
||||
if CONFIG['MOZ_NATIVE_ZLIB']:
|
||||
OS_LIBS += CONFIG['MOZ_ZLIB_LIBS']
|
||||
|
||||
if CONFIG['MOZ_NATIVE_HUNSPELL']:
|
||||
OS_LIBS += CONFIG['MOZ_HUNSPELL_LIBS']
|
||||
|
||||
@ -248,14 +246,12 @@ if CONFIG['MOZ_WIDGET_GTK']:
|
||||
OS_LIBS += [
|
||||
'gthread-2.0',
|
||||
]
|
||||
OS_LIBS += CONFIG['FT2_LIBS']
|
||||
|
||||
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'qt':
|
||||
OS_LIBS += CONFIG['XLDFLAGS']
|
||||
OS_LIBS += CONFIG['XLIBS']
|
||||
OS_LIBS += CONFIG['XT_LIBS']
|
||||
OS_LIBS += CONFIG['MOZ_QT_LIBS']
|
||||
OS_LIBS += CONFIG['FT2_LIBS']
|
||||
OS_LIBS += CONFIG['MOZ_PANGO_LIBS']
|
||||
|
||||
if CONFIG['MOZ_ENABLE_STARTUP_NOTIFICATION']:
|
||||
@ -326,3 +322,6 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
|
||||
'usp10',
|
||||
'oleaut32',
|
||||
]
|
||||
|
||||
# This needs to be last
|
||||
USE_LIBS += ['StaticXULComponentsEnd']
|
||||
|
||||
@ -1,7 +0,0 @@
|
||||
# This Source Code Form is subject to the terms of the Mozilla Public
|
||||
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
|
||||
EXTRA_LIBS += \
|
||||
$(NSPR_LIBS) \
|
||||
$(NULL)
|
||||
@ -16,6 +16,7 @@ IS_COMPONENT = True
|
||||
|
||||
USE_LIBS += [
|
||||
'mozalloc',
|
||||
'nspr',
|
||||
'xpcomglue_s',
|
||||
'xul',
|
||||
]
|
||||
|
||||
@ -1,7 +0,0 @@
|
||||
# This Source Code Form is subject to the terms of the Mozilla Public
|
||||
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
|
||||
EXTRA_LIBS += \
|
||||
$(NSPR_LIBS) \
|
||||
$(NULL)
|
||||
@ -35,6 +35,7 @@ LOCAL_INCLUDES += [
|
||||
|
||||
USE_LIBS += [
|
||||
'mozalloc',
|
||||
'nspr',
|
||||
'xpcomglue_s',
|
||||
'xul',
|
||||
]
|
||||
|
||||
@ -26,8 +26,7 @@ if CONFIG['NS_TRACE_MALLOC']:
|
||||
if CONFIG['MOZ_DMD']:
|
||||
add_tier_dir('platform', 'memory/replace/dmd')
|
||||
|
||||
if CONFIG['MOZ_TREE_FREETYPE']:
|
||||
add_tier_dir('platform', 'config/external/freetype2', trigger='FT2_LIBS')
|
||||
add_tier_dir('platform', 'config/external/freetype2')
|
||||
|
||||
add_tier_dir('platform', 'xpcom')
|
||||
|
||||
|
||||
@ -21,10 +21,13 @@ CPPSRCS += $(EXTRACPPSRCS)
|
||||
|
||||
include $(topsrcdir)/config/config.mk
|
||||
|
||||
# This is the last use of EXTRA_LIBS, and it would be sad to not have an
|
||||
# error if it's used in other Makefiles just because of it. So hack around
|
||||
# the check.
|
||||
_DEPRECATED_VARIABLES := $(filter-out EXTRA_LIBS,$(_DEPRECATED_VARIABLES))
|
||||
EXTRA_LIBS += \
|
||||
tmreader.$(OBJ_SUFFIX) \
|
||||
adreader.$(OBJ_SUFFIX) \
|
||||
$(NSPR_LIBS) \
|
||||
$(NULL)
|
||||
|
||||
EXTRA_DEPS = $(EXTRACSRCS:.c=.$(OBJ_SUFFIX)) $(EXTRACPPSRCS:.cpp=.$(OBJ_SUFFIX))
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user