Bug 643508 - Remove instances of MOZ_META_COMPONENT and META_COMPONENT from comm-central; r=Callek
authorMark Banner <bugzilla@standard8.plus.com>
Thu, 07 Apr 2011 18:13:02 -0700
changeset 7523 ab3d7bdaa533bdf8ea6a3c2820528dc877a52065
parent 7522 18a491487cd93ac4213420977f180cd516079d91
child 7524 827b6f63e9db7199464ff9dfd11b0ba81bc9ec54
push idunknown
push userunknown
push dateunknown
reviewersCallek
bugs643508
Bug 643508 - Remove instances of MOZ_META_COMPONENT and META_COMPONENT from comm-central; r=Callek
config/config.mk
mailnews/addrbook/build/Makefile.in
mailnews/addrbook/src/Makefile.in
mailnews/base/build/Makefile.in
mailnews/base/search/src/Makefile.in
mailnews/base/src/Makefile.in
mailnews/base/util/Makefile.in
mailnews/build/Makefile.in
mailnews/compose/build/Makefile.in
mailnews/compose/src/Makefile.in
mailnews/db/msgdb/build/Makefile.in
mailnews/db/msgdb/src/Makefile.in
mailnews/extensions/bayesian-spam-filter/build/Makefile.in
mailnews/extensions/bayesian-spam-filter/src/Makefile.in
mailnews/extensions/fts3/build/Makefile.in
mailnews/extensions/fts3/src/Makefile.in
mailnews/extensions/mailviews/build/Makefile.in
mailnews/extensions/mailviews/src/Makefile.in
mailnews/extensions/mdn/build/Makefile.in
mailnews/extensions/mdn/src/Makefile.in
mailnews/extensions/smime/build/Makefile.in
mailnews/extensions/smime/src/Makefile.in
mailnews/imap/build/Makefile.in
mailnews/imap/src/Makefile.in
mailnews/import/applemail/src/Makefile.in
mailnews/import/build/Makefile.in
mailnews/import/comm4x/src/Makefile.in
mailnews/import/eudora/src/Makefile.in
mailnews/import/oexpress/Makefile.in
mailnews/import/outlook/src/Makefile.in
mailnews/import/src/Makefile.in
mailnews/import/text/src/Makefile.in
mailnews/import/vcard/src/Makefile.in
mailnews/import/winlivemail/Makefile.in
mailnews/local/build/Makefile.in
mailnews/local/src/Makefile.in
mailnews/mapi/mapihook/src/Makefile.in
mailnews/mime/build/Makefile.in
mailnews/mime/cthandlers/calendar/Makefile.in
mailnews/mime/cthandlers/glue/Makefile.in
mailnews/mime/cthandlers/smimestub/Makefile.in
mailnews/mime/cthandlers/vcard/Makefile.in
mailnews/mime/src/Makefile.in
mailnews/news/build/Makefile.in
mailnews/news/src/Makefile.in
suite/feeds/src/Makefile.in
suite/profile/migration/src/Makefile.in
--- a/config/config.mk
+++ b/config/config.mk
@@ -234,22 +234,16 @@ endif # WINNT && !GNU_CC
 
 ifndef BUILD_STATIC_LIBS
 _ENABLE_PIC=1
 endif
 ifneq (,$(FORCE_SHARED_LIB)$(FORCE_USE_PIC))
 _ENABLE_PIC=1
 endif
 
-# In Firefox, all components are linked into either libxul or the static
-# meta-component, and should be compiled with PIC.
-ifdef MOZ_META_COMPONENT
-_ENABLE_PIC=1
-endif
-
 # If module is going to be merged into the nsStaticModule, 
 # make sure that the entry points are translated and 
 # the module is built static.
 
 ifdef IS_COMPONENT
 ifdef EXPORT_LIBRARY
 ifneq (,$(BUILD_STATIC_LIBS))
 ifdef MODULE_NAME
