--- a/calendar/base/backend/libical/Makefile.in
+++ b/calendar/base/backend/libical/Makefile.in
@@ -6,13 +6,12 @@ DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME     = calbase_s
 MODULE_NAME      = calBaseModule
-FORCE_STATIC_LIB = 1
 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
@@ -7,20 +7,17 @@ DEPTH   = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH   = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME = calbasecomps
 SHORT_LIBNAME = calbscmp
-IS_COMPONENT = 1
 MODULE_NAME = calBaseModule
-# We don't want an EXPORT_LIBRARY
-FORCE_SHARED_LIB = 1
 USE_STATIC_LIBS = 1
 NO_COMPONENTS_MANIFEST = 1
 
 LOCAL_INCLUDES = \
 	-I$(srcdir)/..
 
 SHARED_LIBRARY_LIBS = \
     $(DEPTH)/calendar/base/backend/libical/$(LIB_PREFIX)calbase_s.$(LIB_SUFFIX) \

--- a/calendar/base/backend/libical/build/moz.build
+++ b/calendar/base/backend/libical/build/moz.build
@@ -5,8 +5,11 @@
 
 XPIDL_MODULE = 'caldatetime_libical'
 MODULE = 'calbasecomps'
 
 CPP_SOURCES += [
     'calBaseModule.cpp',
 ]
 
+# We don't want an EXPORT_LIBRARY
+FORCE_SHARED_LIB = True
+IS_COMPONENT = True

--- a/calendar/base/backend/libical/moz.build
+++ b/calendar/base/backend/libical/moz.build
@@ -20,8 +20,10 @@ CPP_SOURCES += [
     'calDuration.cpp',
     'calICSService.cpp',
     'calPeriod.cpp',
     'calRecurrenceRule.cpp',
     'calTimezone.cpp',
     'calUtils.cpp',
 ]
 
+FORCE_STATIC_LIB = True
+

--- a/calendar/libical/src/libical/Makefile.in
+++ b/calendar/libical/src/libical/Makefile.in
@@ -40,17 +40,16 @@ DEPTH= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME     = mozical
 MODULE_NAME      = mozIcalModule
-FORCE_STATIC_LIB = 1
 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
@@ -33,8 +33,10 @@ CSRCS += [
     'icaltimezone.c',
     'icaltypes.c',
     'icalvalue.c',
     'pvl.c',
     'sspm.c',
     'vsnprintf.c',
 ]
 
+FORCE_STATIC_LIB = True
+

--- a/db/mork/build/Makefile.in
+++ b/db/mork/build/Makefile.in
@@ -6,25 +6,19 @@
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 VPATH		= @srcdir@
 srcdir		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= mork
-EXPORT_LIBRARY = 1
 
 ifdef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
-IS_COMPONENT	= 1
 MODULE_NAME	= nsMorkModule
-FORCE_SHARED_LIB = 1
-else
-MOZILLA_INTERNAL_API = 1
-LIBXUL_LIBRARY	= 1
 endif
 
 SHARED_LIBRARY_LIBS = ../src/$(LIB_PREFIX)msgmork_s.$(LIB_SUFFIX)
 
 ifdef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 EXTRA_DSO_LDOPTS += \
 	$(XPCOM_GLUE_LDOPTS) \
 	$(NSPR_LIBS) \

--- a/db/mork/build/moz.build
+++ b/db/mork/build/moz.build
@@ -9,8 +9,16 @@ EXPORTS += [
     'nsIMdbFactoryFactory.h',
     'nsMorkCID.h',
 ]
 
 CPP_SOURCES += [
     'nsMorkFactory.cpp',
 ]
 
+if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
+    IS_COMPONENT = True
+    FORCE_SHARED_LIB = True
+else:
+    LIBXUL_LIBRARY = True
+
+EXPORT_LIBRARY = True
+

--- a/db/mork/src/Makefile.in
+++ b/db/mork/src/Makefile.in
@@ -7,17 +7,10 @@ DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= msgmork_s
 
-ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
-MOZILLA_INTERNAL_API = 1
-LIBXUL_LIBRARY	= 1
-else
-FORCE_STATIC_LIB = 1
-endif
-
 include $(topsrcdir)/config/rules.mk
 

--- a/db/mork/src/moz.build
+++ b/db/mork/src/moz.build
@@ -48,8 +48,13 @@ CPP_SOURCES += [
     'morkYarn.cpp',
     'morkZone.cpp',
     'orkinHeap.cpp',
 ]
 
 if CONFIG['OS_ARCH'] == 'WINNT':
     CPP_SOURCES += ['morkSearchRowCursor.cpp']
 
+if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
+    FORCE_STATIC_LIB = True
+else:
+    LIBXUL_LIBRARY = True
+

--- a/ldap/xpcom/src/Makefile.in
+++ b/ldap/xpcom/src/Makefile.in
@@ -6,25 +6,19 @@
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= mozldap
-EXPORT_LIBRARY	= 1
 
 ifdef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
-IS_COMPONENT	= 1
 MODULE_NAME	= nsLDAPProtocolModule
-FORCE_SHARED_LIB = 1
-else
-MOZILLA_INTERNAL_API = 1
-LIBXUL_LIBRARY	= 1
 endif
 
 ifdef MOZ_PREF_EXTENSIONS
 DEFINES += -DMOZ_PREF_EXTENSIONS
 endif
 
 EXTRA_DSO_LDOPTS += $(LDAP_LIBS)
 ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE

