Bug 910541 - Port LIBXUL_LIBRARY et al to moz.build in comm-central, r=Standard8

2013-09-03 10:26:57 -05:00 · 2013-09-03 10:26:57 -05:00 · c7d2b11d1f
--- a/calendar/base/backend/libical/Makefile.in
+++ b/calendar/base/backend/libical/Makefile.in
@ -11,7 +11,6 @@ include $(DEPTH)/config/autoconf.mk

 LIBRARY_NAME     = calbase_s
 MODULE_NAME      = calBaseModule
-FORCE_STATIC_LIB = 1
 USE_STATIC_LIBS = 1
 NO_INTERFACES_MANIFEST = 1

--- a/calendar/base/backend/libical/build/Makefile.in
+++ b/calendar/base/backend/libical/build/Makefile.in
@ -12,10 +12,7 @@ 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

--- a/calendar/base/backend/libical/build/moz.build
+++ b/calendar/base/backend/libical/build/moz.build
@ -10,3 +10,6 @@ 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
@ -25,3 +25,5 @@ CPP_SOURCES += [
    'calUtils.cpp',
 ]

+FORCE_STATIC_LIB = True
+
--- a/calendar/libical/src/libical/Makefile.in
+++ b/calendar/libical/src/libical/Makefile.in
@ -45,7 +45,6 @@ include $(DEPTH)/config/autoconf.mk

 LIBRARY_NAME     = mozical
 MODULE_NAME      = mozIcalModule
-FORCE_STATIC_LIB = 1
 USE_STATIC_LIBS  = 1

 DEFINES += -DHAVE_CONFIG_H
--- a/calendar/libical/src/libical/moz.build
+++ b/calendar/libical/src/libical/moz.build
@ -38,3 +38,5 @@ CSRCS += [
    'vsnprintf.c',
 ]

+FORCE_STATIC_LIB = True
+
--- a/db/mork/build/Makefile.in
+++ b/db/mork/build/Makefile.in
@ -11,15 +11,9 @@ 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)
--- a/db/mork/build/moz.build
+++ b/db/mork/build/moz.build
@ -14,3 +14,11 @@ 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
@ -12,12 +12,5 @@ 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
@ -53,3 +53,8 @@ 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
+
--- a/ldap/xpcom/src/Makefile.in
+++ b/ldap/xpcom/src/Makefile.in
@ -11,15 +11,9 @@ 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
--- a/ldap/xpcom/src/moz.build
+++ b/ldap/xpcom/src/moz.build
@ -28,3 +28,11 @@ EXTRA_COMPONENTS += [
    '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
@ -14,9 +14,6 @@ include $(DEPTH)/config/autoconf.mk

 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)
--- a/mail/components/build/moz.build
+++ b/mail/components/build/moz.build
@ -9,3 +9,6 @@ CPP_SOURCES += [
    'nsMailComps.cpp',
 ]

+LIBXUL_LIBRARY = True
+EXPORT_LIBRARY = True
+
--- a/mail/components/migration/src/Makefile.in
+++ b/mail/components/migration/src/Makefile.in
@ -13,6 +13,4 @@ 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
@ -26,3 +26,5 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
        'nsProfileMigratorBase.cpp',
    ]

+FORCE_STATIC_LIB = True
+
--- a/mail/components/search/Makefile.in
+++ b/mail/components/search/Makefile.in
@ -16,8 +16,6 @@ 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
@ -10,6 +10,7 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
    DIRS += ['wsenable']
    CPP_SOURCES += ['nsMailWinSearchHelper.cpp']
    EXTRA_PP_JS_MODULES += ['WinSearchIntegration.js']
+    FORCE_STATIC_LIB = True

 MODULE = 'mailwinsearch'

--- a/mail/components/shell/Makefile.in
+++ b/mail/components/shell/Makefile.in
@ -15,8 +15,6 @@ 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
@ -25,3 +25,5 @@ EXTRA_COMPONENTS += [
    'shell.manifest',
 ]

+FORCE_STATIC_LIB = True
+
--- a/mailnews/addrbook/src/Makefile.in
+++ b/mailnews/addrbook/src/Makefile.in
@ -11,12 +11,6 @@ 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
--- a/mailnews/addrbook/src/moz.build
+++ b/mailnews/addrbook/src/moz.build
@ -84,3 +84,8 @@ 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
@ -11,12 +11,6 @@ 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


