зеркало из https://github.com/mozilla/gecko-dev.git
Bug 715576 - libalerts_s.dylib is incorrectly-named (_s indicates a static library) and links against the static-js library, which is bad. Make it link against either libxul (static-js) or the dynamic-js library correctly, and rename it. r=ted
This commit is contained in:
Родитель
94dd505e34
Коммит
f85430f5f5
|
@ -402,7 +402,7 @@
|
|||
@BINPATH@/components/nsWifiWorker.manifest
|
||||
#endif
|
||||
#ifdef XP_MACOSX
|
||||
@BINPATH@/components/libalerts_s.dylib
|
||||
@BINPATH@/components/libalerts.dylib
|
||||
#endif
|
||||
#ifdef MOZ_ENABLE_DBUS
|
||||
@BINPATH@/components/@DLL_PREFIX@dbusservice@DLL_SUFFIX@
|
||||
|
|
|
@ -373,7 +373,7 @@
|
|||
@BINPATH@/components/BrowserProfileMigrators.manifest
|
||||
@BINPATH@/components/ChromeProfileMigrator.js
|
||||
#ifdef XP_MACOSX
|
||||
@BINPATH@/components/libalerts_s.dylib
|
||||
@BINPATH@/components/libalerts.dylib
|
||||
#endif
|
||||
#ifdef MOZ_ENABLE_DBUS
|
||||
@BINPATH@/components/@DLL_PREFIX@dbusservice@DLL_SUFFIX@
|
||||
|
|
|
@ -44,6 +44,9 @@ components/@DLL_PREFIX@brwsrdir@DLL_SUFFIX@
|
|||
components/@DLL_PREFIX@myspell@DLL_SUFFIX@
|
||||
components/@DLL_PREFIX@spellchecker@DLL_SUFFIX@
|
||||
components/@DLL_PREFIX@spellchk@DLL_SUFFIX@
|
||||
#ifdef XP_MACOSX
|
||||
components/libalerts_s.dylib
|
||||
#endif
|
||||
components/aboutCertError.js
|
||||
components/aboutPrivateBrowsing.js
|
||||
components/aboutRights.js
|
||||
|
|
|
@ -390,7 +390,7 @@
|
|||
@BINPATH@/components/nsFilePicker.js
|
||||
@BINPATH@/components/nsFilePicker.manifest
|
||||
#ifdef XP_MACOSX
|
||||
@BINPATH@/components/libalerts_s.dylib
|
||||
@BINPATH@/components/libalerts.dylib
|
||||
#endif
|
||||
#ifdef MOZ_ENABLE_DBUS
|
||||
@BINPATH@/components/@DLL_PREFIX@dbusservice@DLL_SUFFIX@
|
||||
|
|
|
@ -402,7 +402,7 @@
|
|||
@BINPATH@/components/nsWifiWorker.manifest
|
||||
#endif
|
||||
#ifdef XP_MACOSX
|
||||
@BINPATH@/components/libalerts_s.dylib
|
||||
@BINPATH@/components/libalerts.dylib
|
||||
#endif
|
||||
#ifdef MOZ_ENABLE_DBUS
|
||||
@BINPATH@/components/@DLL_PREFIX@dbusservice@DLL_SUFFIX@
|
||||
|
|
|
@ -42,7 +42,7 @@ VPATH = @srcdir@
|
|||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
MODULE = alerts
|
||||
LIBRARY_NAME = alerts_s
|
||||
LIBRARY_NAME = alerts
|
||||
IS_COMPONENT = 1
|
||||
FORCE_SHARED_LIB = 1
|
||||
|
||||
|
@ -70,11 +70,17 @@ SHARED_LIBRARY_LIBS = \
|
|||
growl/$(LIB_PREFIX)growl_s.$(LIB_SUFFIX) \
|
||||
$(NULL)
|
||||
|
||||
ifdef JS_SHARED_LIBRARY
|
||||
js_ldopts = $(MOZ_JS_LIBS)
|
||||
else
|
||||
js_ldopts = $(LIBXUL_LIBS)
|
||||
endif
|
||||
|
||||
EXTRA_DSO_LDOPTS += \
|
||||
-framework Carbon \
|
||||
$(XPCOM_GLUE_LDOPTS) \
|
||||
$(js_ldopts) \
|
||||
$(NSPR_LIBS) \
|
||||
$(MOZ_JS_LIBS) \
|
||||
$(NULL)
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
|
Загрузка…
Ссылка в новой задаче