--- a/ldap/xpcom/src/moz.build
+++ b/ldap/xpcom/src/moz.build
@@ -23,8 +23,16 @@ CPP_SOURCES += [
 if CONFIG['MOZ_PREF_EXTENSIONS']:
     CPP_SOURCES += ['nsLDAPSyncQuery.cpp']
 
 EXTRA_COMPONENTS += [
     'ldapComponents.manifest',
     'nsLDAPProtocolHandler.js',
 ]
 
+if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
+    IS_COMPONENT = True
+    FORCE_SHARED_LIB = True
+else:
+    LIBXUL_LIBRARY = True
+
+EXPORT_LIBRARY = True
+

--- a/mail/components/build/Makefile.in
+++ b/mail/components/build/Makefile.in
@@ -9,19 +9,16 @@ 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
-EXPORT_LIBRARY	= 1
-LIBXUL_LIBRARY = 1
-MOZILLA_INTERNAL_API = 1
 
 ifeq ($(OS_ARCH),WINNT)
 OS_LIBS += $(call EXPAND_LIBNAME,ole32 shell32)
 endif
 
 LOCAL_INCLUDES = \
 	-I$(srcdir)/../migration/src \
 	-I$(srcdir)/../shell \

--- a/mail/components/build/moz.build
+++ b/mail/components/build/moz.build
@@ -4,8 +4,11 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULE = 'mailcomps'
 
 CPP_SOURCES += [
     'nsMailComps.cpp',
 ]
 
+LIBXUL_LIBRARY = True
+EXPORT_LIBRARY = True
+

--- a/mail/components/migration/src/Makefile.in
+++ b/mail/components/migration/src/Makefile.in
@@ -8,11 +8,9 @@ srcdir=@srcdir@
 VPATH=@srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME = profilemigration_s
 MODULE_NAME = nsMailProfileMigratorModule
 MOZILLA_INTERNAL_API = 1
 
-FORCE_STATIC_LIB = 1
-
 include $(topsrcdir)/config/rules.mk

--- a/mail/components/migration/src/moz.build
+++ b/mail/components/migration/src/moz.build
@@ -21,8 +21,10 @@ if CONFIG['OS_ARCH'] == 'WINNT':
     ]
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
     CPP_SOURCES += [
         'nsEudoraProfileMigrator.cpp',
         'nsProfileMigratorBase.cpp',
     ]
 
+FORCE_STATIC_LIB = True
+

--- a/mail/components/search/Makefile.in
+++ b/mail/components/search/Makefile.in
@@ -11,13 +11,11 @@ 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
-
-FORCE_STATIC_LIB = 1
 endif
 
 include $(topsrcdir)/config/rules.mk

--- a/mail/components/search/moz.build
+++ b/mail/components/search/moz.build
@@ -5,16 +5,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
 
 MODULE = 'mailwinsearch'
 
 DIRS += ['public']
 
 EXTRA_PP_JS_MODULES += [
     'SearchIntegration.js',
 ]

--- a/mail/components/shell/Makefile.in
+++ b/mail/components/shell/Makefile.in
@@ -10,13 +10,11 @@ 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
 
-FORCE_STATIC_LIB = 1
-
 include $(topsrcdir)/config/rules.mk
 
 CXXFLAGS += $(TK_CFLAGS)

--- a/mail/components/shell/moz.build
+++ b/mail/components/shell/moz.build
@@ -20,8 +20,10 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk2
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
     CPP_SOURCES += ['nsMailMacIntegration.cpp']
 
 EXTRA_COMPONENTS += [
     'nsSetDefaultMail.js',
     'shell.manifest',
 ]
 
+FORCE_STATIC_LIB = True
+

--- a/mailnews/addrbook/src/Makefile.in
+++ b/mailnews/addrbook/src/Makefile.in
@@ -6,22 +6,16 @@
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= addrbook_s
-ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
-MOZILLA_INTERNAL_API = 1
-LIBXUL_LIBRARY = 1
-else
-FORCE_STATIC_LIB = 1
-endif
 
 ifeq ($(OS_ARCH),WINNT)
 OS_CXXFLAGS += -DNOMINMAX
 endif
 
 ifdef MOZ_LDAP_XPCOM
 DEFINES += -DMOZ_LDAP_XPCOM
 

--- a/mailnews/addrbook/src/moz.build
+++ b/mailnews/addrbook/src/moz.build
@@ -79,8 +79,13 @@ EXTRA_COMPONENTS += [
     'nsAbAutoCompleteSearch.js',
     'nsAbLDAPAttributeMap.js',
 ]
 
 EXTRA_PP_COMPONENTS += [
     'nsAddrbook.manifest',
 ]
 
+if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
+    FORCE_STATIC_LIB = True
+else:
+    LIBXUL_LIBRARY = True
+

--- a/mailnews/base/search/src/Makefile.in
+++ b/mailnews/base/search/src/Makefile.in
@@ -6,22 +6,16 @@
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= msgsearch_s
-ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
-MOZILLA_INTERNAL_API = 1
-LIBXUL_LIBRARY = 1
-else
-FORCE_STATIC_LIB = 1
-endif
 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
@@ -21,8 +21,13 @@ CPP_SOURCES += [
     'nsMsgSearchValue.cpp',
 ]
 
 EXTRA_COMPONENTS += [
     'nsMsgTraitService.js',
     'nsMsgTraitService.manifest',
 ]
 
+if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
+    FORCE_STATIC_LIB = True
+else:
+    LIBXUL_LIBRARY = True
+