--- a/mailnews/addrbook/build/Makefile.in
+++ b/mailnews/addrbook/build/Makefile.in
@@ -40,17 +40,16 @@ topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 LOCAL_INCLUDES += -I$(srcdir)/../src
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= addrbook
 LIBRARY_NAME	= addrbook
-META_COMPONENT = mail
 EXPORT_LIBRARY = 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsAbModule
 ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 MOZILLA_INTERNAL_API = 1
 endif
 
 
--- a/mailnews/addrbook/src/Makefile.in
+++ b/mailnews/addrbook/src/Makefile.in
@@ -40,17 +40,16 @@ DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= addrbook
 LIBRARY_NAME	= addrbook_s
-META_COMPONENT = mail
 ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 MOZILLA_INTERNAL_API = 1
 endif
 
 CPPSRCS		= \
 		nsAbManager.cpp \
 		nsAbRDFDataSource.cpp \
 		nsDirectoryDataSource.cpp \
--- a/mailnews/base/build/Makefile.in
+++ b/mailnews/base/build/Makefile.in
@@ -39,17 +39,16 @@ DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= msgbase
 LIBRARY_NAME	= msgbase
-META_COMPONENT = mail
 EXPORT_LIBRARY = 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsMsgBaseModule
 ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 MOZILLA_INTERNAL_API = 1
 endif
 
 CPPSRCS		= nsMsgFactory.cpp
--- a/mailnews/base/search/src/Makefile.in
+++ b/mailnews/base/search/src/Makefile.in
@@ -40,17 +40,16 @@ topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= msgbase
 XPIDL_MODULE	= msgsearch
 LIBRARY_NAME	= msgsearch_s
-META_COMPONENT = mail
 ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 MOZILLA_INTERNAL_API = 1
 endif
 EXPORT_DIR	= $(DIST)/bin/isp
 
 
 CPPSRCS		= \
 		nsMsgFilterService.cpp \
--- a/mailnews/base/src/Makefile.in
+++ b/mailnews/base/src/Makefile.in
@@ -39,17 +39,16 @@ DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= msgbase
 LIBRARY_NAME	= msgbase_s
-META_COMPONENT = mail
 ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 MOZILLA_INTERNAL_API = 1
 endif
 
 CPPSRCS		= \
 		nsMessenger.cpp \
 		nsMessengerBootstrap.cpp \
 		nsMsgMailSession.cpp \
--- a/mailnews/base/util/Makefile.in
+++ b/mailnews/base/util/Makefile.in
@@ -50,19 +50,16 @@ EXPORT_LIBRARY = 1
 SHORT_LIBNAME	= msgbsutl
 else
 LIBRARY_NAME	= msgbsutl_s
 endif
 ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 MOZILLA_INTERNAL_API = 1
 endif
 
-META_COMPONENT = mail
-
-
 CPPSRCS		= \
 		nsMsgLineBuffer.cpp \
 		nsMsgDBFolder.cpp \
 		nsMsgKeySet.cpp \
 		nsMsgIdentity.cpp \
 		nsMsgIncomingServer.cpp \
 		nsMsgUtils.cpp \
 		nsMsgProtocol.cpp \
--- a/mailnews/build/Makefile.in
+++ b/mailnews/build/Makefile.in
@@ -39,21 +39,17 @@ DEPTH		= ../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= mail
 LIBRARY_NAME = mail
-
-META_COMPONENT = mail
-
 EXPORT_LIBRARY = 1
-
 IS_COMPONENT	= 1
 MOZILLA_INTERNAL_API = 1
 GRE_MODULE	= 1
 LIBXUL_LIBRARY	= 1
 FORCE_USE_PIC   = 1
 
 MODULE_NAME	= nsMailModule
 
--- a/mailnews/compose/build/Makefile.in
+++ b/mailnews/compose/build/Makefile.in
@@ -40,17 +40,16 @@ topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 LOCAL_INCLUDES += -I$(srcdir)/../src
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= msgcompose
 LIBRARY_NAME	= msgcompose
-META_COMPONENT = mail
 EXPORT_LIBRARY = 1
 SHORT_LIBNAME	= msgcompo
 IS_COMPONENT	= 1
 MODULE_NAME	= nsMsgComposeModule
 ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 MOZILLA_INTERNAL_API = 1
 endif
 
--- a/mailnews/compose/src/Makefile.in
+++ b/mailnews/compose/src/Makefile.in
@@ -39,17 +39,16 @@ DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= msgcompose
 LIBRARY_NAME	= msgcompose_s
-META_COMPONENT = mail
 ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 MOZILLA_INTERNAL_API = 1
 endif
 
 EXTRA_COMPONENTS = \
 		nsSMTPProtocolHandler.js \
 		nsSMTPProtocolHandler.manifest \
 		$(NULL)
--- a/mailnews/db/msgdb/build/Makefile.in
+++ b/mailnews/db/msgdb/build/Makefile.in
@@ -39,17 +39,16 @@ DEPTH		= ../../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= msgdb
 LIBRARY_NAME	= msgdb
-META_COMPONENT = mail
 EXPORT_LIBRARY = 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsMsgDBModule
 ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 MOZILLA_INTERNAL_API = 1
 endif
 
 
--- a/mailnews/db/msgdb/src/Makefile.in
+++ b/mailnews/db/msgdb/src/Makefile.in
@@ -39,17 +39,16 @@ DEPTH		= ../../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= msgdb
 LIBRARY_NAME	= msgdb_s
-META_COMPONENT = mail
 ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 MOZILLA_INTERNAL_API = 1
 endif
 
 
 CPPSRCS		= \
 		nsMsgDatabase.cpp \
 		nsDBFolderInfo.cpp \
--- a/mailnews/extensions/bayesian-spam-filter/build/Makefile.in
+++ b/mailnews/extensions/bayesian-spam-filter/build/Makefile.in
@@ -39,17 +39,16 @@ DEPTH		= ../../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= bayesflt
 LIBRARY_NAME	= bayesflt
-META_COMPONENT = mail
 EXPORT_LIBRARY = 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsBayesianFilterModule
 ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 MOZILLA_INTERNAL_API = 1
 endif
 
 
--- a/mailnews/extensions/bayesian-spam-filter/src/Makefile.in
+++ b/mailnews/extensions/bayesian-spam-filter/src/Makefile.in
@@ -39,17 +39,16 @@ DEPTH		= ../../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= bayesflt
 LIBRARY_NAME	= bayesflt_s
-META_COMPONENT = mail
 ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 MOZILLA_INTERNAL_API = 1
 endif
 
 
 CPPSRCS		= \
 		nsBayesianFilter.cpp \
 		$(NULL)
--- a/mailnews/extensions/fts3/build/Makefile.in
+++ b/mailnews/extensions/fts3/build/Makefile.in
@@ -40,17 +40,16 @@ DEPTH		= ../../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= fts3tok
 LIBRARY_NAME	= fts3tok
-META_COMPONENT = mail
 EXPORT_LIBRARY = 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsFts3TokenizerModule
 ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 MOZILLA_INTERNAL_API = 1
 endif
 
 
--- a/mailnews/extensions/fts3/src/Makefile.in
+++ b/mailnews/extensions/fts3/src/Makefile.in
@@ -40,17 +40,16 @@ DEPTH		= ../../../..
 topsrcdir       = @top_srcdir@
 srcdir          = @srcdir@
 VPATH           = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= fts3tok
 LIBRARY_NAME	= fts3tok_s
-META_COMPONENT = mail
 ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 MOZILLA_INTERNAL_API = 1
 endif
 
 
 CPPSRCS		= \
 		nsFts3Tokenizer.cpp \
 		nsGlodaRankerFunction.cpp \
--- a/mailnews/extensions/mailviews/build/Makefile.in
+++ b/mailnews/extensions/mailviews/build/Makefile.in
@@ -39,17 +39,16 @@ DEPTH		= ../../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= mailview
 LIBRARY_NAME	= mailview
-META_COMPONENT = mail
 EXPORT_LIBRARY = 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsMsgMailViewModule
 ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 MOZILLA_INTERNAL_API = 1
 endif
 
 