--- a/mailnews/base/search/src/moz.build
+++ b/mailnews/base/search/src/moz.build
@ -26,3 +26,8 @@ EXTRA_COMPONENTS += [
    '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
@ -11,12 +11,6 @@ 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
--- a/mailnews/base/src/moz.build
+++ b/mailnews/base/src/moz.build
@ -79,3 +79,8 @@ 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
@ -11,12 +11,6 @@ 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

--- a/mailnews/base/util/moz.build
+++ b/mailnews/base/util/moz.build
@ -66,3 +66,8 @@ EXTRA_JS_MODULES += [
    '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
@ -11,14 +11,8 @@ 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
--- a/mailnews/build/moz.build
+++ b/mailnews/build/moz.build
@ -9,3 +9,11 @@ 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
@ -11,12 +11,6 @@ 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

--- a/mailnews/compose/src/moz.build
+++ b/mailnews/compose/src/moz.build
@ -44,3 +44,8 @@ EXTRA_COMPONENTS += [
    '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
@ -11,12 +11,6 @@ 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
@ -16,3 +16,8 @@ CPP_SOURCES += [
    '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
@ -11,11 +11,5 @@ 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
@ -9,3 +9,8 @@ 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
@ -11,13 +11,6 @@ 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)
--- a/mailnews/extensions/fts3/src/moz.build
+++ b/mailnews/extensions/fts3/src/moz.build
@ -15,3 +15,8 @@ CPP_SOURCES += [
    '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
@ -11,12 +11,6 @@ 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
@ -9,3 +9,8 @@ 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
@ -11,12 +11,6 @@ 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
@ -14,3 +14,8 @@ EXTRA_COMPONENTS += [
    '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
@ -11,12 +11,6 @@ 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
@ -16,3 +16,8 @@ EXTRA_COMPONENTS += [
    '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
@ -11,15 +11,6 @@ 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
--- a/mailnews/imap/src/moz.build
+++ b/mailnews/imap/src/moz.build
@ -31,3 +31,8 @@ CPP_SOURCES += [
    '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
@ -11,8 +11,6 @@ relativesrcdir = @relativesrcdir@

 include $(DEPTH)/config/autoconf.mk

-include $(topsrcdir)/config/config.mk
-
 include $(topsrcdir)/config/rules.mk

 LOCAL_INCLUDES = \
--- a/mailnews/import/applemail/src/Makefile.in
+++ b/mailnews/import/applemail/src/Makefile.in
@ -10,11 +10,5 @@ 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
@ -13,3 +13,8 @@ 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
@ -12,13 +12,7 @@ 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


--- a/mailnews/import/build/moz.build
+++ b/mailnews/import/build/moz.build
@ -9,3 +9,10 @@ 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
@ -11,12 +11,6 @@ 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
--- a/mailnews/import/eudora/src/moz.build
+++ b/mailnews/import/eudora/src/moz.build
@ -22,3 +22,8 @@ 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
+
--- a/mailnews/import/oexpress/Makefile.in
+++ b/mailnews/import/oexpress/Makefile.in
@ -11,12 +11,6 @@ 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
--- a/mailnews/import/oexpress/moz.build
+++ b/mailnews/import/oexpress/moz.build
@ -17,3 +17,8 @@ CPP_SOURCES += [
    '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
@ -11,12 +11,6 @@ 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

--- a/mailnews/import/outlook/src/moz.build
+++ b/mailnews/import/outlook/src/moz.build
@ -18,3 +18,8 @@ CPP_SOURCES += [
    '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
@ -11,11 +11,5 @@ 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
@ -23,3 +23,8 @@ CPP_SOURCES += [
    '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
@ -11,12 +11,6 @@ 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

--- a/mailnews/import/text/src/moz.build
+++ b/mailnews/import/text/src/moz.build
@ -10,3 +10,8 @@ CPP_SOURCES += [
    '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
@ -11,12 +11,6 @@ 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

--- a/mailnews/import/vcard/src/moz.build
+++ b/mailnews/import/vcard/src/moz.build
@ -10,3 +10,8 @@ CPP_SOURCES += [
    '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
@ -11,11 +11,5 @@ 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
@ -12,3 +12,8 @@ CPP_SOURCES += [
    '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
@ -11,11 +11,5 @@ 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
@ -33,3 +33,9 @@ if CONFIG['MOZ_MOVEMAIL']:
        '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
@ -23,8 +23,6 @@ endif

 OS_LIBS		+= ole32.lib

-FORCE_SHARED_LIB = 1
-
 EMBED_MANIFEST_AT = 2

 include $(topsrcdir)/config/rules.mk
--- a/mailnews/mapi/mapiDll/moz.build
+++ b/mailnews/mapi/mapiDll/moz.build
@ -9,3 +9,5 @@ CPP_SOURCES += [
    'MapiDll.cpp',
 ]

+FORCE_SHARED_LIB = True
+
--- a/mailnews/mapi/mapihook/build/Makefile.in
+++ b/mailnews/mapi/mapihook/build/Makefile.in
@ -26,8 +26,6 @@ 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
--- a/mailnews/mapi/mapihook/build/moz.build
+++ b/mailnews/mapi/mapihook/build/moz.build
@ -15,3 +15,5 @@ CSRCS += [
    'msgMapi_p.c',
 ]

+FORCE_SHARED_LIB = True
+
--- a/mailnews/mapi/mapihook/src/Makefile.in
+++ b/mailnews/mapi/mapihook/src/Makefile.in
@ -12,12 +12,7 @@ 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)
--- a/mailnews/mapi/mapihook/src/moz.build
+++ b/mailnews/mapi/mapihook/src/moz.build
@ -14,3 +14,8 @@ CPP_SOURCES += [
    '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
@ -11,13 +11,6 @@ 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
@ -14,3 +14,10 @@ CPP_SOURCES += [
    '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
@ -10,13 +10,8 @@ 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
--- a/mailnews/mime/cthandlers/pgpmime/moz.build
+++ b/mailnews/mime/cthandlers/pgpmime/moz.build
@ -13,3 +13,10 @@ 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
@ -11,12 +11,6 @@ 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

--- a/mailnews/mime/cthandlers/vcard/moz.build
+++ b/mailnews/mime/cthandlers/vcard/moz.build
@ -9,3 +9,8 @@ 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
@ -11,12 +11,6 @@ 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
@ -19,3 +19,8 @@ CPP_SOURCES += [
    '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
@ -13,12 +13,6 @@ 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
@ -76,3 +76,8 @@ EXTRA_COMPONENTS += [
    '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
@ -11,12 +11,6 @@ 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
--- a/mailnews/news/src/moz.build
+++ b/mailnews/news/src/moz.build
@ -20,3 +20,8 @@ CPP_SOURCES += [
    '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
@ -10,8 +10,6 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk

 LIBRARY_NAME	 = suite
-FORCE_SHARED_LIB = 1
-IS_COMPONENT	 = 1
 MODULE_NAME	 = nsSuiteModule

 USE_STATIC_LIBS	 = 1
--- a/suite/build/moz.build
+++ b/suite/build/moz.build
@ -9,3 +9,5 @@ CPP_SOURCES += [
    'nsSuiteModule.cpp',
 ]

+FORCE_SHARED_LIB = True
+IS_COMPONENT = True
--- a/suite/feeds/src/Makefile.in
+++ b/suite/feeds/src/Makefile.in
@ -10,7 +10,6 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk

 LIBRARY_NAME = suitefeeds_s
-FORCE_STATIC_LIB = 1

 USE_STATIC_LIBS = 1

--- a/suite/feeds/src/moz.build
+++ b/suite/feeds/src/moz.build
@ -16,3 +16,5 @@ EXTRA_COMPONENTS += [
    'WebContentConverter.js',
 ]

+FORCE_STATIC_LIB = True
+
--- a/suite/profile/Makefile.in
+++ b/suite/profile/Makefile.in
@ -13,9 +13,6 @@ 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
@ -11,8 +11,6 @@ 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
@ -18,3 +18,6 @@ EXTRA_COMPONENTS += [
 EXTRA_PP_COMPONENTS += [
    'SuiteProfileMigrator.js',
 ]
+
+FORCE_STATIC_LIB = True
+
--- a/suite/profile/moz.build
+++ b/suite/profile/moz.build
@ -14,3 +14,5 @@ CPP_SOURCES += [
    'nsSuiteDirectoryProvider.cpp',
 ]

+FORCE_STATIC_LIB = True
+
--- a/suite/shell/src/Makefile.in
+++ b/suite/shell/src/Makefile.in
@ -9,8 +9,6 @@ VPATH   = @srcdir@

 include $(DEPTH)/config/autoconf.mk

-FORCE_STATIC_LIB = 1
-
 USE_STATIC_LIBS = 1

 ifeq ($(OS_ARCH),WINNT)
--- a/suite/shell/src/moz.build
+++ b/suite/shell/src/moz.build
@ -18,3 +18,5 @@ if CPP_SOURCES:
        'nsSetDefault.manifest',
    ]

+FORCE_STATIC_LIB = True
+