Bug 1043019 - "Port |Bug 1036894 - Move in-tree library linkage information to moz.build| and |Bug 1041936 - Allow static library definitions to depend on shared libraries| to comm-central" r=jcranmer, a=jcranmer for CLOSED TREE
This commit is contained in:
Ian Neal
Родитель
3ba5b111e6
Коммит
cacf171b86
|
|
@ -14,17 +14,7 @@ MODULE_NAME = calBaseModule
|
|||
USE_STATIC_LIBS = 1
|
||||
NO_COMPONENTS_MANIFEST = 1
|
||||
|
||||
ifdef JS_SHARED_LIBRARY
|
||||
EXTRA_DSO_LDOPTS += $(MOZ_JS_LIBS)
|
||||
else
|
||||
EXTRA_DSO_LDOPTS += $(XPCOM_LIBS)
|
||||
endif
|
||||
|
||||
EXTRA_DSO_LDOPTS += \
|
||||
$(LIBS_DIR) \
|
||||
$(NSPR_LIBS) \
|
||||
$(XPCOM_STATICRUNTIME_GLUE_LDOPTS) \
|
||||
$(NULL)
|
||||
EXTRA_LIBS += $(NSPR_LIBS)
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
|
|
|
|||
|
|
@ -7,7 +7,6 @@ SOURCES += [
|
|||
'calBaseModule.cpp',
|
||||
]
|
||||
|
||||
FORCE_SHARED_LIB = True
|
||||
IS_COMPONENT = True
|
||||
|
||||
LIBRARY_NAME = 'calbasecomps'
|
||||
|
|
@ -15,3 +14,21 @@ LOCAL_INCLUDES += [
|
|||
'..'
|
||||
]
|
||||
|
||||
USE_LIBS += [
|
||||
'mozalloc',
|
||||
'xul',
|
||||
]
|
||||
|
||||
if CONFIG['JS_SHARED_LIBRARY']:
|
||||
USE_LIBS += [
|
||||
'js',
|
||||
]
|
||||
|
||||
if CONFIG['OS_ARCH'] == 'WINNT':
|
||||
USE_LIBS += [
|
||||
'xpcomglue_staticruntime_s',
|
||||
]
|
||||
else:
|
||||
USE_LIBS += [
|
||||
'xpcomglue_s',
|
||||
]
|
||||
|
|
|
|||
|
|
@ -40,6 +40,7 @@ _MOZBUILD_EXTERNAL_VARIABLES := \
|
|||
CPP_UNIT_TESTS \
|
||||
DIRS \
|
||||
DIST_SUBDIR \
|
||||
EXTRA_DSO_LDOPTS \
|
||||
EXTRA_PP_COMPONENTS \
|
||||
EXTRA_PP_JS_MODULES \
|
||||
FINAL_LIBRARY \
|
||||
|
|
@ -53,13 +54,19 @@ _MOZBUILD_EXTERNAL_VARIABLES := \
|
|||
JAR_MANIFEST \
|
||||
JS_MODULES_PATH \
|
||||
LIBRARY_NAME \
|
||||
LIBS \
|
||||
LIBXUL_LIBRARY \
|
||||
MAKE_FRAMEWORK \
|
||||
MODULE \
|
||||
MSVC_ENABLE_PGO \
|
||||
NO_DIST_INSTALL \
|
||||
PARALLEL_DIRS \
|
||||
SDK_HEADERS \
|
||||
SDK_LIBRARY \
|
||||
SHARED_LIBRARY_LIBS \
|
||||
SHARED_LIBRARY_NAME \
|
||||
SIMPLE_PROGRAMS \
|
||||
STATIC_LIBRARY_NAME \
|
||||
TEST_DIRS \
|
||||
TIERS \
|
||||
TOOL_DIRS \
|
||||
|
|
@ -234,8 +241,6 @@ else
|
|||
endif
|
||||
endif
|
||||
|
||||
MOZALLOC_LIB = $(call EXPAND_MOZLIBNAME,mozalloc)
|
||||
|
||||
OS_CFLAGS += $(_DEBUG_CFLAGS)
|
||||
OS_CXXFLAGS += $(_DEBUG_CFLAGS)
|
||||
OS_LDFLAGS += $(_DEBUG_LDFLAGS)
|
||||
|
|
@ -302,33 +307,9 @@ endif
|
|||
ifdef MODULE_NAME
|
||||
$(error MODULE_NAME is $(MODULE_NAME) but MODULE_NAME and LIBXUL_LIBRARY are not compatible)
|
||||
endif
|
||||
FORCE_STATIC_LIB=1
|
||||
SHORT_LIBNAME=
|
||||
endif
|
||||
|
||||
# If we are building this component into an extension/xulapp, it cannot be
|
||||
# statically linked. In the future we may want to add a xulapp meta-component
|
||||
# build option.
|
||||
|
||||
ifdef XPI_NAME
|
||||
ifdef IS_COMPONENT
|
||||
FORCE_STATIC_LIB=
|
||||
FORCE_SHARED_LIB=1
|
||||
endif
|
||||
endif
|
||||
|
||||
ifndef SHARED_LIBRARY_NAME
|
||||
ifdef LIBRARY_NAME
|
||||
SHARED_LIBRARY_NAME=$(LIBRARY_NAME)
|
||||
endif
|
||||
endif
|
||||
|
||||
ifndef STATIC_LIBRARY_NAME
|
||||
ifdef LIBRARY_NAME
|
||||
STATIC_LIBRARY_NAME=$(LIBRARY_NAME)
|
||||
endif
|
||||
endif
|
||||
|
||||
# Enable profile-based feedback
|
||||
ifndef NO_PROFILE_GUIDED_OPTIMIZE
|
||||
ifdef MOZ_PROFILE_GENERATE
|
||||
|
|
@ -513,17 +494,6 @@ endif
|
|||
#
|
||||
# Override defaults
|
||||
|
||||
# We need to know where to find the libraries we
|
||||
# put on the link line for binaries, and should
|
||||
# we link statically or dynamic? Assuming dynamic for now.
|
||||
|
||||
ifneq (WINNT_,$(OS_ARCH)_$(GNU_CC))
|
||||
LIBS_DIR = -L$(DIST)/bin -L$(DIST)/lib
|
||||
ifdef LIBXUL_SDK
|
||||
LIBS_DIR += -L$(LIBXUL_SDK)/bin -L$(LIBXUL_SDK)/lib
|
||||
endif
|
||||
endif
|
||||
|
||||
# Default location of include files
|
||||
IDL_PARSER_DIR = $(topsrcdir)/xpcom/idl-parser
|
||||
IDL_PARSER_CACHE_DIR = $(DEPTH)/xpcom/idl-parser
|
||||
|
|
@ -533,8 +503,6 @@ SDK_BIN_DIR = $(DIST)/sdk/bin
|
|||
|
||||
DEPENDENCIES = .md
|
||||
|
||||
MOZ_COMPONENT_LIBS=$(XPCOM_LIBS) $(MOZ_COMPONENT_NSPR_LIBS)
|
||||
|
||||
ifeq (xpconnect, $(findstring xpconnect, $(BUILD_MODULES)))
|
||||
DEFINES += -DXPCONNECT_STANDALONE
|
||||
endif
|
||||
|
|
@ -774,7 +742,7 @@ export CL_INCLUDES_PREFIX
|
|||
|
||||
ifneq (,$(MOZ_LIBSTDCXX_TARGET_VERSION)$(MOZ_LIBSTDCXX_HOST_VERSION))
|
||||
ifdef MOZ_LIBSTDCXX_TARGET_VERSION
|
||||
EXTRA_LIBS += $(call EXPAND_LIBNAME_PATH,stdc++compat,$(DEPTH)/mozilla/build/unix/stdc++compat)
|
||||
OS_LIBS += $(call EXPAND_LIBNAME_PATH,stdc++compat,$(DEPTH)/mozilla/build/unix/stdc++compat)
|
||||
endif
|
||||
ifdef MOZ_LIBSTDCXX_HOST_VERSION
|
||||
HOST_EXTRA_LIBS += $(call EXPAND_LIBNAME_PATH,host_stdc++compat,$(DEPTH)/mozilla/build/unix/stdc++compat)
|
||||
|
|
|
|||
|
|
@ -86,15 +86,14 @@ ifdef CPP_UNIT_TESTS
|
|||
# Compile the tests to $(DIST)/bin. Make lots of niceties available by default
|
||||
# through TestHarness.h, by modifying the list of includes and the libs against
|
||||
# which stuff links.
|
||||
CPPSRCS += $(CPP_UNIT_TESTS)
|
||||
SIMPLE_PROGRAMS += $(CPP_UNIT_TESTS:.cpp=$(BIN_SUFFIX))
|
||||
SIMPLE_PROGRAMS += $(CPP_UNIT_TESTS)
|
||||
INCLUDES += -I$(DIST)/include/testing
|
||||
LIBS += $(XPCOM_GLUE_LDOPTS) $(NSPR_LIBS)
|
||||
LIBS += $(NSPR_LIBS)
|
||||
|
||||
# ...and run them the usual way
|
||||
check::
|
||||
@$(EXIT_ON_ERROR) \
|
||||
for f in $(subst .cpp,$(BIN_SUFFIX),$(CPP_UNIT_TESTS)); do \
|
||||
for f in $(CPP_UNIT_TESTS); do \
|
||||
XPCOM_DEBUG_BREAK=stack-and-abort $(RUN_TEST_PROGRAM) $(DIST)/bin/$$f; \
|
||||
done
|
||||
|
||||
|
|
@ -113,15 +112,24 @@ endif # ENABLE_TESTS
|
|||
#
|
||||
|
||||
ifndef LIBRARY
|
||||
ifdef STATIC_LIBRARY_NAME
|
||||
REAL_LIBRARY := $(LIB_PREFIX)$(STATIC_LIBRARY_NAME).$(LIB_SUFFIX)
|
||||
ifdef REAL_LIBRARY
|
||||
# Don't build actual static library if a shared library is also built
|
||||
ifdef FORCE_SHARED_LIB
|
||||
# ... except when we really want one
|
||||
ifdef NO_EXPAND_LIBS
|
||||
LIBRARY := $(REAL_LIBRARY) $(REAL_LIBRARY).$(LIBS_DESC_SUFFIX)
|
||||
else
|
||||
LIBRARY := $(REAL_LIBRARY).$(LIBS_DESC_SUFFIX)
|
||||
endif
|
||||
else
|
||||
# Only build actual library if it is installed in DIST/lib or SDK
|
||||
ifeq (,$(SDK_LIBRARY)$(DIST_INSTALL)$(NO_EXPAND_LIBS))
|
||||
LIBRARY := $(REAL_LIBRARY).$(LIBS_DESC_SUFFIX)
|
||||
else
|
||||
LIBRARY := $(REAL_LIBRARY) $(REAL_LIBRARY).$(LIBS_DESC_SUFFIX)
|
||||
endif
|
||||
endif # STATIC_LIBRARY_NAME
|
||||
endif
|
||||
endif # REAL_LIBRARY
|
||||
endif # LIBRARY
|
||||
|
||||
ifndef HOST_LIBRARY
|
||||
|
|
@ -131,50 +139,19 @@ endif
|
|||
endif
|
||||
|
||||
ifdef LIBRARY
|
||||
ifdef MKSHLIB
|
||||
ifdef FORCE_SHARED_LIB
|
||||
ifdef MKSHLIB
|
||||
|
||||
ifdef LIB_IS_C_ONLY
|
||||
MKSHLIB = $(MKCSHLIB)
|
||||
endif
|
||||
|
||||
ifneq (,$(filter WINNT,$(OS_ARCH)))
|
||||
IMPORT_LIBRARY := $(LIB_PREFIX)$(SHARED_LIBRARY_NAME).$(IMPORT_LIB_SUFFIX)
|
||||
endif
|
||||
|
||||
ifdef MAKE_FRAMEWORK
|
||||
SHARED_LIBRARY := $(SHARED_LIBRARY_NAME)
|
||||
else
|
||||
SHARED_LIBRARY := $(DLL_PREFIX)$(SHARED_LIBRARY_NAME)$(DLL_SUFFIX)
|
||||
endif
|
||||
|
||||
EMBED_MANIFEST_AT=2
|
||||
|
||||
endif # FORCE_SHARED_LIB
|
||||
|
||||
ifdef SONAME
|
||||
DSO_SONAME = $(DLL_PREFIX)$(SONAME)$(DLL_SUFFIX)
|
||||
else
|
||||
DSO_SONAME = $(notdir $@)
|
||||
endif
|
||||
|
||||
endif # MKSHLIB
|
||||
endif # FORCE_SHARED_LIB
|
||||
endif # LIBRARY
|
||||
|
||||
ifdef FORCE_STATIC_LIB
|
||||
ifndef FORCE_SHARED_LIB
|
||||
SHARED_LIBRARY := $(NULL)
|
||||
DEF_FILE := $(NULL)
|
||||
IMPORT_LIBRARY := $(NULL)
|
||||
endif
|
||||
endif
|
||||
|
||||
ifdef FORCE_SHARED_LIB
|
||||
ifndef FORCE_STATIC_LIB
|
||||
LIBRARY := $(NULL)
|
||||
endif
|
||||
endif
|
||||
|
||||
ifeq ($(OS_ARCH),WINNT)
|
||||
ifndef GNU_CC
|
||||
|
||||
|
|
@ -264,7 +241,7 @@ ALL_TRASH = \
|
|||
$(GARBAGE) $(TARGETS) $(OBJS) $(PROGOBJS) LOGS TAGS a.out \
|
||||
$(filter-out $(ASFILES),$(OBJS:.$(OBJ_SUFFIX)=.s)) $(OBJS:.$(OBJ_SUFFIX)=.ii) \
|
||||
$(OBJS:.$(OBJ_SUFFIX)=.i) \
|
||||
$(HOST_PROGOBJS) $(HOST_OBJS) $(IMPORT_LIBRARY) $(DEF_FILE)\
|
||||
$(HOST_PROGOBJS) $(HOST_OBJS) $(IMPORT_LIBRARY) \
|
||||
$(EXE_DEF_FILE) so_locations _gen _stubs $(wildcard *.res) $(wildcard *.RES) \
|
||||
$(wildcard *.pdb) $(CODFILE) $(MAPFILE) $(IMPORT_LIBRARY) \
|
||||
$(SHARED_LIBRARY:$(DLL_SUFFIX)=.exp) $(wildcard *.ilk) \
|
||||
|
|
@ -643,7 +620,7 @@ ifdef PROGRAM
|
|||
endif
|
||||
ifdef SHARED_LIBRARY
|
||||
$(PYTHON) $(MOZILLA_SRCDIR)/build/win32/pgomerge.py \
|
||||
$(SHARED_LIBRARY_NAME) $(DIST)/bin
|
||||
$(patsubst $(DLL_PREFIX)%$(DLL_SUFFIX),%,$(SHARED_LIBRARY)) $(DIST)/bin
|
||||
endif
|
||||
endif # SHARED_LIBRARY || PROGRAM
|
||||
endif # WINNT_
|
||||
|
|
@ -701,7 +678,7 @@ ifdef MOZ_PROFILE_GENERATE
|
|||
touch -t `date +%Y%m%d%H%M.%S -d "now+5seconds"` pgo.relink
|
||||
endif
|
||||
else # !WINNT || GNU_CC
|
||||
$(EXPAND_CCC) -o $@ $(CXXFLAGS) $(PROGOBJS) $(RESFILE) $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(WRAP_LDFLAGS) $(MOZ_GLUE_PROGRAM_LDFLAGS) $(LIBS_DIR) $(LIBS) $(OS_LIBS) $(EXTRA_LIBS) $(BIN_FLAGS) $(EXE_DEF_FILE)
|
||||
$(EXPAND_CCC) -o $@ $(CXXFLAGS) $(PROGOBJS) $(RESFILE) $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(WRAP_LDFLAGS) $(LIBS) $(MOZ_GLUE_PROGRAM_LDFLAGS) $(EXTRA_LIBS) $(OS_LIBS) $(BIN_FLAGS) $(EXE_DEF_FILE) $(STLPORT_LIBS)
|
||||
endif # WINNT && !GNU_CC
|
||||
|
||||
ifdef ENABLE_STRIP
|
||||
|
|
@ -754,7 +731,7 @@ ifdef MSMANIFEST_TOOL
|
|||
fi
|
||||
endif # MSVC with manifest tool
|
||||
else
|
||||
$(EXPAND_CCC) $(CXXFLAGS) -o $@ $< $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(MOZ_GLUE_PROGRAM_LDFLAGS) $(WRAP_LDFLAGS) $(LIBS_DIR) $(LIBS) $(OS_LIBS) $(EXTRA_LIBS) $(BIN_FLAGS)
|
||||
$(EXPAND_CCC) $(CXXFLAGS) -o $@ $< $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(WRAP_LDFLAGS) $(LIBS) $(MOZ_GLUE_PROGRAM_LDFLAGS) $(EXTRA_LIBS) $(OS_LIBS) $(BIN_FLAGS) $(STLPORT_LIBS)
|
||||
endif # WINNT && !GNU_CC
|
||||
|
||||
ifdef ENABLE_STRIP
|
||||
|
|
@ -779,15 +756,15 @@ ifdef DTRACE_PROBE_OBJ
|
|||
EXTRA_DEPS += $(DTRACE_PROBE_OBJ)
|
||||
endif
|
||||
|
||||
$(filter %.$(LIB_SUFFIX),$(LIBRARY)): $(OBJS) $(LOBJS) $(EXTRA_DEPS) $(GLOBAL_DEPS)
|
||||
$(filter %.$(LIB_SUFFIX),$(LIBRARY)): $(OBJS) $(EXTRA_DEPS) $(GLOBAL_DEPS)
|
||||
$(RM) $(LIBRARY)
|
||||
$(EXPAND_AR) $(AR_FLAGS) $(OBJS) $(LOBJS) $(SHARED_LIBRARY_LIBS)
|
||||
$(EXPAND_AR) $(AR_FLAGS) $(OBJS) $(SHARED_LIBRARY_LIBS) $(filter %.$(LIB_SUFFIX),$(EXTRA_LIBS))
|
||||
$(RANLIB) $@
|
||||
|
||||
$(filter-out %.$(LIB_SUFFIX),$(LIBRARY)): $(filter %.$(LIB_SUFFIX),$(LIBRARY)) $(OBJS) $(LOBJS) $(EXTRA_DEPS) $(GLOBAL_DEPS)
|
||||
$(filter-out %.$(LIB_SUFFIX),$(LIBRARY)): $(filter %.$(LIB_SUFFIX),$(LIBRARY)) $(OBJS) $(EXTRA_DEPS) $(GLOBAL_DEPS)
|
||||
# When we only build a library descriptor, blow out any existing library
|
||||
$(if $(filter %.$(LIB_SUFFIX),$(LIBRARY)),,$(RM) $(REAL_LIBRARY))
|
||||
$(EXPAND_LIBS_GEN) -o $@ $(OBJS) $(LOBJS) $(SHARED_LIBRARY_LIBS)
|
||||
$(EXPAND_LIBS_GEN) -o $@ $(OBJS) $(SHARED_LIBRARY_LIBS) $(filter %.$(LIB_SUFFIX),$(EXTRA_LIBS))
|
||||
|
||||
ifeq ($(OS_ARCH),WINNT)
|
||||
$(IMPORT_LIBRARY): $(SHARED_LIBRARY)
|
||||
|
|
@ -814,17 +791,18 @@ endif
|
|||
# symlinks back to the originals. The symlinks are a no-op for stabs debugging,
|
||||
# so no need to conditionalize on OS version or debugging format.
|
||||
|
||||
$(SHARED_LIBRARY): $(OBJS) $(LOBJS) $(DEF_FILE) $(RESFILE) $(LIBRARY) $(EXTRA_DEPS) $(DSO_LDOPTS_DEPS) $(GLOBAL_DEPS)
|
||||
$(SHARED_LIBRARY): $(OBJS) $(RESFILE) $(LIBRARY) $(EXTRA_DEPS) $(DSO_LDOPTS_DEPS) $(GLOBAL_DEPS)
|
||||
ifndef INCREMENTAL_LINKER
|
||||
rm -f $@
|
||||
$(RM) $@
|
||||
endif
|
||||
ifdef DTRACE_LIB_DEPENDENT
|
||||
ifndef XP_MACOSX
|
||||
dtrace -G -C -s $(MOZILLA_DTRACE_SRC) -o $(DTRACE_PROBE_OBJ) $(shell $(EXPAND_LIBS) $(MOZILLA_PROBE_LIBS))
|
||||
endif
|
||||
$(EXPAND_MKSHLIB) $(SHLIB_LDSTARTFILE) $(OBJS) $(LOBJS) $(SUB_SHLOBJS) $(DTRACE_PROBE_OBJ) $(MOZILLA_PROBE_LIBS) $(RESFILE) $(LDFLAGS) $(MOZ_GLUE_LDFLAGS) $(WRAP_LDFLAGS) $(SHARED_LIBRARY_LIBS) $(EXTRA_DSO_LDOPTS) $(OS_LIBS) $(EXTRA_LIBS) $(DEF_FILE) $(SHLIB_LDENDFILE)
|
||||
$(EXPAND_MKSHLIB) $(SHLIB_LDSTARTFILE) $(OBJS) $(SUB_SHLOBJS) $(DTRACE_PROBE_OBJ) $(MOZILLA_PROBE_LIBS) $(RESFILE) $(LDFLAGS) $(WRAP_LDFLAGS) $(SHARED_LIBRARY_LIBS) $(EXTRA_DSO_LDOPTS) $(MOZ_GLUE_LDFLAGS) $(EXTRA_LIBS) $(OS_LIBS) $(SHLIB_LDENDFILE) $(if $(LIB_IS_C_ONLY),,$(STLPORT_LIBS))
|
||||
@$(RM) $(DTRACE_PROBE_OBJ)
|
||||
else # ! DTRACE_LIB_DEPENDENT
|
||||
$(EXPAND_MKSHLIB) $(SHLIB_LDSTARTFILE) $(OBJS) $(DTRACE_PROBE_OBJ) $(LOBJS) $(SUB_SHLOBJS) $(RESFILE) $(LDFLAGS) $(MOZ_GLUE_LDFLAGS) $(WRAP_LDFLAGS) $(SHARED_LIBRARY_LIBS) $(EXTRA_DSO_LDOPTS) $(OS_LIBS) $(EXTRA_LIBS) $(DEF_FILE) $(SHLIB_LDENDFILE)
|
||||
$(EXPAND_MKSHLIB) $(SHLIB_LDSTARTFILE) $(OBJS) $(SUB_SHLOBJS) $(RESFILE) $(LDFLAGS) $(WRAP_LDFLAGS) $(SHARED_LIBRARY_LIBS) $(EXTRA_DSO_LDOPTS) $(MOZ_GLUE_LDFLAGS) $(EXTRA_LIBS) $(OS_LIBS) $(SHLIB_LDENDFILE) $(if $(LIB_IS_C_ONLY),,$(STLPORT_LIBS))
|
||||
endif # DTRACE_LIB_DEPENDENT
|
||||
|
||||
ifeq (_WINNT,$(GNU_CC)_$(OS_ARCH))
|
||||
|
|
|
|||
|
|
@ -13,10 +13,7 @@ include $(DEPTH)/config/autoconf.mk
|
|||
ifdef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
|
||||
MODULE_NAME = nsMorkModule
|
||||
|
||||
EXTRA_DSO_LDOPTS += \
|
||||
$(XPCOM_GLUE_LDOPTS) \
|
||||
$(NSPR_LIBS) \
|
||||
$(NULL)
|
||||
EXTRA_LIBS += $(NSPR_LIBS)
|
||||
endif
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
|
|
|||
|
|
@ -12,9 +12,16 @@ SOURCES += [
|
|||
'nsMorkFactory.cpp',
|
||||
]
|
||||
|
||||
USE_LIBS += [
|
||||
'mozalloc',
|
||||
]
|
||||
|
||||
if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
|
||||
IS_COMPONENT = True
|
||||
FORCE_SHARED_LIB = True
|
||||
USE_LIBS += [
|
||||
'xpcomglue_s',
|
||||
'xul',
|
||||
]
|
||||
else:
|
||||
FINAL_LIBRARY = 'xul'
|
||||
|
||||
|
|
|
|||
|
|
@ -18,15 +18,9 @@ ifdef MOZ_PREF_EXTENSIONS
|
|||
DEFINES += -DMOZ_PREF_EXTENSIONS
|
||||
endif
|
||||
|
||||
EXTRA_DSO_LDOPTS += $(LDAP_LIBS)
|
||||
ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
|
||||
EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS)
|
||||
else
|
||||
EXTRA_DSO_LDOPTS += \
|
||||
$(XPCOM_GLUE_LDOPTS) \
|
||||
$(MOZ_JS_LIBS) \
|
||||
$(NSPR_LIBS) \
|
||||
$(NULL)
|
||||
EXTRA_LIBS += $(LDAP_LIBS)
|
||||
ifdef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
|
||||
EXTRA_LIBS += $(NSPR_LIBS)
|
||||
endif
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
|
|
|||
|
|
@ -26,9 +26,21 @@ EXTRA_COMPONENTS += [
|
|||
'nsLDAPProtocolHandler.js',
|
||||
]
|
||||
|
||||
USE_LIBS += [
|
||||
'mozalloc',
|
||||
]
|
||||
|
||||
if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
|
||||
IS_COMPONENT = True
|
||||
FORCE_SHARED_LIB = True
|
||||
USE_LIBS += [
|
||||
'xpcomglue_s',
|
||||
'xul',
|
||||
]
|
||||
# js needs to come after xul for now, because it is an archive and its content
|
||||
# is discarded when it comes first.
|
||||
USE_LIBS += [
|
||||
'js',
|
||||
]
|
||||
else:
|
||||
FINAL_LIBRARY = 'xul'
|
||||
|
||||
|
|
|
|||
|
|
@ -51,12 +51,8 @@ DIST_FILES = application.ini
|
|||
DEFINES += -DXPCOM_GLUE
|
||||
STL_FLAGS=
|
||||
|
||||
LIBS += \
|
||||
$(XPCOM_STANDALONE_GLUE_LDOPTS) \
|
||||
$(NULL)
|
||||
|
||||
ifdef MOZ_LINKER
|
||||
LIBS += $(MOZ_ZLIB_LIBS)
|
||||
OS_LIBS += $(MOZ_ZLIB_LIBS)
|
||||
endif
|
||||
|
||||
ifndef MOZ_WINCONSOLE
|
||||
|
|
|
|||
|
|
@ -13,3 +13,7 @@ if not CONFIG['LIBXUL_SDK']:
|
|||
'/mozilla/xpcom/base',
|
||||
'/mozilla/xpcom/build',
|
||||
]
|
||||
|
||||
USE_LIBS += [
|
||||
'xpcomglue',
|
||||
]
|
||||
|
|
|
|||
|
|
@ -11,12 +11,8 @@ include $(DEPTH)/config/autoconf.mk
|
|||
|
||||
ifdef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
|
||||
MODULE_NAME = nsMailCompsModule
|
||||
EXTRA_DSO_LDOPTS += \
|
||||
$(XPCOM_GLUE_LDOPTS) \
|
||||
$(NSPR_LIBS) \
|
||||
$(GLIB_LIBS) \
|
||||
$(call EXPAND_LIBNAME_PATH,unicharutil_external_s,$(LIBXUL_DIST)/lib) \
|
||||
$(NULL)
|
||||
EXTRA_LIBS += $(NSPR_LIBS)
|
||||
OS_LIBS += $(GLIB_LIBS)
|
||||
endif
|
||||
|
||||
ifeq ($(OS_ARCH),WINNT)
|
||||
|
|
|
|||
|
|
@ -7,11 +7,19 @@ SOURCES += [
|
|||
'nsMailComps.cpp',
|
||||
]
|
||||
|
||||
USE_LIBS += [
|
||||
'mozalloc',
|
||||
]
|
||||
|
||||
# NOTE: if we switch away from LIBXUL_LIBRARY at any stage
|
||||
# we need to clear the EMBED_MANIFEST_AT flag. (See Bug 714495)
|
||||
if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
|
||||
IS_COMPONENT = True
|
||||
FORCE_SHARED_LIB = True
|
||||
USE_LIBS += [
|
||||
'unicharutil_external_s',
|
||||
'xpcomglue_s',
|
||||
'xul',
|
||||
]
|
||||
else:
|
||||
FINAL_LIBRARY = 'xul'
|
||||
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ INSTALL_TARGETS += PLIST
|
|||
CFLAGS += -mmacosx-version-min=$(MACOSX_DEPLOYMENT_TARGET)
|
||||
# We don't need mozglue
|
||||
WRAP_LDFLAGS :=
|
||||
LIBS += \
|
||||
OS_LDFLAGS += \
|
||||
-framework CoreFoundation \
|
||||
-framework CoreServices \
|
||||
$(NULL)
|
||||
|
|
|
|||
|
|
@ -6,10 +6,18 @@
|
|||
XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
|
||||
|
||||
CPP_UNIT_TESTS += [
|
||||
'TestMailCookie.cpp',
|
||||
'TestMailCookie',
|
||||
]
|
||||
|
||||
SOURCES += sorted('%s.cpp' % t for t in CPP_UNIT_TESTS)
|
||||
|
||||
LOCAL_INCLUDES += [
|
||||
'/mozilla/netwerk/test',
|
||||
'/mozilla/xpcom/tests',
|
||||
]
|
||||
|
||||
USE_LIBS += [
|
||||
'mozalloc',
|
||||
'xpcomglue_s',
|
||||
'xul',
|
||||
]
|
||||
|
|
|
|||
|
|
@ -14,26 +14,14 @@ ifdef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
|
|||
MODULE_NAME = nsMailModule
|
||||
endif
|
||||
|
||||
EXTRA_DSO_LDOPTS = \
|
||||
$(LIBS_DIR) \
|
||||
$(MOZ_JS_LIBS) \
|
||||
$(XPCOM_GLUE_LDOPTS) \
|
||||
$(call EXPAND_LIBNAME_PATH,unicharutil_external_s,$(LIBXUL_DIST)/lib) \
|
||||
$(call EXPAND_LIBNAME_PATH,rdfutil_external_s,$(LIBXUL_DIST)/lib) \
|
||||
$(NSPR_LIBS) \
|
||||
$(XPCOM_LIBS) \
|
||||
$(NULL)
|
||||
EXTRA_LIBS += $(NSPR_LIBS)
|
||||
ifneq (WINNT,$(OS_ARCH))
|
||||
EXTRA_DSO_LDOPTS += \
|
||||
$(MOZ_ZLIB_LIBS) \
|
||||
$(NULL)
|
||||
OS_LIBS += $(MOZ_ZLIB_LIBS)
|
||||
endif
|
||||
|
||||
ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
|
||||
EXTRA_DSO_LDOPTS += \
|
||||
$(TK_LIBS) \
|
||||
-framework Cocoa \
|
||||
$(NULL)
|
||||
OS_LIBS += $(TK_LIBS)
|
||||
OS_LDFLAGS += -framework Cocoa
|
||||
endif
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
|
|
|||
|
|
@ -7,12 +7,27 @@ SOURCES += [
|
|||
'nsMailModule.cpp',
|
||||
]
|
||||
|
||||
USE_LIBS += [
|
||||
'mozalloc',
|
||||
]
|
||||
|
||||
if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
|
||||
IS_COMPONENT = True
|
||||
FORCE_SHARED_LIB = True
|
||||
USE_LIBS += [
|
||||
'rdfutil_external_s',
|
||||
'unicharutil_external_s',
|
||||
'xpcomglue_s',
|
||||
'xul',
|
||||
]
|
||||
else:
|
||||
FINAL_LIBRARY = 'xul'
|
||||
|
||||
# js needs to come after xul for now, because it is an archive and its content
|
||||
# is discarded when it comes first.
|
||||
USE_LIBS += [
|
||||
'js',
|
||||
]
|
||||
|
||||
LIBRARY_NAME = 'mail'
|
||||
|
||||
LOCAL_INCLUDES += [
|
||||
|
|
|
|||
|
|
@ -13,12 +13,5 @@ include $(DEPTH)/config/autoconf.mk
|
|||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
LIBS += $(XPCOM_GLUE_LDOPTS)
|
||||
|
||||
LIBS += \
|
||||
../src/$(LIB_PREFIX)msgimap_s.$(LIB_SUFFIX) \
|
||||
../../base/util/$(LIB_PREFIX)msgbsutl_s.$(LIB_SUFFIX) \
|
||||
$(XPCOM_LIBS) \
|
||||
$(NSPR_LIBS) \
|
||||
$(MOZ_ZLIB_LIBS) \
|
||||
$(NULL)
|
||||
EXTRA_LIBS += $(NSPR_LIBS)
|
||||
OS_LIBS += $(MOZ_ZLIB_LIBS)
|
||||
|
|
|
|||
|
|
@ -11,3 +11,10 @@ LOCAL_INCLUDES += [
|
|||
'/mozilla/xpcom/tests',
|
||||
]
|
||||
|
||||
USE_LIBS += [
|
||||
'mozalloc',
|
||||
'msgbsutl_s',
|
||||
'msgimap_s',
|
||||
'xpcomglue_s',
|
||||
'xul',
|
||||
]
|
||||
|
|
|
|||
|
|
@ -15,33 +15,14 @@ MODULE_NAME = nsImportServiceModule
|
|||
SHARED_LIBRARY_LIBS = ../../base/util/$(LIB_PREFIX)msgbsutl_s.$(LIB_SUFFIX)
|
||||
endif
|
||||
|
||||
|
||||
EXTRA_DSO_LDOPTS += \
|
||||
$(LIBS_DIR) \
|
||||
$(MOZ_JS_LIBS) \
|
||||
$(XPCOM_GLUE_LDOPTS) \
|
||||
$(call EXPAND_LIBNAME_PATH,unicharutil_external_s,$(LIBXUL_DIST)/lib) \
|
||||
$(MOZDEPTH)/rdf/util/src/$(LIB_PREFIX)rdfutil_external_s.$(LIB_SUFFIX) \
|
||||
$(NSPR_LIBS) \
|
||||
$(XPCOM_LIBS) \
|
||||
$(NULL)
|
||||
EXTRA_LIBS += $(NSPR_LIBS)
|
||||
ifneq (WINNT,$(OS_ARCH))
|
||||
EXTRA_DSO_LDOPTS += \
|
||||
$(MOZ_ZLIB_LIBS) \
|
||||
$(NULL)
|
||||
OS_LIBS += $(MOZ_ZLIB_LIBS)
|
||||
endif
|
||||
|
||||
ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
|
||||
EXTRA_DSO_LDOPTS += \
|
||||
-framework Cocoa \
|
||||
$(TK_LIBS) \
|
||||
$(NULL)
|
||||
endif
|
||||
|
||||
ifeq ($(OS_ARCH),AIX)
|
||||
EXTRA_DSO_LDOPTS += \
|
||||
$(MOZDEPTH)/rdf/util/src/$(LIB_PREFIX)rdfutil_external_s.$(LIB_SUFFIX) \
|
||||
$(NULL)
|
||||
OS_LIBS += $(TK_LIBS)
|
||||
OS_LDFLAGS += -framework Cocoa
|
||||
endif
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
|
|
|||
|
|
@ -7,12 +7,27 @@ SOURCES += [
|
|||
'nsImportModule.cpp',
|
||||
]
|
||||
|
||||
USE_LIBS += [
|
||||
'mozalloc',
|
||||
]
|
||||
|
||||
if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
|
||||
IS_COMPONENT = True
|
||||
FORCE_SHARED_LIB = True
|
||||
USE_LIBS += [
|
||||
'rdfutil_external_s',
|
||||
'unicharutil_external_s',
|
||||
'xpcomglue_s',
|
||||
'xul',
|
||||
]
|
||||
else:
|
||||
FINAL_LIBRARY = 'xul'
|
||||
|
||||
# js needs to come after xul for now, because it is an archive and its content
|
||||
# is discarded when it comes first.
|
||||
USE_LIBS += [
|
||||
'js',
|
||||
]
|
||||
|
||||
LIBRARY_NAME = 'import'
|
||||
|
||||
LOCAL_INCLUDES += [
|
||||
|
|
|
|||
|
|
@ -26,10 +26,6 @@ else
|
|||
DEFINES += -DXPCOM_GLUE
|
||||
STL_FLAGS=
|
||||
|
||||
LIBS += \
|
||||
$(XPCOM_STANDALONE_GLUE_LDOPTS) \
|
||||
$(NULL)
|
||||
|
||||
ifndef MOZ_WINCONSOLE
|
||||
ifdef MOZ_DEBUG
|
||||
MOZ_WINCONSOLE = 1
|
||||
|
|
|
|||
|
|
@ -12,3 +12,7 @@ if not CONFIG['LIBXUL_SDK']:
|
|||
'/mozilla/xpcom/build',
|
||||
]
|
||||
GENERATED_INCLUDES += ['/build']
|
||||
|
||||
USE_LIBS += [
|
||||
'xpcomglue',
|
||||
]
|
||||
|
|
|
|||
|
|
@ -17,14 +17,7 @@ ifeq ($(OS_ARCH),WINNT)
|
|||
OS_LIBS += $(call EXPAND_LIBNAME,ole32 shell32)
|
||||
endif
|
||||
|
||||
EXTRA_DSO_LDOPTS += \
|
||||
$(LIBS_DIR) \
|
||||
$(call EXPAND_LIBNAME_PATH,unicharutil_external_s,$(LIBXUL_DIST)/lib) \
|
||||
$(MOZ_JS_LIBS) \
|
||||
$(XPCOM_STATICRUNTIME_GLUE_LDOPTS) \
|
||||
$(MOZ_COMPONENT_LIBS) \
|
||||
$(TK_LIBS) \
|
||||
$(NULL)
|
||||
OS_LIBS += $(TK_LIBS)
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
|
|
|
|||
|
|
@ -7,7 +7,6 @@ SOURCES += [
|
|||
'nsSuiteModule.cpp',
|
||||
]
|
||||
|
||||
FORCE_SHARED_LIB = True
|
||||
IS_COMPONENT = True
|
||||
|
||||
LIBRARY_NAME = 'suite'
|
||||
|
|
@ -19,3 +18,23 @@ LOCAL_INCLUDES += [
|
|||
'/suite/shell/src',
|
||||
]
|
||||
|
||||
USE_LIBS += [
|
||||
'mozalloc',
|
||||
'unicharutil_external_s',
|
||||
'xul',
|
||||
]
|
||||
|
||||
if CONFIG['OS_ARCH'] == 'WINNT':
|
||||
USE_LIBS += [
|
||||
'xpcomglue_staticruntime_s',
|
||||
]
|
||||
else:
|
||||
USE_LIBS += [
|
||||
'xpcomglue_s',
|
||||
]
|
||||
|
||||
# js needs to come after xul for now, because it is an archive and its content
|
||||
# is discarded when it comes first.
|
||||
USE_LIBS += [
|
||||
'js',
|
||||
]
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ VPATH = @srcdir@
|
|||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
EXTRA_DSO_LDOPTS = $(MOZ_COMPONENT_LIBS)
|
||||
EXTRA_LIBS += $(NSPR_LIBS)
|
||||
|
||||
USE_STATIC_LIBS = 1
|
||||
|
||||
|
|
|
|||
|
|
@ -15,3 +15,8 @@ SOURCES += [
|
|||
FINAL_LIBRARY = 'suite'
|
||||
|
||||
JAR_MANIFESTS += ['jar.mn']
|
||||
|
||||
USE_LIBS += [
|
||||
'mozalloc',
|
||||
'xul',
|
||||
]
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче