Bug 884825 - Move LIBRARY_NAME to moz.build in comm-central, r=Standard8, a=jcranmer
authorJoshua Cranmer <Pidgeot18@gmail.com>
Tue, 03 Sep 2013 10:26:59 -0500
changeset 16460 e7a7f385ce1c6e89f9acc4cdd306d6c3481e0221
parent 16459 b9a4146500011551ba67ce757c269e62940269da
child 16461 92726142b5244734563b338557119a2a6cf682dd
push id1019
push userbugzilla@standard8.plus.com
push dateMon, 28 Oct 2013 22:08:40 +0000
treeherdercomm-beta@c81d5f517a5f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersStandard8, jcranmer
bugs884825
Bug 884825 - Move LIBRARY_NAME to moz.build in comm-central, r=Standard8, a=jcranmer Also viable on SeaMonkey's CLOSED TREE.
calendar/base/backend/libical/Makefile.in
calendar/base/backend/libical/build/Makefile.in
calendar/base/backend/libical/build/moz.build
calendar/base/backend/libical/moz.build
calendar/libical/src/libical/Makefile.in
calendar/libical/src/libical/moz.build
db/mork/build/Makefile.in
db/mork/build/moz.build
db/mork/src/Makefile.in
db/mork/src/moz.build
ldap/xpcom/src/Makefile.in
ldap/xpcom/src/moz.build
mail/components/build/Makefile.in
mail/components/build/moz.build
mail/components/migration/src/Makefile.in
mail/components/migration/src/moz.build
mail/components/search/Makefile.in
mail/components/search/moz.build
mail/components/shell/Makefile.in
mail/components/shell/moz.build
mailnews/addrbook/src/Makefile.in
mailnews/addrbook/src/moz.build
mailnews/base/search/src/Makefile.in
mailnews/base/search/src/moz.build
mailnews/base/src/Makefile.in
mailnews/base/src/moz.build
mailnews/base/util/Makefile.in
mailnews/base/util/moz.build
mailnews/build/Makefile.in
mailnews/build/moz.build
mailnews/compose/src/Makefile.in
mailnews/compose/src/moz.build
mailnews/db/msgdb/src/Makefile.in
mailnews/db/msgdb/src/moz.build
mailnews/extensions/bayesian-spam-filter/src/Makefile.in
mailnews/extensions/bayesian-spam-filter/src/moz.build
mailnews/extensions/fts3/src/Makefile.in
mailnews/extensions/fts3/src/moz.build
mailnews/extensions/mailviews/src/Makefile.in
mailnews/extensions/mailviews/src/moz.build
mailnews/extensions/mdn/src/Makefile.in
mailnews/extensions/mdn/src/moz.build
mailnews/extensions/smime/src/Makefile.in
mailnews/extensions/smime/src/moz.build
mailnews/imap/src/Makefile.in
mailnews/imap/src/moz.build
mailnews/import/applemail/src/Makefile.in
mailnews/import/applemail/src/moz.build
mailnews/import/build/Makefile.in
mailnews/import/build/moz.build
mailnews/import/eudora/src/Makefile.in
mailnews/import/eudora/src/moz.build
mailnews/import/oexpress/Makefile.in
mailnews/import/oexpress/moz.build
mailnews/import/outlook/src/Makefile.in
mailnews/import/outlook/src/moz.build
mailnews/import/src/Makefile.in
mailnews/import/src/moz.build
mailnews/import/text/src/Makefile.in
mailnews/import/text/src/moz.build
mailnews/import/vcard/src/Makefile.in
mailnews/import/vcard/src/moz.build
mailnews/import/winlivemail/Makefile.in
mailnews/import/winlivemail/moz.build
mailnews/local/public/Makefile.in
mailnews/local/src/Makefile.in
mailnews/local/src/moz.build
mailnews/mapi/mapiDll/Makefile.in
mailnews/mapi/mapiDll/moz.build
mailnews/mapi/mapihook/build/Makefile.in
mailnews/mapi/mapihook/build/moz.build
mailnews/mapi/mapihook/src/Makefile.in
mailnews/mapi/mapihook/src/moz.build
mailnews/mime/cthandlers/glue/Makefile.in
mailnews/mime/cthandlers/glue/moz.build
mailnews/mime/cthandlers/pgpmime/Makefile.in
mailnews/mime/cthandlers/pgpmime/moz.build
mailnews/mime/cthandlers/vcard/Makefile.in
mailnews/mime/cthandlers/vcard/moz.build
mailnews/mime/emitters/Makefile.in
mailnews/mime/emitters/moz.build
mailnews/mime/src/Makefile.in
mailnews/mime/src/moz.build
mailnews/news/src/Makefile.in
mailnews/news/src/moz.build
suite/build/Makefile.in
suite/build/moz.build
suite/feeds/src/Makefile.in
suite/feeds/src/moz.build
suite/profile/Makefile.in
suite/profile/migration/src/Makefile.in
suite/profile/migration/src/moz.build
suite/profile/moz.build
suite/shell/src/Makefile.in
suite/shell/src/moz.build
--- a/calendar/base/backend/libical/Makefile.in
+++ b/calendar/base/backend/libical/Makefile.in
@@ -4,14 +4,13 @@
 
 DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME     = calbase_s
 MODULE_NAME      = calBaseModule
 USE_STATIC_LIBS = 1
 NO_INTERFACES_MANIFEST = 1
 
 include $(topsrcdir)/config/rules.mk