--- a/mailnews/base/src/Makefile.in
+++ b/mailnews/base/src/Makefile.in
@@ -6,20 +6,14 @@
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= msgbase_s
-ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
-MOZILLA_INTERNAL_API = 1
-LIBXUL_LIBRARY = 1
-else
-FORCE_STATIC_LIB = 1
-endif
 
 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
@@ -74,8 +74,13 @@ EXTRA_COMPONENTS += [
     'newMailNotificationService.js',
     'nsMailNewsCommandLineHandler.js',
 ]
 
 EXTRA_JS_MODULES += [
     'virtualFolderWrapper.js',
 ]
 
+if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
+    FORCE_STATIC_LIB = True
+else:
+    LIBXUL_LIBRARY = True
+

--- a/mailnews/base/util/Makefile.in
+++ b/mailnews/base/util/Makefile.in
@@ -6,22 +6,16 @@
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= msgbsutl_s
-ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
-MOZILLA_INTERNAL_API = 1
-LIBXUL_LIBRARY = 1
-else
-FORCE_STATIC_LIB = 1
-endif
 
 DEFINES		+= -D_IMPL_NS_MSG_BASE
 
 ifeq ($(OS_ARCH),WINNT)
 DEFINES		+= -DZLIB_DLL
 OS_CXXFLAGS	+= -DNOMINMAX
 endif
 

--- a/mailnews/base/util/moz.build
+++ b/mailnews/base/util/moz.build
@@ -61,8 +61,13 @@ EXTRA_JS_MODULES += [
     'jsTreeSelection.js',
     'mailServices.js',
     'mailnewsMigrator.js',
     'msgDBCacheManager.js',
     'templateUtils.js',
     'traceHelper.js',
 ]
 
+if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
+    FORCE_STATIC_LIB = True
+else:
+    LIBXUL_LIBRARY = True
+

--- a/mailnews/build/Makefile.in
+++ b/mailnews/build/Makefile.in
@@ -6,24 +6,18 @@
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME = mail
-EXPORT_LIBRARY = 1
 ifdef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
-IS_COMPONENT	= 1
 MODULE_NAME	= nsMailModule
-FORCE_SHARED_LIB = 1
-else
-MOZILLA_INTERNAL_API = 1
-LIBXUL_LIBRARY	= 1
 endif
 
 ifdef MOZ_LDAP_XPCOM
 DEFINES		+= -DMOZ_LDAP_XPCOM
 endif
 
 ifeq ($(OS_ARCH),WINNT)
 DEFINES		+= -DZLIB_DLL

--- a/mailnews/build/moz.build
+++ b/mailnews/build/moz.build
@@ -4,8 +4,16 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULE = 'mail'
 
 CPP_SOURCES += [
     'nsMailModule.cpp',
 ]
 
+if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
+    IS_COMPONENT = True
+    FORCE_SHARED_LIB = True
+else:
+    LIBXUL_LIBRARY = True
+
+EXPORT_LIBRARY = True
+

--- a/mailnews/compose/src/Makefile.in
+++ b/mailnews/compose/src/Makefile.in
@@ -6,22 +6,16 @@
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= msgcompose_s
-ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
-MOZILLA_INTERNAL_API = 1
-LIBXUL_LIBRARY = 1
-else
-FORCE_STATIC_LIB = 1
-endif
 
 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
@@ -39,8 +39,13 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'coco
         'nsMsgAppleEncode.cpp',
     ]
 
 EXTRA_COMPONENTS += [
     'nsSMTPProtocolHandler.js',
     'nsSMTPProtocolHandler.manifest',
 ]
 
+if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
+    FORCE_STATIC_LIB = True
+else:
+    LIBXUL_LIBRARY = True
+

--- a/mailnews/db/msgdb/src/Makefile.in
+++ b/mailnews/db/msgdb/src/Makefile.in
@@ -6,17 +6,11 @@
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= msgdb_s
-ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
-MOZILLA_INTERNAL_API = 1
-LIBXUL_LIBRARY = 1
-else
-FORCE_STATIC_LIB = 1
-endif
 
 include $(topsrcdir)/config/rules.mk
 

--- a/mailnews/db/msgdb/src/moz.build
+++ b/mailnews/db/msgdb/src/moz.build
@@ -11,8 +11,13 @@ CPP_SOURCES += [
     'nsMailDatabase.cpp',
     'nsMsgDatabase.cpp',
     'nsMsgHdr.cpp',
     'nsMsgOfflineImapOperation.cpp',
     'nsMsgThread.cpp',
     'nsNewsDatabase.cpp',
 ]
 
+if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
+    FORCE_STATIC_LIB = True
+else:
+    LIBXUL_LIBRARY = True
+

--- a/mailnews/extensions/bayesian-spam-filter/src/Makefile.in
+++ b/mailnews/extensions/bayesian-spam-filter/src/Makefile.in
@@ -6,16 +6,10 @@
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= bayesflt_s
-ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
-MOZILLA_INTERNAL_API = 1
-LIBXUL_LIBRARY = 1
-else
-FORCE_STATIC_LIB = 1
-endif
 
 include $(topsrcdir)/config/rules.mk

--- a/mailnews/extensions/bayesian-spam-filter/src/moz.build
+++ b/mailnews/extensions/bayesian-spam-filter/src/moz.build
@@ -4,8 +4,13 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULE = 'bayesflt'
 
 CPP_SOURCES += [
     'nsBayesianFilter.cpp',
 ]
 
+if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
+    FORCE_STATIC_LIB = True
+else:
+    LIBXUL_LIBRARY = True
+

--- a/mailnews/extensions/fts3/src/Makefile.in
+++ b/mailnews/extensions/fts3/src/Makefile.in
@@ -6,20 +6,13 @@
 DEPTH		= @DEPTH@
 topsrcdir       = @top_srcdir@
 srcdir          = @srcdir@
 VPATH           = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= fts3tok_s
-ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
-MOZILLA_INTERNAL_API = 1
-LIBXUL_LIBRARY = 1
-else
-FORCE_STATIC_LIB = 1
-endif
-
 
 LOCAL_INCLUDES = \
 		$(SQLITE_CFLAGS)
 
 include $(topsrcdir)/config/rules.mk

--- a/mailnews/extensions/fts3/src/moz.build
+++ b/mailnews/extensions/fts3/src/moz.build
@@ -10,8 +10,13 @@ CSRCS += [
     'fts3_porter.c',
 ]
 
 CPP_SOURCES += [
     'nsFts3Tokenizer.cpp',
     'nsGlodaRankerFunction.cpp',
 ]
 
+if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
+    FORCE_STATIC_LIB = True
+else:
+    LIBXUL_LIBRARY = True
+

--- a/mailnews/extensions/mailviews/src/Makefile.in
+++ b/mailnews/extensions/mailviews/src/Makefile.in
@@ -6,17 +6,11 @@
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= mailview_s
-ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
-MOZILLA_INTERNAL_API = 1
-LIBXUL_LIBRARY = 1
-else
-FORCE_STATIC_LIB = 1
-endif
 
 include $(topsrcdir)/config/rules.mk
 

--- a/mailnews/extensions/mailviews/src/moz.build
+++ b/mailnews/extensions/mailviews/src/moz.build
@@ -4,8 +4,13 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULE = 'mailview'
 
 CPP_SOURCES += [
     'nsMsgMailViewList.cpp',
 ]
 
+if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
+    FORCE_STATIC_LIB = True
+else:
+    LIBXUL_LIBRARY = True
+

--- a/mailnews/extensions/mdn/src/Makefile.in
+++ b/mailnews/extensions/mdn/src/Makefile.in
@@ -6,17 +6,11 @@
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= msgmdn_s
-ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
-MOZILLA_INTERNAL_API = 1
-LIBXUL_LIBRARY = 1
-else
-FORCE_STATIC_LIB = 1
-endif
 
 include $(topsrcdir)/config/rules.mk
 

--- a/mailnews/extensions/mdn/src/moz.build
+++ b/mailnews/extensions/mdn/src/moz.build
@@ -9,8 +9,13 @@ CPP_SOURCES += [
     'nsMsgMdnGenerator.cpp',
 ]
 
 EXTRA_COMPONENTS += [
     'mdn-service.js',
     'mdn-service.manifest',
 ]
 
+if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
+    FORCE_STATIC_LIB = True
+else:
+    LIBXUL_LIBRARY = True
+

--- a/mailnews/extensions/smime/src/Makefile.in
+++ b/mailnews/extensions/smime/src/Makefile.in
@@ -6,17 +6,11 @@
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= msgsmime_s
-ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
-MOZILLA_INTERNAL_API = 1
-LIBXUL_LIBRARY = 1
-else
-FORCE_STATIC_LIB = 1
-endif
 
 include $(topsrcdir)/config/rules.mk
 

--- a/mailnews/extensions/smime/src/moz.build
+++ b/mailnews/extensions/smime/src/moz.build
@@ -11,8 +11,13 @@ CPP_SOURCES += [
     'nsSMimeJSHelper.cpp',
 ]
 
 EXTRA_COMPONENTS += [
     'smime-service.js',
     'smime-service.manifest',
 ]
 
+if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
+    FORCE_STATIC_LIB = True
+else:
+    LIBXUL_LIBRARY = True
+

--- a/mailnews/imap/src/Makefile.in
+++ b/mailnews/imap/src/Makefile.in
@@ -6,24 +6,15 @@
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= msgimap_s
-ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
-MOZILLA_INTERNAL_API = 1
-LIBXUL_LIBRARY = 1
-else
-FORCE_STATIC_LIB = 1
-endif
-
-
-include $(topsrcdir)/config/config.mk
 
 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
@@ -26,8 +26,13 @@ CPP_SOURCES += [
     'nsImapService.cpp',
     'nsImapStringBundle.cpp',
     'nsImapUndoTxn.cpp',
     'nsImapUrl.cpp',
     'nsImapUtils.cpp',
     'nsSyncRunnableHelpers.cpp',
 ]
 
+if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
+    FORCE_STATIC_LIB = True
+else:
+    LIBXUL_LIBRARY = True
+

--- a/mailnews/imap/test/Makefile.in
+++ b/mailnews/imap/test/Makefile.in
@@ -6,18 +6,16 @@
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-include $(topsrcdir)/config/config.mk
-
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES = \
 		-I$(MOZILLA_SRCDIR)/xpcom/tests \
 		-I$(topsrcdir)/mailnews/base/util \
 		-I$(srcdir)/../src \
 		$(NULL)
 

--- a/mailnews/import/applemail/src/Makefile.in
+++ b/mailnews/import/applemail/src/Makefile.in
@@ -5,16 +5,10 @@
 DEPTH			= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH			= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= applmail_s
-ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
-MOZILLA_INTERNAL_API = 1
-LIBXUL_LIBRARY = 1
-else
-FORCE_STATIC_LIB = 1
-endif
 
 include $(topsrcdir)/config/rules.mk

--- a/mailnews/import/applemail/src/moz.build
+++ b/mailnews/import/applemail/src/moz.build
@@ -8,8 +8,13 @@ MODULE = 'impapplemail'
 CPP_SOURCES += [
     'nsAppleMailImport.cpp',
 ]
 
 CMMSRCS += [
     'nsEmlxHelperUtils.mm',
 ]
 
+if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
+    FORCE_STATIC_LIB = True
+else:
+    LIBXUL_LIBRARY = True
+

--- a/mailnews/import/build/Makefile.in
+++ b/mailnews/import/build/Makefile.in
@@ -7,23 +7,17 @@ DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME = import
 ifdef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
-IS_COMPONENT	= 1
 MODULE_NAME	= nsImportServiceModule
-FORCE_SHARED_LIB=1
-else
-EXPORT_LIBRARY = 1
-MOZILLA_INTERNAL_API = 1
-LIBXUL_LIBRARY = 1
 endif
 
 
 SHARED_LIBRARY_LIBS = \
 		../src/$(LIB_PREFIX)import_s.$(LIB_SUFFIX) \
 		../text/src/$(LIB_PREFIX)imptext_s.$(LIB_SUFFIX) \
 		../vcard/src/$(LIB_PREFIX)impvcard_s.$(LIB_SUFFIX) \
 		$(NULL)

--- a/mailnews/import/build/moz.build
+++ b/mailnews/import/build/moz.build
@@ -4,8 +4,15 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULE = 'import'
 
 CPP_SOURCES += [
     'nsImportModule.cpp',
 ]
 
+if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
+    IS_COMPONENT = True
+    FORCE_SHARED_LIB = True
+else:
+    LIBXUL_LIBRARY = True
+    EXPORT_LIBRARY = True
+

--- a/mailnews/import/eudora/src/Makefile.in
+++ b/mailnews/import/eudora/src/Makefile.in
@@ -6,22 +6,16 @@
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME   = impEudra_s
-ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
-MOZILLA_INTERNAL_API = 1
-LIBXUL_LIBRARY = 1
-else
-FORCE_STATIC_LIB = 1
-endif
 
 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
@@ -17,8 +17,13 @@ CPP_SOURCES += [
 ]
 
 if CONFIG['OS_ARCH'] == 'WINNT':
     CPP_SOURCES += ['nsEudoraWin32.cpp']
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
     CPP_SOURCES += ['nsEudoraMac.cpp']
 
+if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
+    FORCE_STATIC_LIB = True
+else:
+    LIBXUL_LIBRARY = True
+

--- a/mailnews/import/oexpress/Makefile.in
+++ b/mailnews/import/oexpress/Makefile.in
@@ -6,20 +6,14 @@
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME   = importOE_s
-ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
-MOZILLA_INTERNAL_API = 1
-LIBXUL_LIBRARY = 1
-else
-FORCE_STATIC_LIB = 1
-endif
 
 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
@@ -12,8 +12,13 @@ CPP_SOURCES += [
     'nsOEImport.cpp',
     'nsOEMailbox.cpp',
     'nsOERegUtil.cpp',
     'nsOEScanBoxes.cpp',
     'nsOESettings.cpp',
     'nsOEStringBundle.cpp',
 ]
 
+if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
+    FORCE_STATIC_LIB = True
+else:
+    LIBXUL_LIBRARY = True
+

--- a/mailnews/import/outlook/src/Makefile.in
+++ b/mailnews/import/outlook/src/Makefile.in
@@ -6,18 +6,12 @@
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME   = impOutlk_s
-ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
-MOZILLA_INTERNAL_API = 1
-LIBXUL_LIBRARY = 1
-else
-FORCE_STATIC_LIB = 1
-endif
 
 LOCAL_INCLUDES += -I$(srcdir)/../../src
 
 include $(topsrcdir)/config/rules.mk

--- a/mailnews/import/outlook/src/moz.build
+++ b/mailnews/import/outlook/src/moz.build
@@ -13,8 +13,13 @@ CPP_SOURCES += [
     'nsOutlookImport.cpp',
     'nsOutlookMail.cpp',
     'nsOutlookSettings.cpp',
     'nsOutlookStringBundle.cpp',
     'rtfDecoder.cpp',
     'rtfMailDecoder.cpp',
 ]
 
+if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
+    FORCE_STATIC_LIB = True
+else:
+    LIBXUL_LIBRARY = True
+

--- a/mailnews/import/src/Makefile.in
+++ b/mailnews/import/src/Makefile.in
@@ -6,16 +6,10 @@
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME = import_s
-ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
-MOZILLA_INTERNAL_API = 1
-LIBXUL_LIBRARY = 1
-else
-FORCE_STATIC_LIB = 1
-endif
 
 include $(topsrcdir)/config/rules.mk

--- a/mailnews/import/src/moz.build
+++ b/mailnews/import/src/moz.build
@@ -18,8 +18,13 @@ CPP_SOURCES += [
     'nsImportMailboxDescriptor.cpp',
     'nsImportMimeEncode.cpp',
     'nsImportScanFile.cpp',
     'nsImportService.cpp',
     'nsImportStringBundle.cpp',
     'nsImportTranslator.cpp',
 ]
 
+if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
+    FORCE_STATIC_LIB = True
+else:
+    LIBXUL_LIBRARY = True
+

