Bug 875934 - Move LIBRARY_NAME to moz.build (batch #1); r=mshal
authorBrian O'Keefe <bokeefe@alum.wpi.edu>
Mon, 17 Jun 2013 15:21:01 -0400
changeset 147249 d4f61f0a66fd084876fc00fbbfbae9532801d29a
parent 147248 ba0b09e110eed2acd91c25569257287d5225d39f
child 147250 d57032f0b27761d3495b29dbda57c1da36ac1054
push id2697
push userbbajaj@mozilla.com
push dateMon, 05 Aug 2013 18:49:53 +0000
treeherdermozilla-beta@dfec938c7b63 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmshal
bugs875934
milestone24.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 875934 - Move LIBRARY_NAME to moz.build (batch #1); r=mshal
accessible/public/ia2/Makefile.in
accessible/public/ia2/moz.build
accessible/public/msaa/Makefile.in
accessible/public/msaa/moz.build
accessible/src/atk/Makefile.in
accessible/src/atk/moz.build
accessible/src/base/Makefile.in
accessible/src/base/moz.build
accessible/src/generic/Makefile.in
accessible/src/generic/moz.build
accessible/src/html/Makefile.in
accessible/src/html/moz.build
accessible/src/mac/Makefile.in
accessible/src/mac/moz.build
accessible/src/other/Makefile.in
accessible/src/other/moz.build
accessible/src/xpcom/Makefile.in
accessible/src/xpcom/moz.build
accessible/src/xul/Makefile.in
accessible/src/xul/moz.build
browser/components/about/Makefile.in
browser/components/about/moz.build
browser/components/build/Makefile.in
browser/components/build/moz.build
browser/components/dirprovider/Makefile.in
browser/components/dirprovider/moz.build
browser/components/feeds/src/Makefile.in
browser/components/feeds/src/moz.build
browser/components/migration/src/Makefile.in
browser/components/migration/src/moz.build
build/stlport/Makefile.in
build/stlport/moz.build
build/unix/stdc++compat/Makefile.in
build/unix/stdc++compat/moz.build
build/win32/crashinjectdll/Makefile.in
build/win32/crashinjectdll/moz.build
build/win32/vmwarerecordinghelper/Makefile.in
build/win32/vmwarerecordinghelper/moz.build
caps/src/Makefile.in
caps/src/moz.build
content/html/document/src/Makefile.in
content/html/document/src/moz.build
content/media/dash/Makefile.in
content/media/dash/moz.build
content/media/encoder/Makefile.in
content/media/encoder/moz.build
content/media/gstreamer/Makefile.in
content/media/gstreamer/moz.build
content/media/ogg/Makefile.in
content/media/ogg/moz.build
content/media/plugins/Makefile.in
content/media/plugins/moz.build
content/media/raw/Makefile.in
content/media/raw/moz.build
content/media/wave/Makefile.in
content/media/wave/moz.build
content/media/webm/Makefile.in
content/media/webm/moz.build
content/media/wmf/Makefile.in
content/media/wmf/moz.build
content/svg/document/src/Makefile.in
content/svg/document/src/moz.build
content/xml/content/src/Makefile.in
content/xml/content/src/moz.build
content/xml/document/src/Makefile.in
content/xml/document/src/moz.build
content/xslt/src/base/Makefile.in
content/xslt/src/base/moz.build
content/xslt/src/xml/Makefile.in
content/xslt/src/xml/moz.build
content/xslt/src/xpath/Makefile.in
content/xslt/src/xpath/moz.build
content/xslt/src/xslt/Makefile.in
content/xslt/src/xslt/moz.build
content/xul/document/src/Makefile.in
content/xul/document/src/moz.build
content/xul/templates/src/Makefile.in
content/xul/templates/src/moz.build
db/sqlite3/src/Makefile.in
db/sqlite3/src/moz.build
docshell/build/Makefile.in
docshell/build/moz.build
docshell/shistory/src/Makefile.in
docshell/shistory/src/moz.build
dom/media/bridge/Makefile.in
dom/media/bridge/moz.build
dom/plugins/ipc/interpose/Makefile.in
dom/plugins/ipc/interpose/moz.build
dom/plugins/test/testplugin/Makefile.in
dom/plugins/test/testplugin/moz.build
dom/plugins/test/testplugin/secondplugin/Makefile.in
dom/plugins/test/testplugin/secondplugin/moz.build
dom/src/events/Makefile.in
dom/src/events/moz.build
dom/src/json/Makefile.in
dom/src/json/moz.build
dom/src/jsurl/Makefile.in
dom/src/jsurl/moz.build
dom/src/offline/Makefile.in
dom/src/offline/moz.build
dom/workers/Makefile.in
dom/workers/moz.build
editor/composer/src/Makefile.in
editor/composer/src/moz.build
editor/libeditor/base/Makefile.in
editor/libeditor/base/moz.build
editor/libeditor/html/Makefile.in
editor/libeditor/html/moz.build
editor/libeditor/text/Makefile.in
editor/libeditor/text/moz.build
editor/txmgr/src/Makefile.in
editor/txmgr/src/moz.build
editor/txtsvc/src/Makefile.in
editor/txtsvc/src/moz.build
embedding/browser/build/Makefile.in
embedding/browser/build/moz.build
embedding/browser/webBrowser/Makefile.in
embedding/browser/webBrowser/moz.build
embedding/components/appstartup/src/Makefile.in
embedding/components/appstartup/src/moz.build
embedding/components/build/Makefile.in
embedding/components/build/moz.build
embedding/components/commandhandler/src/Makefile.in
embedding/components/commandhandler/src/moz.build
embedding/components/find/src/Makefile.in
embedding/components/find/src/moz.build
embedding/components/printingui/src/mac/Makefile.in
embedding/components/printingui/src/mac/moz.build
embedding/components/printingui/src/os2/Makefile.in
embedding/components/printingui/src/os2/moz.build
embedding/components/printingui/src/unixshared/Makefile.in
embedding/components/printingui/src/unixshared/moz.build
embedding/components/printingui/src/win/Makefile.in
embedding/components/printingui/src/win/moz.build
embedding/components/webbrowserpersist/src/Makefile.in
embedding/components/webbrowserpersist/src/moz.build
embedding/components/windowwatcher/src/Makefile.in
embedding/components/windowwatcher/src/moz.build
extensions/auth/Makefile.in
extensions/auth/moz.build
extensions/gio/Makefile.in
extensions/gio/moz.build
extensions/gnomevfs/Makefile.in
extensions/gnomevfs/moz.build
extensions/permissions/Makefile.in
extensions/permissions/moz.build
extensions/spellcheck/hunspell/src/Makefile.in
extensions/spellcheck/hunspell/src/moz.build
extensions/spellcheck/src/Makefile.in
extensions/spellcheck/src/moz.build
extensions/universalchardet/src/base/Makefile.in
extensions/universalchardet/src/base/moz.build
extensions/universalchardet/src/xpcom/Makefile.in
extensions/universalchardet/src/xpcom/moz.build
extensions/widgetutils/src/Makefile.in
extensions/widgetutils/src/moz.build
gfx/angle/Makefile.in
gfx/angle/moz.build
gfx/angle/src/libEGL/Makefile.in
gfx/angle/src/libEGL/moz.build
gfx/angle/src/libGLESv2/Makefile.in
gfx/angle/src/libGLESv2/moz.build
gfx/cairo/cairo/src/Makefile.in
gfx/cairo/cairo/src/moz.build
gfx/graphite2/src/Makefile.in
gfx/graphite2/src/moz.build
gfx/harfbuzz/src/Makefile.in
gfx/harfbuzz/src/moz.build
gfx/ots/src/Makefile.in
gfx/ots/src/moz.build
gfx/qcms/Makefile.in
gfx/qcms/moz.build
gfx/skia/Makefile.in
gfx/skia/moz.build
gfx/src/Makefile.in
gfx/src/moz.build
gfx/tests/gtest/Makefile.in
gfx/tests/gtest/moz.build
gfx/ycbcr/Makefile.in
gfx/ycbcr/moz.build
image/build/Makefile.in
image/build/moz.build
image/decoders/Makefile.in
image/decoders/icon/Makefile.in
image/decoders/icon/gtk/Makefile.in
image/decoders/icon/gtk/moz.build
image/decoders/icon/mac/Makefile.in
image/decoders/icon/mac/moz.build
image/decoders/icon/moz.build
image/decoders/icon/os2/Makefile.in
image/decoders/icon/os2/moz.build
image/decoders/icon/qt/Makefile.in
image/decoders/icon/qt/moz.build
image/decoders/icon/win/Makefile.in
image/decoders/icon/win/moz.build
image/decoders/moz.build
image/encoders/bmp/Makefile.in
image/encoders/bmp/moz.build
image/encoders/ico/Makefile.in
image/encoders/ico/moz.build
image/encoders/jpeg/Makefile.in
image/encoders/jpeg/moz.build
image/encoders/png/Makefile.in
image/encoders/png/moz.build
intl/build/Makefile.in
intl/build/moz.build
intl/chardet/src/Makefile.in
intl/chardet/src/moz.build
intl/hyphenation/src/Makefile.in
intl/hyphenation/src/moz.build
intl/locale/src/Makefile.in
intl/locale/src/mac/Makefile.in
intl/locale/src/mac/moz.build
intl/locale/src/moz.build
intl/locale/src/os2/Makefile.in
intl/locale/src/os2/moz.build
intl/locale/src/unix/Makefile.in
intl/locale/src/unix/moz.build
intl/locale/src/windows/Makefile.in
intl/locale/src/windows/moz.build
intl/lwbrk/src/Makefile.in
intl/lwbrk/src/moz.build
intl/strres/src/Makefile.in
intl/strres/src/moz.build
intl/uconv/src/Makefile.in
intl/uconv/src/moz.build
intl/uconv/ucvcn/Makefile.in
intl/uconv/ucvcn/moz.build
intl/uconv/ucvibm/Makefile.in
intl/uconv/ucvibm/moz.build
intl/uconv/ucvja/Makefile.in
intl/uconv/ucvja/moz.build
intl/uconv/ucvko/Makefile.in
intl/uconv/ucvko/moz.build
intl/uconv/ucvlatin/Makefile.in
intl/uconv/ucvlatin/moz.build
intl/uconv/ucvtw/Makefile.in
intl/uconv/ucvtw/moz.build
intl/uconv/ucvtw2/Makefile.in
intl/uconv/ucvtw2/moz.build
intl/uconv/util/Makefile.in
intl/uconv/util/moz.build
intl/unicharutil/src/Makefile.in
intl/unicharutil/src/moz.build
intl/unicharutil/util/Makefile.in
intl/unicharutil/util/internal/Makefile.in
intl/unicharutil/util/internal/moz.build
intl/unicharutil/util/moz.build
js/ductwork/debugger/Makefile.in
js/ductwork/debugger/moz.build
js/jsd/Makefile.in
js/jsd/moz.build
js/src/editline/Makefile.in
js/src/editline/moz.build
js/xpconnect/loader/Makefile.in
js/xpconnect/loader/moz.build
js/xpconnect/wrappers/Makefile.in
js/xpconnect/wrappers/moz.build
layout/forms/Makefile.in
layout/forms/moz.build
layout/inspector/src/Makefile.in
layout/inspector/src/moz.build
layout/media/Makefile.in
layout/media/moz.build
layout/printing/Makefile.in
layout/printing/moz.build
layout/tables/Makefile.in
layout/tables/moz.build
layout/tools/layout-debug/src/Makefile.in
layout/tools/layout-debug/src/moz.build
layout/xul/grid/Makefile.in
layout/xul/grid/moz.build
layout/xul/tree/Makefile.in
layout/xul/tree/moz.build
media/kiss_fft/Makefile.in
media/kiss_fft/moz.build
media/libcubeb/src/Makefile.in
media/libcubeb/src/moz.build
media/libjpeg/Makefile.in
media/libjpeg/moz.build
media/libnestegg/src/Makefile.in
media/libnestegg/src/moz.build
media/libogg/src/Makefile.in
media/libogg/src/moz.build
media/libopus/Makefile.in
media/libopus/moz.build
media/libpng/Makefile.in
media/libpng/moz.build
media/libsoundtouch/src/Makefile.in
media/libsoundtouch/src/moz.build
media/libspeex_resampler/src/Makefile.in
media/libspeex_resampler/src/moz.build
media/libtheora/lib/Makefile.in
media/libtheora/lib/moz.build
media/libtremor/lib/Makefile.in
media/libtremor/lib/moz.build
media/libvorbis/lib/Makefile.in
media/libvorbis/lib/moz.build
media/libvpx/Makefile.in
media/libvpx/moz.build
media/mtransport/build/Makefile.in
media/mtransport/build/moz.build
media/mtransport/standalone/Makefile.in
media/mtransport/standalone/moz.build
media/omx-plugin/Makefile.in
media/omx-plugin/froyo/Makefile.in
media/omx-plugin/froyo/moz.build
media/omx-plugin/gb/Makefile.in
media/omx-plugin/gb/moz.build
media/omx-plugin/gb235/Makefile.in
media/omx-plugin/gb235/moz.build
media/omx-plugin/hc/Makefile.in
media/omx-plugin/hc/moz.build
media/omx-plugin/jb-htc/Makefile.in
media/omx-plugin/jb-htc/moz.build
media/omx-plugin/lib/froyo/libstagefright/Makefile.in
media/omx-plugin/lib/froyo/libstagefright/moz.build
media/omx-plugin/lib/gb/libstagefright/Makefile.in
media/omx-plugin/lib/gb/libstagefright/moz.build
media/omx-plugin/lib/gb/libstagefright_color_conversion/Makefile.in
media/omx-plugin/lib/gb/libstagefright_color_conversion/moz.build
media/omx-plugin/lib/gb/libutils/Makefile.in
media/omx-plugin/lib/gb/libutils/moz.build
media/omx-plugin/lib/gb235/libstagefright/Makefile.in
media/omx-plugin/lib/gb235/libstagefright/moz.build
media/omx-plugin/lib/hc/libstagefright/Makefile.in
media/omx-plugin/lib/hc/libstagefright/moz.build
media/omx-plugin/lib/ics/libstagefright/Makefile.in
media/omx-plugin/lib/ics/libstagefright/moz.build
media/omx-plugin/lib/ics/libutils/Makefile.in
media/omx-plugin/lib/ics/libutils/moz.build
media/omx-plugin/moz.build
media/omx-plugin/sony/Makefile.in
media/omx-plugin/sony/moz.build
media/webvtt/Makefile.in
media/webvtt/moz.build
memory/build/Makefile.in
memory/build/moz.build
memory/jemalloc/Makefile.in
memory/jemalloc/moz.build
memory/mozalloc/Makefile.in
memory/mozalloc/moz.build
memory/replace/dummy/Makefile.in
memory/replace/dummy/moz.build
memory/replace/jemalloc/Makefile.in
memory/replace/jemalloc/moz.build
mfbt/Makefile.in
mfbt/moz.build
mobile/android/components/build/Makefile.in
mobile/android/components/build/moz.build
modules/libbz2/src/Makefile.in
modules/libbz2/src/moz.build
modules/libjar/zipwriter/src/Makefile.in
modules/libjar/zipwriter/src/moz.build
modules/libmar/sign/Makefile.in
modules/libmar/sign/moz.build
modules/libmar/src/Makefile.in
modules/libmar/src/moz.build
modules/libmar/verify/Makefile.in
modules/libmar/verify/moz.build
modules/zlib/src/Makefile.in
modules/zlib/src/moz.build
mozglue/android/Makefile.in
mozglue/android/moz.build
mozglue/build/Makefile.in
mozglue/build/moz.build
mozglue/linker/Makefile.in
mozglue/linker/moz.build
netwerk/cache/Makefile.in
netwerk/cache/moz.build
netwerk/dash/mpd/Makefile.in
netwerk/dash/mpd/moz.build
netwerk/dns/Makefile.in
netwerk/dns/moz.build
netwerk/mime/Makefile.in
netwerk/mime/moz.build
netwerk/protocol/data/Makefile.in
netwerk/protocol/data/moz.build
netwerk/protocol/file/Makefile.in
netwerk/protocol/file/moz.build
netwerk/protocol/viewsource/Makefile.in
netwerk/protocol/viewsource/moz.build
netwerk/socket/Makefile.in
netwerk/socket/moz.build
netwerk/streamconv/converters/Makefile.in
netwerk/streamconv/converters/moz.build
netwerk/streamconv/src/Makefile.in
netwerk/streamconv/src/moz.build
netwerk/system/android/Makefile.in
netwerk/system/android/moz.build
netwerk/system/mac/Makefile.in
netwerk/system/mac/moz.build
netwerk/system/maemo/Makefile.in
netwerk/system/maemo/moz.build
netwerk/system/qt/Makefile.in
netwerk/system/qt/moz.build
netwerk/system/win32/Makefile.in
netwerk/system/win32/moz.build
netwerk/wifi/Makefile.in
netwerk/wifi/moz.build
other-licenses/android/Makefile.in
other-licenses/android/moz.build
other-licenses/skia-npapi/Makefile.in
other-licenses/skia-npapi/moz.build
other-licenses/snappy/Makefile.in
other-licenses/snappy/moz.build
parser/expat/lib/Makefile.in
parser/expat/lib/moz.build
parser/html/Makefile.in
parser/html/moz.build
parser/htmlparser/src/Makefile.in
parser/htmlparser/src/moz.build
parser/xml/src/Makefile.in
parser/xml/src/moz.build
profile/dirserviceprovider/src/Makefile.in
profile/dirserviceprovider/src/moz.build
profile/dirserviceprovider/standalone/Makefile.in
profile/dirserviceprovider/standalone/moz.build
rdf/base/src/Makefile.in
rdf/base/src/moz.build
rdf/build/Makefile.in
rdf/build/moz.build
rdf/datasource/src/Makefile.in
rdf/datasource/src/moz.build
rdf/tests/dsds/Makefile.in
rdf/tests/dsds/moz.build
rdf/util/src/Makefile.in
rdf/util/src/internal/Makefile.in
rdf/util/src/internal/moz.build
rdf/util/src/moz.build
security/manager/boot/src/Makefile.in
security/manager/boot/src/moz.build
security/manager/pki/src/Makefile.in
security/manager/pki/src/moz.build
security/manager/ssl/src/Makefile.in
security/manager/ssl/src/moz.build
services/crypto/component/Makefile.in
services/crypto/component/moz.build
startupcache/Makefile.in
startupcache/moz.build
storage/build/Makefile.in
storage/build/moz.build
storage/src/Makefile.in
storage/src/moz.build
testing/gtest/Makefile.in
testing/gtest/moz.build
toolkit/components/autocomplete/Makefile.in
toolkit/components/autocomplete/moz.build
toolkit/components/commandlines/Makefile.in
toolkit/components/commandlines/moz.build
toolkit/components/ctypes/Makefile.in
toolkit/components/ctypes/moz.build
toolkit/components/ctypes/tests/Makefile.in
toolkit/components/ctypes/tests/moz.build
toolkit/components/feeds/Makefile.in
toolkit/components/feeds/moz.build
toolkit/components/find/Makefile.in
toolkit/components/find/moz.build
toolkit/components/intl/Makefile.in
toolkit/components/intl/moz.build
toolkit/components/osfile/Makefile.in
toolkit/components/osfile/moz.build
toolkit/components/perf/Makefile.in
toolkit/components/perf/moz.build
toolkit/components/reflect/Makefile.in
toolkit/components/reflect/moz.build
toolkit/components/remote/Makefile.in
toolkit/components/remote/moz.build
toolkit/components/satchel/Makefile.in
toolkit/components/satchel/moz.build
toolkit/components/startup/Makefile.in
toolkit/components/startup/moz.build
toolkit/components/statusfilter/Makefile.in
toolkit/components/statusfilter/moz.build
toolkit/components/typeaheadfind/Makefile.in
toolkit/components/typeaheadfind/moz.build
toolkit/components/url-classifier/Makefile.in
toolkit/components/url-classifier/moz.build
toolkit/crashreporter/breakpad-windows-libxul/Makefile.in
toolkit/crashreporter/breakpad-windows-libxul/moz.build
toolkit/crashreporter/breakpad-windows-standalone/Makefile.in
toolkit/crashreporter/breakpad-windows-standalone/moz.build
toolkit/crashreporter/google-breakpad/src/client/Makefile.in
toolkit/crashreporter/google-breakpad/src/client/linux/crash_generation/Makefile.in
toolkit/crashreporter/google-breakpad/src/client/linux/crash_generation/moz.build
toolkit/crashreporter/google-breakpad/src/client/linux/handler/Makefile.in
toolkit/crashreporter/google-breakpad/src/client/linux/handler/moz.build
toolkit/crashreporter/google-breakpad/src/client/linux/minidump_writer/Makefile.in
toolkit/crashreporter/google-breakpad/src/client/linux/minidump_writer/moz.build
toolkit/crashreporter/google-breakpad/src/client/mac/crash_generation/Makefile.in
toolkit/crashreporter/google-breakpad/src/client/mac/crash_generation/moz.build
toolkit/crashreporter/google-breakpad/src/client/mac/handler/Makefile.in
toolkit/crashreporter/google-breakpad/src/client/mac/handler/moz.build
toolkit/crashreporter/google-breakpad/src/client/moz.build
toolkit/crashreporter/google-breakpad/src/client/solaris/handler/Makefile.in
toolkit/crashreporter/google-breakpad/src/client/solaris/handler/moz.build
toolkit/crashreporter/google-breakpad/src/common/Makefile.in
toolkit/crashreporter/google-breakpad/src/common/linux/Makefile.in
toolkit/crashreporter/google-breakpad/src/common/linux/moz.build
toolkit/crashreporter/google-breakpad/src/common/mac/Makefile.in
toolkit/crashreporter/google-breakpad/src/common/mac/moz.build
toolkit/crashreporter/google-breakpad/src/common/moz.build
toolkit/crashreporter/google-breakpad/src/common/solaris/Makefile.in
toolkit/crashreporter/google-breakpad/src/common/solaris/moz.build
toolkit/crashreporter/google-breakpad/src/processor/Makefile.in
toolkit/crashreporter/google-breakpad/src/processor/moz.build
toolkit/crashreporter/test/Makefile.in
toolkit/crashreporter/test/moz.build
toolkit/devtools/server/Makefile.in
toolkit/devtools/server/moz.build
toolkit/identity/Makefile.in
toolkit/identity/moz.build
toolkit/library/Makefile.in
toolkit/library/moz.build
toolkit/mozapps/update/common/Makefile.in
toolkit/mozapps/update/common/moz.build
toolkit/profile/Makefile.in
toolkit/profile/moz.build
toolkit/system/androidproxy/Makefile.in
toolkit/system/androidproxy/moz.build
toolkit/system/dbus/Makefile.in
toolkit/system/dbus/moz.build
toolkit/system/gnome/Makefile.in
toolkit/system/gnome/moz.build
toolkit/system/osxproxy/Makefile.in
toolkit/system/osxproxy/moz.build
toolkit/system/unixproxy/Makefile.in
toolkit/system/unixproxy/moz.build
toolkit/system/windowsproxy/Makefile.in
toolkit/system/windowsproxy/moz.build
tools/jprof/stub/Makefile.in
tools/jprof/stub/moz.build
tools/trace-malloc/lib/Makefile.in
tools/trace-malloc/lib/moz.build
uriloader/base/Makefile.in
uriloader/base/moz.build
view/src/Makefile.in
view/src/moz.build
widget/cocoa/Makefile.in
widget/cocoa/moz.build
widget/gtkxtbin/Makefile.in
widget/gtkxtbin/moz.build
widget/os2/Makefile.in
widget/os2/moz.build
widget/qt/faststartupqt/Makefile.in
widget/qt/faststartupqt/moz.build
widget/xremoteclient/Makefile.in
widget/xremoteclient/moz.build
xpcom/components/Makefile.in
xpcom/components/moz.build
xpcom/ds/Makefile.in
xpcom/ds/moz.build
xpcom/glue/Makefile.in
xpcom/glue/moz.build
xpcom/glue/nomozalloc/Makefile.in
xpcom/glue/nomozalloc/moz.build
xpcom/glue/standalone/Makefile.in
xpcom/glue/standalone/moz.build
xpcom/glue/standalone/staticruntime/Makefile.in
xpcom/glue/standalone/staticruntime/moz.build
xpcom/glue/staticruntime/Makefile.in
xpcom/glue/staticruntime/moz.build
xpcom/glue/tests/gtest/Makefile.in
xpcom/glue/tests/gtest/moz.build
xpcom/reflect/xptcall/src/Makefile.in
xpcom/reflect/xptcall/src/moz.build
xpcom/reflect/xptinfo/src/Makefile.in
xpcom/reflect/xptinfo/src/moz.build
xpcom/string/src/Makefile.in
xpcom/string/src/moz.build
xpcom/threads/Makefile.in
xpcom/threads/moz.build
xpcom/typelib/xpt/src/Makefile.in
xpcom/typelib/xpt/src/moz.build
xpfe/appshell/src/Makefile.in
xpfe/appshell/src/moz.build
xpfe/components/autocomplete/src/Makefile.in
xpfe/components/autocomplete/src/moz.build
xpfe/components/directory/Makefile.in
xpfe/components/directory/moz.build
xpfe/components/windowds/Makefile.in
xpfe/components/windowds/moz.build
xulrunner/examples/simple/components/src/Makefile.in
xulrunner/examples/simple/components/src/moz.build
--- a/accessible/public/ia2/Makefile.in
+++ b/accessible/public/ia2/Makefile.in
@@ -2,17 +2,16 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 
-LIBRARY_NAME  = IA2Marshal
 DEFFILE       = $(win_srcdir)/IA2Marshal.def
 
 IA2DIR        = $(topsrcdir)/other-licenses/ia2
 
 include $(DEPTH)/config/autoconf.mk
 
 DEFINES       += -DREGISTER_PROXY_DLL
 
--- a/accessible/public/ia2/moz.build
+++ b/accessible/public/ia2/moz.build
@@ -43,8 +43,11 @@ interfaces_h = ['%s.h' % x for x in midl
 interfaces_c = ['%s_i.c' % x for x in midl_interfaces]
 
 # The underscore throws off sorting and EXPORTS expects sorted lists.
 interfaces_c.sort()
 
 EXPORTS += headers
 EXPORTS += interfaces_h
 EXPORTS += interfaces_c
+
+LIBRARY_NAME = 'IA2Marshal'
+
--- a/accessible/public/msaa/Makefile.in
+++ b/accessible/public/msaa/Makefile.in
@@ -2,17 +2,16 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
-LIBRARY_NAME	= AccessibleMarshal
 DEFFILE = $(win_srcdir)/AccessibleMarshal.def
 
 include $(DEPTH)/config/autoconf.mk
 
 DEFINES += -DREGISTER_PROXY_DLL
 
 GARBAGE += $(MIDL_GENERATED_FILES) done_gen dlldata.c
 
--- a/accessible/public/msaa/moz.build
+++ b/accessible/public/msaa/moz.build
@@ -10,8 +10,10 @@ EXPORTS += [
     'ISimpleDOMDocument.h',
     'ISimpleDOMDocument_i.c',
     'ISimpleDOMNode.h',
     'ISimpleDOMNode_i.c',
     'ISimpleDOMText.h',
     'ISimpleDOMText_i.c',
 ]
 
+LIBRARY_NAME = 'AccessibleMarshal'
+
--- a/accessible/src/atk/Makefile.in
+++ b/accessible/src/atk/Makefile.in
@@ -4,17 +4,16 @@
 
 DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME = accessibility_toolkit_s
 EXPORT_LIBRARY = ..
 LIBXUL_LIBRARY = 1
 
 # we want to force the creation of a static lib.
 FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
 
--- a/accessible/src/atk/moz.build
+++ b/accessible/src/atk/moz.build
@@ -28,8 +28,10 @@ CPP_SOURCES += [
     'nsMaiInterfaceHypertext.cpp',
     'nsMaiInterfaceImage.cpp',
     'nsMaiInterfaceSelection.cpp',
     'nsMaiInterfaceTable.cpp',
     'nsMaiInterfaceText.cpp',
     'nsMaiInterfaceValue.cpp',
 ]
 
+LIBRARY_NAME = 'accessibility_toolkit_s'
+
--- a/accessible/src/base/Makefile.in
+++ b/accessible/src/base/Makefile.in
@@ -4,17 +4,16 @@
 
 DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME = accessibility_base_s
 LIBXUL_LIBRARY = 1
 
 # we don't want the shared lib, but we want to force the creation of a static lib.
 FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES += \
--- a/accessible/src/base/moz.build
+++ b/accessible/src/base/moz.build
@@ -55,8 +55,11 @@ CPP_SOURCES += [
     'TextUpdater.cpp',
     'TreeWalker.cpp',
 ]
 
 if a11y_log:
     CPP_SOURCES += [
         'Logging.cpp',
     ]
+
+LIBRARY_NAME = 'accessibility_base_s'
+
--- a/accessible/src/generic/Makefile.in
+++ b/accessible/src/generic/Makefile.in
@@ -4,17 +4,16 @@
 
 DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME = accessibility_generic_s
 LIBXUL_LIBRARY = 1
 
 # we don't want the shared lib, but we want to force the creation of a static lib.
 FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES = \
--- a/accessible/src/generic/moz.build
+++ b/accessible/src/generic/moz.build
@@ -22,8 +22,10 @@ CPP_SOURCES += [
     'HyperTextAccessible.cpp',
     'ImageAccessible.cpp',
     'OuterDocAccessible.cpp',
     'RootAccessible.cpp',
     'TableCellAccessible.cpp',
     'TextLeafAccessible.cpp',
 ]
 
+LIBRARY_NAME = 'accessibility_generic_s'
+
--- a/accessible/src/html/Makefile.in
+++ b/accessible/src/html/Makefile.in
@@ -5,17 +5,16 @@
 
 DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME = accessibility_html_s
 LIBXUL_LIBRARY = 1
 
 # we don't want the shared lib, but we want to force the creation of a static lib.
 FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES = \
--- a/accessible/src/html/moz.build
+++ b/accessible/src/html/moz.build
@@ -12,8 +12,10 @@ CPP_SOURCES += [
     'HTMLFormControlAccessible.cpp',
     'HTMLImageMapAccessible.cpp',
     'HTMLLinkAccessible.cpp',
     'HTMLListAccessible.cpp',
     'HTMLSelectAccessible.cpp',
     'HTMLTableAccessible.cpp',
 ]
 
+LIBRARY_NAME = 'accessibility_html_s'
+
--- a/accessible/src/mac/Makefile.in
+++ b/accessible/src/mac/Makefile.in
@@ -4,17 +4,16 @@
 
 DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME = accessibility_toolkit_s
 EXPORT_LIBRARY = ..
 LIBXUL_LIBRARY = 1
 
 CMMSRCS = \
           AccessibleWrap.mm \
           DocAccessibleWrap.mm \
           mozAccessible.mm \
           mozDocAccessible.mm \
--- a/accessible/src/mac/moz.build
+++ b/accessible/src/mac/moz.build
@@ -10,8 +10,10 @@ EXPORTS += [
     'mozAccessibleProtocol.h',
 ]
 
 EXPORTS.mozilla.a11y += [
     'AccessibleWrap.h',
     'HyperTextAccessibleWrap.h',
 ]
 
+LIBRARY_NAME = 'accessibility_toolkit_s'
+
--- a/accessible/src/other/Makefile.in
+++ b/accessible/src/other/Makefile.in
@@ -4,17 +4,16 @@
 
 DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME = accessibility_toolkit_s
 EXPORT_LIBRARY = ..
 LIBXUL_LIBRARY = 1
 
 # we don't want the shared lib, but we want to force the creation of a static lib.
 FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
 
--- a/accessible/src/other/moz.build
+++ b/accessible/src/other/moz.build
@@ -11,8 +11,10 @@ EXPORTS.mozilla.a11y += [
     'HyperTextAccessibleWrap.h',
 ]
 
 CPP_SOURCES += [
     'AccessibleWrap.cpp',
     'Platform.cpp',
 ]
 
+LIBRARY_NAME = 'accessibility_toolkit_s'
+
--- a/accessible/src/xpcom/Makefile.in
+++ b/accessible/src/xpcom/Makefile.in
@@ -5,17 +5,16 @@
 
 DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME = accessibility_xpcom_s
 LIBXUL_LIBRARY = 1
 
 # we don't want the shared lib, but we want to force the creation of a static lib.
 FORCE_STATIC_LIB = 1
 
 EXTRA_MDDEPEND_FILES = xpcAccEvents.pp
 
 include $(topsrcdir)/config/rules.mk
--- a/accessible/src/xpcom/moz.build
+++ b/accessible/src/xpcom/moz.build
@@ -12,8 +12,10 @@ EXPORTS += [
 
 CPP_SOURCES += [
     'nsAccessibleRelation.cpp',
     'xpcAccEvents.cpp',
     'xpcAccessibleTable.cpp',
     'xpcAccessibleTableCell.cpp',
 ]
 
+LIBRARY_NAME = 'accessibility_xpcom_s'
+
--- a/accessible/src/xul/Makefile.in
+++ b/accessible/src/xul/Makefile.in
@@ -5,17 +5,16 @@
 
 DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME = accessibility_xul_s
 LIBXUL_LIBRARY = 1
 
 # we don't want the shared lib, but we want to force the creation of a static lib.
 FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES = \
--- a/accessible/src/xul/moz.build
+++ b/accessible/src/xul/moz.build
@@ -16,8 +16,10 @@ CPP_SOURCES += [
     'XULMenuAccessible.cpp',
     'XULSelectControlAccessible.cpp',
     'XULSliderAccessible.cpp',
     'XULTabAccessible.cpp',
     'XULTreeAccessible.cpp',
     'XULTreeGridAccessible.cpp',
 ]
 
+LIBRARY_NAME = 'accessibility_xul_s'
+
--- a/browser/components/about/Makefile.in
+++ b/browser/components/about/Makefile.in
@@ -4,16 +4,14 @@
 
 DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME = browserabout_s
-
 FORCE_STATIC_LIB = 1
 USE_STATIC_LIBS = 1
 
 LOCAL_INCLUDES = -I$(srcdir)/../build
 
 include $(topsrcdir)/config/rules.mk
--- a/browser/components/about/moz.build
+++ b/browser/components/about/moz.build
@@ -9,8 +9,10 @@ MODULE = 'browserabout'
 EXPORTS.mozilla.browser += [
     'AboutRedirector.h',
 ]
 
 CPP_SOURCES += [
     'AboutRedirector.cpp',
 ]
 
+LIBRARY_NAME = 'browserabout_s'
+
--- a/browser/components/build/Makefile.in
+++ b/browser/components/build/Makefile.in
@@ -4,17 +4,16 @@
 
 DEPTH=@DEPTH@
 topsrcdir=@top_srcdir@
 srcdir=@srcdir@
 VPATH=@srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME = browsercomps
 SHORT_LIBNAME = brwsrcmp
 IS_COMPONENT = 1
 MODULE_NAME = nsBrowserCompsModule
 FORCE_SHARED_LIB = 1
 
 USE_STATIC_LIBS = 1
 
 ifeq ($(OS_ARCH),WINNT)
--- a/browser/components/build/moz.build
+++ b/browser/components/build/moz.build
@@ -9,8 +9,10 @@ MODULE = 'browsercomps'
 EXPORTS += [
     'nsBrowserCompsCID.h',
 ]
 
 CPP_SOURCES += [
     'nsModule.cpp',
 ]
 
+LIBRARY_NAME = 'browsercomps'
+
--- a/browser/components/dirprovider/Makefile.in
+++ b/browser/components/dirprovider/Makefile.in
@@ -4,18 +4,16 @@
 
 DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME = browserdir_s
-
 FORCE_STATIC_LIB = 1
 USE_STATIC_LIBS = 1
 
 LOCAL_INCLUDES = -I$(srcdir)/../build
 
 EXTRA_DSO_LDOPTS = \
 	$(XPCOM_GLUE_LDOPTS) \
 	$(NSPR_LIBS) \
--- a/browser/components/dirprovider/moz.build
+++ b/browser/components/dirprovider/moz.build
@@ -11,8 +11,10 @@ MODULE = 'browserdir'
 EXPORTS.mozilla.browser += [
     'DirectoryProvider.h',
 ]
 
 CPP_SOURCES += [
     'DirectoryProvider.cpp',
 ]
 
+LIBRARY_NAME = 'browserdir_s'
+
--- a/browser/components/feeds/src/Makefile.in
+++ b/browser/components/feeds/src/Makefile.in
@@ -4,18 +4,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME = browser_feeds_s
-
 FORCE_STATIC_LIB = 1
 USE_STATIC_LIBS = 1
 
 DEFINES += \
 	-DMOZ_APP_NAME=$(MOZ_APP_NAME) \
 	-DMOZ_MACBUNDLE_NAME=$(MOZ_MACBUNDLE_NAME) \
 	$(NULL)
 
--- a/browser/components/feeds/src/moz.build
+++ b/browser/components/feeds/src/moz.build
@@ -14,8 +14,11 @@ EXTRA_COMPONENTS += [
     'BrowserFeeds.manifest',
     'FeedConverter.js',
     'WebContentConverter.js',
 ]
 
 EXTRA_PP_COMPONENTS += [
     'FeedWriter.js',
 ]
+
+LIBRARY_NAME = 'browser_feeds_s'
+
--- a/browser/components/migration/src/Makefile.in
+++ b/browser/components/migration/src/Makefile.in
@@ -4,18 +4,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME	= migration_s
-
 FORCE_STATIC_LIB = 1
 USE_STATIC_LIBS = 1
 
 DISABLED_EXTRA_COMPONENTS = \
   ProfileMigrator.js \
   FirefoxProfileMigrator.js \
   $(NULL)
 
--- a/browser/components/migration/src/moz.build
+++ b/browser/components/migration/src/moz.build
@@ -30,8 +30,11 @@ if CONFIG['OS_ARCH'] == 'WINNT':
     EXTRA_PP_COMPONENTS += [
         'SafariProfileMigrator.js',
     ]
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
     EXTRA_PP_COMPONENTS += [
         'SafariProfileMigrator.js',
     ]
+
+LIBRARY_NAME = 'migration_s'
+
--- a/build/stlport/Makefile.in
+++ b/build/stlport/Makefile.in
@@ -5,17 +5,16 @@
 DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULES = stlport
-LIBRARY_NAME = stlport_static
 FORCE_STATIC_LIB = 1
 STL_FLAGS =
 
 # Force to build a static library, instead of a fake library, without
 # installing it in dist/lib.
 LIBRARY = $(LIB_PREFIX)$(LIBRARY_NAME).$(LIB_SUFFIX)
 
 VPATH += $(STLPORT_SOURCES)/src
--- a/build/stlport/moz.build
+++ b/build/stlport/moz.build
@@ -5,8 +5,10 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 CONFIGURE_SUBST_FILES += ['stl/config/_android.h']
 
 CPP_SOURCES += [
     '$(notdir $(wildcard $(STLPORT_SOURCES)/src/*.cpp))',
 ]
 
+LIBRARY_NAME = 'stlport_static'
+
--- a/build/unix/stdc++compat/Makefile.in
+++ b/build/unix/stdc++compat/Makefile.in
@@ -4,17 +4,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME	= stdc++compat
 FORCE_STATIC_LIB= 1
 STL_FLAGS =
 NO_EXPAND_LIBS = 1
 NO_PROFILE_GUIDED_OPTIMIZE = 1
 
   $(NULL)
 
 HOST_CPPSRCS = $(CPPSRCS)
--- a/build/unix/stdc++compat/moz.build
+++ b/build/unix/stdc++compat/moz.build
@@ -6,8 +6,11 @@
 
 MODULE = 'build'
 
 CPP_SOURCES += [
     'stdc++compat.cpp',
 ]
 
 HOST_LIBRARY_NAME = 'host_stdc++compat'
+
+LIBRARY_NAME = 'stdc++compat'
+
--- a/build/win32/crashinjectdll/Makefile.in
+++ b/build/win32/crashinjectdll/Makefile.in
@@ -4,16 +4,15 @@
 
 DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME = crashinjectdll
 DEFFILE = $(srcdir)/crashinjectdll.def
 FORCE_SHARED_LIB = 1
 USE_STATIC_LIBS = 1
 
 MOZ_GLUE_LDFLAGS =
 
 include $(topsrcdir)/config/rules.mk
--- a/build/win32/crashinjectdll/moz.build
+++ b/build/win32/crashinjectdll/moz.build
@@ -3,8 +3,10 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 CPP_SOURCES += [
     'crashinjectdll.cpp',
 ]
 
+LIBRARY_NAME = 'crashinjectdll'
+
--- a/build/win32/vmwarerecordinghelper/Makefile.in
+++ b/build/win32/vmwarerecordinghelper/Makefile.in
@@ -4,17 +4,16 @@
 
 DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME = vmwarerecordinghelper
 DEFFILE = $(srcdir)/$(LIBRARY_NAME).def
 
 FORCE_SHARED_LIB = 1
 USE_STATIC_LIBS = 1
 
 MOZ_GLUE_LDFLAGS =
 
 include $(topsrcdir)/config/rules.mk
--- a/build/win32/vmwarerecordinghelper/moz.build
+++ b/build/win32/vmwarerecordinghelper/moz.build
@@ -3,8 +3,10 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 CPP_SOURCES += [
     'vmwarerecordinghelper.cpp',
 ]
 
+LIBRARY_NAME = 'vmwarerecordinghelper'
+
--- a/caps/src/Makefile.in
+++ b/caps/src/Makefile.in
@@ -5,17 +5,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME	= caps_s
 MSVC_ENABLE_PGO := 1
 FORCE_STATIC_LIB = 1
 LIBXUL_LIBRARY = 1
 
 
 include $(topsrcdir)/config/rules.mk
 
 INCLUDES	+= -I$(srcdir)/../include \
--- a/caps/src/moz.build
+++ b/caps/src/moz.build
@@ -11,8 +11,10 @@ CPP_SOURCES += [
     'nsNullPrincipal.cpp',
     'nsNullPrincipalURI.cpp',
     'nsPrincipal.cpp',
     'nsScriptSecurityManager.cpp',
     'nsSecurityManagerFactory.cpp',
     'nsSystemPrincipal.cpp',
 ]
 
+LIBRARY_NAME = 'caps_s'
+
--- a/content/html/document/src/Makefile.in
+++ b/content/html/document/src/Makefile.in
@@ -5,17 +5,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME	= gkconhtmldoc_s
 MSVC_ENABLE_PGO := 1
 LIBXUL_LIBRARY	= 1
 FAIL_ON_WARNINGS = 1
 
 # we don't want the shared lib, but we want to force the creation of a static lib.
 FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
--- a/content/html/document/src/moz.build
+++ b/content/html/document/src/moz.build
@@ -17,8 +17,11 @@ EXPORTS.mozilla.dom += [
 CPP_SOURCES += [
     'ImageDocument.cpp',
     'MediaDocument.cpp',
     'PluginDocument.cpp',
     'VideoDocument.cpp',
     'nsHTMLContentSink.cpp',
     'nsHTMLDocument.cpp',
 ]
+
+LIBRARY_NAME = 'gkconhtmldoc_s'
+
--- a/content/media/dash/Makefile.in
+++ b/content/media/dash/Makefile.in
@@ -10,17 +10,16 @@
 
 DEPTH      := @DEPTH@
 topsrcdir  := @top_srcdir@
 srcdir     := @srcdir@
 VPATH      := @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME   := gkcondash_s
 LIBXUL_LIBRARY := 1
 
 FORCE_STATIC_LIB := 1
 
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES := \
   -I$(topsrcdir)/netwerk/dash/mpd \
--- a/content/media/dash/moz.build
+++ b/content/media/dash/moz.build
@@ -14,8 +14,10 @@ EXPORTS += [
 ]
 
 CPP_SOURCES += [
     'DASHDecoder.cpp',
     'DASHReader.cpp',
     'DASHRepDecoder.cpp',
 ]
 
+LIBRARY_NAME = 'gkcondash_s'
+
--- a/content/media/encoder/Makefile.in
+++ b/content/media/encoder/Makefile.in
@@ -4,16 +4,15 @@
 
 DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME = gkconencoder_s
 LIBXUL_LIBRARY = 1
 FAIL_ON_WARNINGS := 1
 
 
 FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
--- a/content/media/encoder/moz.build
+++ b/content/media/encoder/moz.build
@@ -15,8 +15,11 @@ EXPORTS += [
 CPP_SOURCES += [
     'MediaEncoder.cpp',
     'TrackEncoder.cpp',
 ]
 
 if CONFIG['MOZ_OPUS']:
     EXPORTS += ['OpusTrackEncoder.h']
     CPP_SOURCES += ['OpusTrackEncoder.cpp']
+
+LIBRARY_NAME = 'gkconencoder_s'
+
--- a/content/media/gstreamer/Makefile.in
+++ b/content/media/gstreamer/Makefile.in
@@ -5,17 +5,16 @@
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 FAIL_ON_WARNINGS := 1
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME	= gkcongstreamer_s
 LIBXUL_LIBRARY 	= 1
 
 FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
 
 CFLAGS		+= $(GSTREAMER_CFLAGS)
 CXXFLAGS	+= $(GSTREAMER_CFLAGS)
--- a/content/media/gstreamer/moz.build
+++ b/content/media/gstreamer/moz.build
@@ -16,8 +16,10 @@ EXPORTS += [
 CPP_SOURCES += [
     'GStreamerDecoder.cpp',
     'GStreamerFormatHelper.cpp',
     'GStreamerReader.cpp',
     'GStreamerMozVideoBuffer.cpp',
     'GStreamerLoader.cpp',
 ]
 
+LIBRARY_NAME = 'gkcongstreamer_s'
+
--- a/content/media/ogg/Makefile.in
+++ b/content/media/ogg/Makefile.in
@@ -4,16 +4,15 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME	= gkconogg_s
 LIBXUL_LIBRARY 	= 1
 FAIL_ON_WARNINGS := 1
 
 
 FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
--- a/content/media/ogg/moz.build
+++ b/content/media/ogg/moz.build
@@ -15,8 +15,10 @@ EXPORTS += [
 
 CPP_SOURCES += [
     'OggCodecState.cpp',
     'OggDecoder.cpp',
     'OggReader.cpp',
     'OggWriter.cpp',
 ]
 
+LIBRARY_NAME = 'gkconogg_s'
+
--- a/content/media/plugins/Makefile.in
+++ b/content/media/plugins/Makefile.in
@@ -4,17 +4,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME	= gkconmediaplugins_s
 LIBXUL_LIBRARY 	= 1
 
 FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
 
 INCLUDES	+= \
 		-I$(srcdir)/../../base/src \
--- a/content/media/plugins/moz.build
+++ b/content/media/plugins/moz.build
@@ -14,8 +14,10 @@ EXPORTS += [
 ]
 
 CPP_SOURCES += [
     'MediaPluginDecoder.cpp',
     'MediaPluginHost.cpp',
     'MediaPluginReader.cpp',
 ]
 
+LIBRARY_NAME = 'gkconmediaplugins_s'
+
--- a/content/media/raw/Makefile.in
+++ b/content/media/raw/Makefile.in
@@ -5,17 +5,16 @@
 
 DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME = gkconraw_s
 LIBXUL_LIBRARY = 1
 FAIL_ON_WARNINGS := 1
 
 FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
 
 INCLUDES	+= \
--- a/content/media/raw/moz.build
+++ b/content/media/raw/moz.build
@@ -12,8 +12,10 @@ EXPORTS += [
     'RawStructs.h',
 ]
 
 CPP_SOURCES += [
     'RawDecoder.cpp',
     'RawReader.cpp',
 ]
 
+LIBRARY_NAME = 'gkconraw_s'
+
--- a/content/media/wave/Makefile.in
+++ b/content/media/wave/Makefile.in
@@ -5,15 +5,14 @@
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 FAIL_ON_WARNINGS := 1
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME	= gkconwave_s
 LIBXUL_LIBRARY 	= 1
 
 
 FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
--- a/content/media/wave/moz.build
+++ b/content/media/wave/moz.build
@@ -11,8 +11,10 @@ EXPORTS += [
     'WaveReader.h',
 ]
 
 CPP_SOURCES += [
     'WaveDecoder.cpp',
     'WaveReader.cpp',
 ]
 
+LIBRARY_NAME = 'gkconwave_s'
+
--- a/content/media/webm/Makefile.in
+++ b/content/media/webm/Makefile.in
@@ -5,17 +5,16 @@
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 FAIL_ON_WARNINGS := 1
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME	= gkconwebm_s
 LIBXUL_LIBRARY 	= 1
 
 
 FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES = \
--- a/content/media/webm/moz.build
+++ b/content/media/webm/moz.build
@@ -12,8 +12,10 @@ EXPORTS += [
 ]
 
 CPP_SOURCES += [
     'WebMBufferedParser.cpp',
     'WebMDecoder.cpp',
     'WebMReader.cpp',
 ]
 
+LIBRARY_NAME = 'gkconwebm_s'
+
--- a/content/media/wmf/Makefile.in
+++ b/content/media/wmf/Makefile.in
@@ -5,17 +5,16 @@
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 FAIL_ON_WARNINGS := 1
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME	= gkconwmf_s
 LIBXUL_LIBRARY 	= 1
 
 ifeq ($(OS_ARCH),WINNT)
 OS_CXXFLAGS += -DNOMINMAX
 endif
 
 FORCE_STATIC_LIB = 1
 
--- a/content/media/wmf/moz.build
+++ b/content/media/wmf/moz.build
@@ -16,8 +16,10 @@ CPP_SOURCES += [
     'DXVA2Manager.cpp',
     'WMFByteStream.cpp',
     'WMFDecoder.cpp',
     'WMFReader.cpp',
     'WMFSourceReaderCallback.cpp',
     'WMFUtils.cpp',
 ]
 
+LIBRARY_NAME = 'gkconwmf_s'
+
--- a/content/svg/document/src/Makefile.in
+++ b/content/svg/document/src/Makefile.in
@@ -5,17 +5,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME	= gkconsvgdoc_s
 LIBXUL_LIBRARY	= 1
 FAIL_ON_WARNINGS = 1
 
 # we don't want the shared lib, but we want to force the creation of a static lib.
 FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
 
--- a/content/svg/document/src/moz.build
+++ b/content/svg/document/src/moz.build
@@ -9,8 +9,10 @@ MODULE = 'content'
 EXPORTS.mozilla.dom += [
     'SVGDocument.h',
 ]
 
 CPP_SOURCES += [
     'SVGDocument.cpp',
 ]
 
+LIBRARY_NAME = 'gkconsvgdoc_s'
+
--- a/content/xml/content/src/Makefile.in
+++ b/content/xml/content/src/Makefile.in
@@ -5,17 +5,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME	= gkconxmlcon_s
 MSVC_ENABLE_PGO := 1
 LIBXUL_LIBRARY	= 1
 FAIL_ON_WARNINGS = 1
 
 # we don't want the shared lib, but we want to force the creation of a static lib.
 FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
--- a/content/xml/content/src/moz.build
+++ b/content/xml/content/src/moz.build
@@ -14,8 +14,10 @@ EXPORTS.mozilla.dom += [
 
 CPP_SOURCES += [
     'CDATASection.cpp',
     'ProcessingInstruction.cpp',
     'XMLStylesheetProcessingInstruction.cpp',
     'nsXMLElement.cpp',
 ]
 
+LIBRARY_NAME = 'gkconxmlcon_s'
+
--- a/content/xml/document/src/Makefile.in
+++ b/content/xml/document/src/Makefile.in
@@ -5,17 +5,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME	= gkconxmldoc_s
 MSVC_ENABLE_PGO := 1
 LIBXUL_LIBRARY	= 1
 FAIL_ON_WARNINGS = 1
 
 # we don't want the shared lib, but we want to force the creation of a static lib.
 FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
--- a/content/xml/document/src/moz.build
+++ b/content/xml/document/src/moz.build
@@ -12,8 +12,10 @@ EXPORTS.mozilla.dom += [
 
 CPP_SOURCES += [
     'XMLDocument.cpp',
     'nsXMLContentSink.cpp',
     'nsXMLFragmentContentSink.cpp',
     'nsXMLPrettyPrinter.cpp',
 ]
 
+LIBRARY_NAME = 'gkconxmldoc_s'
+
--- a/content/xslt/src/base/Makefile.in
+++ b/content/xslt/src/base/Makefile.in
@@ -4,17 +4,16 @@
 
 DEPTH           = @DEPTH@
 topsrcdir       = @top_srcdir@
 srcdir          = @srcdir@
 VPATH           = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME = txbase_s
 LIBXUL_LIBRARY = 1
 FAIL_ON_WARNINGS = 1
 
 # we don't want the shared lib, but we want to force the creation of a
 # static lib.
 FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
--- a/content/xslt/src/base/moz.build
+++ b/content/xslt/src/base/moz.build
@@ -9,8 +9,10 @@ MODULE = 'transformiix'
 CPP_SOURCES += [
     'txDouble.cpp',
     'txExpandedNameMap.cpp',
     'txList.cpp',
     'txNamespaceMap.cpp',
     'txURIUtils.cpp',
 ]
 
+LIBRARY_NAME = 'txbase_s'
+
--- a/content/xslt/src/xml/Makefile.in
+++ b/content/xslt/src/xml/Makefile.in
@@ -4,17 +4,16 @@
 
 DEPTH           = @DEPTH@
 topsrcdir       = @top_srcdir@
 srcdir          = @srcdir@
 VPATH           = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME = txxml_s
 LIBXUL_LIBRARY = 1
 FAIL_ON_WARNINGS = 1
 
 # we don't want the shared lib, but we want to force the creation of a
 # static lib.
 FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
--- a/content/xslt/src/xml/moz.build
+++ b/content/xslt/src/xml/moz.build
@@ -6,8 +6,10 @@
 
 MODULE = 'transformiix'
 
 CPP_SOURCES += [
     'txXMLParser.cpp',
     'txXMLUtils.cpp',
 ]
 
+LIBRARY_NAME = 'txxml_s'
+
--- a/content/xslt/src/xpath/Makefile.in
+++ b/content/xslt/src/xpath/Makefile.in
@@ -4,17 +4,16 @@
 
 DEPTH           = @DEPTH@
 topsrcdir       = @top_srcdir@
 srcdir          = @srcdir@
 VPATH           = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME = txxpath_s
 LIBXUL_LIBRARY = 1
 FAIL_ON_WARNINGS = 1
 
 # we don't want the shared lib, but we want to force the creation of a
 # static lib.
 FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
--- a/content/xslt/src/xpath/moz.build
+++ b/content/xslt/src/xpath/moz.build
@@ -42,8 +42,10 @@ CPP_SOURCES += [
     'txUnaryExpr.cpp',
     'txUnionExpr.cpp',
     'txUnionNodeTest.cpp',
     'txVariableRefExpr.cpp',
     'txXPCOMExtensionFunction.cpp',
     'txXPathOptimizer.cpp',
 ]
 
+LIBRARY_NAME = 'txxpath_s'
+
--- a/content/xslt/src/xslt/Makefile.in
+++ b/content/xslt/src/xslt/Makefile.in
@@ -4,17 +4,16 @@
 
 DEPTH           = @DEPTH@
 topsrcdir       = @top_srcdir@
 srcdir          = @srcdir@
 VPATH           = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME = txxslt_s
 LIBXUL_LIBRARY = 1
 FAIL_ON_WARNINGS = 1
 
 # For nsDependentJSString
 LOCAL_INCLUDES += \
   -I$(topsrcdir)/dom/base \
   $(NULL)
 
--- a/content/xslt/src/xslt/moz.build
+++ b/content/xslt/src/xslt/moz.build
@@ -34,8 +34,10 @@ CPP_SOURCES += [
     'txXPathResultComparator.cpp',
     'txXSLTEnvironmentFunctionCall.cpp',
     'txXSLTNumber.cpp',
     'txXSLTNumberCounters.cpp',
     'txXSLTPatterns.cpp',
     'txXSLTProcessor.cpp',
 ]
 
+LIBRARY_NAME = 'txxslt_s'
+
--- a/content/xul/document/src/Makefile.in
+++ b/content/xul/document/src/Makefile.in
@@ -5,17 +5,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME	= gkconxuldoc_s
 MSVC_ENABLE_PGO := 1
 LIBXUL_LIBRARY	= 1
 
 # we don't want the shared lib, but we want to force the creation of a
 # static lib.
 FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
--- a/content/xul/document/src/moz.build
+++ b/content/xul/document/src/moz.build
@@ -13,8 +13,11 @@ CPP_SOURCES += [
 if CONFIG['MOZ_XUL']:
     CPP_SOURCES += [
         'nsXULCommandDispatcher.cpp',
         'nsXULContentSink.cpp',
         'XULDocument.cpp',
         'nsXULPrototypeCache.cpp',
         'nsXULPrototypeDocument.cpp',
     ]
+
+LIBRARY_NAME = 'gkconxuldoc_s'
+
--- a/content/xul/templates/src/Makefile.in
+++ b/content/xul/templates/src/Makefile.in
@@ -5,17 +5,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME	= gkconxultmpl_s
 MSVC_ENABLE_PGO := 1
 LIBXUL_LIBRARY	= 1
 
 # we don't want the shared lib, but we want to force the creation of a static lib.
 FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
 
--- a/content/xul/templates/src/moz.build
+++ b/content/xul/templates/src/moz.build
@@ -30,8 +30,10 @@ CPP_SOURCES += [
     'nsXULTemplateQueryProcessorXML.cpp',
     'nsXULTemplateResultRDF.cpp',
     'nsXULTemplateResultSetRDF.cpp',
     'nsXULTemplateResultStorage.cpp',
     'nsXULTemplateResultXML.cpp',
     'nsXULTreeBuilder.cpp',
 ]
 
+LIBRARY_NAME = 'gkconxultmpl_s'
+
--- a/db/sqlite3/src/Makefile.in
+++ b/db/sqlite3/src/Makefile.in
@@ -5,17 +5,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME     = mozsqlite3
 SHORT_LIBNAME    = mozsqlt3
 ifdef MOZ_FOLD_LIBS
 FORCE_STATIC_LIB = 1
 else
 FORCE_SHARED_LIB = 1
 endif
 VISIBILITY_FLAGS =
 LIB_IS_C_ONLY    = 1
--- a/db/sqlite3/src/moz.build
+++ b/db/sqlite3/src/moz.build
@@ -5,8 +5,10 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULE = 'sqlite3'
 
 EXPORTS += [
     'sqlite3.h',
 ]
 
+LIBRARY_NAME = 'mozsqlite3'
+
--- a/docshell/build/Makefile.in
+++ b/docshell/build/Makefile.in
@@ -8,17 +8,16 @@ topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 IS_COMPONENT = 1
 MODULE_NAME	= docshell_provider
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME	= docshell
 EXPORT_LIBRARY = 1
 LIBXUL_LIBRARY	= 1
 
 
 SHARED_LIBRARY_LIBS= \
 		../base/$(LIB_PREFIX)basedocshell_s.$(LIB_SUFFIX) \
 		$(DEPTH)/uriloader/base/$(LIB_PREFIX)uriloaderbase_s.$(LIB_SUFFIX) \
 		$(DEPTH)/uriloader/exthandler/$(LIB_PREFIX)exthandler_s.$(LIB_SUFFIX) \
--- a/docshell/build/moz.build
+++ b/docshell/build/moz.build
@@ -9,8 +9,10 @@ MODULE = 'docshell'
 EXPORTS += [
     'nsDocShellCID.h',
 ]
 
 CPP_SOURCES += [
     'nsDocShellModule.cpp',
 ]
 
+LIBRARY_NAME = 'docshell'
+
--- a/docshell/shistory/src/Makefile.in
+++ b/docshell/shistory/src/Makefile.in
@@ -5,17 +5,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME	= shistory_s
 MSVC_ENABLE_PGO := 1
 FORCE_STATIC_LIB = 1
 LIBXUL_LIBRARY	= 1
 FAIL_ON_WARNINGS = 1
 
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES += -I$(srcdir)/../../base
--- a/docshell/shistory/src/moz.build
+++ b/docshell/shistory/src/moz.build
@@ -12,8 +12,10 @@ EXPORTS += [
 
 CPP_SOURCES += [
     'nsSHEntry.cpp',
     'nsSHEntryShared.cpp',
     'nsSHTransaction.cpp',
     'nsSHistory.cpp',
 ]
 
+LIBRARY_NAME = 'shistory_s'
+
--- a/dom/media/bridge/Makefile.in
+++ b/dom/media/bridge/Makefile.in
@@ -4,17 +4,16 @@
 
 DEPTH   = ../../..
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH   = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME  = peerconnection
 MODULE_NAME   = peerconnection
 
 IS_COMPONENT   = 1
 EXPORT_LIBRARY = 1
 LIBXUL_LIBRARY = 1
 
 LOCAL_INCLUDES += \
   -I$(topsrcdir)/media/mtransport \
--- a/dom/media/bridge/moz.build
+++ b/dom/media/bridge/moz.build
@@ -9,8 +9,10 @@ XPIDL_SOURCES += [
 ]
 
 MODULE = 'peerconnection'
 
 CPP_SOURCES += [
     'MediaModule.cpp',
 ]
 
+LIBRARY_NAME = 'peerconnection'
+
--- a/dom/plugins/ipc/interpose/Makefile.in
+++ b/dom/plugins/ipc/interpose/Makefile.in
@@ -4,17 +4,16 @@
 
 DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME = plugin_child_interpose
 FORCE_SHARED_LIB = 1
 DIST_INSTALL     = 1
 
 CMMSRCS = $(LIBRARY_NAME).mm plugin_child_quirks.mm
 
 EXTRA_DSO_LDOPTS += \
   -framework Carbon \
   $(NULL)
--- a/dom/plugins/ipc/interpose/moz.build
+++ b/dom/plugins/ipc/interpose/moz.build
@@ -1,6 +1,8 @@
 # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+LIBRARY_NAME = 'plugin_child_interpose'
+
--- a/dom/plugins/test/testplugin/Makefile.in
+++ b/dom/plugins/test/testplugin/Makefile.in
@@ -5,17 +5,16 @@
 
 DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME = nptest
 MODULE_NAME  = TestPlugin
 ifndef _MSC_VER
 FAIL_ON_WARNINGS = 1
 endif # !_MSC_VER
 
 RELATIVE_PATH=.
 COCOA_NAME=Test
 include @srcdir@/testplugin.mk
--- a/dom/plugins/test/testplugin/moz.build
+++ b/dom/plugins/test/testplugin/moz.build
@@ -3,8 +3,10 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 DIRS += ['secondplugin']
 
 MODULE = 'nptest'
 
+LIBRARY_NAME = 'nptest'
+
--- a/dom/plugins/test/testplugin/secondplugin/Makefile.in
+++ b/dom/plugins/test/testplugin/secondplugin/Makefile.in
@@ -5,14 +5,13 @@
 
 DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME = npsecondtest
 MODULE_NAME  = SecondTestPlugin
 
 RELATIVE_PATH=..
 COCOA_NAME=SecondTest
 include @srcdir@/../testplugin.mk
--- a/dom/plugins/test/testplugin/secondplugin/moz.build
+++ b/dom/plugins/test/testplugin/secondplugin/moz.build
@@ -1,8 +1,10 @@
 # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULE = 'npsecondtest'
 
+LIBRARY_NAME = 'npsecondtest'
+
--- a/dom/src/events/Makefile.in
+++ b/dom/src/events/Makefile.in
@@ -6,17 +6,16 @@
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 FAIL_ON_WARNINGS := 1
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME	= jsdomevents_s
 MSVC_ENABLE_PGO := 1
 LIBXUL_LIBRARY	= 1
 
 # we don't want the shared lib, but we want to force the creation of a static lib.
 FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
 
--- a/dom/src/events/moz.build
+++ b/dom/src/events/moz.build
@@ -5,8 +5,10 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULE = 'dom'
 
 CPP_SOURCES += [
     'nsJSEventListener.cpp',
 ]
 
+LIBRARY_NAME = 'jsdomevents_s'
+
--- a/dom/src/json/Makefile.in
+++ b/dom/src/json/Makefile.in
@@ -6,17 +6,16 @@
 DEPTH          = @DEPTH@
 topsrcdir      = @top_srcdir@
 srcdir         = @srcdir@
 VPATH          = @srcdir@
 FAIL_ON_WARNINGS := 1
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME   = json_s
 LIBXUL_LIBRARY = 1
 
 
 FORCE_STATIC_LIB = 1
 
 LOCAL_INCLUDES = \
 		-I$(srcdir)/../base \
 		-I$(topsrcdir)/content/events/src
--- a/dom/src/json/moz.build
+++ b/dom/src/json/moz.build
@@ -11,8 +11,10 @@ MODULE = 'dom'
 EXPORTS += [
     'nsJSON.h',
 ]
 
 CPP_SOURCES += [
     'nsJSON.cpp',
 ]
 
+LIBRARY_NAME = 'json_s'
+
--- a/dom/src/jsurl/Makefile.in
+++ b/dom/src/jsurl/Makefile.in
@@ -6,17 +6,16 @@
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 FAIL_ON_WARNINGS := 1
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME	= jsurl_s
 FORCE_STATIC_LIB = 1
 MODULE_NAME	= javascript__protocol
 LIBXUL_LIBRARY	= 1
 
 LOCAL_INCLUDES += \
 		-I$(srcdir) \
 		-I$(topsrcdir)/dom/base \
 		-I$(topsrcdir)/netwerk/base/src \
--- a/dom/src/jsurl/moz.build
+++ b/dom/src/jsurl/moz.build
@@ -11,8 +11,10 @@ MODULE = 'jsurl'
 EXPORTS += [
     'nsJSProtocolHandler.h',
 ]
 
 CPP_SOURCES += [
     'nsJSProtocolHandler.cpp',
 ]
 
+LIBRARY_NAME = 'jsurl_s'
+
--- a/dom/src/offline/Makefile.in
+++ b/dom/src/offline/Makefile.in
@@ -5,17 +5,16 @@
 
 DEPTH          = @DEPTH@
 topsrcdir      = @top_srcdir@
 srcdir         = @srcdir@
 VPATH          = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME   = jsdomoffline_s
 LIBXUL_LIBRARY = 1
 FAIL_ON_WARNINGS := 1
 
 # we don't want the shared lib, but we want to force the creation of a static lib.
 FORCE_STATIC_LIB = 1
 
 LOCAL_INCLUDES = \
 		-I$(topsrcdir)/dom/base \
--- a/dom/src/offline/moz.build
+++ b/dom/src/offline/moz.build
@@ -8,8 +8,10 @@ MODULE = 'dom'
 
 EXPORTS += [
     'nsDOMOfflineResourceList.h',
 ]
 CPP_SOURCES += [
     'nsDOMOfflineResourceList.cpp',
 ]
 
+LIBRARY_NAME = 'jsdomoffline_s'
+
--- a/dom/workers/Makefile.in
+++ b/dom/workers/Makefile.in
@@ -4,17 +4,16 @@
 
 DEPTH            = @DEPTH@
 topsrcdir        = @top_srcdir@
 srcdir           = @srcdir@
 VPATH            = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME     = domworkers_s
 MSVC_ENABLE_PGO := 1
 LIBXUL_LIBRARY   = 1
 FORCE_STATIC_LIB = 1
 FAIL_ON_WARNINGS := 1
 
 LOCAL_INCLUDES = \
   -I$(topsrcdir)/content/base/src \
   -I$(topsrcdir)/content/events/src \
--- a/dom/workers/moz.build
+++ b/dom/workers/moz.build
@@ -49,8 +49,10 @@ CPP_SOURCES += [
     'Worker.cpp',
     'WorkerPrivate.cpp',
     'WorkerScope.cpp',
     'XMLHttpRequest.cpp',
     'XMLHttpRequestEventTarget.cpp',
     'XMLHttpRequestUpload.cpp',
 ]
 
+LIBRARY_NAME = 'domworkers_s'
+
--- a/editor/composer/src/Makefile.in
+++ b/editor/composer/src/Makefile.in
@@ -5,17 +5,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME	= composer
 EXPORT_LIBRARY = 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsComposerModule
 LIBXUL_LIBRARY	= 1
 FAIL_ON_WARNINGS = 1
 
 
 include $(topsrcdir)/config/rules.mk
--- a/editor/composer/src/moz.build
+++ b/editor/composer/src/moz.build
@@ -12,8 +12,10 @@ CPP_SOURCES += [
     'nsComposerCommandsUpdater.cpp',
     'nsComposerController.cpp',
     'nsComposerDocumentCommands.cpp',
     'nsComposerRegistration.cpp',
     'nsEditingSession.cpp',
     'nsEditorSpellCheck.cpp',
 ]
 
+LIBRARY_NAME = 'composer'
+
--- a/editor/libeditor/base/Makefile.in
+++ b/editor/libeditor/base/Makefile.in
@@ -5,17 +5,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME	= editorbase_s
 LIBXUL_LIBRARY	= 1
 FAIL_ON_WARNINGS = 1
 
 
 # Internal header files, needed by other editor sublibs:
 INTERNAL_HDR_DIR = ../internal
 
 # don't want the shared lib; force the creation of a static lib.
--- a/editor/libeditor/base/moz.build
+++ b/editor/libeditor/base/moz.build
@@ -28,8 +28,10 @@ CPP_SOURCES += [
     'nsEditorCommands.cpp',
     'nsEditorController.cpp',
     'nsEditorEventListener.cpp',
     'nsEditorUtils.cpp',
     'nsSelectionState.cpp',
     'nsStyleSheetTxns.cpp',
 ]
 
+LIBRARY_NAME = 'editorbase_s'
+
--- a/editor/libeditor/html/Makefile.in
+++ b/editor/libeditor/html/Makefile.in
@@ -6,17 +6,16 @@
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 FAIL_ON_WARNINGS = 1
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME	= htmleditor_s
 LIBXUL_LIBRARY	= 1
 
 
 # Building the full blown HTML Editor  so add its source files and objects:
 
 ifdef ENABLE_EDITOR_API_LOG
 DEFINES += -DENABLE_EDITOR_API_LOG
 endif
--- a/editor/libeditor/html/moz.build
+++ b/editor/libeditor/html/moz.build
@@ -27,8 +27,11 @@ CPP_SOURCES += [
     'nsTableEditor.cpp',
     'nsWSRunObject.cpp',
 ]
 
 if CONFIG['ENABLE_EDITOR_API_LOG']:
     CPP_SOURCES += [
         'nsEditorTxnLog.cpp',
     ]
+
+LIBRARY_NAME = 'htmleditor_s'
+
--- a/editor/libeditor/text/Makefile.in
+++ b/editor/libeditor/text/Makefile.in
@@ -6,17 +6,16 @@
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 FAIL_ON_WARNINGS = 1
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME	= texteditor_s
 LIBXUL_LIBRARY	= 1
 
 # don't want the shared lib; force the creation of a static lib.
 FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
 
 INCLUDES	+= \
--- a/editor/libeditor/text/moz.build
+++ b/editor/libeditor/text/moz.build
@@ -12,8 +12,10 @@ CPP_SOURCES += [
     'nsInternetCiter.cpp',
     'nsPlaintextDataTransfer.cpp',
     'nsPlaintextEditor.cpp',
     'nsTextEditRules.cpp',
     'nsTextEditRulesBidi.cpp',
     'nsTextEditUtils.cpp',
 ]
 
+LIBRARY_NAME = 'texteditor_s'
+
--- a/editor/txmgr/src/Makefile.in
+++ b/editor/txmgr/src/Makefile.in
@@ -6,17 +6,16 @@
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 FAIL_ON_WARNINGS = 1
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME	= txmgr
 EXPORT_LIBRARY = 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsTransactionManagerModule
 LIBXUL_LIBRARY	= 1
 
 
 include $(topsrcdir)/config/rules.mk
 
--- a/editor/txmgr/src/moz.build
+++ b/editor/txmgr/src/moz.build
@@ -9,8 +9,10 @@ MODULE = 'txmgr'
 CPP_SOURCES += [
     'nsTransactionItem.cpp',
     'nsTransactionList.cpp',
     'nsTransactionManager.cpp',
     'nsTransactionManagerFactory.cpp',
     'nsTransactionStack.cpp',
 ]
 
+LIBRARY_NAME = 'txmgr'
+
--- a/editor/txtsvc/src/Makefile.in
+++ b/editor/txtsvc/src/Makefile.in
@@ -6,16 +6,15 @@
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 FAIL_ON_WARNINGS = 1
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME	= txtsvc_s
 FORCE_STATIC_LIB = 1
 MODULE_NAME	= nsTextServicesModule
 LIBXUL_LIBRARY	= 1
 
 
 include $(topsrcdir)/config/rules.mk
 
--- a/editor/txtsvc/src/moz.build
+++ b/editor/txtsvc/src/moz.build
@@ -6,8 +6,10 @@
 
 MODULE = 'txtsvc'
 
 CPP_SOURCES += [
     'nsFilteredContentIterator.cpp',
     'nsTextServicesDocument.cpp',
 ]
 
+LIBRARY_NAME = 'txtsvc_s'
+
--- a/embedding/browser/build/Makefile.in
+++ b/embedding/browser/build/Makefile.in
@@ -5,17 +5,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME	= webbrwsr
 IS_COMPONENT	= 1
 MODULE_NAME	= Browser_Embedding_Module
 EXPORT_LIBRARY	= 1
 LIBXUL_LIBRARY	= 1
 
 
 SHARED_LIBRARY_LIBS= \
 		../webBrowser/$(LIB_PREFIX)nsWebBrowser_s.$(LIB_SUFFIX) \
--- a/embedding/browser/build/moz.build
+++ b/embedding/browser/build/moz.build
@@ -5,8 +5,10 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULE = 'webbrwsr'
 
 CPP_SOURCES += [
     'nsWebBrowserModule.cpp',
 ]
 
+LIBRARY_NAME = 'webbrwsr'
+
--- a/embedding/browser/webBrowser/Makefile.in
+++ b/embedding/browser/webBrowser/Makefile.in
@@ -5,17 +5,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME	= nsWebBrowser_s
 LIBXUL_LIBRARY	= 1
 
 
 
 LOCAL_INCLUDES	= \
 		-I$(srcdir)/../../../content/base/src \
 		-I$(srcdir)/../../../content/svg/content/src \
 		$(NULL)
--- a/embedding/browser/webBrowser/moz.build
+++ b/embedding/browser/webBrowser/moz.build
@@ -41,8 +41,10 @@ CPP_SOURCES += [
     'nsCommandHandler.cpp',
     'nsContextMenuInfo.cpp',
     'nsDocShellTreeOwner.cpp',
     'nsEmbedStream.cpp',
     'nsWebBrowser.cpp',
     'nsWebBrowserContentPolicy.cpp',
 ]
 
+LIBRARY_NAME = 'nsWebBrowser_s'
+
--- a/embedding/components/appstartup/src/Makefile.in
+++ b/embedding/components/appstartup/src/Makefile.in
@@ -5,17 +5,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME	= appstartupnotifier_s
 LIBXUL_LIBRARY	= 1
 
 # we don't want the shared lib, but we want to force the creation of a
 # static lib.
 FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
 
--- a/embedding/components/appstartup/src/moz.build
+++ b/embedding/components/appstartup/src/moz.build
@@ -9,8 +9,10 @@ MODULE = 'embedcomponents'
 EXPORTS += [
     'nsIAppStartupNotifier.h',
 ]
 
 CPP_SOURCES += [
     'nsAppStartupNotifier.cpp',
 ]
 
+LIBRARY_NAME = 'appstartupnotifier_s'
+
--- a/embedding/components/build/Makefile.in
+++ b/embedding/components/build/Makefile.in
@@ -4,17 +4,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME	= embedcomponents
 EXPORT_LIBRARY = 1
 IS_COMPONENT	= 1
 MODULE_NAME	= embedcomponents
 LIBXUL_LIBRARY	= 1
 
 SHARED_LIBRARY_LIBS = \
 	../windowwatcher/src/$(LIB_PREFIX)windowwatcher_s.$(LIB_SUFFIX) \
 	../appstartup/src/$(LIB_PREFIX)appstartupnotifier_s.$(LIB_SUFFIX) \
--- a/embedding/components/build/moz.build
+++ b/embedding/components/build/moz.build
@@ -5,8 +5,10 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULE = 'embedcomponents'
 
 CPP_SOURCES += [
     'nsEmbeddingModule.cpp',
 ]
 
+LIBRARY_NAME = 'embedcomponents'
+
--- a/embedding/components/commandhandler/src/Makefile.in
+++ b/embedding/components/commandhandler/src/Makefile.in
@@ -5,17 +5,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME	= commandhandler_s
 LIBXUL_LIBRARY	= 1
 FAIL_ON_WARNINGS = 1
 
 # we don't want the shared lib, but we want to force the creation of a
 # static lib.
 FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
--- a/embedding/components/commandhandler/src/moz.build
+++ b/embedding/components/commandhandler/src/moz.build
@@ -9,8 +9,10 @@ MODULE = 'commandhandler'
 CPP_SOURCES += [
     'nsBaseCommandController.cpp',
     'nsCommandGroup.cpp',
     'nsCommandManager.cpp',
     'nsCommandParams.cpp',
     'nsControllerCommandTable.cpp',
 ]
 
+LIBRARY_NAME = 'commandhandler_s'
+
--- a/embedding/components/find/src/Makefile.in
+++ b/embedding/components/find/src/Makefile.in
@@ -5,17 +5,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME	= find_s
 LIBXUL_LIBRARY	= 1
 FAIL_ON_WARNINGS = 1
 
 # we don't want the shared lib, but we want to force the creation of a
 # static lib.
 FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
--- a/embedding/components/find/src/moz.build
+++ b/embedding/components/find/src/moz.build
@@ -6,8 +6,10 @@
 
 MODULE = 'find'
 
 CPP_SOURCES += [
     'nsFind.cpp',
     'nsWebBrowserFind.cpp',
 ]
 
+LIBRARY_NAME = 'find_s'
+
--- a/embedding/components/printingui/src/mac/Makefile.in
+++ b/embedding/components/printingui/src/mac/Makefile.in
@@ -5,17 +5,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME	= printingui_s
 EXPORT_LIBRARY	= ..
 LIBXUL_LIBRARY	= 1
 
 
 
 CMMSRCS = nsPrintingPromptServiceX.mm
 
 LOCAL_INCLUDES	= \
--- a/embedding/components/printingui/src/mac/moz.build
+++ b/embedding/components/printingui/src/mac/moz.build
@@ -6,8 +6,10 @@
 
 MODULE = 'embedcomponents'
 
 CPP_SOURCES += [
     'nsPrintProgress.cpp',
     'nsPrintProgressParams.cpp',
 ]
 
+LIBRARY_NAME = 'printingui_s'
+
--- a/embedding/components/printingui/src/os2/Makefile.in
+++ b/embedding/components/printingui/src/os2/Makefile.in
@@ -5,17 +5,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME	= printingui_s
 EXPORT_LIBRARY	= ..
 LIBXUL_LIBRARY	= 1
 
 # we don't want the shared lib, but we want to force the creation of a
 # static lib.
 FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
--- a/embedding/components/printingui/src/os2/moz.build
+++ b/embedding/components/printingui/src/os2/moz.build
@@ -7,8 +7,10 @@
 MODULE = 'embedcomponents'
 
 CPP_SOURCES += [
     'nsPrintProgress.cpp',
     'nsPrintProgressParams.cpp',
     'nsPrintingPromptService.cpp',
 ]
 
+LIBRARY_NAME = 'printingui_s'
+
--- a/embedding/components/printingui/src/unixshared/Makefile.in
+++ b/embedding/components/printingui/src/unixshared/Makefile.in
@@ -5,17 +5,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME	= printingui_s
 EXPORT_LIBRARY	= ..
 LIBXUL_LIBRARY	= 1
 
 # we don't want the shared lib, but we want to force the creation of a
 # static lib.
 FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
--- a/embedding/components/printingui/src/unixshared/moz.build
+++ b/embedding/components/printingui/src/unixshared/moz.build
@@ -7,8 +7,10 @@
 MODULE = 'embedcomponents'
 
 CPP_SOURCES += [
     'nsPrintProgress.cpp',
     'nsPrintProgressParams.cpp',
     'nsPrintingPromptService.cpp',
 ]
 
+LIBRARY_NAME = 'printingui_s'
+
--- a/embedding/components/printingui/src/win/Makefile.in
+++ b/embedding/components/printingui/src/win/Makefile.in
@@ -5,17 +5,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME	= printingui_s
 EXPORT_LIBRARY	= ..
 LIBXUL_LIBRARY	= 1
 
 # we don't want the shared lib, but we want to force the creation of a
 # static lib.
 FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
--- a/embedding/components/printingui/src/win/moz.build
+++ b/embedding/components/printingui/src/win/moz.build
@@ -8,8 +8,10 @@ MODULE = 'embedcomponents'
 
 CPP_SOURCES += [
     'nsPrintDialogUtil.cpp',
     'nsPrintProgress.cpp',
     'nsPrintProgressParams.cpp',
     'nsPrintingPromptService.cpp',
 ]
 
+LIBRARY_NAME = 'printingui_s'
+
--- a/embedding/components/webbrowserpersist/src/Makefile.in
+++ b/embedding/components/webbrowserpersist/src/Makefile.in
@@ -5,17 +5,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME	= webbrowserpersist_s
 LIBXUL_LIBRARY	= 1
 
 # we don't want the shared lib, but we want to force the creation of a
 # static lib.
 FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
 
--- a/embedding/components/webbrowserpersist/src/moz.build
+++ b/embedding/components/webbrowserpersist/src/moz.build
@@ -5,8 +5,10 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULE = 'webbrowserpersist'
 
 CPP_SOURCES += [
     'nsWebBrowserPersist.cpp',
 ]
 
+LIBRARY_NAME = 'webbrowserpersist_s'
+
--- a/embedding/components/windowwatcher/src/Makefile.in
+++ b/embedding/components/windowwatcher/src/Makefile.in
@@ -5,17 +5,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME	= windowwatcher_s
 LIBXUL_LIBRARY	= 1
 
 # we don't want the shared lib, but we want to force the creation of a
 # static lib.
 FORCE_STATIC_LIB = 1
 
 # For nsJSUtils
 LOCAL_INCLUDES += -I$(topsrcdir)/dom/base \
--- a/embedding/components/windowwatcher/src/moz.build
+++ b/embedding/components/windowwatcher/src/moz.build
@@ -10,8 +10,11 @@ CPP_SOURCES += [
     'nsAutoWindowStateHelper.cpp',
     'nsWindowWatcher.cpp',
 ]
 
 if CONFIG['MOZ_XUL']:
     CPP_SOURCES += [
         'nsDialogParamBlock.cpp',
     ]
+
+LIBRARY_NAME = 'windowwatcher_s'
+
--- a/extensions/auth/Makefile.in
+++ b/extensions/auth/Makefile.in
@@ -5,17 +5,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME	= auth
 IS_COMPONENT	= 1
 EXPORT_LIBRARY	= 1
 MODULE_NAME	= nsAuthModule
 LIBXUL_LIBRARY = 1
 
 
 ifeq ($(OS_ARCH),WINNT)
 LOCAL_INCLUDES	+= -DUSE_SSPI
--- a/extensions/auth/moz.build
+++ b/extensions/auth/moz.build
@@ -16,8 +16,11 @@ CPP_SOURCES += [
 if CONFIG['OS_ARCH'] == 'WINNT':
     CPP_SOURCES += [
         'nsAuthSSPI.cpp',
     ]
 else:
     CPP_SOURCES += [
         'nsAuthSambaNTLM.cpp',
     ]
+
+LIBRARY_NAME = 'auth'
+
--- a/extensions/gio/Makefile.in
+++ b/extensions/gio/Makefile.in
@@ -5,17 +5,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME	= nkgio
 IS_COMPONENT	= 1
 EXPORT_LIBRARY	= 1
 MODULE_NAME	= nsGIOModule
 LIBXUL_LIBRARY	= 1
 FAIL_ON_WARNINGS = 1
 
 LOCAL_INCLUDES	= $(MOZ_GIO_CFLAGS)
 
--- a/extensions/gio/moz.build
+++ b/extensions/gio/moz.build
@@ -5,8 +5,10 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULE = 'nkgio'
 
 CPP_SOURCES += [
     'nsGIOProtocolHandler.cpp',
 ]
 
+LIBRARY_NAME = 'nkgio'
+
--- a/extensions/gnomevfs/Makefile.in
+++ b/extensions/gnomevfs/Makefile.in
@@ -5,17 +5,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME	= nkgnomevfs
 SHORT_LIBNAME	= nkgnomevfs
 IS_COMPONENT	= 1
 
 
 LOCAL_INCLUDES	= $(MOZ_GNOMEVFS_CFLAGS)
 
 EXTRA_DSO_LDOPTS = \
 		   $(XPCOM_GLUE_LDOPTS) \
--- a/extensions/gnomevfs/moz.build
+++ b/extensions/gnomevfs/moz.build
@@ -5,8 +5,10 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULE = 'nkgnomevfs'
 
 CPP_SOURCES += [
     'nsGnomeVFSProtocolHandler.cpp',
 ]
 
+LIBRARY_NAME = 'nkgnomevfs'
+
--- a/extensions/permissions/Makefile.in
+++ b/extensions/permissions/Makefile.in
@@ -4,16 +4,15 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME	= permissions
 EXPORT_LIBRARY	= 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsPermissionsModule
 LIBXUL_LIBRARY = 1
 
 
 include $(topsrcdir)/config/rules.mk
--- a/extensions/permissions/moz.build
+++ b/extensions/permissions/moz.build
@@ -6,8 +6,10 @@
 
 MODULE = 'permissions'
 
 CPP_SOURCES += [
     'nsContentBlocker.cpp',
     'nsModuleFactory.cpp',
 ]
 
+LIBRARY_NAME = 'permissions'
+
--- a/extensions/spellcheck/hunspell/src/Makefile.in
+++ b/extensions/spellcheck/hunspell/src/Makefile.in
@@ -4,17 +4,16 @@
 
 DEPTH           = @DEPTH@
 topsrcdir       = @top_srcdir@
 srcdir          = @srcdir@
 VPATH           = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME     = hunspell_s
 FORCE_STATIC_LIB = 1
 LIBXUL_LIBRARY   = 1
 
 
 ifndef MOZ_NATIVE_HUNSPELL
 # This variable is referenced in configure.in.  Make sure to change that file
 # too if you need to change this variable.
 DEFINES = -DHUNSPELL_STATIC
--- a/extensions/spellcheck/hunspell/src/moz.build
+++ b/extensions/spellcheck/hunspell/src/moz.build
@@ -20,8 +20,11 @@ if not CONFIG['MOZ_NATIVE_HUNSPELL']:
         'filemgr.cpp',
         'hashmgr.cpp',
         'hunspell.cpp',
         'hunzip.cpp',
         'phonet.cpp',
         'replist.cpp',
         'suggestmgr.cpp',
     ]
+
+LIBRARY_NAME = 'hunspell_s'
+
--- a/extensions/spellcheck/src/Makefile.in
+++ b/extensions/spellcheck/src/Makefile.in
@@ -4,17 +4,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME	= spellchecker
 MODULE_NAME     = mozSpellCheckerModule
 EXPORT_LIBRARY  = 1
 IS_COMPONENT	= 1
 LIBXUL_LIBRARY  = 1
 
 
 SHARED_LIBRARY_LIBS += ../hunspell/src/$(LIB_PREFIX)hunspell_s.$(LIB_SUFFIX)
 
--- a/extensions/spellcheck/src/moz.build
+++ b/extensions/spellcheck/src/moz.build
@@ -12,8 +12,10 @@ CPP_SOURCES += [
     'mozInlineSpellChecker.cpp',
     'mozInlineSpellWordUtil.cpp',
     'mozPersonalDictionary.cpp',
     'mozSpellChecker.cpp',
     'mozSpellCheckerFactory.cpp',
     'mozSpellI18NManager.cpp',
 ]
 
+LIBRARY_NAME = 'spellchecker'
+
--- a/extensions/universalchardet/src/base/Makefile.in
+++ b/extensions/universalchardet/src/base/Makefile.in
@@ -5,14 +5,12 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME	= universalchardet_s
-
 FORCE_STATIC_LIB = 1
 LIBXUL_LIBRARY = 1
 
 include $(topsrcdir)/config/rules.mk
--- a/extensions/universalchardet/src/base/moz.build
+++ b/extensions/universalchardet/src/base/moz.build
@@ -29,8 +29,10 @@ CPP_SOURCES += [
     'nsMBCSSM.cpp',
     'nsSBCSGroupProber.cpp',
     'nsSBCharSetProber.cpp',
     'nsSJISProber.cpp',
     'nsUTF8Prober.cpp',
     'nsUniversalDetector.cpp',
 ]
 
+LIBRARY_NAME = 'universalchardet_s'
+
--- a/extensions/universalchardet/src/xpcom/Makefile.in
+++ b/extensions/universalchardet/src/xpcom/Makefile.in
@@ -5,17 +5,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME	= universalchardet
 EXPORT_LIBRARY	= 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsUniversalCharDetModule
 LIBXUL_LIBRARY = 1
 
 LOCAL_INCLUDES = -I$(srcdir)/../base
 
 SHARED_LIBRARY_LIBS = \
--- a/extensions/universalchardet/src/xpcom/moz.build
+++ b/extensions/universalchardet/src/xpcom/moz.build
@@ -6,8 +6,10 @@
 
 MODULE = 'universalchardet'
 
 CPP_SOURCES += [
     'nsUdetXPCOMWrapper.cpp',
     'nsUniversalCharDetModule.cpp',
 ]
 
+LIBRARY_NAME = 'universalchardet'
+
--- a/extensions/widgetutils/src/Makefile.in
+++ b/extensions/widgetutils/src/Makefile.in
@@ -6,17 +6,16 @@
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 XPI_NAME	= widgetutils
-LIBRARY_NAME    = widgetutils
 SHORT_LIBNAME = widgetutils
 FORCE_SHARED_LIB = 1
 IS_COMPONENT = 1
 
 EXTRA_DSO_LDOPTS = \
 	$(XPCOM_GLUE_LDOPTS) \
 	$(NSPR_LIBS) \
 	$(NULL)
--- a/extensions/widgetutils/src/moz.build
+++ b/extensions/widgetutils/src/moz.build
@@ -5,8 +5,10 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULE = 'widgetutils'
 
 CPP_SOURCES += [
     'nsWidgetUtils.cpp',
 ]
 
+LIBRARY_NAME = 'widgetutils'
+
--- a/gfx/angle/Makefile.in
+++ b/gfx/angle/Makefile.in
@@ -4,17 +4,16 @@
 
 DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME   = angle
 MSVC_ENABLE_PGO := 1
 LIBXUL_LIBRARY = 1
 ifeq (WINNT,$(OS_TARGET))
 VISIBILITY_FLAGS =
 endif
 
 # The below is a rough translation of build_angle.gypi:
 DEFINES += -DANGLE_DISABLE_TRACE
--- a/gfx/angle/moz.build
+++ b/gfx/angle/moz.build
@@ -80,17 +80,16 @@ CPP_SOURCES += [
     'RestrictVertexShaderTiming.cpp',
 ]
 
 # src/third_party/compiler:
 CPP_SOURCES += [
     'ArrayBoundsClamper.cpp',
 ]
 
-
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
     CPP_SOURCES += [
         'ossource_win.cpp',
     ]
 else:
     CPP_SOURCES += [
         'ossource_posix.cpp',
     ]
@@ -104,8 +103,10 @@ CPP_SOURCES += [
     'OutputGLSLBase.cpp',
     'OutputGLSL.cpp',
     'ShaderLang.cpp',
     'TranslatorESSL.cpp',
     'TranslatorGLSL.cpp',
     'VersionGLSL.cpp',
 ]
 
+LIBRARY_NAME = 'angle'
+
--- a/gfx/angle/src/libEGL/Makefile.in
+++ b/gfx/angle/src/libEGL/Makefile.in
@@ -5,17 +5,16 @@
 DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 # On Windows, we don't automatically get "lib" prepended, but we need it.
-LIBRARY_NAME     = libEGL
 FORCE_SHARED_LIB = 1
 
 # ANGLE uses the STL, so we can't use our derpy STL wrappers.
 STL_FLAGS =
 
 # ANGLE uses exceptions internally, so we need to have exception handling
 # support
 ENABLE_CXX_EXCEPTIONS = 1
--- a/gfx/angle/src/libEGL/moz.build
+++ b/gfx/angle/src/libEGL/moz.build
@@ -11,8 +11,10 @@ CPP_SOURCES += [
     'Display.cpp',
     'RefCountObject.cpp',
     'Surface.cpp',
     'debug.cpp',
     'libEGL.cpp',
     'main.cpp',
 ]
 
+LIBRARY_NAME = 'libEGL'
+
--- a/gfx/angle/src/libGLESv2/Makefile.in
+++ b/gfx/angle/src/libGLESv2/Makefile.in
@@ -6,17 +6,16 @@
 DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 # On Windows, we don't automatically get "lib" prepended, but we need it.
-LIBRARY_NAME     = libGLESv2
 FORCE_SHARED_LIB = 1
 
 # ANGLE uses the STL, so we can't use our derpy STL wrappers.
 STL_FLAGS =
 
 # ANGLE uses exceptions internally, so we need to have exception handling
 # support
 ENABLE_CXX_EXCEPTIONS = 1
--- a/gfx/angle/src/libGLESv2/moz.build
+++ b/gfx/angle/src/libGLESv2/moz.build
@@ -88,8 +88,11 @@ CPP_SOURCES += [
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
     CPP_SOURCES += [
         'ossource_win.cpp'
     ]
 else:
     CPP_SOURCES += [
         'ossource_posix.cpp'
     ]
+
+LIBRARY_NAME = 'libGLESv2'
+
--- a/gfx/cairo/cairo/src/Makefile.in
+++ b/gfx/cairo/cairo/src/Makefile.in
@@ -4,17 +4,16 @@
 
 DEPTH           = @DEPTH@
 topsrcdir       = @top_srcdir@
 srcdir          = @srcdir@
 VPATH           = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME    = mozcairo
 MSVC_ENABLE_PGO := 1
 LIBXUL_LIBRARY = 1
 
 ifdef GNU_CC
 ifeq ($(OS_TARGET),Android)
 MODULE_OPTIMIZE_FLAGS = -O2
 endif
 endif
--- a/gfx/cairo/cairo/src/moz.build
+++ b/gfx/cairo/cairo/src/moz.build
@@ -77,8 +77,11 @@ if CONFIG['MOZ_X11']:
         'cairo-xlib-xrender.h',
         'cairo-xlib.h',
     ]
 
 if CONFIG['MOZ_ENABLE_CAIRO_FT']:
     EXPORTS.cairo += [
         'cairo-ft.h',
     ]
+
+LIBRARY_NAME = 'mozcairo'
+
--- a/gfx/graphite2/src/Makefile.in
+++ b/gfx/graphite2/src/Makefile.in
@@ -16,17 +16,16 @@ ifdef GNU_CC
 _MACHINE = direct
 else
 _MACHINE = call
 endif
 
 # get the lists of source files and exported headers
 include $(srcdir)/files.mk
 
-LIBRARY_NAME   = mozgraphite2
 MSVC_ENABLE_PGO := 1
 
 # on Windows, we're going to link graphite with gkmedias instead of libxul
 ifeq (WINNT,$(OS_TARGET))
 VISIBILITY_FLAGS =
 else
 LIBXUL_LIBRARY = 1
 endif
--- a/gfx/graphite2/src/moz.build
+++ b/gfx/graphite2/src/moz.build
@@ -52,8 +52,10 @@ CPP_SOURCES += [
     'Segment.cpp',
     'Silf.cpp',
     'Slot.cpp',
     'Sparse.cpp',
     'TtfUtil.cpp',
     'UtfCodec.cpp',
 ]
 
+LIBRARY_NAME = 'mozgraphite2'
+
--- a/gfx/harfbuzz/src/Makefile.in
+++ b/gfx/harfbuzz/src/Makefile.in
@@ -27,17 +27,16 @@
 
 DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME   = mozharfbuzz
 MSVC_ENABLE_PGO := 1
 ifneq ($(OS_ARCH),WINNT)
 LIBXUL_LIBRARY = 1
 endif
 
 LOCAL_INCLUDES  += -I$(srcdir) 
 
 FORCE_STATIC_LIB = 1
--- a/gfx/harfbuzz/src/moz.build
+++ b/gfx/harfbuzz/src/moz.build
@@ -44,8 +44,10 @@ CPP_SOURCES += [
     'hb-set.cc',
     'hb-shape-plan.cc',
     'hb-shape.cc',
     'hb-shaper.cc',
     'hb-unicode.cc',
     'hb-warning.cc',
 ]
 
+LIBRARY_NAME = 'mozharfbuzz'
+
--- a/gfx/ots/src/Makefile.in
+++ b/gfx/ots/src/Makefile.in
@@ -27,17 +27,16 @@
 
 DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME   = mozots
 MSVC_ENABLE_PGO := 1
 FORCE_STATIC_LIB = 1
 
 ifeq (WINNT,$(OS_TARGET))
 VISIBILITY_FLAGS =
 else
 LIBXUL_LIBRARY = 1
 endif
--- a/gfx/ots/src/moz.build
+++ b/gfx/ots/src/moz.build
@@ -40,8 +40,10 @@ CPP_SOURCES += [
     'prep.cc',
     'svg.cc',
     'vdmx.cc',
     'vhea.cc',
     'vmtx.cc',
     'vorg.cc',
 ]
 
+LIBRARY_NAME = 'mozots'
+
--- a/gfx/qcms/Makefile.in
+++ b/gfx/qcms/Makefile.in
@@ -4,17 +4,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME = mozqcms
 MSVC_ENABLE_PGO := 1
 LIBXUL_LIBRARY = 1
 
 CSRCS = \
   chain.c \
   iccread.c \
   matrix.c \
   transform.c \
--- a/gfx/qcms/moz.build
+++ b/gfx/qcms/moz.build
@@ -6,8 +6,10 @@
 
 MODULE = 'qcms'
 
 EXPORTS += [
     'qcms.h',
     'qcmstypes.h',
 ]
 
+LIBRARY_NAME = 'mozqcms'
+
--- a/gfx/skia/Makefile.in
+++ b/gfx/skia/Makefile.in
@@ -5,17 +5,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME	= skia
 MSVC_ENABLE_PGO := 1
 LIBXUL_LIBRARY  = 1
 EXPORT_LIBRARY  = 1
 
 DEFINES += -DSK_A32_SHIFT=24 -DSK_R32_SHIFT=16 -DSK_G32_SHIFT=8 -DSK_B32_SHIFT=0
 
 LOCAL_INCLUDES += \
 	-I$(srcdir)/include/core \
--- a/gfx/skia/moz.build
+++ b/gfx/skia/moz.build
@@ -195,17 +195,16 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'qt
             'SkThread_pthread.cpp',
             'SkTime_Unix.cpp',
         ]
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
     CPP_SOURCES += [
         'SkThread_pthread.cpp',
     ]
 
-
 # Separate 'if' from above, since the else below applies to all != 'android'
 # toolkits.
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android':
     CPP_SOURCES += [
         'SkDebug_android.cpp',
         'SkFontHost_android_old.cpp',
         'SkFontHost_FreeType.cpp',
         'SkFontHost_FreeType_common.cpp',
@@ -470,8 +469,10 @@ CPP_SOURCES += [
     'SkTypeface.cpp',
     'SkTypefaceCache.cpp',
     'SkUnPreMultiply.cpp',
     'SkUtils.cpp',
     'SkWriter32.cpp',
     'SkXfermode.cpp',
 ]
 
+LIBRARY_NAME = 'skia'
+
--- a/gfx/src/Makefile.in
+++ b/gfx/src/Makefile.in
@@ -6,17 +6,16 @@
 DEPTH       = @DEPTH@
 topsrcdir   = @top_srcdir@
 srcdir      = @srcdir@
 VPATH       = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE_NAME    = nsGfxModule
-LIBRARY_NAME   = gkgfx
 MSVC_ENABLE_PGO := 1
 EXPORT_LIBRARY = 1
 LIBXUL_LIBRARY = 1
 IS_COMPONENT   = 1
 FAIL_ON_WARNINGS = 1
 
 include $(topsrcdir)/config/rules.mk
 
--- a/gfx/src/moz.build
+++ b/gfx/src/moz.build
@@ -50,8 +50,10 @@ CPP_SOURCES += [
     'nsRegion.cpp',
     'nsRenderingContext.cpp',
     'nsScriptableRegion.cpp',
     'nsThebesFontEnumerator.cpp',
     'nsThebesGfxFactory.cpp',
     'nsTransform2D.cpp',
 ]
 
+LIBRARY_NAME = 'gkgfx'
+
--- a/gfx/tests/gtest/Makefile.in
+++ b/gfx/tests/gtest/Makefile.in
@@ -8,17 +8,16 @@ topsrcdir      = @top_srcdir@
 srcdir         = @srcdir@
 VPATH          = @srcdir@ $(srcdir)/$(DEPTH)/gfx/2d/unittest
 relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 # Create a GTest library
 MODULE_NAME    = gfxtest
-LIBRARY_NAME   = gfxtest
 LIBXUL_LIBRARY = 1
 IS_COMPONENT   = 1
 EXPORT_LIBRARY = 1
 
 LOCAL_INCLUDES = \
   -I$(topsrcdir)/gfx/layers \
   -I$(topsrcdir)/gfx/2d \
   -I$(topsrcdir)/gfx/2d/unittest \
--- a/gfx/tests/gtest/moz.build
+++ b/gfx/tests/gtest/moz.build
@@ -1,8 +1,10 @@
 # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULE = 'gfxtest'
 
+LIBRARY_NAME = 'gfxtest'
+
--- a/gfx/ycbcr/Makefile.in
+++ b/gfx/ycbcr/Makefile.in
@@ -1,16 +1,15 @@
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME = ycbcr
 LIBXUL_LIBRARY = 1
 EXPORT_LIBRARY = 1
 
 DEFINES += -D_IMPL_NS_GFX
 
 ifeq (arm,$(findstring arm,$(OS_TEST)))
 ifdef HAVE_ARM_NEON
 ASFILES = yuv_row_arm.$(ASM_SUFFIX) \
--- a/gfx/ycbcr/moz.build
+++ b/gfx/ycbcr/moz.build
@@ -60,8 +60,11 @@ else:
     CPP_SOURCES += [
         'yuv_row_other.cpp',
     ]
 
 if CONFIG['OS_TEST'] == 'arm' and CONFIG['HAVE_ARM_NEON']:
     CPP_SOURCES += [
         'yuv_convert_arm.cpp',
     ]
+
+LIBRARY_NAME = 'ycbcr'
+
--- a/image/build/Makefile.in
+++ b/image/build/Makefile.in
@@ -5,17 +5,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME	= imglib2
 EXPORT_LIBRARY = 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsImageLib2Module
 LIBXUL_LIBRARY = 1
 FAIL_ON_WARNINGS = 1
 
 LOCAL_INCLUDES	= \
 		-I. \
--- a/image/build/moz.build
+++ b/image/build/moz.build
@@ -5,8 +5,10 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULE = 'imglib2'
 
 CPP_SOURCES += [
     'nsImageModule.cpp',
 ]
 
+LIBRARY_NAME = 'imglib2'
+
--- a/image/decoders/Makefile.in
+++ b/image/decoders/Makefile.in
@@ -5,17 +5,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME = imgdecoders_s
 FORCE_STATIC_LIB = 1
 MODULE_NAME = nsDecodersModule
 LIBXUL_LIBRARY  = 1
 FAIL_ON_WARNINGS = 1
 
 CSRCS   = iccjpeg.c \
           $(NULL)
 
--- a/image/decoders/icon/Makefile.in
+++ b/image/decoders/icon/Makefile.in
@@ -5,17 +5,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME	= imgicon
 IS_COMPONENT	= 1
 MODULE_NAME	= nsIconDecoderModule
 LIBXUL_LIBRARY = 1
 EXPORT_LIBRARY = 1
 FAIL_ON_WARNINGS = 1
 
 ifdef MOZ_WIDGET_GTK
 PLATFORM = gtk
--- a/image/decoders/icon/gtk/Makefile.in
+++ b/image/decoders/icon/gtk/Makefile.in
@@ -5,17 +5,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME	= imgicongtk_s
 LIBXUL_LIBRARY  = 1
 FAIL_ON_WARNINGS = 1
 
 ifdef MOZ_ENABLE_GNOMEUI
 LOCAL_INCLUDES += $(MOZ_GNOMEUI_CFLAGS)
 else
 LOCAL_INCLUDES += $(TK_CFLAGS)
 endif
--- a/image/decoders/icon/gtk/moz.build
+++ b/image/decoders/icon/gtk/moz.build
@@ -5,8 +5,10 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULE = 'imgicon'
 
 CPP_SOURCES += [
     'nsIconChannel.cpp',
 ]
 
+LIBRARY_NAME = 'imgicongtk_s'
+
--- a/image/decoders/icon/mac/Makefile.in
+++ b/image/decoders/icon/mac/Makefile.in
@@ -4,17 +4,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME	= imgiconmac_s
 LIBXUL_LIBRARY = 1
 FAIL_ON_WARNINGS = 1
 
 
 CMMSRCS		= nsIconChannelCocoa.mm
 
 # we don't want the shared lib, but we want to force the creation of a static lib.
 FORCE_STATIC_LIB = 1
--- a/image/decoders/icon/mac/moz.build
+++ b/image/decoders/icon/mac/moz.build
@@ -1,8 +1,10 @@
 # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULE = 'imgicon'
 
+LIBRARY_NAME = 'imgiconmac_s'
+
--- a/image/decoders/icon/moz.build
+++ b/image/decoders/icon/moz.build
@@ -11,8 +11,10 @@ XPIDL_SOURCES += [
 MODULE = 'imgicon'
 
 CPP_SOURCES += [
     'nsIconModule.cpp',
     'nsIconProtocolHandler.cpp',
     'nsIconURI.cpp',
 ]
 
+LIBRARY_NAME = 'imgicon'
+
--- a/image/decoders/icon/os2/Makefile.in
+++ b/image/decoders/icon/os2/Makefile.in
@@ -5,16 +5,15 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME	= imgiconos2_s
 LIBXUL_LIBRARY = 1
 
 # we don't want the shared lib, but we want to force the creation of a static lib.
 FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
 
--- a/image/decoders/icon/os2/moz.build
+++ b/image/decoders/icon/os2/moz.build
@@ -5,8 +5,10 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULE = 'imgicon'
 
 CPP_SOURCES += [
     'nsIconChannel.cpp',
 ]
 
+LIBRARY_NAME = 'imgiconos2_s'
+
--- a/image/decoders/icon/qt/Makefile.in
+++ b/image/decoders/icon/qt/Makefile.in
@@ -4,17 +4,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME	= imgiconqt_s
 LIBXUL_LIBRARY	= 1
 
 
 LOCAL_INCLUDES += $(MOZ_QT_CFLAGS)
 
 # we don't want the shared lib, but we want to force the creation of a static lib.
 FORCE_STATIC_LIB = 1
 
--- a/image/decoders/icon/qt/moz.build
+++ b/image/decoders/icon/qt/moz.build
@@ -10,8 +10,11 @@ MODULE = 'imgicon'
 
 CPP_SOURCES += [
     'nsIconChannel.cpp',
 ]
 
 EXTRA_PP_COMPONENTS += [
     'gtkqticonsconverter.js',
 ]
+
+LIBRARY_NAME = 'imgiconqt_s'
+
--- a/image/decoders/icon/win/Makefile.in
+++ b/image/decoders/icon/win/Makefile.in
@@ -5,17 +5,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME	= imgiconwin_s
 LIBXUL_LIBRARY = 1
 FAIL_ON_WARNINGS = 1
 
 # we don't want the shared lib, but we want to force the creation of a static lib.
 FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
 
--- a/image/decoders/icon/win/moz.build
+++ b/image/decoders/icon/win/moz.build
@@ -5,8 +5,10 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULE = 'imgicon'
 
 CPP_SOURCES += [
     'nsIconChannel.cpp',
 ]
 
+LIBRARY_NAME = 'imgiconwin_s'
+
--- a/image/decoders/moz.build
+++ b/image/decoders/moz.build
@@ -33,8 +33,11 @@ CPP_SOURCES += [
     'nsJPEGDecoder.cpp',
     'nsPNGDecoder.cpp',
 ]
 
 if CONFIG['MOZ_WBMP']:
     CPP_SOURCES += [
         'nsWBMPDecoder.cpp',
     ]
+
+LIBRARY_NAME = 'imgdecoders_s'
+
--- a/image/encoders/bmp/Makefile.in
+++ b/image/encoders/bmp/Makefile.in
@@ -4,17 +4,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME	= imgbmpe_s
 FORCE_STATIC_LIB = 1
 MODULE_NAME	= imgEncoderBMPModule
 LIBXUL_LIBRARY = 1
 FAIL_ON_WARNINGS = 1
 
 LOCAL_INCLUDES += -I$(topsrcdir)/image/src/
 
 include $(topsrcdir)/config/rules.mk
--- a/image/encoders/bmp/moz.build
+++ b/image/encoders/bmp/moz.build
@@ -5,8 +5,10 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULE = 'imgbmpe'
 
 CPP_SOURCES += [
     'nsBMPEncoder.cpp',
 ]
 
+LIBRARY_NAME = 'imgbmpe_s'
+
--- a/image/encoders/ico/Makefile.in
+++ b/image/encoders/ico/Makefile.in
@@ -4,17 +4,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME	= imgicoe_s
 FORCE_STATIC_LIB = 1
 MODULE_NAME	= imgEncoderICOModule
 LIBXUL_LIBRARY = 1
 FAIL_ON_WARNINGS = 1
 
 # Decoders need RasterImage.h
 LOCAL_INCLUDES += -I$(topsrcdir)/image/src/
 LOCAL_INCLUDES += -I$(topsrcdir)/image/encoders/bmp/
--- a/image/encoders/ico/moz.build
+++ b/image/encoders/ico/moz.build
@@ -5,8 +5,10 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULE = 'imgicoe'
 
 CPP_SOURCES += [
     'nsICOEncoder.cpp',
 ]
 
+LIBRARY_NAME = 'imgicoe_s'
+
--- a/image/encoders/jpeg/Makefile.in
+++ b/image/encoders/jpeg/Makefile.in
@@ -4,17 +4,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME	= imgjpege_s
 FORCE_STATIC_LIB = 1
 MODULE_NAME	= imgEncoderJPEGModule
 LIBXUL_LIBRARY = 1
 FAIL_ON_WARNINGS = 1
 
 include $(topsrcdir)/config/rules.mk
 
 
--- a/image/encoders/jpeg/moz.build
+++ b/image/encoders/jpeg/moz.build
@@ -5,8 +5,10 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULE = 'imgjpege'
 
 CPP_SOURCES += [
     'nsJPEGEncoder.cpp',
 ]
 
+LIBRARY_NAME = 'imgjpege_s'
+
--- a/image/encoders/png/Makefile.in
+++ b/image/encoders/png/Makefile.in
@@ -4,17 +4,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME	= imgpnge_s
 FORCE_STATIC_LIB = 1
 MODULE_NAME	= imgEncoderPNGModule
 LIBXUL_LIBRARY = 1
 FAIL_ON_WARNINGS = 1
 
 DEFINES		+= -DMOZ_PNG_WRITE \
 	-DMOZ_PNG_READ \
 	$(NULL)
--- a/image/encoders/png/moz.build
+++ b/image/encoders/png/moz.build
@@ -5,8 +5,10 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULE = 'imgpnge'
 
 CPP_SOURCES += [
     'nsPNGEncoder.cpp',
 ]
 
+LIBRARY_NAME = 'imgpnge_s'
+
--- a/intl/build/Makefile.in
+++ b/intl/build/Makefile.in
@@ -4,17 +4,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME	= i18n
 EXPORT_LIBRARY = 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsI18nModule
 LIBXUL_LIBRARY = 1
 
 # see also intl/locale/src/Makefile.in
 ifneq (,$(filter os2 windows, $(MOZ_WIDGET_TOOLKIT)))
 LOCALE_DIR		= $(MOZ_WIDGET_TOOLKIT)
--- a/intl/build/moz.build
+++ b/intl/build/moz.build
@@ -5,8 +5,10 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULE = 'i18n'
 
 CPP_SOURCES += [
     'nsI18nModule.cpp',
 ]
 
+LIBRARY_NAME = 'i18n'
+
--- a/intl/chardet/src/Makefile.in
+++ b/intl/chardet/src/Makefile.in
@@ -5,16 +5,15 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME	= chardet
 EXPORT_LIBRARY = 1
 IS_COMPONENT = 1
 MODULE_NAME = nsChardetModule
 LIBXUL_LIBRARY  = 1
 
 
 include $(topsrcdir)/config/rules.mk
--- a/intl/chardet/src/moz.build
+++ b/intl/chardet/src/moz.build
@@ -6,8 +6,10 @@
 
 MODULE = 'chardet'
 
 CPP_SOURCES += [
     'nsChardetModule.cpp',
     'nsCyrillicDetector.cpp',
 ]
 
+LIBRARY_NAME = 'chardet'
+
--- a/intl/hyphenation/src/Makefile.in
+++ b/intl/hyphenation/src/Makefile.in
@@ -4,16 +4,15 @@
 
 DEPTH           = @DEPTH@
 topsrcdir       = @top_srcdir@
 srcdir          = @srcdir@
 VPATH           = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME     = hyphenation_s
 MSVC_ENABLE_PGO := 1
 LIBXUL_LIBRARY   = 1
 
 CSRCS            = hyphen.c \
                    $(NULL)
 
 include $(topsrcdir)/config/rules.mk
--- a/intl/hyphenation/src/moz.build
+++ b/intl/hyphenation/src/moz.build
@@ -7,8 +7,10 @@
 MODULE = 'hyphenation'
 
 CPP_SOURCES += [
     'hnjstdio.cpp',
     'nsHyphenationManager.cpp',
     'nsHyphenator.cpp',
 ]
 
+LIBRARY_NAME = 'hyphenation_s'
+
--- a/intl/locale/src/Makefile.in
+++ b/intl/locale/src/Makefile.in
@@ -5,17 +5,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME	= nslocale_s
 MSVC_ENABLE_PGO := 1
 LIBXUL_LIBRARY  = 1
 
 ifeq ($(MOZ_WIDGET_TOOLKIT), qt)
 OS_INCLUDES	+= $(MOZ_QT_CFLAGS)
 endif
 
 EXPORT_RESOURCE = \
--- a/intl/locale/src/mac/Makefile.in
+++ b/intl/locale/src/mac/Makefile.in
@@ -4,16 +4,15 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME	= platlocale_s
 FORCE_STATIC_LIB	= 1
 LIBXUL_LIBRARY  = 1
 
 
 include $(topsrcdir)/config/rules.mk
 
 INCLUDES	+= -I$(srcdir)/..
--- a/intl/locale/src/mac/moz.build
+++ b/intl/locale/src/mac/moz.build
@@ -7,8 +7,10 @@
 MODULE = 'locale'
 
 CPP_SOURCES += [
     'nsCollationMacUC.cpp',
     'nsDateTimeFormatMac.cpp',
     'nsMacCharset.cpp',
 ]
 
+LIBRARY_NAME = 'platlocale_s'
+
--- a/intl/locale/src/moz.build
+++ b/intl/locale/src/moz.build
@@ -24,8 +24,10 @@ CPP_SOURCES += [
     'nsCollation.cpp',
     'nsLanguageAtomService.cpp',
     'nsLocale.cpp',
     'nsLocaleService.cpp',
     'nsScriptableDateFormat.cpp',
     'nsUConvPropertySearch.cpp',
 ]
 
+LIBRARY_NAME = 'nslocale_s'
+
--- a/intl/locale/src/os2/Makefile.in
+++ b/intl/locale/src/os2/Makefile.in
@@ -5,17 +5,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME	= platlocale_s
 EXPORT_LIBRARY = 1
 FORCE_STATIC_LIB	= 1
 LIBXUL_LIBRARY  = 1
 
 
 include $(topsrcdir)/config/rules.mk
 
 INCLUDES	+= -I$(srcdir)/..
--- a/intl/locale/src/os2/moz.build
+++ b/intl/locale/src/os2/moz.build
@@ -8,8 +8,10 @@ MODULE = 'locale'
 
 CPP_SOURCES += [
     'nsCollationOS2.cpp',
     'nsDateTimeFormatOS2.cpp',
     'nsOS2Charset.cpp',
     'nsOS2Locale.cpp',
 ]
 
+LIBRARY_NAME = 'platlocale_s'
+
--- a/intl/locale/src/unix/Makefile.in
+++ b/intl/locale/src/unix/Makefile.in
@@ -5,17 +5,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME	= platlocale_s
 FORCE_STATIC_LIB= 1
 LIBXUL_LIBRARY  = 1
 
 include $(topsrcdir)/config/rules.mk
 
 INCLUDES	+= -I$(srcdir)/..
 
 # CODESET is not automatically defined on some older versions of Redhat.
--- a/intl/locale/src/unix/moz.build
+++ b/intl/locale/src/unix/moz.build
@@ -15,8 +15,11 @@ CPP_SOURCES += [
 if CONFIG['OS_TARGET'] == 'Android':
     CPP_SOURCES += [
         'nsAndroidCharset.cpp',
     ]
 else:
     CPP_SOURCES += [
         'nsUNIXCharset.cpp',
     ]
+
+LIBRARY_NAME = 'platlocale_s'
+
--- a/intl/locale/src/windows/Makefile.in
+++ b/intl/locale/src/windows/Makefile.in
@@ -5,17 +5,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME	= platlocale_s
 FORCE_STATIC_LIB	= 1
 LIBXUL_LIBRARY  = 1
 
 
 include $(topsrcdir)/config/rules.mk
 
 INCLUDES	+= -I$(srcdir)/..
 
--- a/intl/locale/src/windows/moz.build
+++ b/intl/locale/src/windows/moz.build
@@ -8,8 +8,10 @@ MODULE = 'locale'
 
 CPP_SOURCES += [
     'nsCollationWin.cpp',
     'nsDateTimeFormatWin.cpp',
     'nsWin32Locale.cpp',
     'nsWinCharset.cpp',
 ]
 
+LIBRARY_NAME = 'platlocale_s'
+
--- a/intl/lwbrk/src/Makefile.in
+++ b/intl/lwbrk/src/Makefile.in
@@ -5,17 +5,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME	= lwbrk_s
 MSVC_ENABLE_PGO := 1
 FORCE_STATIC_LIB = 1
 LIBXUL_LIBRARY  = 1
 
 
 ifeq  ($(MOZ_WIDGET_TOOLKIT),gtk2)
 else
 ifeq  ($(MOZ_WIDGET_TOOLKIT),gtk3)
--- a/intl/lwbrk/src/moz.build
+++ b/intl/lwbrk/src/moz.build
@@ -23,8 +23,11 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'wi
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
     CPP_SOURCES += [
         'nsCarbonBreaker.cpp',
     ]
 else:
     CPP_SOURCES += [
         'nsRuleBreaker.cpp',
     ]
+
+LIBRARY_NAME = 'lwbrk_s'
+
--- a/intl/strres/src/Makefile.in
+++ b/intl/strres/src/Makefile.in
@@ -5,15 +5,14 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME	= strres_s
 MSVC_ENABLE_PGO := 1
 FORCE_STATIC_LIB = 1
 LIBXUL_LIBRARY  = 1
 
 
 include $(topsrcdir)/config/rules.mk
--- a/intl/strres/src/moz.build
+++ b/intl/strres/src/moz.build
@@ -6,8 +6,10 @@
 
 MODULE = 'intl'
 
 CPP_SOURCES += [
     'nsStringBundle.cpp',
     'nsStringBundleTextOverride.cpp',
 ]
 
+LIBRARY_NAME = 'strres_s'
+
--- a/intl/uconv/src/Makefile.in
+++ b/intl/uconv/src/Makefile.in
@@ -5,17 +5,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME	= uconv
 MSVC_ENABLE_PGO := 1
 EXPORT_LIBRARY  = 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsUConvModule
 LIBXUL_LIBRARY = 1
 
 LOCAL_INCLUDES	= -I$(srcdir)/../util \
 		  -I$(srcdir)/../ucvlatin \
--- a/intl/uconv/src/moz.build
+++ b/intl/uconv/src/moz.build
@@ -23,8 +23,11 @@ CPP_SOURCES += [
     'nsUnicodeToMacRoman.cpp',
     'nsUnicodeToUTF8.cpp',
 ]
 
 if CONFIG['INTEL_ARCHITECTURE']:
     CPP_SOURCES += [
         'nsUTF8ToUnicodeSSE2.cpp',
     ]
+
+LIBRARY_NAME = 'uconv'
+
--- a/intl/uconv/ucvcn/Makefile.in
+++ b/intl/uconv/ucvcn/Makefile.in
@@ -5,16 +5,15 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME	= ucvcn_s
 FORCE_STATIC_LIB=1
 LIBXUL_LIBRARY = 1
 
 
 LOCAL_INCLUDES = -I$(srcdir)/../util
 
 include $(topsrcdir)/config/rules.mk
--- a/intl/uconv/ucvcn/moz.build
+++ b/intl/uconv/ucvcn/moz.build
@@ -16,8 +16,10 @@ CPP_SOURCES += [
     'nsHZToUnicode.cpp',
     'nsISO2022CNToUnicode.cpp',
     'nsUnicodeToGB2312V2.cpp',
     'nsUnicodeToGBK.cpp',
     'nsUnicodeToHZ.cpp',
     'nsUnicodeToISO2022CN.cpp',
 ]
 
+LIBRARY_NAME = 'ucvcn_s'
+
--- a/intl/uconv/ucvibm/Makefile.in
+++ b/intl/uconv/ucvibm/Makefile.in
@@ -5,15 +5,14 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME	= ucvibm_s
 FORCE_STATIC_LIB = 1
 LIBXUL_LIBRARY = 1
 
 LOCAL_INCLUDES = -I$(srcdir)/../util
 
 include $(topsrcdir)/config/rules.mk
--- a/intl/uconv/ucvibm/moz.build
+++ b/intl/uconv/ucvibm/moz.build
@@ -29,8 +29,11 @@ if CONFIG['OS_ARCH'] == 'OS2':
     CPP_SOURCES += [
         'nsCP869ToUnicode.cpp',
         'nsUnicodeToCP869.cpp',
         'nsCP1125ToUnicode.cpp',
         'nsUnicodeToCP1125.cpp',
         'nsCP1131ToUnicode.cpp',
         'nsUnicodeToCP1131.cpp',
     ]
+
+LIBRARY_NAME = 'ucvibm_s'
+
--- a/intl/uconv/ucvja/Makefile.in
+++ b/intl/uconv/ucvja/Makefile.in
@@ -5,17 +5,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME	= ucvja_s
 FORCE_STATIC_LIB = 1
 LIBXUL_LIBRARY = 1
 
 
 LOCAL_INCLUDES	= -I$(srcdir)/../util
 
 include $(topsrcdir)/config/rules.mk
 
--- a/intl/uconv/ucvja/moz.build
+++ b/intl/uconv/ucvja/moz.build
@@ -14,8 +14,10 @@ EXPORTS += [
 CPP_SOURCES += [
     'nsJapaneseToUnicode.cpp',
     'nsUnicodeToEUCJP.cpp',
     'nsUnicodeToISO2022JP.cpp',
     'nsUnicodeToJISx0201.cpp',
     'nsUnicodeToSJIS.cpp',
 ]
 
+LIBRARY_NAME = 'ucvja_s'
+
--- a/intl/uconv/ucvko/Makefile.in
+++ b/intl/uconv/ucvko/Makefile.in
@@ -5,17 +5,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME	= ucvko_s
 FORCE_STATIC_LIB=1
 LIBXUL_LIBRARY = 1
 
 
 LOCAL_INCLUDES = -I$(srcdir)/../util
 
 include $(topsrcdir)/config/rules.mk
 
--- a/intl/uconv/ucvko/moz.build
+++ b/intl/uconv/ucvko/moz.build
@@ -13,8 +13,10 @@ EXPORTS += [
 CPP_SOURCES += [
     'nsCP949ToUnicode.cpp',
     'nsISO2022KRToUnicode.cpp',
     'nsJohabToUnicode.cpp',
     'nsUnicodeToCP949.cpp',
     'nsUnicodeToJohab.cpp',
 ]
 
+LIBRARY_NAME = 'ucvko_s'
+
--- a/intl/uconv/ucvlatin/Makefile.in
+++ b/intl/uconv/ucvlatin/Makefile.in
@@ -5,16 +5,15 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME	= ucvlatin_s
 FORCE_STATIC_LIB = 1
 LIBXUL_LIBRARY = 1
 
 
 LOCAL_INCLUDES = -I$(srcdir)/../util -I$(srcdir)/../src
 
 include $(topsrcdir)/config/rules.mk
--- a/intl/uconv/ucvlatin/moz.build
+++ b/intl/uconv/ucvlatin/moz.build
@@ -122,8 +122,10 @@ CPP_SOURCES += [
     'nsUnicodeToVISCII.cpp',
     'nsUnicodeToVPS.cpp',
     'nsUnicodeToZapfDingbat.cpp',
     'nsUserDefinedToUnicode.cpp',
     'nsVISCIIToUnicode.cpp',
     'nsVPSToUnicode.cpp',
 ]
 
+LIBRARY_NAME = 'ucvlatin_s'
+
--- a/intl/uconv/ucvtw/Makefile.in
+++ b/intl/uconv/ucvtw/Makefile.in
@@ -5,16 +5,15 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME	= ucvtw_s
 FORCE_STATIC_LIB=1
 LIBXUL_LIBRARY = 1
 
 
 LOCAL_INCLUDES = -I$(srcdir)/../util
 
 include $(topsrcdir)/config/rules.mk
--- a/intl/uconv/ucvtw/moz.build
+++ b/intl/uconv/ucvtw/moz.build
@@ -13,8 +13,10 @@ EXPORTS += [
 CPP_SOURCES += [
     'nsBIG5HKSCSToUnicode.cpp',
     'nsBIG5ToUnicode.cpp',
     'nsUnicodeToBIG5.cpp',
     'nsUnicodeToBIG5HKSCS.cpp',
     'nsUnicodeToHKSCS.cpp',
 ]
 
+LIBRARY_NAME = 'ucvtw_s'
+
--- a/intl/uconv/ucvtw2/Makefile.in
+++ b/intl/uconv/ucvtw2/Makefile.in
@@ -5,17 +5,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME	= ucvtw2_s
 FORCE_STATIC_LIB=1
 LIBXUL_LIBRARY = 1
 
 
 LOCAL_INCLUDES	= -I$(srcdir)/../util
 
 include $(topsrcdir)/config/rules.mk
 
--- a/intl/uconv/ucvtw2/moz.build
+++ b/intl/uconv/ucvtw2/moz.build
@@ -10,8 +10,10 @@ EXPORTS += [
     'nsUCvTW2CID.h',
 ]
 
 CPP_SOURCES += [
     'nsEUCTWToUnicode.cpp',
     'nsUnicodeToEUCTW.cpp',
 ]
 
+LIBRARY_NAME = 'ucvtw2_s'
+
--- a/intl/uconv/util/Makefile.in
+++ b/intl/uconv/util/Makefile.in
@@ -5,17 +5,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME	= ucvutil_s
 MSVC_ENABLE_PGO := 1
 EXPORT_LIBRARY = 1
 FORCE_STATIC_LIB = 1
 LIBXUL_LIBRARY = 1
 
 MODULE_NAME	= nsUCUtil
 
 CSRCS		= \
--- a/intl/uconv/util/moz.build
+++ b/intl/uconv/util/moz.build
@@ -8,8 +8,10 @@ MODULE = 'uconv'
 
 CPP_SOURCES += [
     'nsUCConstructors.cpp',
     'nsUCSupport.cpp',
     'nsUnicodeDecodeHelper.cpp',
     'nsUnicodeEncodeHelper.cpp',
 ]
 
+LIBRARY_NAME = 'ucvutil_s'
+
--- a/intl/unicharutil/src/Makefile.in
+++ b/intl/unicharutil/src/Makefile.in
@@ -5,13 +5,12 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME	= ucharucomp_s
 FORCE_STATIC_LIB = 1
 LIBXUL_LIBRARY = 1
 
 include $(topsrcdir)/config/rules.mk
--- a/intl/unicharutil/src/moz.build
+++ b/intl/unicharutil/src/moz.build
@@ -9,8 +9,10 @@ MODULE = 'unicharutil'
 CPP_SOURCES += [
     'nsCaseConversionImp2.cpp',
     'nsCategoryImp.cpp',
     'nsEntityConverter.cpp',
     'nsSaveAsCharset.cpp',
     'nsUnicodeNormalizer.cpp',
 ]
 
+LIBRARY_NAME = 'ucharucomp_s'
+
--- a/intl/unicharutil/util/Makefile.in
+++ b/intl/unicharutil/util/Makefile.in
@@ -11,17 +11,16 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 # This makefile builds the unicharutil_external_s library which should be used
 # by frozen (dependent) linkage components. Internal-linkage code should use
 # unicharutil_s which is built in the internal/ subdirectory.
 
 include $(srcdir)/objs.mk
 
-LIBRARY_NAME=unicharutil_external_s
 DIST_INSTALL = 1
 SDK_LIBRARY = $(LIBRARY)
 
 
 SDK_HEADERS = \
 	nsUnicharUtils.h \
 	$(NULL)
 
--- a/intl/unicharutil/util/internal/Makefile.in
+++ b/intl/unicharutil/util/internal/Makefile.in
@@ -9,17 +9,16 @@ srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 # This makefile builds the version of unicharutils_s static library which uses
 # internal linkage. Components that use frozen (external) linkage should use
 # unicharutil_external_s.
 
-LIBRARY_NAME=unicharutil_s
 DIST_INSTALL = 1
 EXPORT_LIBRARY = 1
 MOZILLA_INTERNAL_API = 1
 
 include $(srcdir)/../objs.mk
 
 EXTRA_DEPS += $(srcdir)/../objs.mk
 
--- a/intl/unicharutil/util/internal/moz.build
+++ b/intl/unicharutil/util/internal/moz.build
@@ -5,8 +5,10 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULE = 'unicharutil'
 
 CPP_SOURCES += [
     '$(INTL_UNICHARUTIL_UTIL_LCPPSRCS)',
 ]
 
+LIBRARY_NAME = 'unicharutil_s'
+
--- a/intl/unicharutil/util/moz.build
+++ b/intl/unicharutil/util/moz.build
@@ -17,8 +17,10 @@ EXPORTS += [
 
 CPP_SOURCES += [
     'nsBidiUtils.cpp',
     'nsSpecialCasingData.cpp',
     'nsUnicharUtils.cpp',
     'nsUnicodeProperties.cpp',
 ]
 
+LIBRARY_NAME = 'unicharutil_external_s'
+
--- a/js/ductwork/debugger/Makefile.in
+++ b/js/ductwork/debugger/Makefile.in
@@ -7,17 +7,16 @@ topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
 relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE_NAME = jsdebugger
 
-LIBRARY_NAME = jsdebugger
 LIBXUL_LIBRARY = 1
 EXPORT_LIBRARY = 1
 IS_COMPONENT = 1
 
 EXTRA_DSO_LDOPTS += \
   $(MOZ_COMPONENT_LIBS) \
   $(MOZ_JS_LIBS) \
   $(NULL)
--- a/js/ductwork/debugger/moz.build
+++ b/js/ductwork/debugger/moz.build
@@ -10,8 +10,11 @@ XPIDL_SOURCES += [
 
 MODULE = 'jsdebugger'
 
 XPCSHELL_TESTS_MANIFESTS += ['tests/xpcshell.ini']
 
 CPP_SOURCES += [
     'JSDebugger.cpp',
 ]
+
+LIBRARY_NAME = 'jsdebugger'
+
--- a/js/jsd/Makefile.in
+++ b/js/jsd/Makefile.in
@@ -9,17 +9,16 @@
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 VPATH		= @srcdir@
 srcdir		= @srcdir@
 relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME	= jsd
 IS_COMPONENT = 1
 LIBXUL_LIBRARY = 1
 
 MODULE_NAME = JavaScript_Debugger
 EXPORT_LIBRARY = 1
 
 # REQUIRES	= java js
 
--- a/js/jsd/moz.build
+++ b/js/jsd/moz.build
@@ -25,8 +25,11 @@ CPP_SOURCES += [
     'jsd_stak.cpp',
     'jsd_step.cpp',
     'jsd_text.cpp',
     'jsd_val.cpp',
     'jsd_xpc.cpp',
     'jsdebug.cpp',
     'jshash.cpp',
 ]
+
+LIBRARY_NAME = 'jsd'
+
--- a/js/src/editline/Makefile.in
+++ b/js/src/editline/Makefile.in
@@ -6,17 +6,16 @@
 
 DEPTH = @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH           = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME = editline
 FORCE_STATIC_LIB = 1
 
 CSRCS = editline.c sysunix.c
 
 DEFINES += -DANSI_ARROWS -DHAVE_TCGETATTR -DHIDE -DUSE_DIRENT -DSYS_UNIX \
 	-DHAVE_STDLIB -DUNIQUE_HISTORY
 
 include $(topsrcdir)/config/rules.mk
--- a/js/src/editline/moz.build
+++ b/js/src/editline/moz.build
@@ -1,6 +1,8 @@
 # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+LIBRARY_NAME = 'editline'
+
--- a/js/xpconnect/loader/Makefile.in
+++ b/js/xpconnect/loader/Makefile.in
@@ -5,17 +5,16 @@
 DEPTH 		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 FAIL_ON_WARNINGS := 1
-LIBRARY_NAME	= jsloader_s
 MSVC_ENABLE_PGO := 1
 FORCE_STATIC_LIB = 1
 LIBXUL_LIBRARY = 1
 LOCAL_INCLUDES += \
   -I$(srcdir)/../src \
   -I$(srcdir)/../wrappers \
   -I$(topsrcdir)/content/base/src \
   $(NULL)
--- a/js/xpconnect/loader/moz.build
+++ b/js/xpconnect/loader/moz.build
@@ -7,8 +7,10 @@
 MODULE = 'jsloader'
 
 CPP_SOURCES += [
     'mozJSComponentLoader.cpp',
     'mozJSLoaderUtils.cpp',
     'mozJSSubScriptLoader.cpp',
 ]
 
+LIBRARY_NAME = 'jsloader_s'
+
--- a/js/xpconnect/wrappers/Makefile.in
+++ b/js/xpconnect/wrappers/Makefile.in
@@ -4,17 +4,16 @@
 
 DEPTH 		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME	= xpcwrappers_s
 MSVC_ENABLE_PGO := 1
 FORCE_STATIC_LIB = 1
 LIBXUL_LIBRARY = 1
 ifndef _MSC_VER # warning C4661 for FilteringWrapper
 FAIL_ON_WARNINGS := 1
 endif # !_MSC_VER
 
 LOCAL_INCLUDES = \
--- a/js/xpconnect/wrappers/moz.build
+++ b/js/xpconnect/wrappers/moz.build
@@ -14,8 +14,10 @@ CPP_SOURCES += [
     'AccessCheck.cpp',
     'ChromeObjectWrapper.cpp',
     'FilteringWrapper.cpp',
     'WaiveXrayWrapper.cpp',
     'WrapperFactory.cpp',
     'XrayWrapper.cpp',
 ]
 
+LIBRARY_NAME = 'xpcwrappers_s'
+
--- a/layout/forms/Makefile.in
+++ b/layout/forms/Makefile.in
@@ -5,17 +5,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME	= gkforms_s
 MSVC_ENABLE_PGO := 1
 LIBXUL_LIBRARY	= 1
 FAIL_ON_WARNINGS = 1
 
 # we don't want the shared lib, but we want to force the creation of a static lib.
 FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
--- a/layout/forms/moz.build
+++ b/layout/forms/moz.build
@@ -31,8 +31,10 @@ CPP_SOURCES += [
     'nsListControlFrame.cpp',
     'nsMeterFrame.cpp',
     'nsProgressFrame.cpp',
     'nsRangeFrame.cpp',
     'nsSelectsAreaFrame.cpp',
     'nsTextControlFrame.cpp',
 ]
 
+LIBRARY_NAME = 'gkforms_s'
+
--- a/layout/inspector/src/Makefile.in
+++ b/layout/inspector/src/Makefile.in
@@ -5,17 +5,16 @@
 
 DEPTH=@DEPTH@
 topsrcdir=@top_srcdir@
 srcdir=@srcdir@
 VPATH=@srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME = inspector_s
 LIBXUL_LIBRARY = 1
 FAIL_ON_WARNINGS = 1
 
 FORCE_STATIC_LIB = 1
 
 LOCAL_INCLUDES	+= \
 		-I$(srcdir)/../../style \
 		-I$(topsrcdir)/content/xbl/src \
--- a/layout/inspector/src/moz.build
+++ b/layout/inspector/src/moz.build
@@ -21,8 +21,11 @@ CPP_SOURCES += [
     'nsFontFace.cpp',
     'nsFontFaceList.cpp',
 ]
 
 if CONFIG['MOZ_XUL']:
     CPP_SOURCES += [
         'inDOMView.cpp',
     ]
+
+LIBRARY_NAME = 'inspector_s'
+
--- a/layout/media/Makefile.in
+++ b/layout/media/Makefile.in
@@ -5,17 +5,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME	= gkmedias
 EXPORT_LIBRARY	= $(DIST)/lib
 ifeq (WINNT,$(OS_TARGET))
 FORCE_SHARED_LIB = 1
 endif
 
 SHARED_LIBRARY_LIBS = \
     $(MOZ_OTS_LIBS) \
     $(QCMS_LIBS) \
--- a/layout/media/moz.build
+++ b/layout/media/moz.build
@@ -1,8 +1,10 @@
 # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULE = 'layout'
 
+LIBRARY_NAME = 'gkmedias'
+
--- a/layout/printing/Makefile.in
+++ b/layout/printing/Makefile.in
@@ -4,17 +4,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME	= gkprinting_s
 LIBXUL_LIBRARY	= 1
 FAIL_ON_WARNINGS = 1
 
 FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES += \
--- a/layout/printing/moz.build
+++ b/layout/printing/moz.build
@@ -17,8 +17,10 @@ MODULE = 'layout'
 CPP_SOURCES += [
     'nsPagePrintTimer.cpp',
     'nsPrintData.cpp',
     'nsPrintEngine.cpp',
     'nsPrintObject.cpp',
     'nsPrintPreviewListener.cpp',
 ]
 
+LIBRARY_NAME = 'gkprinting_s'
+
--- a/layout/tables/Makefile.in
+++ b/layout/tables/Makefile.in
@@ -5,17 +5,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME	= gktable_s
 MSVC_ENABLE_PGO := 1
 LIBXUL_LIBRARY	= 1
 FAIL_ON_WARNINGS = 1
 
 # we don't want the shared lib, but we want to force the creation of a static lib.
 FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
--- a/layout/tables/moz.build
+++ b/layout/tables/moz.build
@@ -22,8 +22,10 @@ CPP_SOURCES += [
     'nsTableColGroupFrame.cpp',
     'nsTableFrame.cpp',
     'nsTableOuterFrame.cpp',
     'nsTablePainter.cpp',
     'nsTableRowFrame.cpp',
     'nsTableRowGroupFrame.cpp',
 ]
 
+LIBRARY_NAME = 'gktable_s'
+
--- a/layout/tools/layout-debug/src/Makefile.in
+++ b/layout/tools/layout-debug/src/Makefile.in
@@ -5,17 +5,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME	= gkdebug
 EXPORT_LIBRARY	= 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsLayoutDebugModule
 LIBXUL_LIBRARY	= 1
 FAIL_ON_WARNINGS = 1
 
 
 include $(topsrcdir)/config/rules.mk
--- a/layout/tools/layout-debug/src/moz.build
+++ b/layout/tools/layout-debug/src/moz.build
@@ -17,8 +17,10 @@ EXPORTS += [
 
 CPP_SOURCES += [
     'nsDebugFactory.cpp',
     'nsLayoutDebugCLH.cpp',
     'nsLayoutDebuggingTools.cpp',
     'nsRegressionTester.cpp',
 ]
 
+LIBRARY_NAME = 'gkdebug'
+
--- a/layout/xul/grid/Makefile.in
+++ b/layout/xul/grid/Makefile.in
@@ -5,17 +5,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME	= gkxulgrid_s
 LIBXUL_LIBRARY  = 1
 FAIL_ON_WARNINGS = 1
 
 LOCAL_INCLUDES	= \
 		-I$(srcdir) \
 		-I$(srcdir)/../base/src \
 		-I$(srcdir)/../../generic \
 		-I$(srcdir)/../../style \
--- a/layout/xul/grid/moz.build
+++ b/layout/xul/grid/moz.build
@@ -25,8 +25,10 @@ CPP_SOURCES += [
     'nsGridRow.cpp',
     'nsGridRowGroupFrame.cpp',
     'nsGridRowGroupLayout.cpp',
     'nsGridRowLayout.cpp',
     'nsGridRowLeafFrame.cpp',
     'nsGridRowLeafLayout.cpp',
 ]
 
+LIBRARY_NAME = 'gkxulgrid_s'
+
--- a/layout/xul/tree/Makefile.in
+++ b/layout/xul/tree/Makefile.in
@@ -5,17 +5,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME	= gkxultree_s
 LIBXUL_LIBRARY  = 1
 FAIL_ON_WARNINGS = 1
 
 LOCAL_INCLUDES	= \
 		-I$(srcdir) \
 		-I$(topsrcdir)/content/events/src \
 		-I$(srcdir)/../base/src \
 		-I$(srcdir)/../../base \
--- a/layout/xul/tree/moz.build
+++ b/layout/xul/tree/moz.build
@@ -28,8 +28,10 @@ CPP_SOURCES += [
     'nsTreeColumns.cpp',
     'nsTreeContentView.cpp',
     'nsTreeImageListener.cpp',
     'nsTreeSelection.cpp',
     'nsTreeStyleCache.cpp',
     'nsTreeUtils.cpp',
 ]
 
+LIBRARY_NAME = 'gkxultree_s'
+
--- a/media/kiss_fft/Makefile.in
+++ b/media/kiss_fft/Makefile.in
@@ -4,16 +4,15 @@
 
 DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME = kiss_fft
 ifeq (WINNT,$(OS_TARGET))
 VISIBILITY_FLAGS =
 endif
 DISABLED_CSRCS = kiss_fft.c kiss_fftr.c
 
 include $(topsrcdir)/config/rules.mk
 
--- a/media/kiss_fft/moz.build
+++ b/media/kiss_fft/moz.build
@@ -10,8 +10,11 @@ EXPORTS.kiss_fft += [
     'kiss_fft.h',
     'kiss_fftr.h',
 ]
 
 CSRCS += [
     'kiss_fft.c',
     'kiss_fftr.c',
 ]
+
+LIBRARY_NAME = 'kiss_fft'
+
--- a/media/libcubeb/src/Makefile.in
+++ b/media/libcubeb/src/Makefile.in
@@ -4,17 +4,16 @@
 
 DEPTH           = @DEPTH@
 topsrcdir       = @top_srcdir@
 srcdir          = @srcdir@
 VPATH           = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME    = cubeb
 MSVC_ENABLE_PGO := 1
 FORCE_STATIC_LIB= 1
 ifeq ($(OS_TARGET),WINNT)
 VISIBILITY_FLAGS =
 endif
 
 DISABLED_CSRCS           = \
                 cubeb.c \
--- a/media/libcubeb/src/moz.build
+++ b/media/libcubeb/src/moz.build
@@ -38,8 +38,11 @@ if CONFIG['OS_TARGET'] == 'WINNT':
 if CONFIG['OS_TARGET'] == 'Android':
     CSRCS += [
         'cubeb_opensl.c',
     ]
     if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'gonk':
         CSRCS += [
             'cubeb_audiotrack.c',
         ]
+
+LIBRARY_NAME = 'cubeb'
+
--- a/media/libjpeg/Makefile.in
+++ b/media/libjpeg/Makefile.in
@@ -5,17 +5,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME	= mozjpeg
 MSVC_ENABLE_PGO := 1
 
 ifeq ($(OS_ARCH),WINNT)
 VISIBILITY_FLAGS	=
 endif
 
 DISABLED_CSRCS		= \
 		jcomapi.c \
--- a/media/libjpeg/moz.build
+++ b/media/libjpeg/moz.build
@@ -12,17 +12,16 @@ EXPORTS += [
     'jconfig.h',
     'jerror.h',
     'jinclude.h',
     'jmorecfg.h',
     'jpegint.h',
     'jpeglib.h',
 ]
 
-
 if CONFIG['LIBJPEG_TURBO_X64_ASM']:
     ASFILES += [
         'simd/jccolss2-64.asm',
         'simd/jcgrass2-64.asm',
         'simd/jcqnts2f-64.asm',
         'simd/jcqnts2i-64.asm',
         'simd/jcsamss2-64.asm',
         'simd/jdcolss2-64.asm',
@@ -122,25 +121,27 @@ CSRCS += [
     'jcmaster.c',
     'jcparam.c',
     'jcphuff.c',
     'jcprepct.c',
     'jcsample.c',
     'jctrans.c',
 ]
 
-
 if CONFIG['LIBJPEG_TURBO_ARM_ASM']:
     CSRCS += [
         'simd/jsimd_arm.c',
     ]
 elif CONFIG['LIBJPEG_TURBO_X64_ASM']:
     CSRCS += [
         'simd/jsimd_x86_64.c',
     ]
 elif CONFIG['LIBJPEG_TURBO_X86_ASM']:
     CSRCS += [
         'simd/jsimd_i386.c',
     ]
 else: # No SIMD support?
     CSRCS += [
         'jsimd_none.c',
     ]
+
+LIBRARY_NAME = 'mozjpeg'
+
--- a/media/libnestegg/src/Makefile.in
+++ b/media/libnestegg/src/Makefile.in
@@ -4,17 +4,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME	= nestegg
 MSVC_ENABLE_PGO := 1
 FORCE_STATIC_LIB= 1
 ifeq (WINNT,$(OS_TARGET))
 VISIBILITY_FLAGS =
 endif
 
 DISABLED_CSRCS		= \
 		nestegg.c \
--- a/media/libnestegg/src/moz.build
+++ b/media/libnestegg/src/moz.build
@@ -5,8 +5,11 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULE = 'nestegg'
 
 CSRCS += [
     'halloc.c',
     'nestegg.c',
 ]
+
+LIBRARY_NAME = 'nestegg'
+
--- a/media/libogg/src/Makefile.in
+++ b/media/libogg/src/Makefile.in
@@ -4,17 +4,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME	= ogg
 MSVC_ENABLE_PGO := 1
 FORCE_STATIC_LIB= 1
 ifeq (WINNT,$(OS_TARGET))
 VISIBILITY_FLAGS =
 endif
 
 DISABLED_CSRCS		= \
 		ogg_bitwise.c \
--- a/media/libogg/src/moz.build
+++ b/media/libogg/src/moz.build
@@ -5,8 +5,11 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULE = 'ogg'
 
 CSRCS += [
     'ogg_bitwise.c',
     'ogg_framing.c',
 ]
+
+LIBRARY_NAME = 'ogg'
+
--- a/media/libopus/Makefile.in
+++ b/media/libopus/Makefile.in
@@ -4,17 +4,16 @@
 
 DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME = opus
 MSVC_ENABLE_PGO := 1
 FORCE_STATIC_LIB= 1
 
 DEFINES += \
   -DOPUS_BUILD \
   -DOPUS_VERSION='"draft-11-mozilla"' \
   -DUSE_ALLOCA \
   -Drestrict= \
--- a/media/libopus/moz.build
+++ b/media/libopus/moz.build
@@ -8,8 +8,10 @@ MODULE = 'opus'
 
 EXPORTS.opus += [
     'include/opus.h',
     'include/opus_defines.h',
     'include/opus_multistream.h',
     'include/opus_types.h',
 ]
 
+LIBRARY_NAME = 'opus'
+
--- a/media/libpng/Makefile.in
+++ b/media/libpng/Makefile.in
@@ -5,17 +5,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME	= mozpng
 MSVC_ENABLE_PGO := 1
 FORCE_STATIC_LIB= 1
 ifeq ($(OS_ARCH),WINNT)
 VISIBILITY_FLAGS=
 endif
 
 
 DISABLED_CSRCS		= \
--- a/media/libpng/moz.build
+++ b/media/libpng/moz.build
@@ -28,8 +28,11 @@ CSRCS += [
     'pngrio.c',
     'pngrtran.c',
     'pngrutil.c',
     'pngwio.c',
     'pngwrite.c',
     'pngwtran.c',
     'pngwutil.c',
 ]
+
+LIBRARY_NAME = 'mozpng'
+
--- a/media/libsoundtouch/src/Makefile.in
+++ b/media/libsoundtouch/src/Makefile.in
@@ -4,17 +4,16 @@
 
 DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME = soundtouch
 MSVC_ENABLE_PGO := 1
 SHORT_LIBNAME = soundt
 VISIBILITY_FLAGS =
 EXTRA_DSO_LDOPTS += $(MOZALLOC_LIB)
 
 # Use abort() instead of exception in SoundTouch.
 DEFINES += -DST_NO_EXCEPTION_HANDLING=1
 
--- a/media/libsoundtouch/src/moz.build
+++ b/media/libsoundtouch/src/moz.build
@@ -27,8 +27,11 @@ if CONFIG['INTEL_ARCHITECTURE']:
     if CONFIG['MOZ_SAMPLE_TYPE_FLOAT32']:
         CPP_SOURCES += [
             'sse_optimized.cpp',
         ]
     else:
         CPP_SOURCES += [
             'mmx_optimized.cpp',
         ]
+
+LIBRARY_NAME = 'soundtouch'
+
--- a/media/libspeex_resampler/src/Makefile.in
+++ b/media/libspeex_resampler/src/Makefile.in
@@ -4,17 +4,16 @@
 
 DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME = speex_resampler
 MSVC_ENABLE_PGO := 1
 FORCE_STATIC_LIB = 1
 
 # We don't compile the full speex codec, only the resampler.
 DEFINES += -DOUTSIDE_SPEEX
 # Speex wants a random prefix when building in another program, to avoid name
 # clashes
 DEFINES += -DRANDOM_PREFIX=speex
--- a/media/libspeex_resampler/src/moz.build
+++ b/media/libspeex_resampler/src/moz.build
@@ -7,8 +7,10 @@
 MODULE = 'speex_resampler'
 
 EXPORTS.speex += [
     'speex_config_types.h',
     'speex_resampler.h',
     'speex_types.h',
 ]
 
+LIBRARY_NAME = 'speex_resampler'
+
--- a/media/libtheora/lib/Makefile.in
+++ b/media/libtheora/lib/Makefile.in
@@ -3,17 +3,16 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME     = theora
 MSVC_ENABLE_PGO := 1
 FORCE_STATIC_LIB = 1
 ifeq (WINNT,$(OS_TARGET))
 VISIBILITY_FLAGS =
 endif
 
 # The encoder is currently not included.
 DEFINES += -DTHEORA_DISABLE_ENCODE
--- a/media/libtheora/lib/moz.build
+++ b/media/libtheora/lib/moz.build
@@ -1,8 +1,10 @@
 # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULE = 'theora'
 
+LIBRARY_NAME = 'theora'
+
--- a/media/libtremor/lib/Makefile.in
+++ b/media/libtremor/lib/Makefile.in
@@ -4,17 +4,16 @@
 
 DEPTH  = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir  = @srcdir@
 VPATH  = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME = tremor
 FORCE_STATIC_LIB= 1
 LOCAL_INCLUDES += -I$(topsrcdir)/media/libtremor/include/tremor
 
 CSRCS  = \
   tremor_block.c \
   tremor_codebook.c \
   tremor_floor1.c \
   tremor_floor0.c \
--- a/media/libtremor/lib/moz.build
+++ b/media/libtremor/lib/moz.build
@@ -1,8 +1,10 @@
 # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULE = 'tremor'
 
+LIBRARY_NAME = 'tremor'
+
--- a/media/libvorbis/lib/Makefile.in
+++ b/media/libvorbis/lib/Makefile.in
@@ -4,17 +4,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME	= vorbis
 MSVC_ENABLE_PGO := 1
 FORCE_STATIC_LIB= 1
 ifeq (WINNT,$(OS_TARGET))
 VISIBILITY_FLAGS =
 endif
 
 CSRCS		= \
 		vorbis_mdct.c \
--- a/media/libvorbis/lib/moz.build
+++ b/media/libvorbis/lib/moz.build
@@ -1,8 +1,10 @@
 # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULE = 'vorbis'
 
+LIBRARY_NAME = 'vorbis'
+
--- a/media/libvpx/Makefile.in
+++ b/media/libvpx/Makefile.in
@@ -7,17 +7,16 @@ DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 DEFINES += -DHAVE_CONFIG_H=vpx_config.h
 
-LIBRARY_NAME = vpx
 MSVC_ENABLE_PGO := 1
 FORCE_STATIC_LIB= 1
 ifeq (WINNT,$(OS_TARGET))
 VISIBILITY_FLAGS =
 endif
 
 LOCAL_INCLUDES += \
   -I. \
--- a/media/libvpx/moz.build
+++ b/media/libvpx/moz.build
@@ -26,13 +26,15 @@ EXPORTS.vpx += [
     'vpx_mem_intrnl.h',
     'vpx_timer.h',
     'vpxscale.h',
     'x86.h',
     'yv12config.h',
     'yv12extend.h',
 ]
 
-
 if CONFIG['VPX_NEED_OBJ_INT_EXTRACT']:
     HOST_CSRCS += [
         'obj_int_extract.c',
     ]
+
+LIBRARY_NAME = 'vpx'
+
--- a/media/mtransport/build/Makefile.in
+++ b/media/mtransport/build/Makefile.in
@@ -6,17 +6,16 @@ DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 EXTRA_DEPS += $(srcdir)/../objs.mk
 
-LIBRARY_NAME = mtransport
 FORCE_STATIC_LIB= 1
 ifeq (WINNT,$(OS_TARGET))
 VISIBILITY_FLAGS =
 endif
 
 LIBXUL_LIBRARY=1
 
 ifndef _MSC_VER
--- a/media/mtransport/build/moz.build
+++ b/media/mtransport/build/moz.build
@@ -23,8 +23,10 @@ EXPORTS.mtransport += [
     '../transportlayerloopback.h',
     '../transportlayerprsock.h',
 ]
 
 CPP_SOURCES += [
     '$(MTRANSPORT_LCPPSRCS)',
 ]
 
+LIBRARY_NAME = 'mtransport'
+
--- a/media/mtransport/standalone/Makefile.in
+++ b/media/mtransport/standalone/Makefile.in
@@ -7,17 +7,16 @@ topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 include $(srcdir)/../objs.mk
 
 EXTRA_DEPS += $(srcdir)/../objs.mk
 
-LIBRARY_NAME = mtransport_s
 FORCE_STATIC_LIB= 1
 ifeq (WINNT,$(OS_TARGET))
 VISIBILITY_FLAGS =
 endif
 
 # Make a copy into the local directory for dual compilation
 export:: $(MTRANSPORT_CPPSRCS)
 	$(INSTALL) $^ .
--- a/media/mtransport/standalone/moz.build
+++ b/media/mtransport/standalone/moz.build
@@ -19,8 +19,10 @@ EXPORTS.mtransport += [
     '../transportlayerloopback.h',
     '../transportlayerprsock.h',
 ]
 
 CPP_SOURCES += [
     '$(MTRANSPORT_LCPPSRCS)',
 ]
 
+LIBRARY_NAME = 'mtransport_s'
+
--- a/media/omx-plugin/Makefile.in
+++ b/media/omx-plugin/Makefile.in
@@ -15,17 +15,16 @@
 DEPTH   = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH   = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE_NAME = omxplugin
-LIBRARY_NAME = omxplugin
 FORCE_SHARED_LIB = 1
 
 # Don't use STL wrappers; this isn't Gecko code
 STL_FLAGS =
 
 # must link statically with the CRT; this isn't Gecko code
 USE_STATIC_LIBS = 1
 
--- a/media/omx-plugin/froyo/Makefile.in
+++ b/media/omx-plugin/froyo/Makefile.in
@@ -15,17 +15,16 @@
 DEPTH   = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH   = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE_NAME = omxpluginfroyo
-LIBRARY_NAME = omxpluginfroyo
 FORCE_SHARED_LIB = 1
 
 # Don't use STL wrappers; this isn't Gecko code
 STL_FLAGS =
 
 # must link statically with the CRT; this isn't Gecko code
 USE_STATIC_LIBS = 1
 
--- a/media/omx-plugin/froyo/moz.build
+++ b/media/omx-plugin/froyo/moz.build
@@ -5,8 +5,10 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULE = 'omxpluginfroyo'
 
 CPP_SOURCES += [
     'OmxPluginFroyo.cpp',
 ]
 
+LIBRARY_NAME = 'omxpluginfroyo'
+
--- a/media/omx-plugin/gb/Makefile.in
+++ b/media/omx-plugin/gb/Makefile.in
@@ -15,17 +15,16 @@
 DEPTH   = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH   = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE_NAME = omxplugingb
-LIBRARY_NAME = omxplugingb
 FORCE_SHARED_LIB = 1
 
 # Don't use STL wrappers; this isn't Gecko code
 STL_FLAGS =
 
 # must link statically with the CRT; this isn't Gecko code
 USE_STATIC_LIBS = 1
 
--- a/media/omx-plugin/gb/moz.build
+++ b/media/omx-plugin/gb/moz.build
@@ -5,8 +5,10 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULE = 'omxplugingb'
 
 CPP_SOURCES += [
     'OmxPlugin236.cpp',
 ]
 
+LIBRARY_NAME = 'omxplugingb'
+
--- a/media/omx-plugin/gb235/Makefile.in
+++ b/media/omx-plugin/gb235/Makefile.in
@@ -15,17 +15,16 @@
 DEPTH   = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH   = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE_NAME = omxplugingb235
-LIBRARY_NAME = omxplugingb235
 FORCE_SHARED_LIB = 1
 
 # Don't use STL wrappers; this isn't Gecko code
 STL_FLAGS =
 
 # must link statically with the CRT; this isn't Gecko code
 USE_STATIC_LIBS = 1
 
--- a/media/omx-plugin/gb235/moz.build
+++ b/media/omx-plugin/gb235/moz.build
@@ -5,8 +5,10 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULE = 'omxplugingb235'
 
 CPP_SOURCES += [
     'OmxPlugin235.cpp',
 ]
 
+LIBRARY_NAME = 'omxplugingb235'
+
--- a/media/omx-plugin/hc/Makefile.in
+++ b/media/omx-plugin/hc/Makefile.in
@@ -15,17 +15,16 @@
 DEPTH   = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH   = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE_NAME = omxpluginhc
-LIBRARY_NAME = omxpluginhc
 FORCE_SHARED_LIB = 1
 
 # Don't use STL wrappers; this isn't Gecko code
 STL_FLAGS =
 
 # must link statically with the CRT; this isn't Gecko code
 USE_STATIC_LIBS = 1
 
--- a/media/omx-plugin/hc/moz.build
+++ b/media/omx-plugin/hc/moz.build
@@ -5,8 +5,10 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULE = 'omxpluginhc'
 
 CPP_SOURCES += [
     'OmxPluginHoneycomb.cpp',
 ]
 
+LIBRARY_NAME = 'omxpluginhc'
+
--- a/media/omx-plugin/jb-htc/Makefile.in
+++ b/media/omx-plugin/jb-htc/Makefile.in
@@ -15,17 +15,16 @@
 DEPTH   = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH   = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE_NAME = omxpluginjb-htc
-LIBRARY_NAME = omxpluginjb-htc
 FORCE_SHARED_LIB = 1
 
 # Don't use STL wrappers; this isn't Gecko code
 STL_FLAGS =
 
 # must link statically with the CRT; this isn't Gecko code
 USE_STATIC_LIBS = 1
 
--- a/media/omx-plugin/jb-htc/moz.build
+++ b/media/omx-plugin/jb-htc/moz.build
@@ -5,8 +5,10 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULE = 'omxpluginjb-htc'
 
 CPP_SOURCES += [
     'OmxPluginJB-HTC.cpp',
 ]
 
+LIBRARY_NAME = 'omxpluginjb-htc'
+
--- a/media/omx-plugin/lib/froyo/libstagefright/Makefile.in
+++ b/media/omx-plugin/lib/froyo/libstagefright/Makefile.in
@@ -14,17 +14,16 @@
 DEPTH   = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH   = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE_NAME = libandroidstagefrightfroyo
-LIBRARY_NAME = stagefright
 FORCE_SHARED_LIB = 1
 
 # Don't use STL wrappers; this isn't Gecko code
 STL_FLAGS =
 
 # must link statically with the CRT; this isn't Gecko code
 USE_STATIC_LIBS = 1
 
--- a/media/omx-plugin/lib/froyo/libstagefright/moz.build
+++ b/media/omx-plugin/lib/froyo/libstagefright/moz.build
@@ -5,8 +5,11 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULE = 'libandroidstagefrightfroyo'
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'gonk':
     CPP_SOURCES += [
         'libstagefright.cpp',
     ]
+
+LIBRARY_NAME = 'stagefright'
+
--- a/media/omx-plugin/lib/gb/libstagefright/Makefile.in
+++ b/media/omx-plugin/lib/gb/libstagefright/Makefile.in
@@ -14,17 +14,16 @@
 DEPTH   = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH   = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE_NAME = libandroidstagefrightgb
-LIBRARY_NAME = stagefright
 FORCE_SHARED_LIB = 1
 
 # Don't use STL wrappers; this isn't Gecko code
 STL_FLAGS =
 
 # must link statically with the CRT; this isn't Gecko code
 USE_STATIC_LIBS = 1
 
--- a/media/omx-plugin/lib/gb/libstagefright/moz.build
+++ b/media/omx-plugin/lib/gb/libstagefright/moz.build
@@ -5,8 +5,11 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULE = 'libandroidstagefrightgb'
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'gonk':
     CPP_SOURCES += [
         'libstagefright.cpp',
     ]
+
+LIBRARY_NAME = 'stagefright'
+
--- a/media/omx-plugin/lib/gb/libstagefright_color_conversion/Makefile.in
+++ b/media/omx-plugin/lib/gb/libstagefright_color_conversion/Makefile.in
@@ -14,17 +14,16 @@
 DEPTH   = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH   = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE_NAME = libstagefright_color_conversion
-LIBRARY_NAME = stagefright_color_conversion
 FORCE_SHARED_LIB = 1
 
 # Don't use STL wrappers; this isn't Gecko code
 STL_FLAGS =
 
 # must link statically with the CRT; this isn't Gecko code
 USE_STATIC_LIBS = 1
 
--- a/media/omx-plugin/lib/gb/libstagefright_color_conversion/moz.build
+++ b/media/omx-plugin/lib/gb/libstagefright_color_conversion/moz.build
@@ -5,8 +5,11 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULE = 'libstagefright_color_conversion'
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'gonk':
     CPP_SOURCES += [
         'libstagefright_color_conversion.cpp',
     ]
+
+LIBRARY_NAME = 'stagefright_color_conversion'
+
--- a/media/omx-plugin/lib/gb/libutils/Makefile.in
+++ b/media/omx-plugin/lib/gb/libutils/Makefile.in
@@ -14,17 +14,16 @@
 DEPTH   = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH   = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE_NAME = libandroidutilsgb
-LIBRARY_NAME = utils
 FORCE_SHARED_LIB = 1
 
 # Don't use STL wrappers; this isn't Gecko code
 STL_FLAGS =
 
 # must link statically with the CRT; this isn't Gecko code
 USE_STATIC_LIBS = 1
 
--- a/media/omx-plugin/lib/gb/libutils/moz.build
+++ b/media/omx-plugin/lib/gb/libutils/moz.build
@@ -5,8 +5,11 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULE = 'libandroidutilsgb'
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'gonk':
     CPP_SOURCES += [
         'libutils.cpp',
     ]
+
+LIBRARY_NAME = 'utils'
+
--- a/media/omx-plugin/lib/gb235/libstagefright/Makefile.in
+++ b/media/omx-plugin/lib/gb235/libstagefright/Makefile.in
@@ -14,17 +14,16 @@
 DEPTH   = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH   = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE_NAME = libandroidstagefrightgb234
-LIBRARY_NAME = stagefright
 FORCE_SHARED_LIB = 1
 
 # Don't use STL wrappers; this isn't Gecko code
 STL_FLAGS =
 
 # must link statically with the CRT; this isn't Gecko code
 USE_STATIC_LIBS = 1
 
--- a/media/omx-plugin/lib/gb235/libstagefright/moz.build
+++ b/media/omx-plugin/lib/gb235/libstagefright/moz.build
@@ -5,8 +5,11 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULE = 'libandroidstagefrightgb234'
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'gonk':
     CPP_SOURCES += [
         'libstagefright.cpp',
     ]
+
+LIBRARY_NAME = 'stagefright'
+
--- a/media/omx-plugin/lib/hc/libstagefright/Makefile.in
+++ b/media/omx-plugin/lib/hc/libstagefright/Makefile.in
@@ -14,17 +14,16 @@
 DEPTH   = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH   = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE_NAME = libandroidstagefrighthc
-LIBRARY_NAME = stagefright
 FORCE_SHARED_LIB = 1
 
 # Don't use STL wrappers; this isn't Gecko code
 STL_FLAGS =
 
 # must link statically with the CRT; this isn't Gecko code
 USE_STATIC_LIBS = 1
 
--- a/media/omx-plugin/lib/hc/libstagefright/moz.build
+++ b/media/omx-plugin/lib/hc/libstagefright/moz.build
@@ -5,8 +5,11 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULE = 'libandroidstagefrighthc'
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'gonk':
     CPP_SOURCES += [
         'libstagefright.cpp',
     ]
+
+LIBRARY_NAME = 'stagefright'
+
--- a/media/omx-plugin/lib/ics/libstagefright/Makefile.in
+++ b/media/omx-plugin/lib/ics/libstagefright/Makefile.in
@@ -14,17 +14,16 @@
 DEPTH   = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH   = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE_NAME = libandroidstagefright
-LIBRARY_NAME = stagefright
 FORCE_SHARED_LIB = 1
 
 # Don't use STL wrappers; this isn't Gecko code
 STL_FLAGS =
 
 # must link statically with the CRT; this isn't Gecko code
 USE_STATIC_LIBS = 1
 
--- a/media/omx-plugin/lib/ics/libstagefright/moz.build
+++ b/media/omx-plugin/lib/ics/libstagefright/moz.build
@@ -5,8 +5,11 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULE = 'libandroidstagefright'
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'gonk':
     CPP_SOURCES += [
         'libstagefright.cpp',
     ]
+
+LIBRARY_NAME = 'stagefright'
+
--- a/media/omx-plugin/lib/ics/libutils/Makefile.in
+++ b/media/omx-plugin/lib/ics/libutils/Makefile.in
@@ -14,17 +14,16 @@
 DEPTH   = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH   = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE_NAME = libandroidutils
-LIBRARY_NAME = utils
 FORCE_SHARED_LIB = 1
 
 # Don't use STL wrappers; this isn't Gecko code
 STL_FLAGS =
 
 # must link statically with the CRT; this isn't Gecko code
 USE_STATIC_LIBS = 1
 
--- a/media/omx-plugin/lib/ics/libutils/moz.build
+++ b/media/omx-plugin/lib/ics/libutils/moz.build
@@ -5,8 +5,11 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULE = 'libandroidutils'
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'gonk':
     CPP_SOURCES += [
         'libutils.cpp',
     ]
+
+LIBRARY_NAME = 'utils'
+
--- a/media/omx-plugin/moz.build
+++ b/media/omx-plugin/moz.build
@@ -15,8 +15,10 @@
 # limitations under the License.
 
 MODULE = 'omxplugin'
 
 CPP_SOURCES += [
     'OmxPlugin.cpp',
 ]
 
+LIBRARY_NAME = 'omxplugin'
+
--- a/media/omx-plugin/sony/Makefile.in
+++ b/media/omx-plugin/sony/Makefile.in
@@ -15,17 +15,16 @@
 DEPTH   = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH   = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE_NAME = omxpluginsony
-LIBRARY_NAME = omxpluginsony
 FORCE_SHARED_LIB = 1
 
 # Don't use STL wrappers; this isn't Gecko code
 STL_FLAGS =
 
 # must link statically with the CRT; this isn't Gecko code
 USE_STATIC_LIBS = 1
 
--- a/media/omx-plugin/sony/moz.build
+++ b/media/omx-plugin/sony/moz.build
@@ -5,8 +5,10 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULE = 'omxpluginsony'
 
 CPP_SOURCES += [
     'OmxPluginSony.cpp',
 ]
 
+LIBRARY_NAME = 'omxpluginsony'
+
--- a/media/webvtt/Makefile.in
+++ b/media/webvtt/Makefile.in
@@ -4,18 +4,16 @@
 
 DEPTH           = @DEPTH@
 topsrcdir       = @top_srcdir@
 srcdir          = @srcdir@
 VPATH           = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME      = webvtt
-
 DEFINES += \
   -DWEBVTT_STATIC=1 \
   $(NULL)
 
 CSRCS = \
   alloc.c \
   cue.c \
   cuetext.c \
--- a/media/webvtt/moz.build
+++ b/media/webvtt/moz.build
@@ -31,8 +31,10 @@ EXPORTS.webvtt += [
     'include/webvtt/cue.h',
     'include/webvtt/error.h',
     'include/webvtt/node.h',
     'include/webvtt/parser.h',
     'include/webvtt/string.h',
     'include/webvtt/util.h',
 ]
 
+LIBRARY_NAME = 'webvtt'
+
--- a/memory/build/Makefile.in
+++ b/memory/build/Makefile.in
@@ -4,17 +4,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME = memory
 FORCE_STATIC_LIB = 1
 STLFLAGS =
 ifdef MOZ_GLUE_PROGRAM_LDFLAGS
 SDK_LIBRARY = $(REAL_LIBRARY)
 DIST_INSTALL = 1
 endif
 
 DEFINES += -DMOZ_MEMORY_IMPL
--- a/memory/build/moz.build
+++ b/memory/build/moz.build
@@ -25,8 +25,11 @@ if CONFIG['MOZ_JEMALLOC3']:
     CSRCS += [
         'mozjemalloc_compat.c',
     ]
 
 if CONFIG['MOZ_REPLACE_MALLOC']:
     CSRCS += [
         'replace_malloc.c',
     ]
+
+LIBRARY_NAME = 'memory'
+
--- a/memory/jemalloc/Makefile.in
+++ b/memory/jemalloc/Makefile.in
@@ -5,17 +5,16 @@
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 
 VPATH		= $(srcdir) $(srcdir)/src/src
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME = jemalloc
 FORCE_STATIC_LIB = 1
 
 ifdef MOZ_GLUE_PROGRAM_LDFLAGS
 SDK_LIBRARY = $(REAL_LIBRARY)
 DIST_INSTALL = 1
 endif
 
 DISABLED_CSRCS := $(notdir $(wildcard $(srcdir)/src/src/*.c))
--- a/memory/jemalloc/moz.build
+++ b/memory/jemalloc/moz.build
@@ -32,8 +32,11 @@ CSRCS += [
 ]
 
 # Only OSX needs the zone allocation implementation,
 # but only if replace-malloc is not enabled.
 if CONFIG['OS_TARGET'] == 'Darwin' and not CONFIG['MOZ_REPLACE_MALLOC']:
     CSRCS += [
         'zone.c',
     ]
+
+LIBRARY_NAME = 'jemalloc'
+
--- a/memory/mozalloc/Makefile.in
+++ b/memory/mozalloc/Makefile.in
@@ -11,17 +11,16 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 VISIBILITY_FLAGS=
 STL_FLAGS	=
 ifdef _MSC_VER
 STL_FLAGS	= -D_HAS_EXCEPTIONS=0
 endif
 
-LIBRARY_NAME	= mozalloc
 DIST_INSTALL 	= 1
 
 ifeq (gonk,$(MOZ_WIDGET_TOOLKIT))
 FORCE_STATIC_LIB= 1
 else
 FORCE_SHARED_LIB= 1
 endif
 
--- a/memory/mozalloc/moz.build
+++ b/memory/mozalloc/moz.build
@@ -35,8 +35,11 @@ if CONFIG['WRAP_STL_INCLUDES']:
                 'msvc_throw_wrapper.cpp',
             ]
 
 CPP_SOURCES += [
     'mozalloc.cpp',
     'mozalloc_abort.cpp',
     'mozalloc_oom.cpp',
 ]
+
+LIBRARY_NAME = 'mozalloc'
+
--- a/memory/replace/dummy/Makefile.in
+++ b/memory/replace/dummy/Makefile.in
@@ -4,15 +4,14 @@
 
 DEPTH           = @DEPTH@
 topsrcdir       = @top_srcdir@
 srcdir          = @srcdir@
 VPATH           = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME = replace_malloc
 FORCE_SHARED_LIB = 1
 NO_DIST_INSTALL = 1
 
 DISABLED_CSRCS = dummy_replace_malloc.c
 
 include $(topsrcdir)/config/rules.mk
--- a/memory/replace/dummy/moz.build
+++ b/memory/replace/dummy/moz.build
@@ -4,8 +4,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULE = 'memory'
 
 CSRCS += [
     'dummy_replace_malloc.c',
 ]
+
+LIBRARY_NAME = 'replace_malloc'
+
--- a/memory/replace/jemalloc/Makefile.in
+++ b/memory/replace/jemalloc/Makefile.in
@@ -4,17 +4,16 @@
 
 DEPTH           = @DEPTH@
 topsrcdir       = @top_srcdir@
 srcdir          = @srcdir@
 VPATH           = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME = replace_jemalloc
 FORCE_SHARED_LIB = 1
 NO_DIST_INSTALL = 1
 
 SHARED_LIBRARY_LIBS = $(call EXPAND_LIBNAME_PATH,jemalloc,$(DEPTH)/memory/jemalloc)
 DEFINES += -DMOZ_JEMALLOC3 -DMOZ_REPLACE_JEMALLOC
 LOCAL_INCLUDES += -I../../jemalloc/src/include
 ifdef _MSC_VER
 LOCAL_INCLUDES += -I$(topsrcdir)/memory/jemalloc/src/include/msvc_compat
--- a/memory/replace/jemalloc/moz.build
+++ b/memory/replace/jemalloc/moz.build
@@ -13,8 +13,11 @@ CSRCS += [
 
 # Android doesn't have pthread_atfork, so just implement a dummy function.
 # It shouldn't make much problem, as the use of fork is pretty limited on
 # Android.
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android':
     CSRCS += [
         'pthread_atfork.c',
     ]
+
+LIBRARY_NAME = 'replace_jemalloc'
+
--- a/mfbt/Makefile.in
+++ b/mfbt/Makefile.in
@@ -4,17 +4,16 @@
 
 DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME = mfbt
 FORCE_STATIC_LIB = 1
 STL_FLAGS =
 
 # exported_headers.mk defines the headers exported by mfbt.  It is included by
 # mfbt itself and by the JS engine, which, when built standalone, must do the
 # work to install mfbt's exported headers itself.
 include $(srcdir)/exported_headers.mk
 
--- a/mfbt/moz.build
+++ b/mfbt/moz.build
@@ -3,8 +3,10 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 TEST_DIRS += ['tests']
 
 MODULE = 'mozglue'
 
+LIBRARY_NAME = 'mfbt'
+
--- a/mobile/android/components/build/Makefile.in
+++ b/mobile/android/components/build/Makefile.in
@@ -5,17 +5,16 @@
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE_NAME     = nsBrowserCompsModule
-LIBRARY_NAME    = browsercomps
 LIBXUL_LIBRARY  = 1
 
 IS_COMPONENT	= 1
 EXPORT_LIBRARY  = 1
 
 ifdef MOZ_ANDROID_HISTORY
 LOCAL_INCLUDES += \
 	-I$(topsrcdir)/docshell/base \
--- a/mobile/android/components/build/moz.build
+++ b/mobile/android/components/build/moz.build
@@ -18,8 +18,11 @@ CPP_SOURCES += [
     'nsBrowserModule.cpp',
     'nsShellService.cpp',
 ]
 
 if CONFIG['MOZ_ANDROID_HISTORY']:
     CPP_SOURCES += [
         'nsAndroidHistory.cpp',
     ]
+
+LIBRARY_NAME = 'browsercomps'
+
--- a/modules/libbz2/src/Makefile.in
+++ b/modules/libbz2/src/Makefile.in
@@ -6,17 +6,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME	= bz2
 FORCE_STATIC_LIB= 1
 ifeq ($(OS_ARCH),WINNT)
 USE_STATIC_LIBS = 1
 endif
 
 # This is defined by the bzip2-1.0.3 Makefile.  It appears to be used to
 # configure GLIBC to support large files.  This isn't something we care about
 # at this stage, since we're only interested in the streaming API, but we
--- a/modules/libbz2/src/moz.build
+++ b/modules/libbz2/src/moz.build
@@ -18,8 +18,11 @@ csrcs = [
     'crctable.c',
     'decompress.c',
     'huffman.c',
     'randtable.c',
 ]
 
 HOST_CSRCS += csrcs
 HOST_LIBRARY_NAME = 'hostbz2'
+
+LIBRARY_NAME = 'bz2'
+
--- a/modules/libjar/zipwriter/src/Makefile.in
+++ b/modules/libjar/zipwriter/src/Makefile.in
@@ -4,16 +4,15 @@
 
 DEPTH                 = @DEPTH@
 topsrcdir             = @top_srcdir@
 srcdir                = @srcdir@
 VPATH                 = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME          = zipwriter
 MSVC_ENABLE_PGO := 1
 MODULE_NAME           = ZipWriterModule
 EXPORT_LIBRARY        = 1
 LIBXUL_LIBRARY        = 1
 IS_COMPONENT          = 1
 
 include $(topsrcdir)/config/rules.mk
--- a/modules/libjar/zipwriter/src/moz.build
+++ b/modules/libjar/zipwriter/src/moz.build
@@ -10,8 +10,10 @@ CPP_SOURCES += [
     'StreamFunctions.cpp',
     'ZipWriterModule.cpp',
     'nsDeflateConverter.cpp',
     'nsZipDataStream.cpp',
     'nsZipHeader.cpp',
     'nsZipWriter.cpp',
 ]
 
+LIBRARY_NAME = 'zipwriter'
+
--- a/modules/libmar/sign/Makefile.in
+++ b/modules/libmar/sign/Makefile.in
@@ -4,17 +4,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME = signmar
 FORCE_STATIC_LIB = 1
 ifeq ($(OS_ARCH),WINNT)
 USE_STATIC_LIBS = 1
 endif
 
 # This makefile just builds support for reading archives.
 CSRCS = \
   mar_sign.c \
--- a/modules/libmar/sign/moz.build
+++ b/modules/libmar/sign/moz.build
@@ -1,8 +1,10 @@
 # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULE = 'signmar'
 
+LIBRARY_NAME = 'signmar'
+
--- a/modules/libmar/src/Makefile.in
+++ b/modules/libmar/src/Makefile.in
@@ -6,17 +6,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME	= mar
 FORCE_STATIC_LIB = 1
 ifeq ($(OS_ARCH),WINNT)
 USE_STATIC_LIBS = 1
 endif
 
 # This makefile just builds support for reading archives.
 
 CSRCS = \
--- a/modules/libmar/src/moz.build
+++ b/modules/libmar/src/moz.build
@@ -12,8 +12,11 @@ EXPORTS += [
 ]
 
 HOST_CSRCS += [
     'mar_create.c',
     'mar_extract.c',
     'mar_read.c',
 ]
 HOST_LIBRARY_NAME = 'hostmar'
+
+LIBRARY_NAME = 'mar'
+
--- a/modules/libmar/verify/Makefile.in
+++ b/modules/libmar/verify/Makefile.in
@@ -4,17 +4,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME = verifymar
 FORCE_STATIC_LIB = 1
 ifeq ($(OS_ARCH),WINNT)
 USE_STATIC_LIBS = 1
 endif
 
 # This makefile just builds support for reading archives.
 CSRCS	= \
   mar_verify.c \
--- a/modules/libmar/verify/moz.build
+++ b/modules/libmar/verify/moz.build
@@ -1,8 +1,10 @@
 # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULE = 'verifymar'
 
+LIBRARY_NAME = 'verifymar'
+
--- a/modules/zlib/src/Makefile.in
+++ b/modules/zlib/src/Makefile.in
@@ -6,13 +6,11 @@
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 include $(srcdir)/objs.mk
 
-LIBRARY_NAME	= mozz
-
 CSRCS		= $(MODULES_ZLIB_SRC_LCSRCS)
 
 include $(topsrcdir)/config/rules.mk
--- a/modules/zlib/src/moz.build
+++ b/modules/zlib/src/moz.build
@@ -7,8 +7,10 @@
 MODULE = 'zlib'
 
 EXPORTS += [
     'mozzconf.h',
     'zconf.h',
     'zlib.h',
 ]
 
+LIBRARY_NAME = 'mozz'
+
--- a/mozglue/android/Makefile.in
+++ b/mozglue/android/Makefile.in
@@ -4,17 +4,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME     = android
 FORCE_STATIC_LIB = 1
 STL_FLAGS=
 FAIL_ON_WARNINGS := 1
 
 DEFINES += \
   -DANDROID_PACKAGE_NAME='"$(ANDROID_PACKAGE_NAME)"' \
   $(NULL)
 
--- a/mozglue/android/moz.build
+++ b/mozglue/android/moz.build
@@ -12,8 +12,10 @@ EXPORTS += [
 
 CPP_SOURCES += [
     'APKOpen.cpp',
     'NSSBridge.cpp',
     'SQLiteBridge.cpp',
     'nsGeckoUtils.cpp',
 ]
 
+LIBRARY_NAME = 'android'
+
--- a/mozglue/build/Makefile.in
+++ b/mozglue/build/Makefile.in
@@ -5,17 +5,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME = mozglue
 DIST_INSTALL = 1
 
 # Build mozglue as a shared lib on Windows, OSX and Android.
 # If this is ever changed, update MOZ_SHARED_MOZGLUE in browser/installer/Makefile.in
 ifneq (,$(filter WINNT Darwin Android,$(OS_TARGET)))
 FORCE_SHARED_LIB = 1
 else
 FORCE_STATIC_LIB = 1
--- a/mozglue/build/moz.build
+++ b/mozglue/build/moz.build
@@ -24,8 +24,11 @@ else:
     CPP_SOURCES += [
         'dummy.cpp',
     ]
 
 if CONFIG['OS_TARGET'] == 'Android':
     CPP_SOURCES += [
         'BionicGlue.cpp',
     ]
+
+LIBRARY_NAME = 'mozglue'
+
--- a/mozglue/linker/Makefile.in
+++ b/mozglue/linker/Makefile.in
@@ -4,17 +4,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME	= linker
 FORCE_STATIC_LIB= 1
 STL_FLAGS =
 
 HOST_PROGRAM = szip
 
 HOST_CPPSRCS = \
   szip.cpp \
   SeekableZStream.cpp \
--- a/mozglue/linker/moz.build
+++ b/mozglue/linker/moz.build
@@ -9,8 +9,10 @@ MODULE = 'mozglue'
 CPP_SOURCES += [
     'CustomElf.cpp',
     'ElfLoader.cpp',
     'Mappable.cpp',
     'SeekableZStream.cpp',
     'Zip.cpp',
 ]
 
+LIBRARY_NAME = 'linker'
+
--- a/netwerk/cache/Makefile.in
+++ b/netwerk/cache/Makefile.in
@@ -5,17 +5,16 @@
 
 DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME   = nkcache_s
 MSVC_ENABLE_PGO := 1
 LIBXUL_LIBRARY = 1
 FAIL_ON_WARNINGS := 1
 
 FORCE_STATIC_LIB = 1
 
 LOCAL_INCLUDES = \
   -I$(srcdir)/../base/src \
--- a/netwerk/cache/moz.build
+++ b/netwerk/cache/moz.build
@@ -37,8 +37,10 @@ CPP_SOURCES += [
     'nsDiskCacheDevice.cpp',
     'nsDiskCacheDeviceSQL.cpp',
     'nsDiskCacheEntry.cpp',
     'nsDiskCacheMap.cpp',
     'nsDiskCacheStreams.cpp',
     'nsMemoryCacheDevice.cpp',
 ]
 
+LIBRARY_NAME = 'nkcache_s'
+
--- a/netwerk/dash/mpd/Makefile.in
+++ b/netwerk/dash/mpd/Makefile.in
@@ -10,17 +10,16 @@
 
 DEPTH     := @DEPTH@
 topsrcdir := @top_srcdir@
 srcdir    := @srcdir@
 VPATH     := @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME   := nkdashmpd_s
 LIBXUL_LIBRARY := 1
 FORCE_STATIC_LIB := 1
 
 LOCAL_INCLUDES := \
   -I$(topsrcdir)/content/base/src \
   -I$(topsrcdir)/content/html/content/public \
   -I$(topsrcdir)/content/html/content/src \
   $(NULL)
--- a/netwerk/dash/mpd/moz.build
+++ b/netwerk/dash/mpd/moz.build
@@ -13,8 +13,10 @@ CPP_SOURCES += [
     'Period.cpp',
     'Representation.cpp',
     'SegmentBase.cpp',
     'nsDASHMPDParser.cpp',
     'nsDASHWebMODManager.cpp',
     'nsDASHWebMODParser.cpp',
 ]
 
+LIBRARY_NAME = 'nkdashmpd_s'
+
--- a/netwerk/dns/Makefile.in
+++ b/netwerk/dns/Makefile.in
@@ -5,17 +5,16 @@
 
 DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME   = neckodns_s
 MSVC_ENABLE_PGO := 1
 LIBXUL_LIBRARY = 1
 FAIL_ON_WARNINGS := 1
 
 DISABLED_CSRCS = \
   race.c \
   nameprep.c \
   punycode.c \
--- a/netwerk/dns/moz.build
+++ b/netwerk/dns/moz.build
@@ -29,8 +29,11 @@ CSRCS += [
 
 CPP_SOURCES += [
     'DNS.cpp',
     'nsDNSService2.cpp',
     'nsEffectiveTLDService.cpp',
     'nsHostResolver.cpp',
     'nsIDNService.cpp',
 ]
+
+LIBRARY_NAME = 'neckodns_s'
+
--- a/netwerk/mime/Makefile.in
+++ b/netwerk/mime/Makefile.in
@@ -6,17 +6,16 @@
 DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 FAIL_ON_WARNINGS := 1
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME   = nkmime_s
 MSVC_ENABLE_PGO := 1
 LIBXUL_LIBRARY = 1
 
 FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
 
 DEFINES += -DIMPL_NS_NET
--- a/netwerk/mime/moz.build
+++ b/netwerk/mime/moz.build
@@ -19,8 +19,10 @@ MODULE = 'mimetype'
 EXPORTS += [
     'nsMimeTypes.h',
 ]
 
 CPP_SOURCES += [
     'nsMIMEHeaderParamImpl.cpp',
 ]
 
+LIBRARY_NAME = 'nkmime_s'
+
--- a/netwerk/protocol/data/Makefile.in
+++ b/netwerk/protocol/data/Makefile.in
@@ -6,17 +6,16 @@
 DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 FAIL_ON_WARNINGS = 1
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME   = nkdata_s
 LIBXUL_LIBRARY = 1
 
 FORCE_STATIC_LIB = 1
 
 LOCAL_INCLUDES = \
   -I$(srcdir)/../../base/src \
   $(NULL)
 
--- a/netwerk/protocol/data/moz.build
+++ b/netwerk/protocol/data/moz.build
@@ -6,8 +6,10 @@
 
 MODULE = 'necko'
 
 CPP_SOURCES += [
     'nsDataChannel.cpp',
     'nsDataHandler.cpp',
 ]
 
+LIBRARY_NAME = 'nkdata_s'
+
--- a/netwerk/protocol/file/Makefile.in
+++ b/netwerk/protocol/file/Makefile.in
@@ -6,17 +6,16 @@
 DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 FAIL_ON_WARNINGS = 1
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME   = nkfile_s
 MSVC_ENABLE_PGO := 1
 LIBXUL_LIBRARY = 1
 
 FORCE_STATIC_LIB = 1
 
 LOCAL_INCLUDES = \
   -I$(srcdir)/../../base/src \
   -I$(topsrcdir)/xpcom/ds \
--- a/netwerk/protocol/file/moz.build
+++ b/netwerk/protocol/file/moz.build
@@ -17,8 +17,10 @@ XPIDL_FLAGS += [
 
 MODULE = 'necko'
 
 CPP_SOURCES += [
     'nsFileChannel.cpp',
     'nsFileProtocolHandler.cpp',
 ]
 
+LIBRARY_NAME = 'nkfile_s'
+
--- a/netwerk/protocol/viewsource/Makefile.in
+++ b/netwerk/protocol/viewsource/Makefile.in
@@ -6,17 +6,16 @@
 DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 FAIL_ON_WARNINGS = 1
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME   = nkviewsource_s
 LIBXUL_LIBRARY = 1
 
 FORCE_STATIC_LIB = 1
 
 LOCAL_INCLUDES = \
   -I$(srcdir)/../../base/src \
   $(NULL)
 
--- a/netwerk/protocol/viewsource/moz.build
+++ b/netwerk/protocol/viewsource/moz.build
@@ -16,8 +16,10 @@ XPIDL_FLAGS += [
 
 MODULE = 'necko'
 
 CPP_SOURCES += [
     'nsViewSourceChannel.cpp',
     'nsViewSourceHandler.cpp',
 ]
 
+LIBRARY_NAME = 'nkviewsource_s'
+
--- a/netwerk/socket/Makefile.in
+++ b/netwerk/socket/Makefile.in
@@ -6,16 +6,15 @@
 DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 FAIL_ON_WARNINGS := 1
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME   = neckosocket_s
 LIBXUL_LIBRARY = 1
 
 FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
 
 DEFINES += -DIMPL_NS_NET
--- a/netwerk/socket/moz.build
+++ b/netwerk/socket/moz.build
@@ -18,8 +18,10 @@ MODULE = 'necko'
 
 CPP_SOURCES += [
     'nsSOCKSIOLayer.cpp',
     'nsSOCKSSocketProvider.cpp',
     'nsSocketProviderService.cpp',
     'nsUDPSocketProvider.cpp',
 ]
 
+LIBRARY_NAME = 'neckosocket_s'
+
--- a/netwerk/streamconv/converters/Makefile.in
+++ b/netwerk/streamconv/converters/Makefile.in
@@ -5,17 +5,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME	= nkcnvts_s
 MSVC_ENABLE_PGO := 1
 LIBXUL_LIBRARY = 1
 FAIL_ON_WARNINGS := 1
 
 # we don't want the shared lib, but we want to force the creation of a
 # static lib.
 FORCE_STATIC_LIB = 1
 
--- a/netwerk/streamconv/converters/moz.build
+++ b/netwerk/streamconv/converters/moz.build
@@ -22,8 +22,11 @@ if CONFIG['NECKO_PROTOCOLS'].find('ftp')
         'ParseFTPList.cpp',
         'nsFTPDirListingConv.cpp',
     ]
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'cocoa':
     CPP_SOURCES += [
         'nsBinHexDecoder.cpp',
     ]
+
+LIBRARY_NAME = 'nkcnvts_s'
+
--- a/netwerk/streamconv/src/Makefile.in
+++ b/netwerk/streamconv/src/Makefile.in
@@ -5,17 +5,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME	= nkconv_s
 MSVC_ENABLE_PGO := 1
 LIBXUL_LIBRARY  = 1
 
 ifneq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 ifeq (x86_64,$(OS_TEST))
 # nsAppleFileDecoder.cpp has warnings I don't understand.
 FAIL_ON_WARNINGS := 1
 endif
--- a/netwerk/streamconv/src/moz.build
+++ b/netwerk/streamconv/src/moz.build
@@ -10,8 +10,11 @@ CPP_SOURCES += [
     'nsStreamConverterService.cpp',
 ]
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
     if CONFIG['OS_TEST'] != 'x86_64':
         CPP_SOURCES += [
             'nsAppleFileDecoder.cpp',
         ]
+
+LIBRARY_NAME = 'nkconv_s'
+
--- a/netwerk/system/android/Makefile.in
+++ b/netwerk/system/android/Makefile.in
@@ -5,17 +5,16 @@
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 FAIL_ON_WARNINGS := 1
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME   = neckosystem_s
 LIBXUL_LIBRARY = 1
 
 FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
 
 DEFINES += -DIMPL_NS_NET
 
--- a/netwerk/system/android/moz.build
+++ b/netwerk/system/android/moz.build
@@ -5,8 +5,10 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULE = 'necko'
 
 CPP_SOURCES += [
     'nsAndroidNetworkLinkService.cpp',
 ]
 
+LIBRARY_NAME = 'neckosystem_s'
+
--- a/netwerk/system/mac/Makefile.in
+++ b/netwerk/system/mac/Makefile.in
@@ -6,17 +6,16 @@
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 FAIL_ON_WARNINGS := 1
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME   = neckosystem_s
 LIBXUL_LIBRARY = 1
 
 FORCE_STATIC_LIB = 1
 
 CMMSRCS += nsNetworkLinkService.mm
 
 include $(topsrcdir)/config/rules.mk
 
--- a/netwerk/system/mac/moz.build
+++ b/netwerk/system/mac/moz.build
@@ -1,8 +1,10 @@
 # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULE = 'necko'
 
+LIBRARY_NAME = 'neckosystem_s'
+
--- a/netwerk/system/maemo/Makefile.in
+++ b/netwerk/system/maemo/Makefile.in
@@ -5,17 +5,16 @@
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 FAIL_ON_WARNINGS := 1
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME   = neckosystem_s
 LIBXUL_LIBRARY = 1
 
 FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
 
 DEFINES += -DIMPL_NS_NET
 
--- a/netwerk/system/maemo/moz.build
+++ b/netwerk/system/maemo/moz.build
@@ -6,8 +6,10 @@
 
 MODULE = 'necko'
 
 CPP_SOURCES += [
     'nsMaemoNetworkLinkService.cpp',
     'nsMaemoNetworkManager.cpp',
 ]
 
+LIBRARY_NAME = 'neckosystem_s'
+
--- a/netwerk/system/qt/Makefile.in
+++ b/netwerk/system/qt/Makefile.in
@@ -6,17 +6,16 @@
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir	 = @srcdir@
 VPATH		= @srcdir@
 FAIL_ON_WARNINGS := 1
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME   = neckosystem_s
 LIBXUL_LIBRARY = 1
 
 FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
 
 DEFINES += -DIMPL_NS_NET
 
--- a/netwerk/system/qt/moz.build
+++ b/netwerk/system/qt/moz.build
@@ -7,8 +7,10 @@
 MODULE = 'necko'
 
 CPP_SOURCES += [
     'moc_nsQtNetworkManager.cpp',
     'nsQtNetworkLinkService.cpp',
     'nsQtNetworkManager.cpp',
 ]
 
+LIBRARY_NAME = 'neckosystem_s'
+
--- a/netwerk/system/win32/Makefile.in
+++ b/netwerk/system/win32/Makefile.in
@@ -6,16 +6,15 @@
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 FAIL_ON_WARNINGS := 1
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME   = neckosystem_s
 LIBXUL_LIBRARY = 1
 
 FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk