From 0ee041b9fd0e45c1fe4bf6838083f2ea1c0698aa Mon Sep 17 00:00:00 2001 From: Brian O'Keefe Date: Thu, 15 Aug 2013 09:02:09 -0400 Subject: [PATCH] Bug 875934 - Move LIBRARY_NAME to moz.build, batch 3; r=mshal --- accessible/src/windows/ia2/Makefile.in | 1 - accessible/src/windows/ia2/moz.build | 2 ++ accessible/src/windows/msaa/Makefile.in | 1 - accessible/src/windows/msaa/moz.build | 2 ++ accessible/src/windows/sdn/Makefile.in | 1 - accessible/src/windows/sdn/moz.build | 2 ++ accessible/src/windows/uia/Makefile.in | 1 - accessible/src/windows/uia/moz.build | 2 ++ chrome/src/Makefile.in | 1 - chrome/src/moz.build | 2 ++ content/base/src/Makefile.in | 1 - content/base/src/moz.build | 2 ++ content/canvas/src/Makefile.in | 1 - content/canvas/src/moz.build | 2 ++ content/events/src/Makefile.in | 1 - content/events/src/moz.build | 2 ++ content/html/content/src/Makefile.in | 1 - content/html/content/src/moz.build | 2 ++ content/mathml/content/src/Makefile.in | 1 - content/mathml/content/src/moz.build | 2 ++ content/media/Makefile.in | 1 - content/media/directshow/Makefile.in | 1 - content/media/directshow/moz.build | 2 ++ content/media/mediasource/Makefile.in | 1 - content/media/mediasource/moz.build | 2 ++ content/media/moz.build | 2 ++ content/media/omx/Makefile.in | 1 - content/media/omx/mediaresourcemanager/Makefile.in | 2 -- content/media/omx/mediaresourcemanager/moz.build | 2 ++ content/media/omx/moz.build | 2 ++ content/media/webaudio/Makefile.in | 1 - content/media/webaudio/blink/Makefile.in | 1 - content/media/webaudio/blink/moz.build | 2 ++ content/media/webaudio/moz.build | 2 ++ content/media/webrtc/Makefile.in | 1 - content/media/webrtc/moz.build | 2 ++ content/media/webspeech/recognition/Makefile.in | 1 - content/media/webspeech/recognition/moz.build | 2 ++ content/media/webspeech/synth/Makefile.in | 1 - content/media/webspeech/synth/moz.build | 2 ++ content/smil/Makefile.in | 1 - content/smil/moz.build | 2 ++ content/svg/content/src/Makefile.in | 1 - content/svg/content/src/moz.build | 2 ++ content/xbl/src/Makefile.in | 1 - content/xbl/src/moz.build | 2 ++ docshell/base/Makefile.in | 1 - docshell/base/moz.build | 2 ++ dom/activities/src/Makefile.in | 1 - dom/activities/src/moz.build | 2 ++ dom/alarm/Makefile.in | 1 - dom/alarm/moz.build | 2 ++ dom/audiochannel/Makefile.in | 1 - dom/audiochannel/moz.build | 2 ++ dom/base/Makefile.in | 1 - dom/base/moz.build | 2 ++ dom/battery/Makefile.in | 1 - dom/battery/moz.build | 2 ++ dom/bindings/Makefile.in | 1 - dom/bindings/moz.build | 2 ++ dom/bindings/test/Makefile.in | 1 - dom/bindings/test/moz.build | 2 ++ dom/browser-element/Makefile.in | 1 - dom/browser-element/moz.build | 2 ++ dom/camera/Makefile.in | 1 - dom/camera/moz.build | 2 ++ dom/cellbroadcast/src/Makefile.in | 1 - dom/cellbroadcast/src/moz.build | 2 ++ dom/devicestorage/Makefile.in | 1 - dom/devicestorage/moz.build | 2 ++ dom/encoding/Makefile.in | 1 - dom/encoding/moz.build | 2 ++ dom/file/Makefile.in | 1 - dom/file/moz.build | 2 ++ dom/fm/Makefile.in | 1 - dom/fm/moz.build | 2 ++ dom/gamepad/Makefile.in | 1 - dom/gamepad/moz.build | 2 ++ dom/icc/src/Makefile.in | 1 - dom/icc/src/moz.build | 2 ++ dom/indexedDB/Makefile.in | 1 - dom/indexedDB/ipc/Makefile.in | 1 - dom/indexedDB/ipc/moz.build | 2 ++ dom/indexedDB/moz.build | 2 ++ dom/interfaces/devicestorage/Makefile.in | 1 - dom/interfaces/devicestorage/moz.build | 2 ++ dom/ipc/Makefile.in | 1 - dom/ipc/moz.build | 2 ++ dom/media/Makefile.in | 1 - dom/media/moz.build | 2 ++ dom/mobilemessage/src/Makefile.in | 1 - dom/mobilemessage/src/moz.build | 2 ++ dom/network/src/Makefile.in | 1 - dom/network/src/moz.build | 2 ++ dom/plugins/base/Makefile.in | 1 - dom/plugins/base/android/Makefile.in | 1 - dom/plugins/base/android/moz.build | 2 ++ dom/plugins/base/moz.build | 2 ++ dom/plugins/ipc/Makefile.in | 1 - dom/plugins/ipc/moz.build | 2 ++ dom/power/Makefile.in | 1 - dom/power/moz.build | 2 ++ dom/promise/Makefile.in | 1 - dom/promise/moz.build | 2 ++ dom/quota/Makefile.in | 1 - dom/quota/moz.build | 2 ++ dom/src/geolocation/Makefile.in | 1 - dom/src/geolocation/moz.build | 2 ++ dom/src/notification/Makefile.in | 1 - dom/src/notification/moz.build | 2 ++ dom/src/storage/Makefile.in | 1 - dom/src/storage/moz.build | 2 ++ dom/system/Makefile.in | 1 - dom/system/android/Makefile.in | 2 -- dom/system/android/moz.build | 2 ++ dom/system/gonk/Makefile.in | 1 - dom/system/gonk/moz.build | 2 ++ dom/system/mac/Makefile.in | 2 -- dom/system/mac/moz.build | 2 ++ dom/system/moz.build | 2 ++ dom/system/unix/Makefile.in | 2 -- dom/system/unix/moz.build | 2 ++ dom/system/windows/Makefile.in | 2 -- dom/system/windows/moz.build | 2 ++ dom/telephony/Makefile.in | 1 - dom/telephony/moz.build | 2 ++ dom/time/Makefile.in | 1 - dom/time/moz.build | 2 ++ dom/voicemail/Makefile.in | 1 - dom/voicemail/moz.build | 2 ++ dom/wifi/Makefile.in | 1 - dom/wifi/moz.build | 2 ++ extensions/cookie/Makefile.in | 1 - extensions/cookie/moz.build | 2 ++ extensions/pref/autoconfig/src/Makefile.in | 1 - extensions/pref/autoconfig/src/moz.build | 2 ++ gfx/2d/Makefile.in | 1 - gfx/2d/moz.build | 2 ++ gfx/cairo/libpixman/src/Makefile.in | 1 - gfx/cairo/libpixman/src/moz.build | 2 ++ gfx/gl/Makefile.in | 1 - gfx/gl/moz.build | 2 ++ gfx/ipc/Makefile.in | 1 - gfx/ipc/moz.build | 2 ++ gfx/layers/Makefile.in | 1 - gfx/layers/moz.build | 2 ++ gfx/thebes/Makefile.in | 1 - gfx/thebes/moz.build | 2 ++ hal/Makefile.in | 1 - hal/moz.build | 2 ++ image/decoders/icon/android/Makefile.in | 1 - image/decoders/icon/android/moz.build | 2 ++ image/src/Makefile.in | 1 - image/src/moz.build | 2 ++ ipc/chromium/Makefile.in | 1 - ipc/chromium/moz.build | 2 ++ ipc/dbus/Makefile.in | 1 - ipc/dbus/moz.build | 2 ++ ipc/glue/Makefile.in | 1 - ipc/glue/moz.build | 2 ++ ipc/ipdl/Makefile.in | 1 - ipc/ipdl/moz.build | 2 ++ ipc/netd/Makefile.in | 1 - ipc/netd/moz.build | 2 ++ ipc/nfc/Makefile.in | 1 - ipc/nfc/moz.build | 2 ++ ipc/ril/Makefile.in | 1 - ipc/ril/moz.build | 2 ++ ipc/testshell/Makefile.in | 1 - ipc/testshell/moz.build | 2 ++ ipc/unixsocket/Makefile.in | 1 - ipc/unixsocket/moz.build | 2 ++ js/ipc/Makefile.in | 1 - js/ipc/moz.build | 2 ++ js/xpconnect/src/Makefile.in | 1 - js/xpconnect/src/moz.build | 2 ++ js/xpconnect/tests/components/js/Makefile.in | 1 - js/xpconnect/tests/components/js/moz.build | 2 ++ js/xpconnect/tests/components/native/Makefile.in | 1 - js/xpconnect/tests/components/native/moz.build | 2 ++ layout/base/Makefile.in | 1 - layout/base/moz.build | 2 ++ layout/build/Makefile.in | 1 - layout/build/moz.build | 2 ++ layout/generic/Makefile.in | 1 - layout/generic/moz.build | 2 ++ layout/ipc/Makefile.in | 1 - layout/ipc/moz.build | 2 ++ layout/mathml/Makefile.in | 1 - layout/mathml/moz.build | 2 ++ layout/style/Makefile.in | 1 - layout/style/moz.build | 2 ++ layout/svg/Makefile.in | 1 - layout/svg/moz.build | 2 ++ layout/xul/base/src/Makefile.in | 1 - layout/xul/base/src/moz.build | 2 ++ memory/replace/dmd/Makefile.in | 1 - memory/replace/dmd/moz.build | 3 +++ modules/libpref/src/Makefile.in | 1 - modules/libpref/src/moz.build | 2 ++ netwerk/base/src/Makefile.in | 1 - netwerk/base/src/moz.build | 2 ++ netwerk/build/Makefile.in | 1 - netwerk/build/moz.build | 2 ++ netwerk/ipc/Makefile.in | 1 - netwerk/ipc/moz.build | 2 ++ netwerk/protocol/about/Makefile.in | 1 - netwerk/protocol/about/moz.build | 2 ++ netwerk/protocol/device/Makefile.in | 1 - netwerk/protocol/device/moz.build | 2 ++ netwerk/protocol/ftp/Makefile.in | 1 - netwerk/protocol/ftp/moz.build | 2 ++ netwerk/protocol/http/Makefile.in | 1 - netwerk/protocol/http/moz.build | 2 ++ netwerk/protocol/res/Makefile.in | 1 - netwerk/protocol/res/moz.build | 2 ++ netwerk/protocol/websocket/Makefile.in | 1 - netwerk/protocol/websocket/moz.build | 2 ++ netwerk/protocol/wyciwyg/Makefile.in | 1 - netwerk/protocol/wyciwyg/moz.build | 2 ++ netwerk/sctp/datachannel/Makefile.in | 1 - netwerk/sctp/datachannel/moz.build | 2 ++ netwerk/sctp/src/Makefile.in | 1 - netwerk/sctp/src/moz.build | 2 ++ netwerk/srtp/src/Makefile.in | 1 - netwerk/srtp/src/moz.build | 2 ++ security/sandbox/Makefile.in | 1 - security/sandbox/moz.build | 2 ++ toolkit/components/alerts/Makefile.in | 1 - toolkit/components/alerts/moz.build | 2 ++ toolkit/components/build/Makefile.in | 1 - toolkit/components/build/moz.build | 2 ++ toolkit/components/diskspacewatcher/Makefile.in | 1 - toolkit/components/diskspacewatcher/moz.build | 2 ++ toolkit/components/downloads/Makefile.in | 1 - toolkit/components/downloads/moz.build | 2 ++ toolkit/components/mediasniffer/Makefile.in | 1 - toolkit/components/mediasniffer/moz.build | 2 ++ toolkit/components/protobuf/Makefile.in | 1 - toolkit/components/protobuf/moz.build | 2 ++ toolkit/components/telemetry/Makefile.in | 1 - toolkit/components/telemetry/moz.build | 2 ++ toolkit/crashreporter/Makefile.in | 1 - toolkit/crashreporter/injector/Makefile.in | 1 - toolkit/crashreporter/injector/moz.build | 2 ++ toolkit/crashreporter/moz.build | 2 ++ toolkit/xre/Makefile.in | 1 - toolkit/xre/moz.build | 2 ++ uriloader/exthandler/Makefile.in | 1 - uriloader/exthandler/moz.build | 2 ++ uriloader/prefetch/Makefile.in | 1 - uriloader/prefetch/moz.build | 2 ++ widget/android/Makefile.in | 1 - widget/android/moz.build | 2 ++ widget/gonk/Makefile.in | 1 - widget/gonk/libdisplay/Makefile.in | 1 - widget/gonk/libdisplay/moz.build | 3 +++ widget/gonk/moz.build | 2 ++ widget/gonk/nativewindow/Makefile.in | 1 - widget/gonk/nativewindow/moz.build | 2 ++ widget/qt/Makefile.in | 1 - widget/qt/moz.build | 2 ++ widget/shared/Makefile.in | 1 - widget/shared/moz.build | 2 ++ widget/shared/x11/Makefile.in | 1 - widget/shared/x11/moz.build | 2 ++ widget/windows/Makefile.in | 1 - widget/windows/moz.build | 2 ++ widget/windows/winrt/Makefile.in | 1 - widget/windows/winrt/moz.build | 2 ++ widget/xpwidgets/Makefile.in | 1 - widget/xpwidgets/moz.build | 2 ++ xpcom/base/Makefile.in | 1 - xpcom/base/moz.build | 2 ++ xpcom/build/Makefile.in | 1 - xpcom/build/moz.build | 2 ++ xpcom/io/Makefile.in | 1 - xpcom/io/moz.build | 2 ++ xpcom/reflect/xptcall/src/md/os2/Makefile.in | 1 - xpcom/reflect/xptcall/src/md/os2/moz.build | 2 ++ xpcom/reflect/xptcall/src/md/unix/Makefile.in | 1 - xpcom/reflect/xptcall/src/md/unix/moz.build | 3 +++ xpcom/reflect/xptcall/src/md/win32/Makefile.in | 1 - xpcom/reflect/xptcall/src/md/win32/moz.build | 3 +++ xpcom/sample/Makefile.in | 4 ---- xpcom/sample/moz.build | 5 +++++ xpcom/tests/bug656331_component/Makefile.in | 1 - xpcom/tests/bug656331_component/moz.build | 2 ++ xpcom/tests/component/Makefile.in | 1 - xpcom/tests/component/moz.build | 2 ++ xpcom/tests/component_no_aslr/Makefile.in | 1 - xpcom/tests/component_no_aslr/moz.build | 2 ++ xpfe/components/build/Makefile.in | 1 - xpfe/components/build/moz.build | 2 ++ 294 files changed, 301 insertions(+), 155 deletions(-) diff --git a/accessible/src/windows/ia2/Makefile.in b/accessible/src/windows/ia2/Makefile.in index 0b57d0c5b6c..2eae05159b1 100644 --- a/accessible/src/windows/ia2/Makefile.in +++ b/accessible/src/windows/ia2/Makefile.in @@ -9,7 +9,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBRARY_NAME = accessibility_toolkit_ia2_s EXPORT_LIBRARY = 1 # The midl generated code include Windows headers which defines min and max diff --git a/accessible/src/windows/ia2/moz.build b/accessible/src/windows/ia2/moz.build index 883f9978664..01665814af6 100644 --- a/accessible/src/windows/ia2/moz.build +++ b/accessible/src/windows/ia2/moz.build @@ -32,3 +32,5 @@ CPP_SOURCES += [ LIBXUL_LIBRARY = True +LIBRARY_NAME = 'accessibility_toolkit_ia2_s' + diff --git a/accessible/src/windows/msaa/Makefile.in b/accessible/src/windows/msaa/Makefile.in index e019041a9a7..a805a8e256c 100644 --- a/accessible/src/windows/msaa/Makefile.in +++ b/accessible/src/windows/msaa/Makefile.in @@ -9,7 +9,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBRARY_NAME = accessibility_toolkit_msaa_s EXPORT_LIBRARY = 1 include $(topsrcdir)/config/rules.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/accessible/src/windows/msaa/moz.build b/accessible/src/windows/msaa/moz.build index 52b83aa601b..f75bcf59902 100644 --- a/accessible/src/windows/msaa/moz.build +++ b/accessible/src/windows/msaa/moz.build @@ -44,3 +44,5 @@ if CONFIG['MOZ_XUL']: LIBXUL_LIBRARY = True +LIBRARY_NAME = 'accessibility_toolkit_msaa_s' + diff --git a/accessible/src/windows/sdn/Makefile.in b/accessible/src/windows/sdn/Makefile.in index ba998fda494..0c6595e9e82 100644 --- a/accessible/src/windows/sdn/Makefile.in +++ b/accessible/src/windows/sdn/Makefile.in @@ -9,7 +9,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBRARY_NAME = accessibility_toolkit_sdn_s EXPORT_LIBRARY = 1 # The midl generated code include Windows headers which defines min and max diff --git a/accessible/src/windows/sdn/moz.build b/accessible/src/windows/sdn/moz.build index b5768afe05a..b779adb20c0 100644 --- a/accessible/src/windows/sdn/moz.build +++ b/accessible/src/windows/sdn/moz.build @@ -13,3 +13,5 @@ CPP_SOURCES += [ LIBXUL_LIBRARY = True +LIBRARY_NAME = 'accessibility_toolkit_sdn_s' + diff --git a/accessible/src/windows/uia/Makefile.in b/accessible/src/windows/uia/Makefile.in index d39f7f9a6cd..bd00a15d811 100644 --- a/accessible/src/windows/uia/Makefile.in +++ b/accessible/src/windows/uia/Makefile.in @@ -9,7 +9,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBRARY_NAME = accessibility_toolkit_uia_s EXPORT_LIBRARY = .. # The midl generated code include Windows headers which defines min and max diff --git a/accessible/src/windows/uia/moz.build b/accessible/src/windows/uia/moz.build index eb3bb01e298..00205ddee9e 100644 --- a/accessible/src/windows/uia/moz.build +++ b/accessible/src/windows/uia/moz.build @@ -12,3 +12,5 @@ CPP_SOURCES += [ LIBXUL_LIBRARY = True +LIBRARY_NAME = 'accessibility_toolkit_uia_s' + diff --git a/chrome/src/Makefile.in b/chrome/src/Makefile.in index d8b7edc2b21..0a38fc116aa 100644 --- a/chrome/src/Makefile.in +++ b/chrome/src/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBRARY_NAME = chrome_s include $(topsrcdir)/config/rules.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/chrome/src/moz.build b/chrome/src/moz.build index b7eecd935db..2130b2060f7 100644 --- a/chrome/src/moz.build +++ b/chrome/src/moz.build @@ -21,3 +21,5 @@ LIBXUL_LIBRARY = True MSVC_ENABLE_PGO = True +LIBRARY_NAME = 'chrome_s' + diff --git a/content/base/src/Makefile.in b/content/base/src/Makefile.in index a3da2fe27af..f931ab856eb 100644 --- a/content/base/src/Makefile.in +++ b/content/base/src/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBRARY_NAME = gkconbase_s ifdef MOZ_WEBRTC LOCAL_INCLUDES += \ -I$(topsrcdir)/netwerk/sctp/datachannel \ diff --git a/content/base/src/moz.build b/content/base/src/moz.build index e4549860d8c..436c6826e11 100644 --- a/content/base/src/moz.build +++ b/content/base/src/moz.build @@ -176,3 +176,5 @@ LIBXUL_LIBRARY = True MSVC_ENABLE_PGO = True +LIBRARY_NAME = 'gkconbase_s' + diff --git a/content/canvas/src/Makefile.in b/content/canvas/src/Makefile.in index 9a21d93e5af..98748a33051 100644 --- a/content/canvas/src/Makefile.in +++ b/content/canvas/src/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBRARY_NAME = gkconcvs_s ifdef MOZ_WEBGL LOCAL_INCLUDES += \ -I$(topsrcdir)/js/xpconnect/wrappers \ diff --git a/content/canvas/src/moz.build b/content/canvas/src/moz.build index 8bbb6e53b02..cd3c1652e2a 100644 --- a/content/canvas/src/moz.build +++ b/content/canvas/src/moz.build @@ -81,3 +81,5 @@ LIBXUL_LIBRARY = True MSVC_ENABLE_PGO = True +LIBRARY_NAME = 'gkconcvs_s' + diff --git a/content/events/src/Makefile.in b/content/events/src/Makefile.in index 46cb969fe3e..306dbedcb9c 100644 --- a/content/events/src/Makefile.in +++ b/content/events/src/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBRARY_NAME = gkconevents_s include $(topsrcdir)/config/rules.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/content/events/src/moz.build b/content/events/src/moz.build index d655cb3cb8f..11589a66a77 100644 --- a/content/events/src/moz.build +++ b/content/events/src/moz.build @@ -73,3 +73,5 @@ LIBXUL_LIBRARY = True MSVC_ENABLE_PGO = True +LIBRARY_NAME = 'gkconevents_s' + diff --git a/content/html/content/src/Makefile.in b/content/html/content/src/Makefile.in index e3bb873aa75..1c989becd6c 100644 --- a/content/html/content/src/Makefile.in +++ b/content/html/content/src/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBRARY_NAME = gkconhtmlcon_s include $(topsrcdir)/config/rules.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/content/html/content/src/moz.build b/content/html/content/src/moz.build index 67a2c7b225a..0a06da36267 100644 --- a/content/html/content/src/moz.build +++ b/content/html/content/src/moz.build @@ -160,3 +160,5 @@ LIBXUL_LIBRARY = True MSVC_ENABLE_PGO = True +LIBRARY_NAME = 'gkconhtmlcon_s' + diff --git a/content/mathml/content/src/Makefile.in b/content/mathml/content/src/Makefile.in index 5a711f04ccf..a7b35446231 100644 --- a/content/mathml/content/src/Makefile.in +++ b/content/mathml/content/src/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBRARY_NAME = gkcontentmathml_s include $(topsrcdir)/config/rules.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/content/mathml/content/src/moz.build b/content/mathml/content/src/moz.build index 738d55c31c8..8e46ae3d14c 100644 --- a/content/mathml/content/src/moz.build +++ b/content/mathml/content/src/moz.build @@ -15,3 +15,5 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True +LIBRARY_NAME = 'gkcontentmathml_s' + diff --git a/content/media/Makefile.in b/content/media/Makefile.in index 12c8a45c8c5..6e472d619fe 100644 --- a/content/media/Makefile.in +++ b/content/media/Makefile.in @@ -9,7 +9,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBRARY_NAME = gkconmedia_s include $(topsrcdir)/config/rules.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/content/media/directshow/Makefile.in b/content/media/directshow/Makefile.in index 41d6d9ae847..ac6f8e15798 100644 --- a/content/media/directshow/Makefile.in +++ b/content/media/directshow/Makefile.in @@ -9,7 +9,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBRARY_NAME = gkcondirectshow_s LOCAL_INCLUDES += -I$(topsrcdir)/media/webrtc/trunk/webrtc/modules/video_capture/windows/ ifeq ($(OS_ARCH),WINNT) diff --git a/content/media/directshow/moz.build b/content/media/directshow/moz.build index 8787ee845b0..853ef0761df 100644 --- a/content/media/directshow/moz.build +++ b/content/media/directshow/moz.build @@ -38,3 +38,5 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True +LIBRARY_NAME = 'gkcondirectshow_s' + diff --git a/content/media/mediasource/Makefile.in b/content/media/mediasource/Makefile.in index e533fc0a4d0..e1a22d0a52e 100644 --- a/content/media/mediasource/Makefile.in +++ b/content/media/mediasource/Makefile.in @@ -8,5 +8,4 @@ srcdir = @srcdir@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBRARY_NAME = gkconmediasource_s include $(topsrcdir)/config/rules.mk diff --git a/content/media/mediasource/moz.build b/content/media/mediasource/moz.build index 2e4e68fe31b..8ced57f5f78 100644 --- a/content/media/mediasource/moz.build +++ b/content/media/mediasource/moz.build @@ -30,3 +30,5 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True +LIBRARY_NAME = 'gkconmediasource_s' + diff --git a/content/media/moz.build b/content/media/moz.build index a16fdbf33c8..47e49d4ff3e 100644 --- a/content/media/moz.build +++ b/content/media/moz.build @@ -141,3 +141,5 @@ LIBXUL_LIBRARY = True MSVC_ENABLE_PGO = True +LIBRARY_NAME = 'gkconmedia_s' + diff --git a/content/media/omx/Makefile.in b/content/media/omx/Makefile.in index f82b0b53091..4f36f04040c 100644 --- a/content/media/omx/Makefile.in +++ b/content/media/omx/Makefile.in @@ -9,7 +9,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBRARY_NAME = gkconomx_s include $(topsrcdir)/config/rules.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/content/media/omx/mediaresourcemanager/Makefile.in b/content/media/omx/mediaresourcemanager/Makefile.in index fc56f8d6078..726aaed1dbd 100644 --- a/content/media/omx/mediaresourcemanager/Makefile.in +++ b/content/media/omx/mediaresourcemanager/Makefile.in @@ -9,8 +9,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBRARY_NAME = mediaresourcemanager - FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk diff --git a/content/media/omx/mediaresourcemanager/moz.build b/content/media/omx/mediaresourcemanager/moz.build index e759be0a577..54e66083b14 100644 --- a/content/media/omx/mediaresourcemanager/moz.build +++ b/content/media/omx/mediaresourcemanager/moz.build @@ -14,3 +14,5 @@ CPP_SOURCES += [ 'MediaResourceManagerService.cpp', ] +LIBRARY_NAME = 'mediaresourcemanager' + diff --git a/content/media/omx/moz.build b/content/media/omx/moz.build index 39da6142060..2b972908b60 100644 --- a/content/media/omx/moz.build +++ b/content/media/omx/moz.build @@ -21,3 +21,5 @@ CPP_SOURCES += [ LIBXUL_LIBRARY = True +LIBRARY_NAME = 'gkconomx_s' + diff --git a/content/media/webaudio/Makefile.in b/content/media/webaudio/Makefile.in index 087db3ab8b8..a95152ffc10 100644 --- a/content/media/webaudio/Makefile.in +++ b/content/media/webaudio/Makefile.in @@ -9,6 +9,5 @@ VPATH := @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBRARY_NAME := gkconwebaudio_s include $(topsrcdir)/config/rules.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/content/media/webaudio/blink/Makefile.in b/content/media/webaudio/blink/Makefile.in index 39dabd4fcc9..1354f2bea29 100644 --- a/content/media/webaudio/blink/Makefile.in +++ b/content/media/webaudio/blink/Makefile.in @@ -9,7 +9,6 @@ VPATH := @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBRARY_NAME := gkconwebaudio_blink_s LOCAL_INCLUDES += -I$(topsrcdir)/content/media/webaudio include $(topsrcdir)/config/rules.mk diff --git a/content/media/webaudio/blink/moz.build b/content/media/webaudio/blink/moz.build index 3041b726753..fc0e3e3a18f 100644 --- a/content/media/webaudio/blink/moz.build +++ b/content/media/webaudio/blink/moz.build @@ -27,3 +27,5 @@ CPP_SOURCES += [ LIBXUL_LIBRARY = True +LIBRARY_NAME = 'gkconwebaudio_blink_s' + diff --git a/content/media/webaudio/moz.build b/content/media/webaudio/moz.build index 5c8d4d50555..1173f47756a 100644 --- a/content/media/webaudio/moz.build +++ b/content/media/webaudio/moz.build @@ -88,3 +88,5 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True +LIBRARY_NAME = 'gkconwebaudio_s' + diff --git a/content/media/webrtc/Makefile.in b/content/media/webrtc/Makefile.in index b9711326229..97b264995a1 100644 --- a/content/media/webrtc/Makefile.in +++ b/content/media/webrtc/Makefile.in @@ -9,7 +9,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBRARY_NAME = gkconwebrtc_s ifeq ($(OS_ARCH),WINNT) OS_CXXFLAGS += -DNOMINMAX endif diff --git a/content/media/webrtc/moz.build b/content/media/webrtc/moz.build index c7020ac1c2b..aa053d9d91a 100644 --- a/content/media/webrtc/moz.build +++ b/content/media/webrtc/moz.build @@ -25,3 +25,5 @@ CPP_SOURCES += [ LIBXUL_LIBRARY = True +LIBRARY_NAME = 'gkconwebrtc_s' + diff --git a/content/media/webspeech/recognition/Makefile.in b/content/media/webspeech/recognition/Makefile.in index af4b62f4ff2..1c9ea07715a 100644 --- a/content/media/webspeech/recognition/Makefile.in +++ b/content/media/webspeech/recognition/Makefile.in @@ -14,7 +14,6 @@ VPATH += \ $(srcdir)/test \ $(NULL) -LIBRARY_NAME := gkconwebspeechrecognition_s LOCAL_INCLUDES += $(VPATH:%=-I%) include $(topsrcdir)/config/rules.mk diff --git a/content/media/webspeech/recognition/moz.build b/content/media/webspeech/recognition/moz.build index 047c7da2389..5c8d4bce8d2 100644 --- a/content/media/webspeech/recognition/moz.build +++ b/content/media/webspeech/recognition/moz.build @@ -42,3 +42,5 @@ CPP_SOURCES += [ LIBXUL_LIBRARY = True +LIBRARY_NAME = 'gkconwebspeechrecognition_s' + diff --git a/content/media/webspeech/synth/Makefile.in b/content/media/webspeech/synth/Makefile.in index 25eecb68aaa..b5c8b166988 100644 --- a/content/media/webspeech/synth/Makefile.in +++ b/content/media/webspeech/synth/Makefile.in @@ -13,7 +13,6 @@ VPATH += \ $(srcdir)/ipc \ $(NULL) -LIBRARY_NAME := gkconwebspeechsynth_s EXPORT_LIBRARY = 1 LOCAL_INCLUDES += $(VPATH:%=-I%) diff --git a/content/media/webspeech/synth/moz.build b/content/media/webspeech/synth/moz.build index c8459bea178..36c1f1bdd43 100644 --- a/content/media/webspeech/synth/moz.build +++ b/content/media/webspeech/synth/moz.build @@ -47,3 +47,5 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True +LIBRARY_NAME = 'gkconwebspeechsynth_s' + diff --git a/content/smil/Makefile.in b/content/smil/Makefile.in index f1a5232f7d8..6168d72cbfb 100644 --- a/content/smil/Makefile.in +++ b/content/smil/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBRARY_NAME = gkconsmil_s LOCAL_INCLUDES += \ -I$(srcdir)/../base/src \ -I$(srcdir)/../../layout/style \ diff --git a/content/smil/moz.build b/content/smil/moz.build index 846a95370d8..0e4c6f74569 100644 --- a/content/smil/moz.build +++ b/content/smil/moz.build @@ -65,3 +65,5 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True +LIBRARY_NAME = 'gkconsmil_s' + diff --git a/content/svg/content/src/Makefile.in b/content/svg/content/src/Makefile.in index 72baafae11b..c3d3f208a76 100644 --- a/content/svg/content/src/Makefile.in +++ b/content/svg/content/src/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBRARY_NAME = gkcontentsvg_s include $(topsrcdir)/config/rules.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/content/svg/content/src/moz.build b/content/svg/content/src/moz.build index dc553bfc0cf..f33253988a7 100644 --- a/content/svg/content/src/moz.build +++ b/content/svg/content/src/moz.build @@ -248,3 +248,5 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True +LIBRARY_NAME = 'gkcontentsvg_s' + diff --git a/content/xbl/src/Makefile.in b/content/xbl/src/Makefile.in index 92ec1bc2e2e..25228a20733 100644 --- a/content/xbl/src/Makefile.in +++ b/content/xbl/src/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBRARY_NAME = gkconxbl_s include $(topsrcdir)/config/rules.mk LOCAL_INCLUDES = \ diff --git a/content/xbl/src/moz.build b/content/xbl/src/moz.build index e0c5f245ad2..e3cfed1451f 100644 --- a/content/xbl/src/moz.build +++ b/content/xbl/src/moz.build @@ -42,3 +42,5 @@ LIBXUL_LIBRARY = True MSVC_ENABLE_PGO = True +LIBRARY_NAME = 'gkconxbl_s' + diff --git a/docshell/base/Makefile.in b/docshell/base/Makefile.in index e8fc84cff76..45d725053d8 100644 --- a/docshell/base/Makefile.in +++ b/docshell/base/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBRARY_NAME = basedocshell_s ifdef MOZ_TOOLKIT_SEARCH DEFINES += -DMOZ_TOOLKIT_SEARCH endif diff --git a/docshell/base/moz.build b/docshell/base/moz.build index 171028a4d91..5f27ace529c 100644 --- a/docshell/base/moz.build +++ b/docshell/base/moz.build @@ -68,3 +68,5 @@ LIBXUL_LIBRARY = True MSVC_ENABLE_PGO = True +LIBRARY_NAME = 'basedocshell_s' + diff --git a/dom/activities/src/Makefile.in b/dom/activities/src/Makefile.in index 7d7022d974c..c66470e81eb 100644 --- a/dom/activities/src/Makefile.in +++ b/dom/activities/src/Makefile.in @@ -9,7 +9,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBRARY_NAME = dom_activities_s include $(topsrcdir)/dom/dom-config.mk include $(topsrcdir)/config/rules.mk diff --git a/dom/activities/src/moz.build b/dom/activities/src/moz.build index 8aa085a3b46..965cbe4704e 100644 --- a/dom/activities/src/moz.build +++ b/dom/activities/src/moz.build @@ -32,3 +32,5 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True +LIBRARY_NAME = 'dom_activities_s' + diff --git a/dom/alarm/Makefile.in b/dom/alarm/Makefile.in index 96239d2b506..d12fb1ba7d1 100644 --- a/dom/alarm/Makefile.in +++ b/dom/alarm/Makefile.in @@ -9,7 +9,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBRARY_NAME = domalarm_s include $(topsrcdir)/dom/dom-config.mk diff --git a/dom/alarm/moz.build b/dom/alarm/moz.build index b40c4a5bd6a..daa6848101e 100644 --- a/dom/alarm/moz.build +++ b/dom/alarm/moz.build @@ -37,3 +37,5 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True +LIBRARY_NAME = 'domalarm_s' + diff --git a/dom/audiochannel/Makefile.in b/dom/audiochannel/Makefile.in index adcd696c4b5..dc8fbba1144 100644 --- a/dom/audiochannel/Makefile.in +++ b/dom/audiochannel/Makefile.in @@ -19,7 +19,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBRARY_NAME = domaudiochannel_s EXPORT_LIBRARY = 1 include $(topsrcdir)/config/rules.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/dom/audiochannel/moz.build b/dom/audiochannel/moz.build index 4b3d9d5a8a7..054f13ad31d 100644 --- a/dom/audiochannel/moz.build +++ b/dom/audiochannel/moz.build @@ -31,3 +31,5 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True +LIBRARY_NAME = 'domaudiochannel_s' + diff --git a/dom/base/Makefile.in b/dom/base/Makefile.in index fd8d9e95a0e..0149114f57e 100644 --- a/dom/base/Makefile.in +++ b/dom/base/Makefile.in @@ -9,7 +9,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBRARY_NAME = jsdombase_s include $(topsrcdir)/dom/dom-config.mk ifdef MOZ_JSDEBUGGER diff --git a/dom/base/moz.build b/dom/base/moz.build index 4829577bbf7..c671ae63a94 100644 --- a/dom/base/moz.build +++ b/dom/base/moz.build @@ -116,3 +116,5 @@ LIBXUL_LIBRARY = True MSVC_ENABLE_PGO = True +LIBRARY_NAME = 'jsdombase_s' + diff --git a/dom/battery/Makefile.in b/dom/battery/Makefile.in index 8cdd16a182e..4617b496c6b 100644 --- a/dom/battery/Makefile.in +++ b/dom/battery/Makefile.in @@ -9,7 +9,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBRARY_NAME = dom_battery_s include $(topsrcdir)/dom/dom-config.mk LOCAL_INCLUDES = \ diff --git a/dom/battery/moz.build b/dom/battery/moz.build index 5e56663cd0a..31b6d61ca41 100644 --- a/dom/battery/moz.build +++ b/dom/battery/moz.build @@ -19,3 +19,5 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True +LIBRARY_NAME = 'dom_battery_s' + diff --git a/dom/bindings/Makefile.in b/dom/bindings/Makefile.in index 0632c84c116..b4fc965b457 100644 --- a/dom/bindings/Makefile.in +++ b/dom/bindings/Makefile.in @@ -9,7 +9,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBRARY_NAME = dombindings_s EXPORT_LIBRARY = 1 # Need this to find all our DOM source files. diff --git a/dom/bindings/moz.build b/dom/bindings/moz.build index 2a41e68e400..69b28606ed6 100644 --- a/dom/bindings/moz.build +++ b/dom/bindings/moz.build @@ -35,3 +35,5 @@ LIBXUL_LIBRARY = True MSVC_ENABLE_PGO = True +LIBRARY_NAME = 'dombindings_s' + diff --git a/dom/bindings/test/Makefile.in b/dom/bindings/test/Makefile.in index fd386e68faa..f032f562f31 100644 --- a/dom/bindings/test/Makefile.in +++ b/dom/bindings/test/Makefile.in @@ -8,7 +8,6 @@ srcdir = @srcdir@ VPATH = @srcdir@ relativesrcdir = @relativesrcdir@ -LIBRARY_NAME = dombindings_test_s # Do NOT export this library. We don't actually want our test code # being added to libxul or anything. diff --git a/dom/bindings/test/moz.build b/dom/bindings/test/moz.build index c62097ecf12..ebacd22cff0 100644 --- a/dom/bindings/test/moz.build +++ b/dom/bindings/test/moz.build @@ -14,3 +14,5 @@ LIBXUL_LIBRARY = True # Do NOT export this library. We don't actually want our test code # being added to libxul or anything. +LIBRARY_NAME = 'dombindings_test_s' + diff --git a/dom/browser-element/Makefile.in b/dom/browser-element/Makefile.in index 8e1c254045f..b1c673e3534 100644 --- a/dom/browser-element/Makefile.in +++ b/dom/browser-element/Makefile.in @@ -9,7 +9,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBRARY_NAME = dom_browserelement_s include $(topsrcdir)/dom/dom-config.mk diff --git a/dom/browser-element/moz.build b/dom/browser-element/moz.build index e1a0b808d63..5a004ab8d13 100644 --- a/dom/browser-element/moz.build +++ b/dom/browser-element/moz.build @@ -32,3 +32,5 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True +LIBRARY_NAME = 'dom_browserelement_s' + diff --git a/dom/camera/Makefile.in b/dom/camera/Makefile.in index 996df86f6dc..b2e44d42139 100644 --- a/dom/camera/Makefile.in +++ b/dom/camera/Makefile.in @@ -9,7 +9,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBRARY_NAME = domcamera_s include $(topsrcdir)/dom/dom-config.mk include $(topsrcdir)/config/rules.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/dom/camera/moz.build b/dom/camera/moz.build index 440b6ff00ab..f4b791a5085 100644 --- a/dom/camera/moz.build +++ b/dom/camera/moz.build @@ -49,3 +49,5 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True +LIBRARY_NAME = 'domcamera_s' + diff --git a/dom/cellbroadcast/src/Makefile.in b/dom/cellbroadcast/src/Makefile.in index fdd548d4dcb..db4cf4d7802 100644 --- a/dom/cellbroadcast/src/Makefile.in +++ b/dom/cellbroadcast/src/Makefile.in @@ -9,7 +9,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBRARY_NAME = dom_cellbroadcast_s include $(topsrcdir)/dom/dom-config.mk include $(topsrcdir)/config/rules.mk diff --git a/dom/cellbroadcast/src/moz.build b/dom/cellbroadcast/src/moz.build index e706fe5ca7e..adc0812a32d 100644 --- a/dom/cellbroadcast/src/moz.build +++ b/dom/cellbroadcast/src/moz.build @@ -18,3 +18,5 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True +LIBRARY_NAME = 'dom_cellbroadcast_s' + diff --git a/dom/devicestorage/Makefile.in b/dom/devicestorage/Makefile.in index edbc285088f..a3edba0dfda 100644 --- a/dom/devicestorage/Makefile.in +++ b/dom/devicestorage/Makefile.in @@ -9,7 +9,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBRARY_NAME = domdevicestorage_s include $(topsrcdir)/dom/dom-config.mk LOCAL_INCLUDES = \ diff --git a/dom/devicestorage/moz.build b/dom/devicestorage/moz.build index 54e5749e9f0..fd718c506e0 100644 --- a/dom/devicestorage/moz.build +++ b/dom/devicestorage/moz.build @@ -34,3 +34,5 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True +LIBRARY_NAME = 'domdevicestorage_s' + diff --git a/dom/encoding/Makefile.in b/dom/encoding/Makefile.in index 6560ae45743..7311ab1eac3 100644 --- a/dom/encoding/Makefile.in +++ b/dom/encoding/Makefile.in @@ -8,7 +8,6 @@ srcdir = @srcdir@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBRARY_NAME = domencoding_s LOCAL_INCLUDES = \ -I$(topsrcdir)/intl/locale/src \ $(NULL) diff --git a/dom/encoding/moz.build b/dom/encoding/moz.build index 0df5bd54b94..2f3edeebb44 100644 --- a/dom/encoding/moz.build +++ b/dom/encoding/moz.build @@ -24,3 +24,5 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True +LIBRARY_NAME = 'domencoding_s' + diff --git a/dom/file/Makefile.in b/dom/file/Makefile.in index 9320a05ec7d..4ddef56abb7 100644 --- a/dom/file/Makefile.in +++ b/dom/file/Makefile.in @@ -9,7 +9,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBRARY_NAME = domfile_s include $(topsrcdir)/dom/dom-config.mk include $(topsrcdir)/config/rules.mk diff --git a/dom/file/moz.build b/dom/file/moz.build index 90fe8f2d885..6e1de211437 100644 --- a/dom/file/moz.build +++ b/dom/file/moz.build @@ -59,3 +59,5 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True +LIBRARY_NAME = 'domfile_s' + diff --git a/dom/fm/Makefile.in b/dom/fm/Makefile.in index f49a4f67288..c9743ac1e3a 100644 --- a/dom/fm/Makefile.in +++ b/dom/fm/Makefile.in @@ -9,7 +9,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBRARY_NAME = domfm_s include $(topsrcdir)/dom/dom-config.mk include $(topsrcdir)/config/rules.mk diff --git a/dom/fm/moz.build b/dom/fm/moz.build index 1fe739b8c85..2094f23e4bf 100644 --- a/dom/fm/moz.build +++ b/dom/fm/moz.build @@ -29,3 +29,5 @@ EXTRA_COMPONENTS += [ LIBXUL_LIBRARY = True +LIBRARY_NAME = 'domfm_s' + diff --git a/dom/gamepad/Makefile.in b/dom/gamepad/Makefile.in index 13e16b9ac73..8c7bfb43ee3 100644 --- a/dom/gamepad/Makefile.in +++ b/dom/gamepad/Makefile.in @@ -9,7 +9,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBRARY_NAME = domgamepad_s LOCAL_INCLUDES += \ -I$(topsrcdir)/dom/base \ $(NULL) diff --git a/dom/gamepad/moz.build b/dom/gamepad/moz.build index 19f225b7cb4..58459d49586 100644 --- a/dom/gamepad/moz.build +++ b/dom/gamepad/moz.build @@ -18,3 +18,5 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True +LIBRARY_NAME = 'domgamepad_s' + diff --git a/dom/icc/src/Makefile.in b/dom/icc/src/Makefile.in index ced411e76d9..8979fb75e30 100644 --- a/dom/icc/src/Makefile.in +++ b/dom/icc/src/Makefile.in @@ -9,7 +9,6 @@ VPATH = $(srcdir) include $(DEPTH)/config/autoconf.mk -LIBRARY_NAME = dom_icc_s include $(topsrcdir)/dom/dom-config.mk LOCAL_INCLUDES = \ diff --git a/dom/icc/src/moz.build b/dom/icc/src/moz.build index 16746ddc800..2789db7ec81 100644 --- a/dom/icc/src/moz.build +++ b/dom/icc/src/moz.build @@ -17,3 +17,5 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True +LIBRARY_NAME = 'dom_icc_s' + diff --git a/dom/indexedDB/Makefile.in b/dom/indexedDB/Makefile.in index cfcf03ea625..764c625f23e 100644 --- a/dom/indexedDB/Makefile.in +++ b/dom/indexedDB/Makefile.in @@ -9,7 +9,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBRARY_NAME = dom_indexeddb_s LOCAL_INCLUDES = \ -I$(topsrcdir)/caps/include \ -I$(topsrcdir)/content/base/src \ diff --git a/dom/indexedDB/ipc/Makefile.in b/dom/indexedDB/ipc/Makefile.in index 05a02685143..a89145fa759 100644 --- a/dom/indexedDB/ipc/Makefile.in +++ b/dom/indexedDB/ipc/Makefile.in @@ -9,7 +9,6 @@ relativesrcdir = @relativesrcdir@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBRARY_NAME = dom_indexeddb_ipc_s LOCAL_INCLUDES += \ -I$(topsrcdir)/dom/indexedDB \ -I$(topsrcdir)/content/events/src \ diff --git a/dom/indexedDB/ipc/moz.build b/dom/indexedDB/ipc/moz.build index 8b465094d76..216f15b28ff 100644 --- a/dom/indexedDB/ipc/moz.build +++ b/dom/indexedDB/ipc/moz.build @@ -34,3 +34,5 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True +LIBRARY_NAME = 'dom_indexeddb_ipc_s' + diff --git a/dom/indexedDB/moz.build b/dom/indexedDB/moz.build index 82e968464f0..bd19eeccafa 100644 --- a/dom/indexedDB/moz.build +++ b/dom/indexedDB/moz.build @@ -67,3 +67,5 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True +LIBRARY_NAME = 'dom_indexeddb_s' + diff --git a/dom/interfaces/devicestorage/Makefile.in b/dom/interfaces/devicestorage/Makefile.in index c0c7305abb3..728a356cb51 100644 --- a/dom/interfaces/devicestorage/Makefile.in +++ b/dom/interfaces/devicestorage/Makefile.in @@ -9,7 +9,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBRARY_NAME = domdevicestorage_s include $(topsrcdir)/dom/dom-config.mk include $(topsrcdir)/config/rules.mk diff --git a/dom/interfaces/devicestorage/moz.build b/dom/interfaces/devicestorage/moz.build index fd882d036fc..c7a4beb6319 100644 --- a/dom/interfaces/devicestorage/moz.build +++ b/dom/interfaces/devicestorage/moz.build @@ -15,3 +15,5 @@ MODULE = 'dom' LIBXUL_LIBRARY = True +LIBRARY_NAME = 'domdevicestorage_s' + diff --git a/dom/ipc/Makefile.in b/dom/ipc/Makefile.in index 09108c96991..ef6d8e5d6cd 100644 --- a/dom/ipc/Makefile.in +++ b/dom/ipc/Makefile.in @@ -9,7 +9,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBRARY_NAME = domipc_s EXPORT_LIBRARY = 1 include $(topsrcdir)/config/rules.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/dom/ipc/moz.build b/dom/ipc/moz.build index d39c49c27f0..9b5dc27215c 100644 --- a/dom/ipc/moz.build +++ b/dom/ipc/moz.build @@ -75,3 +75,5 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True +LIBRARY_NAME = 'domipc_s' + diff --git a/dom/media/Makefile.in b/dom/media/Makefile.in index fd340892975..35e1ce58fb6 100644 --- a/dom/media/Makefile.in +++ b/dom/media/Makefile.in @@ -10,7 +10,6 @@ relativesrcdir = @relativesrcdir@ include $(DEPTH)/config/autoconf.mk -LIBRARY_NAME = dom_media_s include $(topsrcdir)/dom/dom-config.mk diff --git a/dom/media/moz.build b/dom/media/moz.build index 14cfc77d1d4..edf694cb7f2 100644 --- a/dom/media/moz.build +++ b/dom/media/moz.build @@ -36,3 +36,5 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True +LIBRARY_NAME = 'dom_media_s' + diff --git a/dom/mobilemessage/src/Makefile.in b/dom/mobilemessage/src/Makefile.in index 999eade2fbd..4dfe608bd89 100644 --- a/dom/mobilemessage/src/Makefile.in +++ b/dom/mobilemessage/src/Makefile.in @@ -20,7 +20,6 @@ else VPATH += $(srcdir)/fallback endif -LIBRARY_NAME = dom_mobilemessage_s include $(topsrcdir)/dom/dom-config.mk LOCAL_INCLUDES = \ diff --git a/dom/mobilemessage/src/moz.build b/dom/mobilemessage/src/moz.build index e90c7bdd6aa..505fddd8242 100644 --- a/dom/mobilemessage/src/moz.build +++ b/dom/mobilemessage/src/moz.build @@ -85,3 +85,5 @@ LIBXUL_LIBRARY = True MSVC_ENABLE_PGO = True +LIBRARY_NAME = 'dom_mobilemessage_s' + diff --git a/dom/network/src/Makefile.in b/dom/network/src/Makefile.in index 597150cb3b1..a6fae9dcfa5 100644 --- a/dom/network/src/Makefile.in +++ b/dom/network/src/Makefile.in @@ -9,7 +9,6 @@ VPATH = $(srcdir) include $(DEPTH)/config/autoconf.mk -LIBRARY_NAME = dom_network_s ifdef MOZ_B2G_RIL endif diff --git a/dom/network/src/moz.build b/dom/network/src/moz.build index 25b67ec7cfa..ff7558e4b7e 100644 --- a/dom/network/src/moz.build +++ b/dom/network/src/moz.build @@ -52,3 +52,5 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True +LIBRARY_NAME = 'dom_network_s' + diff --git a/dom/plugins/base/Makefile.in b/dom/plugins/base/Makefile.in index 4e5c9d2c457..0cb5d745b51 100644 --- a/dom/plugins/base/Makefile.in +++ b/dom/plugins/base/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBRARY_NAME = gkplugin EXPORT_LIBRARY = 1 ifeq ($(MOZ_WIDGET_TOOLKIT),android) LOCAL_INCLUDES += -I$(topsrcdir)/dom/plugins/base/android diff --git a/dom/plugins/base/android/Makefile.in b/dom/plugins/base/android/Makefile.in index 93bea224b24..a486fa80a79 100644 --- a/dom/plugins/base/android/Makefile.in +++ b/dom/plugins/base/android/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBRARY_NAME = gkpluginandroid_s EXPORT_LIBRARY = 1 LOCAL_INCLUDES += \ -I$(topsrcdir)/widget/android \ diff --git a/dom/plugins/base/android/moz.build b/dom/plugins/base/android/moz.build index 27306f7560a..daa7b2fa860 100644 --- a/dom/plugins/base/android/moz.build +++ b/dom/plugins/base/android/moz.build @@ -29,3 +29,5 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True +LIBRARY_NAME = 'gkpluginandroid_s' + diff --git a/dom/plugins/base/moz.build b/dom/plugins/base/moz.build index 0deba65014c..9c10c920c60 100644 --- a/dom/plugins/base/moz.build +++ b/dom/plugins/base/moz.build @@ -99,3 +99,5 @@ LIBXUL_LIBRARY = True MSVC_ENABLE_PGO = True +LIBRARY_NAME = 'gkplugin' + diff --git a/dom/plugins/ipc/Makefile.in b/dom/plugins/ipc/Makefile.in index 7b0151a96ae..f85a0aa406f 100644 --- a/dom/plugins/ipc/Makefile.in +++ b/dom/plugins/ipc/Makefile.in @@ -9,7 +9,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBRARY_NAME = domplugins_s EXPORT_LIBRARY = 1 ifeq (WINNT,$(OS_ARCH)) diff --git a/dom/plugins/ipc/moz.build b/dom/plugins/ipc/moz.build index 191d6effa74..753a36d3955 100644 --- a/dom/plugins/ipc/moz.build +++ b/dom/plugins/ipc/moz.build @@ -107,3 +107,5 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True +LIBRARY_NAME = 'domplugins_s' + diff --git a/dom/power/Makefile.in b/dom/power/Makefile.in index 79d08580b10..50514d42687 100644 --- a/dom/power/Makefile.in +++ b/dom/power/Makefile.in @@ -9,7 +9,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBRARY_NAME = dom_power_s include $(topsrcdir)/dom/dom-config.mk include $(topsrcdir)/config/rules.mk diff --git a/dom/power/moz.build b/dom/power/moz.build index 1162924a9d5..aa8df6acd0a 100644 --- a/dom/power/moz.build +++ b/dom/power/moz.build @@ -31,3 +31,5 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True +LIBRARY_NAME = 'dom_power_s' + diff --git a/dom/promise/Makefile.in b/dom/promise/Makefile.in index d920a5c8f2d..f5c87a32483 100644 --- a/dom/promise/Makefile.in +++ b/dom/promise/Makefile.in @@ -9,7 +9,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBRARY_NAME = dompromise_s LOCAL_INCLUDES += \ -I$(topsrcdir)/dom/workers \ -I$(topsrcdir)/dom/base \ diff --git a/dom/promise/moz.build b/dom/promise/moz.build index 59c29727ce8..69bcf602d9f 100644 --- a/dom/promise/moz.build +++ b/dom/promise/moz.build @@ -25,3 +25,5 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True +LIBRARY_NAME = 'dompromise_s' + diff --git a/dom/quota/Makefile.in b/dom/quota/Makefile.in index aa2e25a07c4..09269702360 100644 --- a/dom/quota/Makefile.in +++ b/dom/quota/Makefile.in @@ -9,7 +9,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBRARY_NAME = domquota_s include $(topsrcdir)/dom/dom-config.mk LOCAL_INCLUDES = \ diff --git a/dom/quota/moz.build b/dom/quota/moz.build index c037c572673..eb4c95d8ee0 100644 --- a/dom/quota/moz.build +++ b/dom/quota/moz.build @@ -45,3 +45,5 @@ LIBXUL_LIBRARY = True MSVC_ENABLE_PGO = True +LIBRARY_NAME = 'domquota_s' + diff --git a/dom/src/geolocation/Makefile.in b/dom/src/geolocation/Makefile.in index 8414486bdaa..d5eaa13868f 100644 --- a/dom/src/geolocation/Makefile.in +++ b/dom/src/geolocation/Makefile.in @@ -9,7 +9,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBRARY_NAME = jsdomgeolocation_s LOCAL_INCLUDES = \ -I$(topsrcdir)/dom/base \ -I$(topsrcdir)/dom/ipc \ diff --git a/dom/src/geolocation/moz.build b/dom/src/geolocation/moz.build index a8000c599cd..ff9ca7413be 100644 --- a/dom/src/geolocation/moz.build +++ b/dom/src/geolocation/moz.build @@ -20,3 +20,5 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True +LIBRARY_NAME = 'jsdomgeolocation_s' + diff --git a/dom/src/notification/Makefile.in b/dom/src/notification/Makefile.in index a9a07c7d292..24601103d74 100644 --- a/dom/src/notification/Makefile.in +++ b/dom/src/notification/Makefile.in @@ -9,7 +9,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBRARY_NAME = jsdomnotification_s LOCAL_INCLUDES = \ -I$(topsrcdir)/dom/base \ -I$(topsrcdir)/dom/ipc \ diff --git a/dom/src/notification/moz.build b/dom/src/notification/moz.build index 4499653b931..f4644c861e2 100644 --- a/dom/src/notification/moz.build +++ b/dom/src/notification/moz.build @@ -20,3 +20,5 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True +LIBRARY_NAME = 'jsdomnotification_s' + diff --git a/dom/src/storage/Makefile.in b/dom/src/storage/Makefile.in index d1242ff1340..2a957c9d0a4 100644 --- a/dom/src/storage/Makefile.in +++ b/dom/src/storage/Makefile.in @@ -9,7 +9,6 @@ srcdir = @srcdir@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBRARY_NAME = jsdomstorage_s LOCAL_INCLUDES = \ -I$(topsrcdir)/dom/base \ -I$(topsrcdir)/content/events/src diff --git a/dom/src/storage/moz.build b/dom/src/storage/moz.build index eef23759a91..8ca0a094f38 100644 --- a/dom/src/storage/moz.build +++ b/dom/src/storage/moz.build @@ -29,3 +29,5 @@ LIBXUL_LIBRARY = True MSVC_ENABLE_PGO = True +LIBRARY_NAME = 'jsdomstorage_s' + diff --git a/dom/system/Makefile.in b/dom/system/Makefile.in index ef32be70d7c..eac93c7f427 100644 --- a/dom/system/Makefile.in +++ b/dom/system/Makefile.in @@ -9,7 +9,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBRARY_NAME = domsystem_s DEFINES += -DDLL_PREFIX=\"$(DLL_PREFIX)\" -DDLL_SUFFIX=\"$(DLL_SUFFIX)\" # We fire the nsDOMDeviceAcceleration diff --git a/dom/system/android/Makefile.in b/dom/system/android/Makefile.in index 07c1d60363a..036363b3e4d 100644 --- a/dom/system/android/Makefile.in +++ b/dom/system/android/Makefile.in @@ -9,8 +9,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBRARY_NAME = domsystemandroid_s - EXPORT_LIBRARY = 1 LOCAL_INCLUDES += -I$(topsrcdir)/dom/src/geolocation \ -I$(topsrcdir)/content/events/src diff --git a/dom/system/android/moz.build b/dom/system/android/moz.build index d493f3eef6a..acedb0665a2 100644 --- a/dom/system/android/moz.build +++ b/dom/system/android/moz.build @@ -15,3 +15,5 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True +LIBRARY_NAME = 'domsystemandroid_s' + diff --git a/dom/system/gonk/Makefile.in b/dom/system/gonk/Makefile.in index 0bba3333f24..d648d2d7407 100644 --- a/dom/system/gonk/Makefile.in +++ b/dom/system/gonk/Makefile.in @@ -21,7 +21,6 @@ relativesrcdir = @relativesrcdir@ include $(DEPTH)/config/autoconf.mk -LIBRARY_NAME = domsystemgonk_s include $(topsrcdir)/dom/dom-config.mk LOCAL_INCLUDES = \ diff --git a/dom/system/gonk/moz.build b/dom/system/gonk/moz.build index f6b3d3102da..694b01a0217 100644 --- a/dom/system/gonk/moz.build +++ b/dom/system/gonk/moz.build @@ -84,3 +84,5 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True +LIBRARY_NAME = 'domsystemgonk_s' + diff --git a/dom/system/mac/Makefile.in b/dom/system/mac/Makefile.in index 0b207e86ada..65edb1f26e4 100644 --- a/dom/system/mac/Makefile.in +++ b/dom/system/mac/Makefile.in @@ -9,8 +9,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBRARY_NAME = domsystemmac_s - EXPORT_LIBRARY = 1 LOCAL_INCLUDES += -I$(topsrcdir)/dom/src/geolocation \ $(NULL) diff --git a/dom/system/mac/moz.build b/dom/system/mac/moz.build index 53bf3cc2971..41b83520330 100644 --- a/dom/system/mac/moz.build +++ b/dom/system/mac/moz.build @@ -12,3 +12,5 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True +LIBRARY_NAME = 'domsystemmac_s' + diff --git a/dom/system/moz.build b/dom/system/moz.build index 53d359be298..7c42531a005 100644 --- a/dom/system/moz.build +++ b/dom/system/moz.build @@ -53,3 +53,5 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True +LIBRARY_NAME = 'domsystem_s' + diff --git a/dom/system/unix/Makefile.in b/dom/system/unix/Makefile.in index f36484c5144..e7fffdabaaa 100644 --- a/dom/system/unix/Makefile.in +++ b/dom/system/unix/Makefile.in @@ -9,8 +9,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBRARY_NAME = domsystemunix_s - EXPORT_LIBRARY = 1 ifdef MOZ_MAEMO_LIBLOCATION LOCAL_INCLUDES += $(MOZ_PLATFORM_MAEMO_CFLAGS) \ diff --git a/dom/system/unix/moz.build b/dom/system/unix/moz.build index 46525978247..af40172fc0b 100644 --- a/dom/system/unix/moz.build +++ b/dom/system/unix/moz.build @@ -26,3 +26,5 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True +LIBRARY_NAME = 'domsystemunix_s' + diff --git a/dom/system/windows/Makefile.in b/dom/system/windows/Makefile.in index f42d6907e0e..d2b151cd35c 100644 --- a/dom/system/windows/Makefile.in +++ b/dom/system/windows/Makefile.in @@ -9,8 +9,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBRARY_NAME = domsystemwindows_s - EXPORT_LIBRARY = 1 # We fire the nsDOMDeviceAcceleration diff --git a/dom/system/windows/moz.build b/dom/system/windows/moz.build index 09bac1aa885..b50acb8b559 100644 --- a/dom/system/windows/moz.build +++ b/dom/system/windows/moz.build @@ -14,3 +14,5 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True +LIBRARY_NAME = 'domsystemwindows_s' + diff --git a/dom/telephony/Makefile.in b/dom/telephony/Makefile.in index 60f2ca43627..143590c476a 100644 --- a/dom/telephony/Makefile.in +++ b/dom/telephony/Makefile.in @@ -9,7 +9,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBRARY_NAME = domtelephony_s include $(topsrcdir)/dom/dom-config.mk include $(topsrcdir)/config/rules.mk diff --git a/dom/telephony/moz.build b/dom/telephony/moz.build index 0489b424bba..8910a24c887 100644 --- a/dom/telephony/moz.build +++ b/dom/telephony/moz.build @@ -24,3 +24,5 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True +LIBRARY_NAME = 'domtelephony_s' + diff --git a/dom/time/Makefile.in b/dom/time/Makefile.in index 4a4d6bb6741..50514d42687 100644 --- a/dom/time/Makefile.in +++ b/dom/time/Makefile.in @@ -9,7 +9,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBRARY_NAME = dom_time_s include $(topsrcdir)/dom/dom-config.mk include $(topsrcdir)/config/rules.mk diff --git a/dom/time/moz.build b/dom/time/moz.build index 001c8e1b1fe..5aa2dfff2a5 100644 --- a/dom/time/moz.build +++ b/dom/time/moz.build @@ -30,3 +30,5 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True +LIBRARY_NAME = 'dom_time_s' + diff --git a/dom/voicemail/Makefile.in b/dom/voicemail/Makefile.in index 001a9024553..143590c476a 100644 --- a/dom/voicemail/Makefile.in +++ b/dom/voicemail/Makefile.in @@ -9,7 +9,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBRARY_NAME = domvoicemail_s include $(topsrcdir)/dom/dom-config.mk include $(topsrcdir)/config/rules.mk diff --git a/dom/voicemail/moz.build b/dom/voicemail/moz.build index c6fb68bc8ae..073488c2562 100644 --- a/dom/voicemail/moz.build +++ b/dom/voicemail/moz.build @@ -27,3 +27,5 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True +LIBRARY_NAME = 'domvoicemail_s' + diff --git a/dom/wifi/Makefile.in b/dom/wifi/Makefile.in index f170a4ee936..1e569fdf9c1 100644 --- a/dom/wifi/Makefile.in +++ b/dom/wifi/Makefile.in @@ -9,7 +9,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBRARY_NAME = domwifi_s EXPORT_LIBRARY = 1 include $(topsrcdir)/dom/dom-config.mk diff --git a/dom/wifi/moz.build b/dom/wifi/moz.build index 66a4deb44a0..90de482c787 100644 --- a/dom/wifi/moz.build +++ b/dom/wifi/moz.build @@ -31,3 +31,5 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk': LIBXUL_LIBRARY = True +LIBRARY_NAME = 'domwifi_s' + diff --git a/extensions/cookie/Makefile.in b/extensions/cookie/Makefile.in index a9a62c97518..711dc3a4521 100644 --- a/extensions/cookie/Makefile.in +++ b/extensions/cookie/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBRARY_NAME = cookie EXPORT_LIBRARY = 1 include $(topsrcdir)/config/rules.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/extensions/cookie/moz.build b/extensions/cookie/moz.build index 213da9333d0..93c6e5a5a90 100644 --- a/extensions/cookie/moz.build +++ b/extensions/cookie/moz.build @@ -26,3 +26,5 @@ LIBXUL_LIBRARY = True MSVC_ENABLE_PGO = True +LIBRARY_NAME = 'cookie' + diff --git a/extensions/pref/autoconfig/src/Makefile.in b/extensions/pref/autoconfig/src/Makefile.in index fc7b8eff3b6..ad702409c25 100644 --- a/extensions/pref/autoconfig/src/Makefile.in +++ b/extensions/pref/autoconfig/src/Makefile.in @@ -9,7 +9,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBRARY_NAME = autoconfig EXPORT_LIBRARY = 1 AUTOCFG_JS_EXPORTS = \ $(srcdir)/prefcalls.js \ diff --git a/extensions/pref/autoconfig/src/moz.build b/extensions/pref/autoconfig/src/moz.build index 12d64e9aa30..22b91829abc 100644 --- a/extensions/pref/autoconfig/src/moz.build +++ b/extensions/pref/autoconfig/src/moz.build @@ -15,3 +15,5 @@ CPP_SOURCES += [ LIBXUL_LIBRARY = True +LIBRARY_NAME = 'autoconfig' + diff --git a/gfx/2d/Makefile.in b/gfx/2d/Makefile.in index 79f17a6f2b6..51a7000c80b 100644 --- a/gfx/2d/Makefile.in +++ b/gfx/2d/Makefile.in @@ -10,7 +10,6 @@ VPATH = $(srcdir) $(srcdir)/unittest include $(DEPTH)/config/autoconf.mk -LIBRARY_NAME = gfx2d EXPORT_LIBRARY = 1 DEFINES += -DMOZ_GFX -DUSE_CAIRO -DGFX2D_INTERNAL diff --git a/gfx/2d/moz.build b/gfx/2d/moz.build index 78e3728621a..7a660d2751a 100644 --- a/gfx/2d/moz.build +++ b/gfx/2d/moz.build @@ -106,3 +106,5 @@ LIBXUL_LIBRARY = True MSVC_ENABLE_PGO = True +LIBRARY_NAME = 'gfx2d' + diff --git a/gfx/cairo/libpixman/src/Makefile.in b/gfx/cairo/libpixman/src/Makefile.in index 482f2d973af..2b3ad7f7f42 100644 --- a/gfx/cairo/libpixman/src/Makefile.in +++ b/gfx/cairo/libpixman/src/Makefile.in @@ -9,7 +9,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBRARY_NAME = mozlibpixman ifeq ($(OS_TARGET),Android) MODULE_OPTIMIZE_FLAGS = -O2 endif diff --git a/gfx/cairo/libpixman/src/moz.build b/gfx/cairo/libpixman/src/moz.build index 559a0892889..3a43c7a937f 100644 --- a/gfx/cairo/libpixman/src/moz.build +++ b/gfx/cairo/libpixman/src/moz.build @@ -64,3 +64,5 @@ CSRCS += [ MSVC_ENABLE_PGO = True +LIBRARY_NAME = 'mozlibpixman' + diff --git a/gfx/gl/Makefile.in b/gfx/gl/Makefile.in index 0794128a6d8..4e756f24214 100644 --- a/gfx/gl/Makefile.in +++ b/gfx/gl/Makefile.in @@ -9,7 +9,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBRARY_NAME = gl EXPORT_LIBRARY = 1 ifeq ($(MOZ_WIDGET_TOOLKIT),windows) ifdef MOZ_WEBGL diff --git a/gfx/gl/moz.build b/gfx/gl/moz.build index fd99840dbcf..9a735ffd79d 100644 --- a/gfx/gl/moz.build +++ b/gfx/gl/moz.build @@ -122,3 +122,5 @@ LIBXUL_LIBRARY = True MSVC_ENABLE_PGO = True +LIBRARY_NAME = 'gl' + diff --git a/gfx/ipc/Makefile.in b/gfx/ipc/Makefile.in index 0fba90e60d3..ae6071cd0f7 100644 --- a/gfx/ipc/Makefile.in +++ b/gfx/ipc/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBRARY_NAME = gfxipc_s EXPORT_LIBRARY = 1 include $(topsrcdir)/config/rules.mk diff --git a/gfx/ipc/moz.build b/gfx/ipc/moz.build index 05bbd3f6694..e099e2085bc 100644 --- a/gfx/ipc/moz.build +++ b/gfx/ipc/moz.build @@ -30,3 +30,5 @@ CPP_SOURCES += [ LIBXUL_LIBRARY = True +LIBRARY_NAME = 'gfxipc_s' + diff --git a/gfx/layers/Makefile.in b/gfx/layers/Makefile.in index 960ee40c9c2..110e22ae6f9 100644 --- a/gfx/layers/Makefile.in +++ b/gfx/layers/Makefile.in @@ -20,7 +20,6 @@ VPATH = \ include $(DEPTH)/config/autoconf.mk -LIBRARY_NAME = layers ifdef MOZ_DEBUG DEFINES += -DD3D_DEBUG_INFO endif diff --git a/gfx/layers/moz.build b/gfx/layers/moz.build index 16a902baa0a..9fc1c02191a 100644 --- a/gfx/layers/moz.build +++ b/gfx/layers/moz.build @@ -272,3 +272,5 @@ LIBXUL_LIBRARY = True MSVC_ENABLE_PGO = True +LIBRARY_NAME = 'layers' + diff --git a/gfx/thebes/Makefile.in b/gfx/thebes/Makefile.in index c7f643b873a..0c0355f426e 100644 --- a/gfx/thebes/Makefile.in +++ b/gfx/thebes/Makefile.in @@ -9,7 +9,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBRARY_NAME = thebes EXPORT_LIBRARY = 1 # gfxSVGGlyphs needs nsDOMParser.h diff --git a/gfx/thebes/moz.build b/gfx/thebes/moz.build index 04edc21695b..d3673b4676b 100644 --- a/gfx/thebes/moz.build +++ b/gfx/thebes/moz.build @@ -274,3 +274,5 @@ LIBXUL_LIBRARY = True MSVC_ENABLE_PGO = True +LIBRARY_NAME = 'thebes' + diff --git a/hal/Makefile.in b/hal/Makefile.in index 2ab608b3782..b9fb880a43a 100644 --- a/hal/Makefile.in +++ b/hal/Makefile.in @@ -21,7 +21,6 @@ relativesrcdir = @relativesrcdir@ include $(DEPTH)/config/autoconf.mk -LIBRARY_NAME = hal_s EXPORT_LIBRARY = 1 MOCHITEST_BROWSER_FILES += \ tests/browser_alarms.js \ diff --git a/hal/moz.build b/hal/moz.build index 386a01663b1..b69cc222b22 100644 --- a/hal/moz.build +++ b/hal/moz.build @@ -154,3 +154,5 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True +LIBRARY_NAME = 'hal_s' + diff --git a/image/decoders/icon/android/Makefile.in b/image/decoders/icon/android/Makefile.in index eeaa3db2cb3..75370a8aeeb 100644 --- a/image/decoders/icon/android/Makefile.in +++ b/image/decoders/icon/android/Makefile.in @@ -9,6 +9,5 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBRARY_NAME = imgiconandroid_s include $(topsrcdir)/config/rules.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/image/decoders/icon/android/moz.build b/image/decoders/icon/android/moz.build index 18587733662..22789f01c51 100644 --- a/image/decoders/icon/android/moz.build +++ b/image/decoders/icon/android/moz.build @@ -14,3 +14,5 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True +LIBRARY_NAME = 'imgiconandroid_s' + diff --git a/image/src/Makefile.in b/image/src/Makefile.in index 0d9a8e0667e..b74bb645caf 100644 --- a/image/src/Makefile.in +++ b/image/src/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBRARY_NAME = imglib2_s # We need to instantiate the decoders LOCAL_INCLUDES += -I$(topsrcdir)/image/decoders diff --git a/image/src/moz.build b/image/src/moz.build index 0ea2f3e6867..8f5330fe542 100644 --- a/image/src/moz.build +++ b/image/src/moz.build @@ -44,3 +44,5 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True +LIBRARY_NAME = 'imglib2_s' + diff --git a/ipc/chromium/Makefile.in b/ipc/chromium/Makefile.in index 5edef29c599..7a87383ebec 100644 --- a/ipc/chromium/Makefile.in +++ b/ipc/chromium/Makefile.in @@ -11,7 +11,6 @@ include $(DEPTH)/config/autoconf.mk OS_CXXFLAGS := $(filter-out -fshort-wchar,$(OS_CXXFLAGS)) -LIBRARY_NAME = chromium_s EXPORT_LIBRARY = 1 ACDEFINES = diff --git a/ipc/chromium/moz.build b/ipc/chromium/moz.build index d59edde1f36..626842d9ef5 100644 --- a/ipc/chromium/moz.build +++ b/ipc/chromium/moz.build @@ -234,3 +234,5 @@ if ost.find('86') == -1 and ost.find('arm') == -1 and ost.find('mips') == -1: LIBXUL_LIBRARY = True +LIBRARY_NAME = 'chromium_s' + diff --git a/ipc/dbus/Makefile.in b/ipc/dbus/Makefile.in index 13d0039fa76..cee0b50dcb4 100644 --- a/ipc/dbus/Makefile.in +++ b/ipc/dbus/Makefile.in @@ -9,7 +9,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBRARY_NAME = mozdbus_s EXPORT_LIBRARY = 1 ifdef MOZ_ENABLE_DBUS diff --git a/ipc/dbus/moz.build b/ipc/dbus/moz.build index a639e9e9247..291045ea210 100644 --- a/ipc/dbus/moz.build +++ b/ipc/dbus/moz.build @@ -20,3 +20,5 @@ CPP_SOURCES += [ LIBXUL_LIBRARY = True +LIBRARY_NAME = 'mozdbus_s' + diff --git a/ipc/glue/Makefile.in b/ipc/glue/Makefile.in index 822f7011ba3..714ab33e009 100644 --- a/ipc/glue/Makefile.in +++ b/ipc/glue/Makefile.in @@ -11,7 +11,6 @@ include $(DEPTH)/config/autoconf.mk LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/crashreporter -LIBRARY_NAME = mozipc_s EXPORT_LIBRARY = 1 DEFINES += -DMOZ_CHILD_PROCESS_NAME=\"$(MOZ_CHILD_PROCESS_NAME)\" diff --git a/ipc/glue/moz.build b/ipc/glue/moz.build index 4af604fe64c..f42b88a3f51 100644 --- a/ipc/glue/moz.build +++ b/ipc/glue/moz.build @@ -103,3 +103,5 @@ IPDL_SOURCES = [ LIBXUL_LIBRARY = True +LIBRARY_NAME = 'mozipc_s' + diff --git a/ipc/ipdl/Makefile.in b/ipc/ipdl/Makefile.in index 9413d47e8c8..5608fd6ff29 100644 --- a/ipc/ipdl/Makefile.in +++ b/ipc/ipdl/Makefile.in @@ -12,7 +12,6 @@ include $(DEPTH)/config/autoconf.mk GARBAGE_DIRS += _ipdlheaders GARBAGE += ipdl_lextab.py ipdl_yacctab.py $(wildcard *.pyc $(srcdir)/ipdl/*.pyc $(srcdir)/ipdl/cxx/*.pyc) -LIBRARY_NAME = mozipdlgen_s EXPORT_LIBRARY = 1 # This file is generated by the moz.build backend. diff --git a/ipc/ipdl/moz.build b/ipc/ipdl/moz.build index bb733d72d34..7bdbd542034 100644 --- a/ipc/ipdl/moz.build +++ b/ipc/ipdl/moz.build @@ -11,3 +11,5 @@ MODULE = 'ipdlgen' LIBXUL_LIBRARY = True +LIBRARY_NAME = 'mozipdlgen_s' + diff --git a/ipc/netd/Makefile.in b/ipc/netd/Makefile.in index aa1ae80b273..1202c04971b 100644 --- a/ipc/netd/Makefile.in +++ b/ipc/netd/Makefile.in @@ -9,7 +9,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBRARY_NAME = moznetd_s EXPORT_LIBRARY = 1 include $(topsrcdir)/config/rules.mk diff --git a/ipc/netd/moz.build b/ipc/netd/moz.build index 08fff59f4d2..9991aea1242 100644 --- a/ipc/netd/moz.build +++ b/ipc/netd/moz.build @@ -16,3 +16,5 @@ CPP_SOURCES += [ LIBXUL_LIBRARY = True +LIBRARY_NAME = 'moznetd_s' + diff --git a/ipc/nfc/Makefile.in b/ipc/nfc/Makefile.in index 210520d4407..1202c04971b 100644 --- a/ipc/nfc/Makefile.in +++ b/ipc/nfc/Makefile.in @@ -9,7 +9,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBRARY_NAME = moznfc_s EXPORT_LIBRARY = 1 include $(topsrcdir)/config/rules.mk diff --git a/ipc/nfc/moz.build b/ipc/nfc/moz.build index d21f12b3be5..2babb70994a 100644 --- a/ipc/nfc/moz.build +++ b/ipc/nfc/moz.build @@ -14,3 +14,5 @@ if CONFIG['MOZ_B2G_NFC']: LIBXUL_LIBRARY = True +LIBRARY_NAME = 'moznfc_s' + diff --git a/ipc/ril/Makefile.in b/ipc/ril/Makefile.in index dba0bc5bc90..1202c04971b 100644 --- a/ipc/ril/Makefile.in +++ b/ipc/ril/Makefile.in @@ -9,7 +9,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBRARY_NAME = mozril_s EXPORT_LIBRARY = 1 include $(topsrcdir)/config/rules.mk diff --git a/ipc/ril/moz.build b/ipc/ril/moz.build index fb2f4ad277b..68971580719 100644 --- a/ipc/ril/moz.build +++ b/ipc/ril/moz.build @@ -16,3 +16,5 @@ CPP_SOURCES += [ LIBXUL_LIBRARY = True +LIBRARY_NAME = 'mozril_s' + diff --git a/ipc/testshell/Makefile.in b/ipc/testshell/Makefile.in index e3c12f30deb..97e53df366a 100644 --- a/ipc/testshell/Makefile.in +++ b/ipc/testshell/Makefile.in @@ -9,7 +9,6 @@ VPATH = @srcdir@ relativesrcdir = @relativesrcdir@ include $(DEPTH)/config/autoconf.mk -LIBRARY_NAME = ipcshell_s EXPORT_LIBRARY = 1 # For xpcshell error messages and nsDependentJSString diff --git a/ipc/testshell/moz.build b/ipc/testshell/moz.build index d108d6b24cb..dfb2d162833 100644 --- a/ipc/testshell/moz.build +++ b/ipc/testshell/moz.build @@ -31,3 +31,5 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True +LIBRARY_NAME = 'ipcshell_s' + diff --git a/ipc/unixsocket/Makefile.in b/ipc/unixsocket/Makefile.in index 2e53f851be6..93fd4c0e90c 100644 --- a/ipc/unixsocket/Makefile.in +++ b/ipc/unixsocket/Makefile.in @@ -9,7 +9,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBRARY_NAME = mozipcunixsocket_s EXPORT_LIBRARY = 1 include $(topsrcdir)/config/rules.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/ipc/unixsocket/moz.build b/ipc/unixsocket/moz.build index 104fec8b8c2..51f91545f8a 100644 --- a/ipc/unixsocket/moz.build +++ b/ipc/unixsocket/moz.build @@ -18,3 +18,5 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True +LIBRARY_NAME = 'mozipcunixsocket_s' + diff --git a/js/ipc/Makefile.in b/js/ipc/Makefile.in index 0ed8dc605ae..53fcd8f07db 100644 --- a/js/ipc/Makefile.in +++ b/js/ipc/Makefile.in @@ -9,7 +9,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBRARY_NAME = jsipc_s EXPORT_LIBRARY = 1 LOCAL_INCLUDES += \ -I$(topsrcdir)/dom/base \ diff --git a/js/ipc/moz.build b/js/ipc/moz.build index 21a25f1020d..803a4780054 100644 --- a/js/ipc/moz.build +++ b/js/ipc/moz.build @@ -21,3 +21,5 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True +LIBRARY_NAME = 'jsipc_s' + diff --git a/js/xpconnect/src/Makefile.in b/js/xpconnect/src/Makefile.in index 0cc48a7da0d..74105ae9933 100644 --- a/js/xpconnect/src/Makefile.in +++ b/js/xpconnect/src/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBRARY_NAME = xpconnect_s LOCAL_INCLUDES = \ -I$(srcdir)/../wrappers \ -I$(srcdir)/../loader \ diff --git a/js/xpconnect/src/moz.build b/js/xpconnect/src/moz.build index da8880f24f3..b47d77abd48 100644 --- a/js/xpconnect/src/moz.build +++ b/js/xpconnect/src/moz.build @@ -60,3 +60,5 @@ LIBXUL_LIBRARY = True MSVC_ENABLE_PGO = True +LIBRARY_NAME = 'xpconnect_s' + diff --git a/js/xpconnect/tests/components/js/Makefile.in b/js/xpconnect/tests/components/js/Makefile.in index 26b9c7e0ef4..bd3d0f82758 100644 --- a/js/xpconnect/tests/components/js/Makefile.in +++ b/js/xpconnect/tests/components/js/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBRARY_NAME = xpctest IS_COMPONENT = 1 MODULE_NAME = xpconnect_test diff --git a/js/xpconnect/tests/components/js/moz.build b/js/xpconnect/tests/components/js/moz.build index dd637b2b8cc..edf08dc2b2d 100644 --- a/js/xpconnect/tests/components/js/moz.build +++ b/js/xpconnect/tests/components/js/moz.build @@ -7,3 +7,5 @@ MODULE = 'xpctest' NO_DIST_INSTALL = True +LIBRARY_NAME = 'xpctest' + diff --git a/js/xpconnect/tests/components/native/Makefile.in b/js/xpconnect/tests/components/native/Makefile.in index 82566601058..c69fcd8a8f8 100644 --- a/js/xpconnect/tests/components/native/Makefile.in +++ b/js/xpconnect/tests/components/native/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBRARY_NAME = xpctest IS_COMPONENT = 1 MODULE_NAME = xpconnect_test FORCE_SHARED_LIB = 1 diff --git a/js/xpconnect/tests/components/native/moz.build b/js/xpconnect/tests/components/native/moz.build index 2fd58b138d7..bba3fe775c8 100644 --- a/js/xpconnect/tests/components/native/moz.build +++ b/js/xpconnect/tests/components/native/moz.build @@ -13,3 +13,5 @@ CPP_SOURCES += [ 'xpctest_params.cpp', ] +LIBRARY_NAME = 'xpctest' + diff --git a/layout/base/Makefile.in b/layout/base/Makefile.in index 6680a227a3e..3f105c5393f 100644 --- a/layout/base/Makefile.in +++ b/layout/base/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBRARY_NAME = gkbase_s include $(topsrcdir)/config/rules.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/layout/base/moz.build b/layout/base/moz.build index 411d2acef2e..d26b2a2f9a7 100644 --- a/layout/base/moz.build +++ b/layout/base/moz.build @@ -106,3 +106,5 @@ LIBXUL_LIBRARY = True MSVC_ENABLE_PGO = True +LIBRARY_NAME = 'gkbase_s' + diff --git a/layout/build/Makefile.in b/layout/build/Makefile.in index 406627e5044..cb36affded6 100644 --- a/layout/build/Makefile.in +++ b/layout/build/Makefile.in @@ -15,7 +15,6 @@ ifeq ($(OS_ARCH),SunOS) SHELL := ksh endif -LIBRARY_NAME = gklayout EXPORT_LIBRARY = 1 SHARED_LIBRARY_LIBS = \ ../base/$(LIB_PREFIX)gkbase_s.$(LIB_SUFFIX) \ diff --git a/layout/build/moz.build b/layout/build/moz.build index a063b7955d1..fc3c2578a80 100644 --- a/layout/build/moz.build +++ b/layout/build/moz.build @@ -24,3 +24,5 @@ LIBXUL_LIBRARY = True MSVC_ENABLE_PGO = True +LIBRARY_NAME = 'gklayout' + diff --git a/layout/generic/Makefile.in b/layout/generic/Makefile.in index df29b7dfc32..e73c623db33 100644 --- a/layout/generic/Makefile.in +++ b/layout/generic/Makefile.in @@ -9,7 +9,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBRARY_NAME = gkgeneric_s RESOURCES_HTML = \ $(srcdir)/folder.png \ $(NULL) diff --git a/layout/generic/moz.build b/layout/generic/moz.build index 97a7766bcee..509da305fbe 100644 --- a/layout/generic/moz.build +++ b/layout/generic/moz.build @@ -100,3 +100,5 @@ LIBXUL_LIBRARY = True MSVC_ENABLE_PGO = True +LIBRARY_NAME = 'gkgeneric_s' + diff --git a/layout/ipc/Makefile.in b/layout/ipc/Makefile.in index 7fa9dddbd0a..494e6254fe5 100644 --- a/layout/ipc/Makefile.in +++ b/layout/ipc/Makefile.in @@ -9,7 +9,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBRARY_NAME = gkipc_s EXPORT_LIBRARY = 1 include $(topsrcdir)/config/rules.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/layout/ipc/moz.build b/layout/ipc/moz.build index d17e9d3c912..d1c3e408e7a 100644 --- a/layout/ipc/moz.build +++ b/layout/ipc/moz.build @@ -25,3 +25,5 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True +LIBRARY_NAME = 'gkipc_s' + diff --git a/layout/mathml/Makefile.in b/layout/mathml/Makefile.in index b9a5b730d67..db15a65438f 100644 --- a/layout/mathml/Makefile.in +++ b/layout/mathml/Makefile.in @@ -11,7 +11,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBRARY_NAME = gkmathml_s LOCAL_INCLUDES = \ -I$(srcdir)/../style \ -I$(srcdir)/../base \ diff --git a/layout/mathml/moz.build b/layout/mathml/moz.build index aa73a270d3f..c97f6c7a8ff 100644 --- a/layout/mathml/moz.build +++ b/layout/mathml/moz.build @@ -35,3 +35,5 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True +LIBRARY_NAME = 'gkmathml_s' + diff --git a/layout/style/Makefile.in b/layout/style/Makefile.in index d7a2d19b355..e526b903499 100644 --- a/layout/style/Makefile.in +++ b/layout/style/Makefile.in @@ -9,7 +9,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBRARY_NAME = gkstyle_s ifdef GNU_CC OS_CFLAGS := $(OS_CFLAGS) -Wshadow OS_CXXFLAGS := $(OS_CXXFLAGS) -Wshadow diff --git a/layout/style/moz.build b/layout/style/moz.build index 76e6c7d7fad..0d4ed279a21 100644 --- a/layout/style/moz.build +++ b/layout/style/moz.build @@ -129,3 +129,5 @@ LIBXUL_LIBRARY = True MSVC_ENABLE_PGO = True +LIBRARY_NAME = 'gkstyle_s' + diff --git a/layout/svg/Makefile.in b/layout/svg/Makefile.in index 76438c6b526..74bb3d11a02 100644 --- a/layout/svg/Makefile.in +++ b/layout/svg/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBRARY_NAME = gksvgbase_s include $(topsrcdir)/config/rules.mk LOCAL_INCLUDES = \ diff --git a/layout/svg/moz.build b/layout/svg/moz.build index e4838633e20..874d2ef62b5 100644 --- a/layout/svg/moz.build +++ b/layout/svg/moz.build @@ -57,3 +57,5 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True +LIBRARY_NAME = 'gksvgbase_s' + diff --git a/layout/xul/base/src/Makefile.in b/layout/xul/base/src/Makefile.in index 8f7c5190275..2a6261dc47d 100644 --- a/layout/xul/base/src/Makefile.in +++ b/layout/xul/base/src/Makefile.in @@ -9,7 +9,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBRARY_NAME = gkxulbase_s include $(topsrcdir)/config/rules.mk LOCAL_INCLUDES = \ diff --git a/layout/xul/base/src/moz.build b/layout/xul/base/src/moz.build index 327500aa9a4..948ea1b970c 100644 --- a/layout/xul/base/src/moz.build +++ b/layout/xul/base/src/moz.build @@ -60,3 +60,5 @@ LIBXUL_LIBRARY = True MSVC_ENABLE_PGO = True +LIBRARY_NAME = 'gkxulbase_s' + diff --git a/memory/replace/dmd/Makefile.in b/memory/replace/dmd/Makefile.in index 860d43f33e1..71833134375 100644 --- a/memory/replace/dmd/Makefile.in +++ b/memory/replace/dmd/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBRARY_NAME = dmd FORCE_SHARED_LIB= 1 DEFINES += -DMOZ_NO_MOZALLOC diff --git a/memory/replace/dmd/moz.build b/memory/replace/dmd/moz.build index 8ff3dbbc1e4..644d09b6a81 100644 --- a/memory/replace/dmd/moz.build +++ b/memory/replace/dmd/moz.build @@ -19,3 +19,6 @@ CPP_SOURCES += [ CSRCS += [ 'strcpy.c', ] + +LIBRARY_NAME = 'dmd' + diff --git a/modules/libpref/src/Makefile.in b/modules/libpref/src/Makefile.in index 04e7101a996..f5a52b922fe 100644 --- a/modules/libpref/src/Makefile.in +++ b/modules/libpref/src/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBRARY_NAME = pref EXPORT_LIBRARY = 1 DEFINES += -DOS_ARCH=$(OS_ARCH) \ -DMOZ_WIDGET_TOOLKIT=$(MOZ_WIDGET_TOOLKIT) \ diff --git a/modules/libpref/src/moz.build b/modules/libpref/src/moz.build index bcafc630a00..3edeca4b1b6 100644 --- a/modules/libpref/src/moz.build +++ b/modules/libpref/src/moz.build @@ -18,3 +18,5 @@ LIBXUL_LIBRARY = True MSVC_ENABLE_PGO = True +LIBRARY_NAME = 'pref' + diff --git a/netwerk/base/src/Makefile.in b/netwerk/base/src/Makefile.in index acd989d1361..29e09b839da 100644 --- a/netwerk/base/src/Makefile.in +++ b/netwerk/base/src/Makefile.in @@ -11,7 +11,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBRARY_NAME = neckobase_s LOCAL_INCLUDES += -I$(topsrcdir)/dom/base ifdef MOZ_PLATFORM_MAEMO diff --git a/netwerk/base/src/moz.build b/netwerk/base/src/moz.build index 250c8bbac44..2eb74cb0338 100644 --- a/netwerk/base/src/moz.build +++ b/netwerk/base/src/moz.build @@ -117,3 +117,5 @@ LIBXUL_LIBRARY = True MSVC_ENABLE_PGO = True +LIBRARY_NAME = 'neckobase_s' + diff --git a/netwerk/build/Makefile.in b/netwerk/build/Makefile.in index bb8f2897b6c..50ba6a20ae4 100644 --- a/netwerk/build/Makefile.in +++ b/netwerk/build/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBRARY_NAME = necko EXPORT_LIBRARY = 1 SHARED_LIBRARY_LIBS = \ ../base/src/$(LIB_PREFIX)neckobase_s.$(LIB_SUFFIX) \ diff --git a/netwerk/build/moz.build b/netwerk/build/moz.build index 7da937ee259..36c17ab186a 100644 --- a/netwerk/build/moz.build +++ b/netwerk/build/moz.build @@ -20,3 +20,5 @@ LIBXUL_LIBRARY = True MSVC_ENABLE_PGO = True +LIBRARY_NAME = 'necko' + diff --git a/netwerk/ipc/Makefile.in b/netwerk/ipc/Makefile.in index d8efeaef153..6b42f3aa945 100644 --- a/netwerk/ipc/Makefile.in +++ b/netwerk/ipc/Makefile.in @@ -8,7 +8,6 @@ srcdir = @srcdir@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBRARY_NAME = neckoipc_s EXPORT_LIBRARY = 1 LOCAL_INCLUDES += \ -I$(srcdir)/../protocol/http \ diff --git a/netwerk/ipc/moz.build b/netwerk/ipc/moz.build index 993773b5ff0..4ab79d5a6d4 100644 --- a/netwerk/ipc/moz.build +++ b/netwerk/ipc/moz.build @@ -41,3 +41,5 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True +LIBRARY_NAME = 'neckoipc_s' + diff --git a/netwerk/protocol/about/Makefile.in b/netwerk/protocol/about/Makefile.in index 7c98604c565..a96a2dca740 100644 --- a/netwerk/protocol/about/Makefile.in +++ b/netwerk/protocol/about/Makefile.in @@ -9,7 +9,6 @@ srcdir = @srcdir@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBRARY_NAME = nkabout_s LOCAL_INCLUDES = \ -I$(srcdir)/../../base/src \ $(NULL) diff --git a/netwerk/protocol/about/moz.build b/netwerk/protocol/about/moz.build index 971da5dd1d7..a46e469e09d 100644 --- a/netwerk/protocol/about/moz.build +++ b/netwerk/protocol/about/moz.build @@ -28,3 +28,5 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True +LIBRARY_NAME = 'nkabout_s' + diff --git a/netwerk/protocol/device/Makefile.in b/netwerk/protocol/device/Makefile.in index 9f009f6499f..698b6714c09 100644 --- a/netwerk/protocol/device/Makefile.in +++ b/netwerk/protocol/device/Makefile.in @@ -8,7 +8,6 @@ srcdir = @srcdir@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBRARY_NAME = nkdevice_s LOCAL_INCLUDES = -I$(srcdir)/../../base/src/ \ $(NULL) diff --git a/netwerk/protocol/device/moz.build b/netwerk/protocol/device/moz.build index 97be44c600e..c458602802b 100644 --- a/netwerk/protocol/device/moz.build +++ b/netwerk/protocol/device/moz.build @@ -24,3 +24,5 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True +LIBRARY_NAME = 'nkdevice_s' + diff --git a/netwerk/protocol/ftp/Makefile.in b/netwerk/protocol/ftp/Makefile.in index 7b64e080b3a..2a53b1c2256 100644 --- a/netwerk/protocol/ftp/Makefile.in +++ b/netwerk/protocol/ftp/Makefile.in @@ -9,7 +9,6 @@ srcdir = @srcdir@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBRARY_NAME = nkftp_s LOCAL_INCLUDES = \ -I$(srcdir)/../../base/src \ -I$(topsrcdir)/xpcom/ds \ diff --git a/netwerk/protocol/ftp/moz.build b/netwerk/protocol/ftp/moz.build index 67fbf771a4c..b56edd81b86 100644 --- a/netwerk/protocol/ftp/moz.build +++ b/netwerk/protocol/ftp/moz.build @@ -40,3 +40,5 @@ LIBXUL_LIBRARY = True MSVC_ENABLE_PGO = True +LIBRARY_NAME = 'nkftp_s' + diff --git a/netwerk/protocol/http/Makefile.in b/netwerk/protocol/http/Makefile.in index 9918a6966f3..f1b1a9e5114 100644 --- a/netwerk/protocol/http/Makefile.in +++ b/netwerk/protocol/http/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBRARY_NAME = nkhttp_s LOCAL_INCLUDES = \ -I$(srcdir)/../../base/src \ -I$(topsrcdir)/xpcom/ds \ diff --git a/netwerk/protocol/http/moz.build b/netwerk/protocol/http/moz.build index ecc190ac93e..d95d6b1bf31 100644 --- a/netwerk/protocol/http/moz.build +++ b/netwerk/protocol/http/moz.build @@ -86,3 +86,5 @@ LIBXUL_LIBRARY = True MSVC_ENABLE_PGO = True +LIBRARY_NAME = 'nkhttp_s' + diff --git a/netwerk/protocol/res/Makefile.in b/netwerk/protocol/res/Makefile.in index a296b85597a..a3cbb9faba3 100644 --- a/netwerk/protocol/res/Makefile.in +++ b/netwerk/protocol/res/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBRARY_NAME = nkres_s LOCAL_INCLUDES = \ -I$(topsrcdir)/netwerk/base/src \ $(NULL) diff --git a/netwerk/protocol/res/moz.build b/netwerk/protocol/res/moz.build index 67216dc6309..6d18116ef0c 100644 --- a/netwerk/protocol/res/moz.build +++ b/netwerk/protocol/res/moz.build @@ -22,3 +22,5 @@ LIBXUL_LIBRARY = True MSVC_ENABLE_PGO = True +LIBRARY_NAME = 'nkres_s' + diff --git a/netwerk/protocol/websocket/Makefile.in b/netwerk/protocol/websocket/Makefile.in index 8c1a829296f..92f9dab7576 100644 --- a/netwerk/protocol/websocket/Makefile.in +++ b/netwerk/protocol/websocket/Makefile.in @@ -9,7 +9,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBRARY_NAME = nkwebsocket_s LOCAL_INCLUDES = \ -I$(srcdir)/../../base/src \ -I$(topsrcdir)/content/base/src \ diff --git a/netwerk/protocol/websocket/moz.build b/netwerk/protocol/websocket/moz.build index 70203387068..4414ed17780 100644 --- a/netwerk/protocol/websocket/moz.build +++ b/netwerk/protocol/websocket/moz.build @@ -37,3 +37,5 @@ LIBXUL_LIBRARY = True MSVC_ENABLE_PGO = True +LIBRARY_NAME = 'nkwebsocket_s' + diff --git a/netwerk/protocol/wyciwyg/Makefile.in b/netwerk/protocol/wyciwyg/Makefile.in index 0f5137cb4e0..0ef6835f507 100644 --- a/netwerk/protocol/wyciwyg/Makefile.in +++ b/netwerk/protocol/wyciwyg/Makefile.in @@ -9,7 +9,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBRARY_NAME = nkwyciwyg_s LOCAL_INCLUDES = \ -I$(srcdir)/../../base/src \ $(NULL) diff --git a/netwerk/protocol/wyciwyg/moz.build b/netwerk/protocol/wyciwyg/moz.build index 203402d4e73..43dffa3ac86 100644 --- a/netwerk/protocol/wyciwyg/moz.build +++ b/netwerk/protocol/wyciwyg/moz.build @@ -33,3 +33,5 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True +LIBRARY_NAME = 'nkwyciwyg_s' + diff --git a/netwerk/sctp/datachannel/Makefile.in b/netwerk/sctp/datachannel/Makefile.in index f36860f0e9d..07abd70d0a8 100644 --- a/netwerk/sctp/datachannel/Makefile.in +++ b/netwerk/sctp/datachannel/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBRARY_NAME = nkdatachan_s NO_PROFILE_GUIDED_OPTIMIZE = 1 # Don't PGO LOCAL_INCLUDES = \ -I$(topsrcdir)/xpcom/ds \ diff --git a/netwerk/sctp/datachannel/moz.build b/netwerk/sctp/datachannel/moz.build index 71c5267cd3b..b3b1e6a627f 100644 --- a/netwerk/sctp/datachannel/moz.build +++ b/netwerk/sctp/datachannel/moz.build @@ -21,3 +21,5 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True +LIBRARY_NAME = 'nkdatachan_s' + diff --git a/netwerk/sctp/src/Makefile.in b/netwerk/sctp/src/Makefile.in index 0655bd630c4..304af4310b4 100644 --- a/netwerk/sctp/src/Makefile.in +++ b/netwerk/sctp/src/Makefile.in @@ -14,7 +14,6 @@ VPATH = \ include $(DEPTH)/config/autoconf.mk -LIBRARY_NAME = nksctp_s NO_PROFILE_GUIDED_OPTIMIZE = 1 # Don't PGO LOCAL_INCLUDES = \ diff --git a/netwerk/sctp/src/moz.build b/netwerk/sctp/src/moz.build index 233204a8143..4d8434269f6 100644 --- a/netwerk/sctp/src/moz.build +++ b/netwerk/sctp/src/moz.build @@ -47,3 +47,5 @@ if CONFIG['OS_TARGET'] == 'Android': LIBXUL_LIBRARY = True +LIBRARY_NAME = 'nksctp_s' + diff --git a/netwerk/srtp/src/Makefile.in b/netwerk/srtp/src/Makefile.in index 9e89bb3f066..13b6889eb58 100644 --- a/netwerk/srtp/src/Makefile.in +++ b/netwerk/srtp/src/Makefile.in @@ -20,7 +20,6 @@ VPATH = \ include $(DEPTH)/config/autoconf.mk -LIBRARY_NAME = nksrtp_s LOCAL_INCLUDES = \ -I$(srcdir)/include \ -I$(srcdir)/crypto/include \ diff --git a/netwerk/srtp/src/moz.build b/netwerk/srtp/src/moz.build index 090389225c7..7456dd079da 100644 --- a/netwerk/srtp/src/moz.build +++ b/netwerk/srtp/src/moz.build @@ -37,3 +37,5 @@ CSRCS += [ LIBXUL_LIBRARY = True +LIBRARY_NAME = 'nksrtp_s' + diff --git a/security/sandbox/Makefile.in b/security/sandbox/Makefile.in index 3ef1f8a62a2..3edac69c69f 100644 --- a/security/sandbox/Makefile.in +++ b/security/sandbox/Makefile.in @@ -9,7 +9,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBRARY_NAME = sandbox_s EXPORT_LIBRARY = 1 FAIL_ON_WARNINGS = 1 diff --git a/security/sandbox/moz.build b/security/sandbox/moz.build index 9a5c3dcc020..1636ed7eb76 100644 --- a/security/sandbox/moz.build +++ b/security/sandbox/moz.build @@ -16,3 +16,5 @@ CPP_SOURCES += [ LIBXUL_LIBRARY = True +LIBRARY_NAME = 'sandbox_s' + diff --git a/toolkit/components/alerts/Makefile.in b/toolkit/components/alerts/Makefile.in index 181509b078d..a898e8b2665 100644 --- a/toolkit/components/alerts/Makefile.in +++ b/toolkit/components/alerts/Makefile.in @@ -9,7 +9,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBRARY_NAME = alerts_s LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/components/build/ include $(topsrcdir)/config/rules.mk diff --git a/toolkit/components/alerts/moz.build b/toolkit/components/alerts/moz.build index 4decbae989f..e54c9381b05 100644 --- a/toolkit/components/alerts/moz.build +++ b/toolkit/components/alerts/moz.build @@ -19,3 +19,5 @@ CPP_SOURCES += [ LIBXUL_LIBRARY = True +LIBRARY_NAME = 'alerts_s' + diff --git a/toolkit/components/build/Makefile.in b/toolkit/components/build/Makefile.in index 86e6c3303a7..ab78ab56650 100644 --- a/toolkit/components/build/Makefile.in +++ b/toolkit/components/build/Makefile.in @@ -10,7 +10,6 @@ VPATH=@srcdir@ include $(DEPTH)/config/autoconf.mk -LIBRARY_NAME = toolkitcomps EXPORT_LIBRARY = 1 LOCAL_INCLUDES = \ -I$(srcdir)/../alerts \ diff --git a/toolkit/components/build/moz.build b/toolkit/components/build/moz.build index 788691537f3..d58d6267856 100644 --- a/toolkit/components/build/moz.build +++ b/toolkit/components/build/moz.build @@ -16,3 +16,5 @@ CPP_SOURCES += [ LIBXUL_LIBRARY = True +LIBRARY_NAME = 'toolkitcomps' + diff --git a/toolkit/components/diskspacewatcher/Makefile.in b/toolkit/components/diskspacewatcher/Makefile.in index 3fbfc9bc8a6..2eed6114270 100644 --- a/toolkit/components/diskspacewatcher/Makefile.in +++ b/toolkit/components/diskspacewatcher/Makefile.in @@ -9,7 +9,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBRARY_NAME = diskspacewatcher EXPORT_LIBRARY = 1 include $(topsrcdir)/config/rules.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/toolkit/components/diskspacewatcher/moz.build b/toolkit/components/diskspacewatcher/moz.build index cf544546b51..235834c7d83 100644 --- a/toolkit/components/diskspacewatcher/moz.build +++ b/toolkit/components/diskspacewatcher/moz.build @@ -21,3 +21,5 @@ CPP_SOURCES = [ LIBXUL_LIBRARY = True +LIBRARY_NAME = 'diskspacewatcher' + diff --git a/toolkit/components/downloads/Makefile.in b/toolkit/components/downloads/Makefile.in index 0d86b9cdd2d..bd53a3dcc09 100644 --- a/toolkit/components/downloads/Makefile.in +++ b/toolkit/components/downloads/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBRARY_NAME = download_s include $(topsrcdir)/config/rules.mk CXXFLAGS += $(TK_CFLAGS) -DGOOGLE_PROTOBUF_NO_RTTI diff --git a/toolkit/components/downloads/moz.build b/toolkit/components/downloads/moz.build index 923a62e893e..5d7a8c10a9e 100644 --- a/toolkit/components/downloads/moz.build +++ b/toolkit/components/downloads/moz.build @@ -40,3 +40,5 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True +LIBRARY_NAME = 'download_s' + diff --git a/toolkit/components/mediasniffer/Makefile.in b/toolkit/components/mediasniffer/Makefile.in index 439bf2b7349..4301cae66bf 100644 --- a/toolkit/components/mediasniffer/Makefile.in +++ b/toolkit/components/mediasniffer/Makefile.in @@ -9,7 +9,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBRARY_NAME = mediasniffer EXPORT_LIBRARY = 1 include $(topsrcdir)/config/rules.mk diff --git a/toolkit/components/mediasniffer/moz.build b/toolkit/components/mediasniffer/moz.build index c5230af2f64..1f14e35915b 100644 --- a/toolkit/components/mediasniffer/moz.build +++ b/toolkit/components/mediasniffer/moz.build @@ -23,3 +23,5 @@ CSRCS += [ LIBXUL_LIBRARY = True +LIBRARY_NAME = 'mediasniffer' + diff --git a/toolkit/components/protobuf/Makefile.in b/toolkit/components/protobuf/Makefile.in index c0aaf14b3a9..7a51a803e8d 100644 --- a/toolkit/components/protobuf/Makefile.in +++ b/toolkit/components/protobuf/Makefile.in @@ -17,7 +17,6 @@ VPATH = \ @srcdir@/google/protobuf/stubs \ $(NULL) -LIBRARY_NAME = protobuf_s FORCE_STATIC_LIB = 1 LOCAL_INCLUDES = \ diff --git a/toolkit/components/protobuf/moz.build b/toolkit/components/protobuf/moz.build index 0200de6e091..bff60df278b 100644 --- a/toolkit/components/protobuf/moz.build +++ b/toolkit/components/protobuf/moz.build @@ -45,3 +45,5 @@ CPP_SOURCES += [ 'zero_copy_stream_impl_lite.cc', ] +LIBRARY_NAME = 'protobuf_s' + diff --git a/toolkit/components/telemetry/Makefile.in b/toolkit/components/telemetry/Makefile.in index e81d7a8ffef..96de16c4932 100644 --- a/toolkit/components/telemetry/Makefile.in +++ b/toolkit/components/telemetry/Makefile.in @@ -13,7 +13,6 @@ USE_RCS_MK := 1 include $(topsrcdir)/config/makefiles/rcs.mk EXPORT_LIBRARY = 1 -LIBRARY_NAME = telemetry LOCAL_INCLUDES += -I$(topsrcdir)/xpcom/build LOCAL_INCLUDES += -I$(topsrcdir)/xpcom/threads diff --git a/toolkit/components/telemetry/moz.build b/toolkit/components/telemetry/moz.build index f1780f69343..363cff19012 100644 --- a/toolkit/components/telemetry/moz.build +++ b/toolkit/components/telemetry/moz.build @@ -43,3 +43,5 @@ LIBXUL_LIBRARY = True MSVC_ENABLE_PGO = True +LIBRARY_NAME = 'telemetry' + diff --git a/toolkit/crashreporter/Makefile.in b/toolkit/crashreporter/Makefile.in index 44bf8ed0947..ddd1b40550d 100644 --- a/toolkit/crashreporter/Makefile.in +++ b/toolkit/crashreporter/Makefile.in @@ -9,7 +9,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBRARY_NAME = exception_handler_s ifeq ($(OS_ARCH),Linux) # MOZ_APP_NAME is needed on Android, where we # need to launch by package name. diff --git a/toolkit/crashreporter/injector/Makefile.in b/toolkit/crashreporter/injector/Makefile.in index 883245ff9b0..2fd65673afc 100644 --- a/toolkit/crashreporter/injector/Makefile.in +++ b/toolkit/crashreporter/injector/Makefile.in @@ -9,7 +9,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBRARY_NAME = breakpadinjector FORCE_SHARED_LIB = 1 USE_STATIC_LIBS = 1 STL_FLAGS = diff --git a/toolkit/crashreporter/injector/moz.build b/toolkit/crashreporter/injector/moz.build index 371a3734d58..e6a016da278 100644 --- a/toolkit/crashreporter/injector/moz.build +++ b/toolkit/crashreporter/injector/moz.build @@ -8,3 +8,5 @@ CPP_SOURCES += [ 'injector.cpp', ] +LIBRARY_NAME = 'breakpadinjector' + diff --git a/toolkit/crashreporter/moz.build b/toolkit/crashreporter/moz.build index de7a456210b..79cecd96141 100644 --- a/toolkit/crashreporter/moz.build +++ b/toolkit/crashreporter/moz.build @@ -81,3 +81,5 @@ LIBXUL_LIBRARY = True MSVC_ENABLE_PGO = True +LIBRARY_NAME = 'exception_handler_s' + diff --git a/toolkit/xre/Makefile.in b/toolkit/xre/Makefile.in index 59623b2c60b..5779d430b36 100644 --- a/toolkit/xre/Makefile.in +++ b/toolkit/xre/Makefile.in @@ -17,7 +17,6 @@ include $(topsrcdir)/config/makefiles/makeutils.mk milestone_txt = $(topsrcdir)/config/milestone.txt -LIBRARY_NAME = xulapp_s ifeq ($(MOZ_GL_DEFAULT_PROVIDER),GLX) DEFINES += -DUSE_GLX_TEST endif diff --git a/toolkit/xre/moz.build b/toolkit/xre/moz.build index ca01069a3d6..e3e5cfc3370 100644 --- a/toolkit/xre/moz.build +++ b/toolkit/xre/moz.build @@ -98,3 +98,5 @@ LIBXUL_LIBRARY = True MSVC_ENABLE_PGO = True +LIBRARY_NAME = 'xulapp_s' + diff --git a/uriloader/exthandler/Makefile.in b/uriloader/exthandler/Makefile.in index 98507f13c57..70a46d8ba6a 100644 --- a/uriloader/exthandler/Makefile.in +++ b/uriloader/exthandler/Makefile.in @@ -33,7 +33,6 @@ endif VPATH := $(srcdir) $(srcdir)/$(OSDIR) -LIBRARY_NAME = exthandler_s ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa) CMMSRCS = nsOSHelperAppService.mm \ diff --git a/uriloader/exthandler/moz.build b/uriloader/exthandler/moz.build index 8f8c4c4156d..ed9a37031d6 100644 --- a/uriloader/exthandler/moz.build +++ b/uriloader/exthandler/moz.build @@ -127,3 +127,5 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True +LIBRARY_NAME = 'exthandler_s' + diff --git a/uriloader/prefetch/Makefile.in b/uriloader/prefetch/Makefile.in index 2afb56e1f80..289490db49c 100644 --- a/uriloader/prefetch/Makefile.in +++ b/uriloader/prefetch/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBRARY_NAME = prefetch_s LOCAL_INCLUDES = \ -I$(topsrcdir)/content/base/src \ -I$(topsrcdir)/content/events/src \ diff --git a/uriloader/prefetch/moz.build b/uriloader/prefetch/moz.build index 8fca016cdac..bdfd3151a46 100644 --- a/uriloader/prefetch/moz.build +++ b/uriloader/prefetch/moz.build @@ -37,3 +37,5 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True +LIBRARY_NAME = 'prefetch_s' + diff --git a/widget/android/Makefile.in b/widget/android/Makefile.in index 2ab6b9c2e67..985f4e9f375 100644 --- a/widget/android/Makefile.in +++ b/widget/android/Makefile.in @@ -9,7 +9,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBRARY_NAME = widget_android EXPORT_LIBRARY = 1 SHARED_LIBRARY_LIBS = ../xpwidgets/libxpwidgets_s.a diff --git a/widget/android/moz.build b/widget/android/moz.build index 2edf650b975..7da87cb13c5 100644 --- a/widget/android/moz.build +++ b/widget/android/moz.build @@ -42,3 +42,5 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True +LIBRARY_NAME = 'widget_android' + diff --git a/widget/gonk/Makefile.in b/widget/gonk/Makefile.in index cc3b8802a93..a838823ee2b 100644 --- a/widget/gonk/Makefile.in +++ b/widget/gonk/Makefile.in @@ -22,7 +22,6 @@ VPATH = \ include $(DEPTH)/config/autoconf.mk -LIBRARY_NAME = widget_gonk EXPORT_LIBRARY = 1 SHARED_LIBRARY_LIBS = ../xpwidgets/libxpwidgets_s.a diff --git a/widget/gonk/libdisplay/Makefile.in b/widget/gonk/libdisplay/Makefile.in index 76e13b98148..10bba6484ac 100644 --- a/widget/gonk/libdisplay/Makefile.in +++ b/widget/gonk/libdisplay/Makefile.in @@ -21,7 +21,6 @@ VPATH = \ include $(DEPTH)/config/autoconf.mk -LIBRARY_NAME = display FORCE_STATIC_LIB= 1 STL_FLAGS= diff --git a/widget/gonk/libdisplay/moz.build b/widget/gonk/libdisplay/moz.build index ea186b6d655..b6d1a24d0e7 100644 --- a/widget/gonk/libdisplay/moz.build +++ b/widget/gonk/libdisplay/moz.build @@ -32,3 +32,6 @@ elif CONFIG['ANDROID_VERSION'] == '15': ] else: error('Unsupported platform version: %s' % (CONFIG['ANDROID_VERSION'])) + +LIBRARY_NAME = 'display' + diff --git a/widget/gonk/moz.build b/widget/gonk/moz.build index cdc09c30900..ae6e7cb8676 100644 --- a/widget/gonk/moz.build +++ b/widget/gonk/moz.build @@ -63,3 +63,5 @@ if CONFIG['ANDROID_VERSION'] == '15': LIBXUL_LIBRARY = True +LIBRARY_NAME = 'widget_gonk' + diff --git a/widget/gonk/nativewindow/Makefile.in b/widget/gonk/nativewindow/Makefile.in index 204df9618e1..0f9cd248cac 100644 --- a/widget/gonk/nativewindow/Makefile.in +++ b/widget/gonk/nativewindow/Makefile.in @@ -18,7 +18,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBRARY_NAME = nativewindow STL_FLAGS= include $(topsrcdir)/config/rules.mk diff --git a/widget/gonk/nativewindow/moz.build b/widget/gonk/nativewindow/moz.build index 8598e2e4799..5b8a5be03fe 100644 --- a/widget/gonk/nativewindow/moz.build +++ b/widget/gonk/nativewindow/moz.build @@ -36,3 +36,5 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True +LIBRARY_NAME = 'nativewindow' + diff --git a/widget/qt/Makefile.in b/widget/qt/Makefile.in index abc779c40fd..ed428f241ac 100644 --- a/widget/qt/Makefile.in +++ b/widget/qt/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBRARY_NAME = widget_qt EXPORT_LIBRARY = 1 SHARED_LIBRARY_LIBS = ../xpwidgets/libxpwidgets_s.a diff --git a/widget/qt/moz.build b/widget/qt/moz.build index 4c66ce6b55b..8554d63af1b 100644 --- a/widget/qt/moz.build +++ b/widget/qt/moz.build @@ -53,3 +53,5 @@ if CONFIG[' MOZ_ENABLE_QTMOBILITY']: LIBXUL_LIBRARY = True +LIBRARY_NAME = 'widget_qt' + diff --git a/widget/shared/Makefile.in b/widget/shared/Makefile.in index bbf65964fde..29ef2d582c9 100644 --- a/widget/shared/Makefile.in +++ b/widget/shared/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBRARY_NAME = widget_shared include $(topsrcdir)/config/rules.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/widget/shared/moz.build b/widget/shared/moz.build index 190f4111a4e..eff0c3c24d7 100644 --- a/widget/shared/moz.build +++ b/widget/shared/moz.build @@ -16,3 +16,5 @@ CPP_SOURCES += [ LIBXUL_LIBRARY = True +LIBRARY_NAME = 'widget_shared' + diff --git a/widget/shared/x11/Makefile.in b/widget/shared/x11/Makefile.in index 5abd98e96a8..f0ed88151eb 100644 --- a/widget/shared/x11/Makefile.in +++ b/widget/shared/x11/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBRARY_NAME = widget_shared_x11 include $(topsrcdir)/config/rules.mk CXXFLAGS += $(TK_CFLAGS) diff --git a/widget/shared/x11/moz.build b/widget/shared/x11/moz.build index 5c5512fbef1..40a6c432500 100644 --- a/widget/shared/x11/moz.build +++ b/widget/shared/x11/moz.build @@ -12,3 +12,5 @@ CSRCS += [ LIBXUL_LIBRARY = True +LIBRARY_NAME = 'widget_shared_x11' + diff --git a/widget/windows/Makefile.in b/widget/windows/Makefile.in index c6558045b26..49a76fbb6f0 100644 --- a/widget/windows/Makefile.in +++ b/widget/windows/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBRARY_NAME = widget_windows EXPORT_LIBRARY = 1 RESFILE = widget.res DEFINES += -DMOZ_UNICODE diff --git a/widget/windows/moz.build b/widget/windows/moz.build index 6f33a6e922a..62ffa070912 100644 --- a/widget/windows/moz.build +++ b/widget/windows/moz.build @@ -86,3 +86,5 @@ LIBXUL_LIBRARY = True MSVC_ENABLE_PGO = True +LIBRARY_NAME = 'widget_windows' + diff --git a/widget/windows/winrt/Makefile.in b/widget/windows/winrt/Makefile.in index 27a0671307c..ba8a581b009 100644 --- a/widget/windows/winrt/Makefile.in +++ b/widget/windows/winrt/Makefile.in @@ -9,7 +9,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBRARY_NAME = widget_winrt EXPORT_LIBRARY = 1 DEFINES += -DMOZ_UNICODE diff --git a/widget/windows/winrt/moz.build b/widget/windows/winrt/moz.build index b2ba9e97186..1f5b2313339 100644 --- a/widget/windows/winrt/moz.build +++ b/widget/windows/winrt/moz.build @@ -29,3 +29,5 @@ EXTRA_COMPONENTS += [ LIBXUL_LIBRARY = True +LIBRARY_NAME = 'widget_winrt' + diff --git a/widget/xpwidgets/Makefile.in b/widget/xpwidgets/Makefile.in index d8285c62317..095d1426259 100644 --- a/widget/xpwidgets/Makefile.in +++ b/widget/xpwidgets/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBRARY_NAME = xpwidgets_s SHARED_LIBRARY_LIBS = ../shared/$(LIB_PREFIX)widget_shared.$(LIB_SUFFIX) ifdef MOZ_X11 SHARED_LIBRARY_LIBS += ../shared/x11/$(LIB_PREFIX)widget_shared_x11.$(LIB_SUFFIX) diff --git a/widget/xpwidgets/moz.build b/widget/xpwidgets/moz.build index b100788698a..7a31da63a1d 100644 --- a/widget/xpwidgets/moz.build +++ b/widget/xpwidgets/moz.build @@ -59,3 +59,5 @@ LIBXUL_LIBRARY = True MSVC_ENABLE_PGO = True +LIBRARY_NAME = 'xpwidgets_s' + diff --git a/xpcom/base/Makefile.in b/xpcom/base/Makefile.in index ada30737595..cdb4b4ae698 100644 --- a/xpcom/base/Makefile.in +++ b/xpcom/base/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBRARY_NAME = xpcombase_s MOZILLA_INTERNAL_API =1 ifeq ($(OS_ARCH),WINNT) diff --git a/xpcom/base/moz.build b/xpcom/base/moz.build index 8e6b77583a2..b46a78f0cec 100644 --- a/xpcom/base/moz.build +++ b/xpcom/base/moz.build @@ -135,3 +135,5 @@ LIBXUL_LIBRARY = True MSVC_ENABLE_PGO = True +LIBRARY_NAME = 'xpcombase_s' + diff --git a/xpcom/build/Makefile.in b/xpcom/build/Makefile.in index 4fe9203e20a..651f2404207 100644 --- a/xpcom/build/Makefile.in +++ b/xpcom/build/Makefile.in @@ -14,7 +14,6 @@ include $(srcdir)/../glue/objs.mk EXTRA_DEPS += $(srcdir)/../glue/objs.mk -LIBRARY_NAME = xpcom_core EXPORT_LIBRARY = 1 MOZILLA_INTERNAL_API = 1 diff --git a/xpcom/build/moz.build b/xpcom/build/moz.build index bc794608b2b..6f07a01b3c9 100644 --- a/xpcom/build/moz.build +++ b/xpcom/build/moz.build @@ -56,3 +56,5 @@ LIBXUL_LIBRARY = True MSVC_ENABLE_PGO = True +LIBRARY_NAME = 'xpcom_core' + diff --git a/xpcom/io/Makefile.in b/xpcom/io/Makefile.in index b66e3b2d911..78c4772e306 100644 --- a/xpcom/io/Makefile.in +++ b/xpcom/io/Makefile.in @@ -9,7 +9,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBRARY_NAME = xpcomio_s MOZILLA_INTERNAL_API = 1 include $(topsrcdir)/config/rules.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/xpcom/io/moz.build b/xpcom/io/moz.build index dfa091596ca..df491513627 100644 --- a/xpcom/io/moz.build +++ b/xpcom/io/moz.build @@ -126,3 +126,5 @@ LIBXUL_LIBRARY = True MSVC_ENABLE_PGO = True +LIBRARY_NAME = 'xpcomio_s' + diff --git a/xpcom/reflect/xptcall/src/md/os2/Makefile.in b/xpcom/reflect/xptcall/src/md/os2/Makefile.in index aee80a11414..7552f11e5a7 100644 --- a/xpcom/reflect/xptcall/src/md/os2/Makefile.in +++ b/xpcom/reflect/xptcall/src/md/os2/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBRARY_NAME = xptcmd EXPORT_LIBRARY = ../.. MOZILLA_INTERNAL_API = 1 diff --git a/xpcom/reflect/xptcall/src/md/os2/moz.build b/xpcom/reflect/xptcall/src/md/os2/moz.build index 42a5b890831..d81d2ddc6ee 100644 --- a/xpcom/reflect/xptcall/src/md/os2/moz.build +++ b/xpcom/reflect/xptcall/src/md/os2/moz.build @@ -11,3 +11,5 @@ CPP_SOURCES += [ 'xptcstubs_gcc_x86_os2.cpp', ] +LIBRARY_NAME = 'xptcmd' + diff --git a/xpcom/reflect/xptcall/src/md/unix/Makefile.in b/xpcom/reflect/xptcall/src/md/unix/Makefile.in index f3e0c89042b..430748165a3 100644 --- a/xpcom/reflect/xptcall/src/md/unix/Makefile.in +++ b/xpcom/reflect/xptcall/src/md/unix/Makefile.in @@ -11,7 +11,6 @@ NO_PROFILE_GUIDED_OPTIMIZE = 1 include $(DEPTH)/config/autoconf.mk -LIBRARY_NAME = xptcmd EXPORT_LIBRARY = ../.. MOZILLA_INTERNAL_API = 1 diff --git a/xpcom/reflect/xptcall/src/md/unix/moz.build b/xpcom/reflect/xptcall/src/md/unix/moz.build index f18de2e43fe..202aaf24397 100644 --- a/xpcom/reflect/xptcall/src/md/unix/moz.build +++ b/xpcom/reflect/xptcall/src/md/unix/moz.build @@ -264,3 +264,6 @@ if CONFIG['OS_ARCH'] == 'Linux': 'xptcinvoke_linux_s390x.cpp', 'xptcstubs_linux_s390x.cpp', ] + +LIBRARY_NAME = 'xptcmd' + diff --git a/xpcom/reflect/xptcall/src/md/win32/Makefile.in b/xpcom/reflect/xptcall/src/md/win32/Makefile.in index 2acf067ec35..b4049f1b81e 100644 --- a/xpcom/reflect/xptcall/src/md/win32/Makefile.in +++ b/xpcom/reflect/xptcall/src/md/win32/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBRARY_NAME = xptcmd EXPORT_LIBRARY = ../.. MOZILLA_INTERNAL_API = 1 diff --git a/xpcom/reflect/xptcall/src/md/win32/moz.build b/xpcom/reflect/xptcall/src/md/win32/moz.build index 86962784fd0..d4ba4dc8920 100644 --- a/xpcom/reflect/xptcall/src/md/win32/moz.build +++ b/xpcom/reflect/xptcall/src/md/win32/moz.build @@ -35,3 +35,6 @@ else: 'xptcinvoke.cpp', 'xptcstubs.cpp', ] + +LIBRARY_NAME = 'xptcmd' + diff --git a/xpcom/sample/Makefile.in b/xpcom/sample/Makefile.in index 698a02addf4..7a64ee1639c 100644 --- a/xpcom/sample/Makefile.in +++ b/xpcom/sample/Makefile.in @@ -10,10 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -# LIBRARY_NAME names the library generated by this makefile, -# i.e. dist/bin/components/libxpcomsample.so -LIBRARY_NAME = xpcomsample - # On OS/2, SHORT_LIBNAME is used to generate a library with an 8.3 filename, # e.g. dist/bin/components/xpcomsmp.dll SHORT_LIBNAME = xpcomsmp diff --git a/xpcom/sample/moz.build b/xpcom/sample/moz.build index 964920ec3db..47e64891fed 100644 --- a/xpcom/sample/moz.build +++ b/xpcom/sample/moz.build @@ -26,3 +26,8 @@ EXTRA_COMPONENTS += [ 'nsSample.js', 'nsSample.manifest', ] + +# LIBRARY_NAME names the library generated by this makefile, +# i.e. dist/bin/components/libxpcomsample.so +LIBRARY_NAME = 'xpcomsample' + diff --git a/xpcom/tests/bug656331_component/Makefile.in b/xpcom/tests/bug656331_component/Makefile.in index 33466a7b704..f475a794498 100644 --- a/xpcom/tests/bug656331_component/Makefile.in +++ b/xpcom/tests/bug656331_component/Makefile.in @@ -12,7 +12,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBRARY_NAME = test656331 IS_COMPONENT = 1 FORCE_SHARED_LIB = 1 diff --git a/xpcom/tests/bug656331_component/moz.build b/xpcom/tests/bug656331_component/moz.build index 9ac7ea65cc4..2485c6f29a1 100644 --- a/xpcom/tests/bug656331_component/moz.build +++ b/xpcom/tests/bug656331_component/moz.build @@ -10,3 +10,5 @@ CPP_SOURCES += [ 'TestComponent.cpp', ] +LIBRARY_NAME = 'test656331' + diff --git a/xpcom/tests/component/Makefile.in b/xpcom/tests/component/Makefile.in index e9bbcf455ee..e2f9b65b199 100644 --- a/xpcom/tests/component/Makefile.in +++ b/xpcom/tests/component/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBRARY_NAME = testcomponent IS_COMPONENT = 1 FORCE_SHARED_LIB = 1 diff --git a/xpcom/tests/component/moz.build b/xpcom/tests/component/moz.build index 9ac7ea65cc4..0af5f1fd2c8 100644 --- a/xpcom/tests/component/moz.build +++ b/xpcom/tests/component/moz.build @@ -10,3 +10,5 @@ CPP_SOURCES += [ 'TestComponent.cpp', ] +LIBRARY_NAME = 'testcomponent' + diff --git a/xpcom/tests/component_no_aslr/Makefile.in b/xpcom/tests/component_no_aslr/Makefile.in index b7e875e654a..62f10a40b47 100644 --- a/xpcom/tests/component_no_aslr/Makefile.in +++ b/xpcom/tests/component_no_aslr/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBRARY_NAME = testcompnoaslr IS_COMPONENT = 1 FORCE_SHARED_LIB = 1 diff --git a/xpcom/tests/component_no_aslr/moz.build b/xpcom/tests/component_no_aslr/moz.build index 9ac7ea65cc4..e0e6cc9b0cf 100644 --- a/xpcom/tests/component_no_aslr/moz.build +++ b/xpcom/tests/component_no_aslr/moz.build @@ -10,3 +10,5 @@ CPP_SOURCES += [ 'TestComponent.cpp', ] +LIBRARY_NAME = 'testcompnoaslr' + diff --git a/xpfe/components/build/Makefile.in b/xpfe/components/build/Makefile.in index 9320543d347..c11be5e52d4 100644 --- a/xpfe/components/build/Makefile.in +++ b/xpfe/components/build/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBRARY_NAME = appcomps EXPORT_LIBRARY = 1 SHARED_LIBRARY_LIBS += ../directory/$(LIB_PREFIX)directory_s.$(LIB_SUFFIX) LOCAL_INCLUDES += -I$(srcdir)/../directory diff --git a/xpfe/components/build/moz.build b/xpfe/components/build/moz.build index b3ffd0e6f38..ef050074d85 100644 --- a/xpfe/components/build/moz.build +++ b/xpfe/components/build/moz.build @@ -12,3 +12,5 @@ CPP_SOURCES += [ LIBXUL_LIBRARY = True +LIBRARY_NAME = 'appcomps' +