--- a/mailnews/extensions/mailviews/src/Makefile.in
+++ b/mailnews/extensions/mailviews/src/Makefile.in
@@ -39,17 +39,16 @@ DEPTH		= ../../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= mailview
 LIBRARY_NAME	= mailview_s
-META_COMPONENT = mail
 ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 MOZILLA_INTERNAL_API = 1
 endif
 
 
 CPPSRCS		= \
                 nsMsgMailViewList.cpp \
 		$(NULL)
--- a/mailnews/extensions/mdn/build/Makefile.in
+++ b/mailnews/extensions/mdn/build/Makefile.in
@@ -39,17 +39,16 @@ DEPTH		= ../../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= msgmdn
 LIBRARY_NAME	= msgmdn
-META_COMPONENT = mail
 EXPORT_LIBRARY = 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsMsgMdnModule
 ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 MOZILLA_INTERNAL_API = 1
 endif
 
 
--- a/mailnews/extensions/mdn/src/Makefile.in
+++ b/mailnews/extensions/mdn/src/Makefile.in
@@ -39,17 +39,16 @@ DEPTH		= ../../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= msgmdn
 LIBRARY_NAME	= msgmdn_s
-META_COMPONENT = mail
 ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 MOZILLA_INTERNAL_API = 1
 endif
 
 
 CPPSRCS		= \
                 nsMsgMdnGenerator.cpp \
 		$(NULL)
--- a/mailnews/extensions/smime/build/Makefile.in
+++ b/mailnews/extensions/smime/build/Makefile.in
@@ -39,17 +39,16 @@ DEPTH		= ../../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= msgsmime
 LIBRARY_NAME	= msgsmime
-META_COMPONENT = mail
 EXPORT_LIBRARY = 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsMsgSMIMEModule
 ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 MOZILLA_INTERNAL_API = 1
 endif
 LIBXUL_LIBRARY = 1
 
--- a/mailnews/extensions/smime/src/Makefile.in
+++ b/mailnews/extensions/smime/src/Makefile.in
@@ -39,17 +39,16 @@ DEPTH		= ../../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= msgsmime
 LIBRARY_NAME	= msgsmime_s
-META_COMPONENT = mail
 ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 MOZILLA_INTERNAL_API = 1
 endif
 
 
 CPPSRCS		= \
                 nsMsgComposeSecure.cpp \
                 nsSMimeJSHelper.cpp \
--- a/mailnews/imap/build/Makefile.in
+++ b/mailnews/imap/build/Makefile.in
@@ -40,17 +40,16 @@ topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 LOCAL_INCLUDES += -I$(srcdir)/../src
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= msgimap
 LIBRARY_NAME	= msgimap
-META_COMPONENT = mail
 EXPORT_LIBRARY = 1
 IS_COMPONENT	= 1
 MODULE_NAME	= IMAP_factory
 ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 MOZILLA_INTERNAL_API = 1
 endif
 
 
--- a/mailnews/imap/src/Makefile.in
+++ b/mailnews/imap/src/Makefile.in
@@ -39,17 +39,16 @@ DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= msgimap
 LIBRARY_NAME	= msgimap_s
-META_COMPONENT = mail
 ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 MOZILLA_INTERNAL_API = 1
 endif
 
 
 EXPORTS = \
 		nsImapCore.h \
 		$(NULL)
--- a/mailnews/import/applemail/src/Makefile.in
+++ b/mailnews/import/applemail/src/Makefile.in
@@ -38,23 +38,20 @@ DEPTH			= ../../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH			= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE				= impapplemail
 LIBRARY_NAME	= applmail_s
-
 ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 MOZILLA_INTERNAL_API = 1
 endif
 
-META_COMPONENT = mail
-
 CPPSRCS = \
 		nsAppleMailImport.cpp \
 		$(NULL)
 
 CMMSRCS = \
 		nsEmlxHelperUtils.mm \
 		$(NULL)
 
--- a/mailnews/import/build/Makefile.in
+++ b/mailnews/import/build/Makefile.in
@@ -39,17 +39,16 @@ DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE = import
 LIBRARY_NAME = import