--- a/mailnews/import/text/src/Makefile.in
+++ b/mailnews/import/text/src/Makefile.in
@@ -6,18 +6,12 @@
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME   = imptext_s
-ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
-MOZILLA_INTERNAL_API = 1
-LIBXUL_LIBRARY = 1
-else
-FORCE_STATIC_LIB = 1
-endif
 
 LOCAL_INCLUDES += -I$(srcdir)/../../src
 
 include $(topsrcdir)/config/rules.mk

--- a/mailnews/import/text/src/moz.build
+++ b/mailnews/import/text/src/moz.build
@@ -5,8 +5,13 @@
 
 MODULE = 'impText'
 
 CPP_SOURCES += [
     'nsTextAddress.cpp',
     'nsTextImport.cpp',
 ]
 
+if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
+    FORCE_STATIC_LIB = True
+else:
+    LIBXUL_LIBRARY = True
+

--- a/mailnews/import/vcard/src/Makefile.in
+++ b/mailnews/import/vcard/src/Makefile.in
@@ -6,18 +6,12 @@
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME   = impvcard_s
-ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
-MOZILLA_INTERNAL_API = 1
-LIBXUL_LIBRARY = 1
-else
-FORCE_STATIC_LIB = 1
-endif
 
 LOCAL_INCLUDES += -I$(srcdir)/../../src
 
 include $(topsrcdir)/config/rules.mk

--- a/mailnews/import/vcard/src/moz.build
+++ b/mailnews/import/vcard/src/moz.build
@@ -5,8 +5,13 @@
 
 MODULE = 'impvcard'
 
 CPP_SOURCES += [
     'nsVCardAddress.cpp',
     'nsVCardImport.cpp',
 ]
 
+if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
+    FORCE_STATIC_LIB = True
+else:
+    LIBXUL_LIBRARY = True
+

--- a/mailnews/import/winlivemail/Makefile.in
+++ b/mailnews/import/winlivemail/Makefile.in
@@ -6,16 +6,10 @@
 DEPTH       =   @DEPTH@
 topsrcdir   =   @top_srcdir@
 srcdir      =   @srcdir@
 VPATH       =   @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME   =        importWM_s
-ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
-MOZILLA_INTERNAL_API = 1
-LIBXUL_LIBRARY = 1
-else
-FORCE_STATIC_LIB = 1
-endif
 
 include $(topsrcdir)/config/rules.mk

--- a/mailnews/import/winlivemail/moz.build
+++ b/mailnews/import/winlivemail/moz.build
@@ -7,8 +7,13 @@ MODULE = 'importWM'
 
 CPP_SOURCES += [
     'nsWMImport.cpp',
     'nsWMSettings.cpp',
     'nsWMStringBundle.cpp',
     'nsWMUtils.cpp',
 ]
 
+if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
+    FORCE_STATIC_LIB = True
+else:
+    LIBXUL_LIBRARY = True
+

--- a/mailnews/local/src/Makefile.in
+++ b/mailnews/local/src/Makefile.in
@@ -6,16 +6,10 @@
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= msglocal_s
-ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
-MOZILLA_INTERNAL_API = 1
-LIBXUL_LIBRARY = 1
-else
-FORCE_STATIC_LIB = 1
-endif
 
 include $(topsrcdir)/config/rules.mk

--- a/mailnews/local/src/moz.build
+++ b/mailnews/local/src/moz.build
@@ -28,8 +28,14 @@ CPP_SOURCES += [
     'nsRssService.cpp',
 ]
 
 if CONFIG['MOZ_MOVEMAIL']:
     CPP_SOURCES += [
         'nsMovemailIncomingServer.cpp',
         'nsMovemailService.cpp',
     ]
+
+if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
+    FORCE_STATIC_LIB = True
+else:
+    LIBXUL_LIBRARY = True
+

--- a/mailnews/mapi/mapiDll/Makefile.in
+++ b/mailnews/mapi/mapiDll/Makefile.in
@@ -18,15 +18,13 @@ LIBRARY_NAME	= $(MODULE)
 DEFFILE		= $(win_srcdir)/Mapi32.def
 ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
 MOZILLA_INTERNAL_API = 1
 endif
 
 
 OS_LIBS		+= ole32.lib
 
-FORCE_SHARED_LIB = 1
-
 EMBED_MANIFEST_AT = 2
 
 include $(topsrcdir)/config/rules.mk
 
 DEFINES	+= -DUNICODE -D_UNICODE

--- a/mailnews/mapi/mapiDll/moz.build
+++ b/mailnews/mapi/mapiDll/moz.build
@@ -4,8 +4,10 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULE = 'mozMapi32'
 
 CPP_SOURCES += [
     'MapiDll.cpp',
 ]
 
+FORCE_SHARED_LIB = True
+

--- a/mailnews/mapi/mapihook/build/Makefile.in
+++ b/mailnews/mapi/mapihook/build/Makefile.in
@@ -21,18 +21,16 @@ OS_LIBS		+= rpcrt4.lib
 MIDL_GENERATED_FILES = msgMapi.h msgMapi_p.c msgMapi_i.c dlldata.c
 
 SRCDIR_CSRCS	= $(addprefix $(srcdir)/,$(CSRCS))
 
 GARBAGE	+= $(MIDL_GENERATED_FILES) done_gen $(CSRCS) $(SRCDIR_CSRCS)
 
 LOCAL_INCLUDES	= -I.
 