--- a/calendar/base/backend/libical/build/Makefile.in
+++ b/calendar/base/backend/libical/build/Makefile.in
@@ -5,17 +5,16 @@
 
 DEPTH   = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH   = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME = calbasecomps
 SHORT_LIBNAME = calbscmp
 MODULE_NAME = calBaseModule
 USE_STATIC_LIBS = 1
 NO_COMPONENTS_MANIFEST = 1
 
 LOCAL_INCLUDES = \
 	-I$(srcdir)/..
 
--- a/calendar/base/backend/libical/build/moz.build
+++ b/calendar/base/backend/libical/build/moz.build
@@ -8,8 +8,11 @@ MODULE = 'calbasecomps'
 
 CPP_SOURCES += [
     'calBaseModule.cpp',
 ]
 
 # We don't want an EXPORT_LIBRARY
 FORCE_SHARED_LIB = True
 IS_COMPONENT = True
+
+LIBRARY_NAME = 'calbasecomps'
+
--- a/calendar/base/backend/libical/moz.build
+++ b/calendar/base/backend/libical/moz.build
@@ -22,8 +22,10 @@ CPP_SOURCES += [
     'calPeriod.cpp',
     'calRecurrenceRule.cpp',
     'calTimezone.cpp',
     'calUtils.cpp',
 ]
 
 FORCE_STATIC_LIB = True
 
+LIBRARY_NAME = 'calbase_s'
+
--- a/calendar/libical/src/libical/Makefile.in
+++ b/calendar/libical/src/libical/Makefile.in
@@ -38,17 +38,16 @@
 DEPTH= @DEPTH@
 
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME     = mozical
 MODULE_NAME      = mozIcalModule
 USE_STATIC_LIBS  = 1
 
 DEFINES += -DHAVE_CONFIG_H
 
 ifneq (,$(filter BeOS Darwin OpenVMS NetBSD FreeBSD,$(OS_ARCH)))
 DEFINES	+= -D__USE_BSD=1
 endif
--- a/calendar/libical/src/libical/moz.build
+++ b/calendar/libical/src/libical/moz.build
@@ -35,8 +35,10 @@ CSRCS += [
     'icalvalue.c',
     'pvl.c',
     'sspm.c',
     'vsnprintf.c',
 ]
 
 FORCE_STATIC_LIB = True
 
+LIBRARY_NAME = 'mozical'
+
--- a/db/mork/build/Makefile.in
+++ b/db/mork/build/Makefile.in
@@ -5,18 +5,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 VPATH		= @srcdir@
 srcdir		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME	= mork
-
 ifdef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 MODULE_NAME	= nsMorkModule
 endif
 
 SHARED_LIBRARY_LIBS = ../src/$(LIB_PREFIX)msgmork_s.$(LIB_SUFFIX)
 
 ifdef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 EXTRA_DSO_LDOPTS += \