-META_COMPONENT = mail
 EXPORT_LIBRARY = 1
 IS_COMPONENT	= 1
 ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 MOZILLA_INTERNAL_API = 1
 endif
 LIBXUL_LIBRARY = 1
 
 MODULE_NAME	= nsImportServiceModule
--- a/mailnews/import/comm4x/src/Makefile.in
+++ b/mailnews/import/comm4x/src/Makefile.in
@@ -39,23 +39,20 @@ DEPTH		= ../../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= impComm4xMail
 LIBRARY_NAME   = imp4mail_s
-
 ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 MOZILLA_INTERNAL_API = 1
 endif
 
-META_COMPONENT  = mail
-
 CPPSRCS		= 	\
 			nsComm4xMailImport.cpp			\
 			nsComm4xMail.cpp				\
 			nsComm4xProfile.cpp				\
 			$(NULL)
 
 # we don't want the shared lib, but we want to force the creation of a static lib.
 FORCE_STATIC_LIB = 1
--- a/mailnews/import/eudora/src/Makefile.in
+++ b/mailnews/import/eudora/src/Makefile.in
@@ -39,17 +39,16 @@ DEPTH		= ../../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= impEudra
 LIBRARY_NAME   = impEudra_s
-META_COMPONENT	= mail
 ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 MOZILLA_INTERNAL_API = 1
 endif
 
 
 CPPSRCS		= \
 		nsEudoraStringBundle.cpp \
 		nsEudoraImport.cpp \
--- a/mailnews/import/oexpress/Makefile.in
+++ b/mailnews/import/oexpress/Makefile.in
@@ -42,18 +42,16 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= importOE
 LIBRARY_NAME   = importOE_s
 ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 MOZILLA_INTERNAL_API = 1
 endif
-META_COMPONENT	= mail
-
 
 CPPSRCS		= \
 		nsOEImport.cpp			\
 		nsOEScanBoxes.cpp		\
 		nsOEMailbox.cpp			\
 		nsOEAddressIterator.cpp		\
 		WabObject.cpp			\
 		nsOERegUtil.cpp			\
--- a/mailnews/import/outlook/src/Makefile.in
+++ b/mailnews/import/outlook/src/Makefile.in
@@ -39,17 +39,16 @@ DEPTH		= ../../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= impOutlk
 LIBRARY_NAME   = impOutlk_s
-META_COMPONENT	= mail
 ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 MOZILLA_INTERNAL_API = 1
 endif
 
 
 CPPSRCS		= \
 		nsOutlookRegUtil.cpp		\
 		nsOutlookStringBundle.cpp	\
--- a/mailnews/import/src/Makefile.in
+++ b/mailnews/import/src/Makefile.in
@@ -39,18 +39,16 @@ DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE = import
 LIBRARY_NAME = import_s
-
-META_COMPONENT = mail
 ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 MOZILLA_INTERNAL_API = 1
 endif
 
 
 
 
 CPPSRCS		= 	\
--- a/mailnews/import/text/src/Makefile.in
+++ b/mailnews/import/text/src/Makefile.in
@@ -38,25 +38,21 @@
 DEPTH		= ../../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= impText
-
 LIBRARY_NAME   = imptext_s
-
-META_COMPONENT = mail
 ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 MOZILLA_INTERNAL_API = 1
 endif
 
-
 CPPSRCS		= \
 		nsTextImport.cpp				\
 		nsTextAddress.cpp 				\
 		$(NULL)
 
 LOCAL_INCLUDES += -I$(srcdir)/../../src
 
 # we don't want the shared lib, but we want to force the creation of a static lib.
--- a/mailnews/import/vcard/src/Makefile.in
+++ b/mailnews/import/vcard/src/Makefile.in
@@ -39,17 +39,16 @@ DEPTH		= ../../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= impvcard
 LIBRARY_NAME   = impvcard_s
-META_COMPONENT	= mail
 ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 MOZILLA_INTERNAL_API = 1
 endif
 
 REQUIRES	= xpcom \
 		  string \
 		  import \
 		  intl \
