mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-04-02 20:42:49 +00:00
Bug 306615 - Fold PSM into libxul r=darin
This commit is contained in:
parent
26d6dc029c
commit
a63c75a8a1
@ -264,6 +264,10 @@ ifdef MOZ_JSDEBUGGER
|
||||
tier_50_dirs += js/jsd
|
||||
endif
|
||||
|
||||
ifdef MOZ_PSM
|
||||
tier_50_dirs += security/manager
|
||||
endif
|
||||
|
||||
ifdef MOZ_ENABLE_LIBXUL
|
||||
tier_50_dirs += \
|
||||
toolkit/library \
|
||||
@ -275,10 +279,6 @@ ifdef NS_TRACE_MALLOC
|
||||
tier_50_dirs += tools/trace-malloc
|
||||
endif
|
||||
|
||||
ifdef MOZ_PSM
|
||||
tier_50_dirs += security/manager
|
||||
endif
|
||||
|
||||
ifdef MOZ_STORAGE
|
||||
tier_50_dirs += storage
|
||||
endif
|
||||
|
@ -51,7 +51,7 @@ MODULE_NAME = BOOT
|
||||
EXPORT_LIBRARY = 1
|
||||
META_COMPONENT = crypto
|
||||
GRE_MODULE = 1
|
||||
MOZILLA_INTERNAL_API = 1
|
||||
LIBXUL_LIBRARY = 1
|
||||
|
||||
PACKAGE_FILE = pipboot.pkg
|
||||
|
||||
|
@ -52,7 +52,7 @@ MODULE_NAME = PKI
|
||||
EXPORT_LIBRARY = 1
|
||||
META_COMPONENT = crypto
|
||||
GRE_MODULE = 1
|
||||
MOZILLA_INTERNAL_API = 1
|
||||
LIBXUL_LIBRARY = 1
|
||||
|
||||
PACKAGE_FILE = pippki.pkg
|
||||
|
||||
|
@ -52,7 +52,7 @@ MODULE_NAME = NSS
|
||||
EXPORT_LIBRARY = 1
|
||||
META_COMPONENT = crypto
|
||||
GRE_MODULE = 1
|
||||
MOZILLA_INTERNAL_API = 1
|
||||
LIBXUL_LIBRARY = 1
|
||||
|
||||
PACKAGE_FILE = pipnss.pkg
|
||||
|
||||
|
@ -133,6 +133,9 @@ COMPONENT_LIBS += \
|
||||
toolkitcomps \
|
||||
xpinstall \
|
||||
jsd \
|
||||
pippki \
|
||||
pipboot \
|
||||
pipnss \
|
||||
$(NULL)
|
||||
|
||||
ifeq ($(OS_ARCH),WINNT)
|
||||
@ -256,6 +259,7 @@ EXTRA_DSO_LDOPTS += \
|
||||
$(JPEG_LIBS) \
|
||||
$(PNG_LIBS) \
|
||||
$(MOZ_JS_LIBS) \
|
||||
$(NSS_LIBS) \
|
||||
$(NULL)
|
||||
|
||||
ifdef MOZ_NATIVE_ZLIB
|
||||
|
@ -192,6 +192,9 @@
|
||||
XREMOTE_MODULES \
|
||||
MODULE(nsSoftwareUpdate) \
|
||||
MODULE(JavaScript_Debugger) \
|
||||
MODULE(PKI) \
|
||||
MODULE(BOOT) \
|
||||
MODULE(NSS) \
|
||||
/* end of list */
|
||||
|
||||
#define MODULE(_name) \
|
||||
|
@ -88,6 +88,13 @@ DEPENDENT_LIBS_LIST += \
|
||||
|
||||
ifdef MOZ_ENABLE_LIBXUL
|
||||
|
||||
DEPENDENT_LIBS_LIST += \
|
||||
$(LIB_PREFIX)softokn3$(DLL_SUFFIX) \
|
||||
$(LIB_PREFIX)nss3$(DLL_SUFFIX) \
|
||||
$(LIB_PREFIX)ssl3$(DLL_SUFFIX) \
|
||||
$(LIB_PREFIX)smime3$(DLL_SUFFIX) \
|
||||
$(NULL)
|
||||
|
||||
ifeq (,$(filter-out WINNT WINCE,$(OS_ARCH)))
|
||||
DEPENDENT_LIBS_LIST += js$(MOZ_BITS)$(VERSION_NUMBER)$(DLL_SUFFIX)
|
||||
else
|
||||
|
Loading…
x
Reference in New Issue
Block a user