--- a/db/mork/build/moz.build
+++ b/db/mork/build/moz.build
@@ -17,8 +17,10 @@ CPP_SOURCES += [
 if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
     IS_COMPONENT = True
     FORCE_SHARED_LIB = True
 else:
     LIBXUL_LIBRARY = True
 
 EXPORT_LIBRARY = True
 
+LIBRARY_NAME = 'mork'
+
deleted file mode 100644
--- a/db/mork/src/Makefile.in
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# 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/.
-
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-LIBRARY_NAME	= msgmork_s
-
-include $(topsrcdir)/config/rules.mk
-
--- a/db/mork/src/moz.build
+++ b/db/mork/src/moz.build
@@ -53,8 +53,10 @@ CPP_SOURCES += [
 if CONFIG['OS_ARCH'] == 'WINNT':
     CPP_SOURCES += ['morkSearchRowCursor.cpp']
 
 if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
     FORCE_STATIC_LIB = True
 else:
     LIBXUL_LIBRARY = True
 
+LIBRARY_NAME = 'msgmork_s'
+
--- a/ldap/xpcom/src/Makefile.in
+++ b/ldap/xpcom/src/Makefile.in
@@ -5,18 +5,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME	= mozldap
-
 ifdef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 MODULE_NAME	= nsLDAPProtocolModule
 endif
 
 ifdef MOZ_PREF_EXTENSIONS
 DEFINES += -DMOZ_PREF_EXTENSIONS
 endif
 
--- a/ldap/xpcom/src/moz.build
+++ b/ldap/xpcom/src/moz.build
@@ -31,8 +31,10 @@ EXTRA_COMPONENTS += [
 if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
     IS_COMPONENT = True
     FORCE_SHARED_LIB = True
 else:
     LIBXUL_LIBRARY = True
 
 EXPORT_LIBRARY = True
 
+LIBRARY_NAME = 'mozldap'
+
--- a/mail/components/build/Makefile.in
+++ b/mail/components/build/Makefile.in
@@ -7,17 +7,16 @@ topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 # NOTE: if we switch away from LIBXUL_LIBRARY at any stage
 # we need to clear the EMBED_MANIFEST_AT flag. (See Bug 714495)
 
-LIBRARY_NAME	= mailcomps
 SHORT_LIBNAME	= mailcmp
 
 ifeq ($(OS_ARCH),WINNT)
 OS_LIBS += $(call EXPAND_LIBNAME,ole32 shell32)
 endif
 
 LOCAL_INCLUDES = \
 	-I$(srcdir)/../migration/src \
--- a/mail/components/build/moz.build
+++ b/mail/components/build/moz.build
@@ -7,8 +7,10 @@ MODULE = 'mailcomps'
 
 CPP_SOURCES += [
     'nsMailComps.cpp',
 ]
 
 LIBXUL_LIBRARY = True
 EXPORT_LIBRARY = True
 
+LIBRARY_NAME = 'mailcomps'
+
--- a/mail/components/migration/src/Makefile.in
+++ b/mail/components/migration/src/Makefile.in
@@ -4,13 +4,12 @@
 
 DEPTH=@DEPTH@
 topsrcdir=@top_srcdir@
 srcdir=@srcdir@
 VPATH=@srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME = profilemigration_s
 MODULE_NAME = nsMailProfileMigratorModule
 MOZILLA_INTERNAL_API = 1
 
 include $(topsrcdir)/config/rules.mk
--- a/mail/components/migration/src/moz.build
+++ b/mail/components/migration/src/moz.build
@@ -23,8 +23,10 @@ if CONFIG['OS_ARCH'] == 'WINNT':
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
     CPP_SOURCES += [
         'nsEudoraProfileMigrator.cpp',
         'nsProfileMigratorBase.cpp',
     ]
 
 FORCE_STATIC_LIB = True
 
+LIBRARY_NAME = 'profilemigration_s'
+
--- a/mail/components/search/Makefile.in
+++ b/mail/components/search/Makefile.in
@@ -6,16 +6,15 @@ DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 # If on Windows, build Windows Search integration
 ifneq (,$(filter windows, $(MOZ_WIDGET_TOOLKIT)))
-LIBRARY_NAME = winsearch_s
 MODULE_NAME = nsMailWinSearchHelperModule
 ifneq ($(MOZ_WIDGET_TOOLKIT), gtk2)
 MOZILLA_INTERNAL_API = 1
 endif
 endif
 
 include $(topsrcdir)/config/rules.mk
--- a/mail/components/search/moz.build
+++ b/mail/components/search/moz.build
@@ -6,16 +6,17 @@
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
     DIRS += ['mdimporter']
     EXTRA_PP_JS_MODULES += ['SpotlightIntegration.js']
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
     DIRS += ['wsenable']
     CPP_SOURCES += ['nsMailWinSearchHelper.cpp']
     EXTRA_PP_JS_MODULES += ['WinSearchIntegration.js']
     FORCE_STATIC_LIB = True
+    LIBRARY_NAME = 'winsearch_s'
 
 MODULE = 'mailwinsearch'
 
 DIRS += ['public']
 
 EXTRA_PP_JS_MODULES += [
     'SearchIntegration.js',
 ]
--- a/mail/components/shell/Makefile.in
+++ b/mail/components/shell/Makefile.in
@@ -6,15 +6,14 @@ DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 DEFINES += -DMOZ_APP_NAME=\"$(MOZ_APP_NAME)\"
 
-LIBRARY_NAME = shellservice_s
 MODULE_NAME = nsMailShellModule
 MOZILLA_INTERNAL_API = 1
 
 include $(topsrcdir)/config/rules.mk
 
 CXXFLAGS += $(TK_CFLAGS)
--- a/mail/components/shell/moz.build
+++ b/mail/components/shell/moz.build
@@ -22,8 +22,10 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'coco
 
 EXTRA_COMPONENTS += [
     'nsSetDefaultMail.js',
     'shell.manifest',
 ]
 
 FORCE_STATIC_LIB = True
 
+LIBRARY_NAME = 'shellservice_s'
+
--- a/mailnews/addrbook/src/Makefile.in
+++ b/mailnews/addrbook/src/Makefile.in
@@ -5,18 +5,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME	= addrbook_s
-
 ifeq ($(OS_ARCH),WINNT)
 OS_CXXFLAGS += -DNOMINMAX
 endif
 
 ifdef MOZ_LDAP_XPCOM
 DEFINES += -DMOZ_LDAP_XPCOM
 
 # XXX These files are not being built as they don't work. Bug 311632 should
--- a/mailnews/addrbook/src/moz.build
+++ b/mailnews/addrbook/src/moz.build
@@ -84,8 +84,10 @@ EXTRA_PP_COMPONENTS += [
     'nsAddrbook.manifest',
 ]
 
 if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
     FORCE_STATIC_LIB = True
 else:
     LIBXUL_LIBRARY = True
 
+LIBRARY_NAME = 'addrbook_s'
+
--- a/mailnews/base/search/src/Makefile.in
+++ b/mailnews/base/search/src/Makefile.in
@@ -5,17 +5,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME	= msgsearch_s
 EXPORT_DIR	= $(DIST)/bin/isp
 
 
 EXPORT_RESOURCE_FILES	= \
 				  Bogofilter.sfd \
 				  DSPAM.sfd \
 				  POPFile.sfd \
 				  SpamAssassin.sfd \
--- a/mailnews/base/search/src/moz.build
+++ b/mailnews/base/search/src/moz.build
@@ -26,8 +26,10 @@ EXTRA_COMPONENTS += [
     'nsMsgTraitService.manifest',
 ]
 
 if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
     FORCE_STATIC_LIB = True
 else:
     LIBXUL_LIBRARY = True
 
+LIBRARY_NAME = 'msgsearch_s'
+
--- a/mailnews/base/src/Makefile.in
+++ b/mailnews/base/src/Makefile.in
@@ -5,15 +5,13 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME	= msgbase_s
-
 ifdef MOZ_LDAP_XPCOM
 DEFINES         += -DMOZ_LDAP_XPCOM
 endif
 
 include $(topsrcdir)/config/rules.mk
--- a/mailnews/base/src/moz.build
+++ b/mailnews/base/src/moz.build
@@ -79,8 +79,10 @@ EXTRA_JS_MODULES += [
     'virtualFolderWrapper.js',
 ]
 
 if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
     FORCE_STATIC_LIB = True
 else:
     LIBXUL_LIBRARY = True
 
+LIBRARY_NAME = 'msgbase_s'
+
--- a/mailnews/base/util/Makefile.in
+++ b/mailnews/base/util/Makefile.in
@@ -5,18 +5,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME	= msgbsutl_s
-
 DEFINES		+= -D_IMPL_NS_MSG_BASE
 
 ifeq ($(OS_ARCH),WINNT)
 DEFINES		+= -DZLIB_DLL
 OS_CXXFLAGS	+= -DNOMINMAX
 endif
 
 include $(topsrcdir)/config/rules.mk
--- a/mailnews/base/util/moz.build
+++ b/mailnews/base/util/moz.build
@@ -66,8 +66,10 @@ EXTRA_JS_MODULES += [
     'traceHelper.js',
 ]
 
 if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
     FORCE_STATIC_LIB = True
 else:
     LIBXUL_LIBRARY = True
 
+LIBRARY_NAME = 'msgbsutl_s'
+
--- a/mailnews/build/Makefile.in
+++ b/mailnews/build/Makefile.in
@@ -5,17 +5,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME = mail
 ifdef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 MODULE_NAME	= nsMailModule
 endif
 
 ifdef MOZ_LDAP_XPCOM
 DEFINES		+= -DMOZ_LDAP_XPCOM
 endif
 
--- a/mailnews/build/moz.build
+++ b/mailnews/build/moz.build
@@ -12,8 +12,10 @@ CPP_SOURCES += [
 if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
     IS_COMPONENT = True
     FORCE_SHARED_LIB = True
 else:
     LIBXUL_LIBRARY = True
 
 EXPORT_LIBRARY = True
 
+LIBRARY_NAME = 'mail'
+
--- a/mailnews/compose/src/Makefile.in
+++ b/mailnews/compose/src/Makefile.in
@@ -5,17 +5,15 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME	= msgcompose_s
-
 include $(topsrcdir)/config/rules.mk
 
 ifeq ($(OS_ARCH),WINNT)
 ifdef MOZ_UNICODE
 DEFINES		+= -DMOZ_UNICODE
 endif
 endif
--- a/mailnews/compose/src/moz.build
+++ b/mailnews/compose/src/moz.build
@@ -44,8 +44,10 @@ EXTRA_COMPONENTS += [
     'nsSMTPProtocolHandler.manifest',
 ]
 
 if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
     FORCE_STATIC_LIB = True
 else:
     LIBXUL_LIBRARY = True
 
+LIBRARY_NAME = 'msgcompose_s'
+
deleted file mode 100644
--- a/mailnews/db/msgdb/src/Makefile.in
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# 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/.
-
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-LIBRARY_NAME	= msgdb_s
-
-include $(topsrcdir)/config/rules.mk
-
--- a/mailnews/db/msgdb/src/moz.build
+++ b/mailnews/db/msgdb/src/moz.build
@@ -16,8 +16,10 @@ CPP_SOURCES += [
     'nsNewsDatabase.cpp',
 ]
 
 if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
     FORCE_STATIC_LIB = True
 else:
     LIBXUL_LIBRARY = True
 
+LIBRARY_NAME = 'msgdb_s'
+
deleted file mode 100644
--- a/mailnews/extensions/bayesian-spam-filter/src/Makefile.in
+++ /dev/null
@@ -1,15 +0,0 @@
-#
-# 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/.
-
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-LIBRARY_NAME	= bayesflt_s
-
-include $(topsrcdir)/config/rules.mk
--- a/mailnews/extensions/bayesian-spam-filter/src/moz.build
+++ b/mailnews/extensions/bayesian-spam-filter/src/moz.build
@@ -9,8 +9,10 @@ CPP_SOURCES += [
     'nsBayesianFilter.cpp',
 ]
 
 if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
     FORCE_STATIC_LIB = True
 else:
     LIBXUL_LIBRARY = True
 
+LIBRARY_NAME = 'bayesflt_s'
+
--- a/mailnews/extensions/fts3/src/Makefile.in
+++ b/mailnews/extensions/fts3/src/Makefile.in
@@ -5,14 +5,12 @@
 
 DEPTH		= @DEPTH@
 topsrcdir       = @top_srcdir@
 srcdir          = @srcdir@
 VPATH           = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME	= fts3tok_s
-
 LOCAL_INCLUDES = \
 		$(SQLITE_CFLAGS)
 
 include $(topsrcdir)/config/rules.mk
--- a/mailnews/extensions/fts3/src/moz.build
+++ b/mailnews/extensions/fts3/src/moz.build
@@ -15,8 +15,10 @@ CPP_SOURCES += [
     'nsGlodaRankerFunction.cpp',
 ]
 
 if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
     FORCE_STATIC_LIB = True
 else:
     LIBXUL_LIBRARY = True
 
+LIBRARY_NAME = 'fts3tok_s'
+
deleted file mode 100644
--- a/mailnews/extensions/mailviews/src/Makefile.in
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# 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/.
-
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-LIBRARY_NAME	= mailview_s
-
-include $(topsrcdir)/config/rules.mk
-
--- a/mailnews/extensions/mailviews/src/moz.build
+++ b/mailnews/extensions/mailviews/src/moz.build
@@ -9,8 +9,10 @@ CPP_SOURCES += [
     'nsMsgMailViewList.cpp',
 ]
 
 if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
     FORCE_STATIC_LIB = True
 else:
     LIBXUL_LIBRARY = True
 
+LIBRARY_NAME = 'mailview_s'
+
deleted file mode 100644
--- a/mailnews/extensions/mdn/src/Makefile.in
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# 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/.
-
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-LIBRARY_NAME	= msgmdn_s
-
-include $(topsrcdir)/config/rules.mk
-
--- a/mailnews/extensions/mdn/src/moz.build
+++ b/mailnews/extensions/mdn/src/moz.build
@@ -14,8 +14,10 @@ EXTRA_COMPONENTS += [
     'mdn-service.manifest',
 ]
 
 if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
     FORCE_STATIC_LIB = True
 else:
     LIBXUL_LIBRARY = True
 
+LIBRARY_NAME = 'msgmdn_s'
+
deleted file mode 100644
--- a/mailnews/extensions/smime/src/Makefile.in
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# 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/.
-
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-LIBRARY_NAME	= msgsmime_s
-
-include $(topsrcdir)/config/rules.mk
-
--- a/mailnews/extensions/smime/src/moz.build
+++ b/mailnews/extensions/smime/src/moz.build
@@ -16,8 +16,10 @@ EXTRA_COMPONENTS += [
     'smime-service.manifest',
 ]
 
 if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
     FORCE_STATIC_LIB = True
 else:
     LIBXUL_LIBRARY = True
 
+LIBRARY_NAME = 'msgsmime_s'
+
--- a/mailnews/imap/src/Makefile.in
+++ b/mailnews/imap/src/Makefile.in
@@ -5,16 +5,14 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME	= msgimap_s
-
 ifeq ($(OS_ARCH),WINNT)
 OS_CXXFLAGS += -DNOMINMAX
 endif
 
 include $(topsrcdir)/config/rules.mk
 
--- a/mailnews/imap/src/moz.build
+++ b/mailnews/imap/src/moz.build
@@ -31,8 +31,10 @@ CPP_SOURCES += [
     'nsSyncRunnableHelpers.cpp',
 ]
 
 if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
     FORCE_STATIC_LIB = True
 else:
     LIBXUL_LIBRARY = True
 
+LIBRARY_NAME = 'msgimap_s'
+
deleted file mode 100644
--- a/mailnews/import/applemail/src/Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-# 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/.
-
-DEPTH			= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH			= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-LIBRARY_NAME	= applmail_s
-
-include $(topsrcdir)/config/rules.mk
--- a/mailnews/import/applemail/src/moz.build
+++ b/mailnews/import/applemail/src/moz.build
@@ -13,8 +13,10 @@ CMMSRCS += [
     'nsEmlxHelperUtils.mm',
 ]
 
 if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
     FORCE_STATIC_LIB = True
 else:
     LIBXUL_LIBRARY = True
 
+LIBRARY_NAME = 'applmail_s'
+
--- a/mailnews/import/build/Makefile.in
+++ b/mailnews/import/build/Makefile.in
@@ -5,17 +5,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME = import
 ifdef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 MODULE_NAME	= nsImportServiceModule
 endif
 
 
 SHARED_LIBRARY_LIBS = \
 		../src/$(LIB_PREFIX)import_s.$(LIB_SUFFIX) \
 		../text/src/$(LIB_PREFIX)imptext_s.$(LIB_SUFFIX) \
--- a/mailnews/import/build/moz.build
+++ b/mailnews/import/build/moz.build
@@ -11,8 +11,10 @@ CPP_SOURCES += [
 
 if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
     IS_COMPONENT = True
     FORCE_SHARED_LIB = True
 else:
     LIBXUL_LIBRARY = True
     EXPORT_LIBRARY = True
 
+LIBRARY_NAME = 'import'
+
--- a/mailnews/import/eudora/src/Makefile.in
+++ b/mailnews/import/eudora/src/Makefile.in
@@ -5,17 +5,15 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME   = impEudra_s
-
 ifeq ($(OS_ARCH),WINNT)
 OS_CXXFLAGS += -DNOMINMAX
 endif
 
 LOCAL_INCLUDES += -I$(srcdir)/../../src
 
 include $(topsrcdir)/config/rules.mk
--- a/mailnews/import/eudora/src/moz.build
+++ b/mailnews/import/eudora/src/moz.build
@@ -22,8 +22,10 @@ if CONFIG['OS_ARCH'] == 'WINNT':
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
     CPP_SOURCES += ['nsEudoraMac.cpp']
 
 if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
     FORCE_STATIC_LIB = True
 else:
     LIBXUL_LIBRARY = True
 
+LIBRARY_NAME = 'impEudra_s'
+
--- a/mailnews/import/oexpress/Makefile.in
+++ b/mailnews/import/oexpress/Makefile.in
@@ -5,15 +5,13 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME   = importOE_s
-
 ifeq ($(OS_ARCH),WINNT)
 OS_CXXFLAGS += -DNOMINMAX
 endif
 
 include $(topsrcdir)/config/rules.mk
--- a/mailnews/import/oexpress/moz.build
+++ b/mailnews/import/oexpress/moz.build
@@ -17,8 +17,10 @@ CPP_SOURCES += [
     'nsOEStringBundle.cpp',
 ]
 
 if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
     FORCE_STATIC_LIB = True
 else:
     LIBXUL_LIBRARY = True
 
+LIBRARY_NAME = 'importOE_s'
+
--- a/mailnews/import/outlook/src/Makefile.in
+++ b/mailnews/import/outlook/src/Makefile.in
@@ -5,13 +5,11 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME   = impOutlk_s
-
 LOCAL_INCLUDES += -I$(srcdir)/../../src
 
 include $(topsrcdir)/config/rules.mk
--- a/mailnews/import/outlook/src/moz.build
+++ b/mailnews/import/outlook/src/moz.build
@@ -18,8 +18,10 @@ CPP_SOURCES += [
     'rtfMailDecoder.cpp',
 ]
 
 if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
     FORCE_STATIC_LIB = True
 else:
     LIBXUL_LIBRARY = True
 
+LIBRARY_NAME = 'impOutlk_s'
+
deleted file mode 100644
--- a/mailnews/import/src/Makefile.in
+++ /dev/null
@@ -1,15 +0,0 @@
-#
-# 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/.
-
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-LIBRARY_NAME = import_s
-
-include $(topsrcdir)/config/rules.mk
--- a/mailnews/import/src/moz.build
+++ b/mailnews/import/src/moz.build
@@ -23,8 +23,10 @@ CPP_SOURCES += [
     'nsImportTranslator.cpp',
 ]
 
 if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
     FORCE_STATIC_LIB = True
 else:
     LIBXUL_LIBRARY = True
 
+LIBRARY_NAME = 'import_s'
+
--- a/mailnews/import/text/src/Makefile.in
+++ b/mailnews/import/text/src/Makefile.in
@@ -5,13 +5,11 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME   = imptext_s
-
 LOCAL_INCLUDES += -I$(srcdir)/../../src
 
 include $(topsrcdir)/config/rules.mk
--- a/mailnews/import/text/src/moz.build
+++ b/mailnews/import/text/src/moz.build
@@ -10,8 +10,10 @@ CPP_SOURCES += [
     'nsTextImport.cpp',
 ]
 
 if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
     FORCE_STATIC_LIB = True
 else:
     LIBXUL_LIBRARY = True
 
+LIBRARY_NAME = 'imptext_s'
+
--- a/mailnews/import/vcard/src/Makefile.in
+++ b/mailnews/import/vcard/src/Makefile.in
@@ -5,13 +5,11 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME   = impvcard_s
-
 LOCAL_INCLUDES += -I$(srcdir)/../../src
 
 include $(topsrcdir)/config/rules.mk
--- a/mailnews/import/vcard/src/moz.build
+++ b/mailnews/import/vcard/src/moz.build
@@ -10,8 +10,10 @@ CPP_SOURCES += [
     'nsVCardImport.cpp',
 ]
 
 if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
     FORCE_STATIC_LIB = True
 else:
     LIBXUL_LIBRARY = True
 
+LIBRARY_NAME = 'impvcard_s'
+
deleted file mode 100644
--- a/mailnews/import/winlivemail/Makefile.in
+++ /dev/null
@@ -1,15 +0,0 @@
-#
-# 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/.
-
-DEPTH       =   @DEPTH@
-topsrcdir   =   @top_srcdir@
-srcdir      =   @srcdir@
-VPATH       =   @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-LIBRARY_NAME   =        importWM_s
-
-include $(topsrcdir)/config/rules.mk
--- a/mailnews/import/winlivemail/moz.build
+++ b/mailnews/import/winlivemail/moz.build
@@ -12,8 +12,10 @@ CPP_SOURCES += [
     'nsWMUtils.cpp',
 ]
 
 if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
     FORCE_STATIC_LIB = True
 else:
     LIBXUL_LIBRARY = True
 
+LIBRARY_NAME = 'importWM_s'
+
deleted file mode 100644
--- a/mailnews/local/public/Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-# 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/.
-
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-include $(topsrcdir)/config/rules.mk
deleted file mode 100644
--- a/mailnews/local/src/Makefile.in
+++ /dev/null
@@ -1,15 +0,0 @@
-#
-# 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/.
-
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-LIBRARY_NAME	= msglocal_s
-
-include $(topsrcdir)/config/rules.mk
--- a/mailnews/local/src/moz.build
+++ b/mailnews/local/src/moz.build
@@ -34,8 +34,10 @@ if CONFIG['MOZ_MOVEMAIL']:
         'nsMovemailService.cpp',
     ]
 
 if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
     FORCE_STATIC_LIB = True
 else:
     LIBXUL_LIBRARY = True
 
+LIBRARY_NAME = 'msglocal_s'
+
--- a/mailnews/mapi/mapiDll/Makefile.in
+++ b/mailnews/mapi/mapiDll/Makefile.in
@@ -9,17 +9,16 @@ srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 # Statically link against the CRT, so that we don't go hunting around for it
 # and not find it when we're loaded into explorer.exe or similar
 USE_STATIC_LIBS = 1
 
-LIBRARY_NAME	= $(MODULE)
 DEFFILE		= $(win_srcdir)/Mapi32.def
 ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 MOZILLA_INTERNAL_API = 1
 endif
 
 
 OS_LIBS		+= ole32.lib
 
--- a/mailnews/mapi/mapiDll/moz.build
+++ b/mailnews/mapi/mapiDll/moz.build
@@ -1,13 +1,14 @@
 # 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 = 'mozMapi32'
+LIBRARY_NAME = 'mozMapi32'
 
 CPP_SOURCES += [
     'MapiDll.cpp',
 ]
 
 FORCE_SHARED_LIB = True
 
--- a/mailnews/mapi/mapihook/build/Makefile.in
+++ b/mailnews/mapi/mapihook/build/Makefile.in
@@ -5,17 +5,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME	= $(MODULE)
 DEFFILE		= $(win_srcdir)/MapiProxy.def
 ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 MOZILLA_INTERNAL_API = 1
 endif
 
 OS_LIBS		+= rpcrt4.lib
 
 MIDL_GENERATED_FILES = msgMapi.h msgMapi_p.c msgMapi_i.c dlldata.c
--- a/mailnews/mapi/mapihook/build/moz.build
+++ b/mailnews/mapi/mapihook/build/moz.build
@@ -1,14 +1,15 @@
 # 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 = 'MapiProxy'
+LIBRARY_NAME = 'MapiProxy'
 
 EXPORTS += [
     'msgMapi.h',
 ]
 
 CSRCS += [
     'dlldata.c',
     'msgMapi_i.c',
--- a/mailnews/mapi/mapihook/src/Makefile.in
+++ b/mailnews/mapi/mapihook/src/Makefile.in
@@ -5,17 +5,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME	= $(MODULE)
 ifdef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 MODULE_NAME	= msgMapiModule
 endif
 
 LOBJS		= ../build/msgMapi_i.$(OBJ_SUFFIX)
 
 OS_LIBS		+= ole32.lib
 
--- a/mailnews/mapi/mapihook/src/moz.build
+++ b/mailnews/mapi/mapihook/src/moz.build
@@ -1,21 +1,23 @@
 # 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 = 'msgMapi'
+LIBRARY_NAME = 'msgMapi'
 
 CPP_SOURCES += [
     'Registry.cpp',
     'msgMapiFactory.cpp',
     'msgMapiHook.cpp',
     'msgMapiImp.cpp',
     'msgMapiMain.cpp',
     'msgMapiSupport.cpp',
 ]
 
 if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
     IS_COMPONENT = True
 else:
     LIBXUL_LIBRARY = True
     EXPORT_LIBRARY = True
+
deleted file mode 100644
--- a/mailnews/mime/cthandlers/glue/Makefile.in
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# 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/.
-
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-LIBRARY_NAME	= mimecthglue_s
-
-include $(topsrcdir)/config/rules.mk
-
--- a/mailnews/mime/cthandlers/glue/moz.build
+++ b/mailnews/mime/cthandlers/glue/moz.build
@@ -16,8 +16,10 @@ CPP_SOURCES += [
 
 if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
     FORCE_STATIC_LIB = True
 else:
     LIBXUL_LIBRARY = True
 
 EXPORT_LIBRARY = True
 
+LIBRARY_NAME = 'mimecthglue_s'
+
--- a/mailnews/mime/cthandlers/pgpmime/Makefile.in
+++ b/mailnews/mime/cthandlers/pgpmime/Makefile.in
@@ -4,16 +4,15 @@
 
 DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME   = pgpmime_s
 ifdef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 MODULE_NAME    = nsPgpMimeModule
 endif
 
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES = -I$(srcdir)/../glue
--- a/mailnews/mime/cthandlers/pgpmime/moz.build
+++ b/mailnews/mime/cthandlers/pgpmime/moz.build
@@ -15,8 +15,10 @@ CPP_SOURCES += [
 
 if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
     IS_COMPONENT = True
 else:
     LIBXUL_LIBRARY = True
 
 EXPORT_LIBRARY = True
 
+LIBRARY_NAME = 'pgpmime_s'
+
--- a/mailnews/mime/cthandlers/vcard/Makefile.in
+++ b/mailnews/mime/cthandlers/vcard/Makefile.in
@@ -5,13 +5,11 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME = vcard_s
-
 LOCAL_INCLUDES = -I$(srcdir)/../glue
 
 include $(topsrcdir)/config/rules.mk
--- a/mailnews/mime/cthandlers/vcard/moz.build
+++ b/mailnews/mime/cthandlers/vcard/moz.build
@@ -9,8 +9,10 @@ CPP_SOURCES += [
     'mimevcrd.cpp',
 ]
 
 if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
     FORCE_STATIC_LIB = True
 else:
     LIBXUL_LIBRARY = True
 
+LIBRARY_NAME = 'vcard_s'
+
deleted file mode 100644
--- a/mailnews/mime/emitters/Makefile.in
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# 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/.
-
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-LIBRARY_NAME	= emitterutil_s
-
-include $(topsrcdir)/config/rules.mk
-
--- a/mailnews/mime/emitters/moz.build
+++ b/mailnews/mime/emitters/moz.build
@@ -19,8 +19,10 @@ CPP_SOURCES += [
     'nsMimeXmlEmitter.cpp',
 ]
 
 if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
     FORCE_STATIC_LIB = True
 else:
     LIBXUL_LIBRARY = True
 
+LIBRARY_NAME = 'emitterutil_s'
+
--- a/mailnews/mime/src/Makefile.in
+++ b/mailnews/mime/src/Makefile.in
@@ -7,13 +7,11 @@ DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 DEFINES		+= -DENABLE_SMIME
 
-LIBRARY_NAME	= mime_s
-
 include $(topsrcdir)/config/rules.mk
 
 
--- a/mailnews/mime/src/moz.build
+++ b/mailnews/mime/src/moz.build
@@ -76,8 +76,10 @@ EXTRA_COMPONENTS += [
     'msgMime.manifest',
 ]
 
 if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
     FORCE_STATIC_LIB = True
 else:
     LIBXUL_LIBRARY = True
 
+LIBRARY_NAME = 'mime_s'
+
--- a/mailnews/news/src/Makefile.in
+++ b/mailnews/news/src/Makefile.in
@@ -5,16 +5,14 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME	= msgnews_s
-
 ifeq ($(OS_ARCH),WINNT)
 OS_CXXFLAGS += -DNOMINMAX
 endif
 
 include $(topsrcdir)/config/rules.mk
 
--- a/mailnews/news/src/moz.build
+++ b/mailnews/news/src/moz.build
@@ -20,8 +20,10 @@ CPP_SOURCES += [
     'nsNntpUrl.cpp',
 ]
 
 if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
     FORCE_STATIC_LIB = True
 else:
     LIBXUL_LIBRARY = True
 
+LIBRARY_NAME = 'msgnews_s'
+
--- a/suite/build/Makefile.in
+++ b/suite/build/Makefile.in
@@ -4,17 +4,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME	 = suite
 MODULE_NAME	 = nsSuiteModule
 
 USE_STATIC_LIBS	 = 1
 
 ifeq ($(OS_ARCH),WINNT)
 OS_LIBS += $(call EXPAND_LIBNAME,ole32 shell32)
 endif
 
--- a/suite/build/moz.build
+++ b/suite/build/moz.build
@@ -6,8 +6,11 @@
 MODULE = 'suite'
 
 CPP_SOURCES += [
     'nsSuiteModule.cpp',
 ]
 
 FORCE_SHARED_LIB = True
 IS_COMPONENT = True
+
+LIBRARY_NAME = 'suite'
+
--- a/suite/feeds/src/Makefile.in
+++ b/suite/feeds/src/Makefile.in
@@ -4,13 +4,11 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME = suitefeeds_s
-
 USE_STATIC_LIBS = 1
 
 include $(topsrcdir)/config/rules.mk
--- a/suite/feeds/src/moz.build
+++ b/suite/feeds/src/moz.build
@@ -13,8 +13,10 @@ EXTRA_COMPONENTS += [
     'FeedConverter.js',
     'FeedWriter.js',
     'SuiteFeeds.manifest',
     'WebContentConverter.js',
 ]
 
 FORCE_STATIC_LIB = True
 
+LIBRARY_NAME = 'suitefeeds_s'
+
--- a/suite/profile/Makefile.in
+++ b/suite/profile/Makefile.in
@@ -4,16 +4,14 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME	= suiteprofile_s
-
 EXTRA_DSO_LDOPTS = $(MOZ_COMPONENT_LIBS)
 
 USE_STATIC_LIBS = 1
 
 include $(topsrcdir)/config/rules.mk
 
--- a/suite/profile/migration/src/Makefile.in
+++ b/suite/profile/migration/src/Makefile.in
@@ -4,13 +4,11 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME	= suitemigration_s
-
 USE_STATIC_LIBS = 1
 
 include $(topsrcdir)/config/rules.mk
--- a/suite/profile/migration/src/moz.build
+++ b/suite/profile/migration/src/moz.build
@@ -16,8 +16,10 @@ EXTRA_COMPONENTS += [
 ]
 
 EXTRA_PP_COMPONENTS += [
     'SuiteProfileMigrator.js',
 ]
 
 FORCE_STATIC_LIB = True
 
+LIBRARY_NAME = 'suitemigration_s'
+
--- a/suite/profile/moz.build
+++ b/suite/profile/moz.build
@@ -11,8 +11,10 @@ PARALLEL_DIRS += [
 MODULE = 'suiteprofile'
 
 CPP_SOURCES += [
     'nsSuiteDirectoryProvider.cpp',
 ]
 
 FORCE_STATIC_LIB = True
 
+LIBRARY_NAME = 'suiteprofile_s'
+
--- a/suite/shell/src/Makefile.in
+++ b/suite/shell/src/Makefile.in
@@ -10,13 +10,11 @@ VPATH   = @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 USE_STATIC_LIBS = 1
 
 ifeq ($(OS_ARCH),WINNT)
 OS_LIBS         += $(call EXPAND_LIBNAME,ole32 version uuid shell32)
 endif
 
-LIBRARY_NAME = shellservice_s
-
 include $(topsrcdir)/config/rules.mk
 
 CXXFLAGS += $(TK_CFLAGS)
--- a/suite/shell/src/moz.build
+++ b/suite/shell/src/moz.build
@@ -15,8 +15,10 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gt
 if CPP_SOURCES:
     EXTRA_COMPONENTS += [
         'nsSetDefault.js',
         'nsSetDefault.manifest',
     ]
 
 FORCE_STATIC_LIB = True
 
+LIBRARY_NAME = 'shellservice_s'
+