--- a/mailnews/import/winlivemail/Makefile.in
+++ b/mailnews/import/winlivemail/Makefile.in
@@ -40,18 +40,16 @@ topsrcdir   =   @top_srcdir@
 srcdir      =   @srcdir@
 VPATH       =   @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE      =           importWM
 LIBRARY_NAME   =        importWM_s
 MOZILLA_INTERNAL_API =  1
-META_COMPONENT  =       mail
-
 
 CPPSRCS     = \
                         nsWMSettings.cpp        \
                         nsWMImport.cpp  \
                         nsWMStringBundle.cpp    \
                         $(NULL)
 
 # we don't want the shared lib, but we want to force the creation of a static lib.
--- a/mailnews/local/build/Makefile.in
+++ b/mailnews/local/build/Makefile.in
@@ -39,17 +39,16 @@ DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= msglocal
 LIBRARY_NAME	= msglocal
-META_COMPONENT = mail
 EXPORT_LIBRARY = 1
 IS_COMPONENT	= 1
 MODULE_NAME	= local_mail_services
 ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 MOZILLA_INTERNAL_API = 1
 endif
 LOCAL_INCLUDES += -I$(srcdir)/../src
 
--- a/mailnews/local/src/Makefile.in
+++ b/mailnews/local/src/Makefile.in
@@ -39,17 +39,16 @@ DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= msglocal
 LIBRARY_NAME	= msglocal_s
-META_COMPONENT = mail
 ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 MOZILLA_INTERNAL_API = 1
 endif
 
 
 CPPSRCS		= \
 		nsPop3Protocol.cpp \
 		nsPop3URL.cpp \
--- a/mailnews/mapi/mapihook/src/Makefile.in
+++ b/mailnews/mapi/mapihook/src/Makefile.in
@@ -42,17 +42,16 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= msgMapi
 LIBRARY_NAME	= $(MODULE)
 MODULE_NAME	= msgMapiModule
 EXPORT_LIBRARY  = 1
 IS_COMPONENT	= 1
-META_COMPONENT	= mail
 LIBXUL_LIBRARY  = 1
 ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 MOZILLA_INTERNAL_API = 1
 endif
 
 
 CPPSRCS		= \
 		msgMapiFactory.cpp \
--- a/mailnews/mime/build/Makefile.in
+++ b/mailnews/mime/build/Makefile.in
@@ -39,17 +39,16 @@ DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= mime
 LIBRARY_NAME	= mime
-META_COMPONENT = mail
 EXPORT_LIBRARY = 1
 IS_COMPONENT	= 1
 MODULE_NAME	= mime_services
 ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 MOZILLA_INTERNAL_API = 1
 endif
 LOCAL_INCLUDES += -I$(srcdir)/../src
 
--- a/mailnews/mime/cthandlers/calendar/Makefile.in
+++ b/mailnews/mime/cthandlers/calendar/Makefile.in
@@ -47,24 +47,20 @@ ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 MOZILLA_INTERNAL_API = 1
 endif
 
 ifndef MOZ_STATIC_MAIL_BUILD
 LIBRARY_NAME	= calendar
 EXPORT_LIBRARY = 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsCalendarModule
-
 else
 LIBRARY_NAME = calendar_s
 endif
 
-META_COMPONENT = mail
-
-
 ifeq ($(OS_ARCH),WINNT)
 MAPFILE		= calendar.map
 DEFFILE		= $(win_srcdir)/calendar.def
 endif
 
 LOCAL_INCLUDES = -I$(srcdir)/../glue
 
 CPPSRCS		= \
--- a/mailnews/mime/cthandlers/glue/Makefile.in
+++ b/mailnews/mime/cthandlers/glue/Makefile.in
@@ -39,17 +39,16 @@ DEPTH		= ../../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= mime
 LIBRARY_NAME	= mimecthglue_s
-META_COMPONENT = mail
 EXPORT_LIBRARY = 1
 ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 MOZILLA_INTERNAL_API = 1
 endif
 
 
 CPPSRCS		= \
 		mimexpcom.cpp \
