Bug 875934 - Move LIBRARY_NAME to moz.build, batch 4; r=mshal

dom/bluetooth/Makefile.in

@@ -23,7 +23,6 @@ VPATH += $(srcdir)/ipc
 
 ifneq (,$(MOZ_B2G_BT))
 
-LIBRARY_NAME     = dombluetooth_s
 
 ifeq (gonk,$(MOZ_WIDGET_TOOLKIT))
 VPATH += \

dom/bluetooth/moz.build

@@ -17,6 +17,7 @@
 if CONFIG['MOZ_B2G_BT']:
     LIBXUL_LIBRARY = True
     MODULE = 'dom'
+    LIBRARY_NAME = 'dombluetooth_s'
     XPIDL_MODULE = 'dom_bluetooth'
     XPIDL_SOURCES += [
         'nsIDOMBluetoothDevice.idl',

ipc/ipdl/test/cxx/Makefile.in

@@ -9,7 +9,6 @@ VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME = $(MODULE)_s
 EXPORT_LIBRARY = 1
 
 IPDLTESTS = \

ipc/ipdl/test/cxx/moz.build

@@ -7,6 +7,7 @@
 TOOL_DIRS += ['app']
 
 MODULE = 'ipdlunittest'
+LIBRARY_NAME = 'ipdlunittest_s'
 
 EXPORTS.mozilla._ipdltest += [
     'IPDLUnitTestProcessChild.h',

js/src/Makefile.in

@@ -13,12 +13,6 @@ TOPLEVEL_BUILD := 1
 run_for_side_effects := $(shell echo "MAKE: $(MAKE)")
 include $(DEPTH)/config/autoconf.mk
 
-ifdef JS_STANDALONE
-LIBRARY_NAME	= mozjs-@MOZJS_MAJOR_VERSION@.@MOZJS_MINOR_VERSION@@MOZJS_ALPHA@
-else
-LIBRARY_NAME	= mozjs
-endif
-
 STATIC_LIBRARY_NAME = js_static
 LIBS		= $(NSPR_LIBS)
 

js/src/moz.build

@@ -24,6 +24,11 @@ TEST_DIRS += ['tests', 'gdb']
 
 MODULE = 'js'
 
+if CONFIG['JS_STANDALONE']:
+    LIBRARY_NAME = 'mozjs-%s.%s%s' % (CONFIG['MOZJS_MAJOR_VERSION'], CONFIG['MOZJS_MINOR_VERSION'], CONFIG['MOZJS_ALPHA'])
+else:
+    LIBRARY_NAME = 'mozjs'
+
 CONFIGURE_SUBST_FILES += ['devtools/rootAnalysis/Makefile']
 
 # Changes to internal header files, used externally, massively slow down

modules/libjar/Makefile.in

@@ -10,7 +10,6 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME	= jar$(VERSION_NUMBER)
 EXPORT_LIBRARY = 1
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk

modules/libjar/moz.build

@@ -17,6 +17,7 @@ XPIDL_SOURCES += [
 ]
 
 MODULE = 'jar'
+LIBRARY_NAME	= 'jar'
 
 EXPORTS += [
     'nsJARURI.h',

netwerk/cookie/Makefile.in

@@ -12,7 +12,6 @@ relativesrcdir = @relativesrcdir@
 include $(DEPTH)/config/autoconf.mk
 
 ifdef NECKO_COOKIES
-LIBRARY_NAME     = neckocookie_s
 
 LOCAL_INCLUDES	= \
 		-I$(topsrcdir)/intl/uconv/src \

netwerk/cookie/moz.build

@@ -22,6 +22,8 @@ if CONFIG['NECKO_COOKIES']:
     LIBXUL_LIBRARY = True
     MSVC_ENABLE_PGO = True
 
+    LIBRARY_NAME = 'neckocookie_s'
+
     EXPORTS.mozilla.net = [
         'CookieServiceParent.h',
         'CookieServiceChild.h',

security/build/Makefile.in

@@ -13,8 +13,6 @@ CC_WRAPPER =
 CXX_WRAPPER =
 
 ifdef MOZ_FOLD_LIBS
-# TODO: The library name can be changed when bug 845217 is fixed.
-LIBRARY_NAME = nss3
 FORCE_SHARED_LIB = 1
 endif
 

security/build/moz.build

@@ -5,3 +5,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULE = 'nss'
+
+if CONFIG['MOZ_FOLD_LIBS']:
+    # TODO: The library name can be changed when bug 845217 is fixed.
+    LIBRARY_NAME = 'nss3'

toolkit/components/places/Makefile.in

@@ -10,7 +10,6 @@ VPATH = @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 ifdef MOZ_PLACES
-LIBRARY_NAME  = places
 EXPORT_LIBRARY = 1
 
 LOCAL_INCLUDES += -I$(srcdir)/../build

toolkit/components/places/moz.build

@@ -14,6 +14,7 @@ XPIDL_SOURCES += [
 if CONFIG['MOZ_PLACES']:
     LIBXUL_LIBRARY = True
     MSVC_ENABLE_PGO = True
+    LIBRARY_NAME = 'places'
 
     XPIDL_SOURCES += [
         'mozIAsyncFavicons.idl',

toolkit/library/Makefile.in

@@ -148,7 +148,7 @@ COMPONENT_LIBS += \
   uconv \
   i18n \
   chardet \
-  jar$(VERSION_NUMBER) \
+  jar \
   startupcache \
   pref \
   htmlpars \

widget/gtk2/Makefile.in

@@ -10,12 +10,6 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-ifdef MOZ_ENABLE_GTK2
-LIBRARY_NAME	= widget_gtk2
-else
-LIBRARY_NAME	= widget_gtk3
-endif
-
 EXPORT_LIBRARY	= 1
 NATIVE_THEME_SUPPORT = 1
 

widget/gtk2/moz.build

@@ -6,6 +6,11 @@
 
 MODULE = 'widget'
 
+if CONFIG['MOZ_ENABLE_GTK2']:
+    LIBRARY_NAME = 'widget_gtk2'
+else:
+    LIBRARY_NAME = 'widget_gtk3'
+
 EXPORTS += [
     'mozcontainer.h',
     'nsGTKToolkit.h',