-FORCE_SHARED_LIB = 1
-
 EMBED_MANIFEST_AT = 2
 
 include $(topsrcdir)/config/rules.mk
 
 DEFINES += -DREGISTER_PROXY_DLL -DUNICODE -D_UNICODE -D_WIN32_WINNT=0x400
 
 $(MIDL_GENERATED_FILES): done_gen
 

--- a/mailnews/mapi/mapihook/build/moz.build
+++ b/mailnews/mapi/mapihook/build/moz.build
@@ -10,8 +10,10 @@ EXPORTS += [
 ]
 
 CSRCS += [
     'dlldata.c',
     'msgMapi_i.c',
     'msgMapi_p.c',
 ]
 
+FORCE_SHARED_LIB = True
+

--- a/mailnews/mapi/mapihook/src/Makefile.in
+++ b/mailnews/mapi/mapihook/src/Makefile.in
@@ -7,22 +7,17 @@ DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= $(MODULE)
 ifdef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
-IS_COMPONENT	= 1
 MODULE_NAME	= msgMapiModule
-else
-EXPORT_LIBRARY  = 1
-MOZILLA_INTERNAL_API = 1
-LIBXUL_LIBRARY  = 1
 endif
 
 LOBJS		= ../build/msgMapi_i.$(OBJ_SUFFIX)
 
 OS_LIBS		+= ole32.lib
 
 include $(topsrcdir)/config/rules.mk
 

--- a/mailnews/mapi/mapihook/src/moz.build
+++ b/mailnews/mapi/mapihook/src/moz.build
@@ -9,8 +9,13 @@ 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

--- a/mailnews/mime/cthandlers/glue/Makefile.in
+++ b/mailnews/mime/cthandlers/glue/Makefile.in
@@ -6,18 +6,11 @@
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= mimecthglue_s
-EXPORT_LIBRARY = 1
-ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
-MOZILLA_INTERNAL_API = 1
-LIBXUL_LIBRARY = 1
-else
-FORCE_STATIC_LIB = 1
-endif
 
 include $(topsrcdir)/config/rules.mk
 

--- a/mailnews/mime/cthandlers/glue/moz.build
+++ b/mailnews/mime/cthandlers/glue/moz.build
@@ -9,8 +9,15 @@ EXPORTS += [
     'nsMimeContentTypeHandler.h',
 ]
 
 CPP_SOURCES += [
     'mimexpcom.cpp',
     'nsMimeContentTypeHandler.cpp',
 ]
 
+if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
+    FORCE_STATIC_LIB = True
+else:
+    LIBXUL_LIBRARY = True
+
+EXPORT_LIBRARY = True
+

--- a/mailnews/mime/cthandlers/pgpmime/Makefile.in
+++ b/mailnews/mime/cthandlers/pgpmime/Makefile.in
@@ -5,20 +5,15 @@
 DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME   = pgpmime_s
-EXPORT_LIBRARY = 1
 ifdef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
-IS_COMPONENT   = 1
 MODULE_NAME    = nsPgpMimeModule
-else
-MOZILLA_INTERNAL_API = 1
-LIBXUL_LIBRARY = 1
 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
@@ -8,8 +8,15 @@ MODULE = 'pgpmime'
 EXPORTS += [
     'nsPgpMimeProxy.h',
 ]
 
 CPP_SOURCES += [
     'nsPgpMimeProxy.cpp',
 ]
 
+if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
+    IS_COMPONENT = True
+else:
+    LIBXUL_LIBRARY = True
+
+EXPORT_LIBRARY = True
+

--- a/mailnews/mime/cthandlers/vcard/Makefile.in
+++ b/mailnews/mime/cthandlers/vcard/Makefile.in
@@ -6,18 +6,12 @@
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME = vcard_s
-ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
-MOZILLA_INTERNAL_API = 1
-LIBXUL_LIBRARY = 1
-else
-FORCE_STATIC_LIB = 1
-endif
 
 LOCAL_INCLUDES = -I$(srcdir)/../glue
 
 include $(topsrcdir)/config/rules.mk

--- a/mailnews/mime/cthandlers/vcard/moz.build
+++ b/mailnews/mime/cthandlers/vcard/moz.build
@@ -4,8 +4,13 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULE = 'vcard'
 
 CPP_SOURCES += [
     'mimevcrd.cpp',
 ]
 
+if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
+    FORCE_STATIC_LIB = True
+else:
+    LIBXUL_LIBRARY = True
+

--- a/mailnews/mime/emitters/Makefile.in
+++ b/mailnews/mime/emitters/Makefile.in
@@ -6,17 +6,11 @@
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= emitterutil_s
-ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
-MOZILLA_INTERNAL_API = 1
-LIBXUL_LIBRARY = 1
-else
-FORCE_STATIC_LIB = 1
-endif
 
 include $(topsrcdir)/config/rules.mk
 

--- a/mailnews/mime/emitters/moz.build
+++ b/mailnews/mime/emitters/moz.build
@@ -14,8 +14,13 @@ CPP_SOURCES += [
     'nsMimeBaseEmitter.cpp',
     'nsMimeHtmlEmitter.cpp',
     'nsMimePlainEmitter.cpp',
     'nsMimeRawEmitter.cpp',
     'nsMimeRebuffer.cpp',
     'nsMimeXmlEmitter.cpp',
 ]
 
+if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
+    FORCE_STATIC_LIB = True
+else:
+    LIBXUL_LIBRARY = True
+