--- a/mailnews/mime/cthandlers/smimestub/Makefile.in
+++ b/mailnews/mime/cthandlers/smimestub/Makefile.in
@@ -39,17 +39,16 @@ DEPTH		= ../../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= smime
 LIBRARY_NAME	= smimestb
-META_COMPONENT = mail
 EXPORT_LIBRARY = 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsSMIMEModule
 ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 MOZILLA_INTERNAL_API = 1
 endif
 
 
--- a/mailnews/mime/cthandlers/vcard/Makefile.in
+++ b/mailnews/mime/cthandlers/vcard/Makefile.in
@@ -47,24 +47,20 @@ ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 MOZILLA_INTERNAL_API = 1
 endif
 
 ifndef MOZ_STATIC_MAIL_BUILD
 LIBRARY_NAME	= vcard
 EXPORT_LIBRARY = 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsVCardModule
-
 else
 LIBRARY_NAME = vcard_s
 endif
 
-META_COMPONENT = mail
-
-
 ifeq ($(OS_ARCH),WINNT)
 MAPFILE		= vcard.map
 DEFFILE		= $(win_srcdir)/vcard.def
 endif
 
 LOCAL_INCLUDES = -I$(srcdir)/../glue
 
 CPPSRCS		= \
--- a/mailnews/mime/src/Makefile.in
+++ b/mailnews/mime/src/Makefile.in
@@ -47,17 +47,16 @@ BUILD_SMIME=1
 endif
 
 ifdef BUILD_SMIME
 DEFINES		+= -DENABLE_SMIME
 endif
 
 MODULE		= mime
 LIBRARY_NAME	= mime_s
-META_COMPONENT = mail
 ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 MOZILLA_INTERNAL_API = 1
 endif
 
 CPPSRCS		= \
 		nsMimeObjectClassAccess.cpp \
 		nsMimeConverter.cpp \
 		nsSimpleMimeConverterStub.cpp \
--- a/mailnews/news/build/Makefile.in
+++ b/mailnews/news/build/Makefile.in
@@ -39,17 +39,16 @@ DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= msgnews
 LIBRARY_NAME	= msgnews
-META_COMPONENT = mail
 EXPORT_LIBRARY = 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsMsgNewsModule
 ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 MOZILLA_INTERNAL_API = 1
 endif
 
 
--- a/mailnews/news/src/Makefile.in
+++ b/mailnews/news/src/Makefile.in
@@ -39,17 +39,16 @@ DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= msgnews
 LIBRARY_NAME	= msgnews_s
-META_COMPONENT = mail
 ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 MOZILLA_INTERNAL_API = 1
 endif
 
 
 CPPSRCS		= \
 		nsNNTPArticleList.cpp \
 		nsNNTPNewsgroupList.cpp \
--- a/suite/feeds/src/Makefile.in
+++ b/suite/feeds/src/Makefile.in
@@ -38,17 +38,16 @@ DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE = suitefeeds
 LIBRARY_NAME = suitefeeds_s
-META_COMPONENT  = suite
 FORCE_STATIC_LIB = 1
 FORCE_USE_PIC = 1
 
 DEFINES += \
 	-DMOZ_APP_NAME=$(MOZ_APP_NAME) \
 	-DMOZ_APP_DISPLAYNAME=$(MOZ_APP_DISPLAYNAME) \
 	$(NULL)
 
--- a/suite/profile/migration/src/Makefile.in
+++ b/suite/profile/migration/src/Makefile.in
@@ -38,18 +38,16 @@ DEPTH		= ../../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= suitemigration
 LIBRARY_NAME	= suitemigration_s
-META_COMPONENT  = suite
-
 
 CPPSRCS = \
 		nsProfileMigrator.cpp \
 		nsSuiteProfileMigratorUtils.cpp \
 		nsNetscapeProfileMigratorBase.cpp \
 		nsSeamonkeyProfileMigrator.cpp \
 		nsThunderbirdProfileMigrator.cpp \
 		$(NULL)