--- a/mailnews/mime/src/Makefile.in
+++ b/mailnews/mime/src/Makefile.in
@@ -8,18 +8,12 @@ topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 DEFINES		+= -DENABLE_SMIME
 
 LIBRARY_NAME	= mime_s
-ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
-MOZILLA_INTERNAL_API = 1
-LIBXUL_LIBRARY = 1
-else
-FORCE_STATIC_LIB = 1
-endif
 
 include $(topsrcdir)/config/rules.mk
 
 

--- a/mailnews/mime/src/moz.build
+++ b/mailnews/mime/src/moz.build
@@ -71,8 +71,13 @@ CPP_SOURCES += [
     'nsStreamConverter.cpp',
 ]
 
 EXTRA_COMPONENTS += [
     'mimeJSComponents.js',
     'msgMime.manifest',
 ]
 
+if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
+    FORCE_STATIC_LIB = True
+else:
+    LIBXUL_LIBRARY = True
+

--- a/mailnews/news/src/Makefile.in
+++ b/mailnews/news/src/Makefile.in
@@ -6,21 +6,15 @@
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= msgnews_s
-ifndef MOZ_INCOMPLETE_EXTERNAL_LINKAGE
-MOZILLA_INTERNAL_API = 1
-LIBXUL_LIBRARY = 1
-else
-FORCE_STATIC_LIB = 1
-endif
 
 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
@@ -15,8 +15,13 @@ CPP_SOURCES += [
     'nsNewsFolder.cpp',
     'nsNewsUtils.cpp',
     'nsNntpIncomingServer.cpp',
     'nsNntpMockChannel.cpp',
     'nsNntpService.cpp',
     'nsNntpUrl.cpp',
 ]
 
+if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
+    FORCE_STATIC_LIB = True
+else:
+    LIBXUL_LIBRARY = True
+

--- a/suite/build/Makefile.in
+++ b/suite/build/Makefile.in
@@ -5,18 +5,16 @@
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	 = suite
-FORCE_SHARED_LIB = 1
-IS_COMPONENT	 = 1
 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
@@ -4,8 +4,10 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULE = 'suite'
 
 CPP_SOURCES += [
     'nsSuiteModule.cpp',
 ]
 
+FORCE_SHARED_LIB = True
+IS_COMPONENT = True

--- a/suite/feeds/src/Makefile.in
+++ b/suite/feeds/src/Makefile.in
@@ -5,13 +5,12 @@
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME = suitefeeds_s
-FORCE_STATIC_LIB = 1
 
 USE_STATIC_LIBS = 1
 
 include $(topsrcdir)/config/rules.mk

--- a/suite/feeds/src/moz.build
+++ b/suite/feeds/src/moz.build
@@ -11,8 +11,10 @@ CPP_SOURCES += [
 
 EXTRA_COMPONENTS += [
     'FeedConverter.js',
     'FeedWriter.js',
     'SuiteFeeds.manifest',
     'WebContentConverter.js',
 ]
 
+FORCE_STATIC_LIB = True
+

--- a/suite/profile/Makefile.in
+++ b/suite/profile/Makefile.in
@@ -8,15 +8,12 @@ srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= suiteprofile_s
 
 EXTRA_DSO_LDOPTS = $(MOZ_COMPONENT_LIBS)
 
-# we don't want the shared lib, but we want to force the creation of a static lib.
-FORCE_STATIC_LIB = 1
-
 USE_STATIC_LIBS = 1
 
 include $(topsrcdir)/config/rules.mk
 

--- a/suite/profile/migration/src/Makefile.in
+++ b/suite/profile/migration/src/Makefile.in
@@ -6,13 +6,11 @@ DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= suitemigration_s
 
-FORCE_STATIC_LIB = 1
-
 USE_STATIC_LIBS = 1
 
 include $(topsrcdir)/config/rules.mk

--- a/suite/profile/migration/src/moz.build
+++ b/suite/profile/migration/src/moz.build
@@ -13,8 +13,11 @@ CPP_SOURCES += [
 
 EXTRA_COMPONENTS += [
     'SuiteProfileMigrator.manifest',
 ]
 
 EXTRA_PP_COMPONENTS += [
     'SuiteProfileMigrator.js',
 ]
+
+FORCE_STATIC_LIB = True
+

--- a/suite/profile/moz.build
+++ b/suite/profile/moz.build
@@ -9,8 +9,10 @@ PARALLEL_DIRS += [
 ]
 
 MODULE = 'suiteprofile'
 
 CPP_SOURCES += [
     'nsSuiteDirectoryProvider.cpp',
 ]
 
+FORCE_STATIC_LIB = True
+

--- a/suite/shell/src/Makefile.in
+++ b/suite/shell/src/Makefile.in
@@ -4,18 +4,16 @@
 
 DEPTH   = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH   = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-FORCE_STATIC_LIB = 1
-
 USE_STATIC_LIBS = 1
 
 ifeq ($(OS_ARCH),WINNT)
 OS_LIBS         += $(call EXPAND_LIBNAME,ole32 version uuid shell32)
 endif
 
 LIBRARY_NAME = shellservice_s
 

--- a/suite/shell/src/moz.build
+++ b/suite/shell/src/moz.build
@@ -13,8 +13,10 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gt
     CPP_SOURCES += ['nsGNOMEShellService.cpp']
 
 if CPP_SOURCES:
     EXTRA_COMPONENTS += [
         'nsSetDefault.js',
         'nsSetDefault.manifest',
     ]
 
+FORCE_STATIC_LIB = True
+