bug 887483 - rm a bunch of useless assignments to FORCE_STATIC_LIB r=mshal
☠☠ backed out by 348d0694eb86 ☠ ☠
authorTrevor Saunders <trev.saunders@gmail.com>
Tue, 25 Jun 2013 14:29:26 -0400
changeset 151163 b7d6458d2a3cc8a7fa5417400d5a41355dd95c84
parent 151162 4ee2783daa4749cec7a0ad79c44dcd1a787f5655
child 151164 b674f0e40c8eb12edb964b80aa4ca2af37fcbf4c
push id382
push userakeybl@mozilla.com
push dateMon, 21 Oct 2013 21:47:13 +0000
treeherdermozilla-release@5f1868ee45cb [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmshal
bugs887483
milestone25.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
bug 887483 - rm a bunch of useless assignments to FORCE_STATIC_LIB r=mshal
accessible/src/atk/Makefile.in
accessible/src/base/Makefile.in
accessible/src/generic/Makefile.in
accessible/src/html/Makefile.in
accessible/src/mac/Makefile.in
accessible/src/other/Makefile.in
accessible/src/windows/ia2/Makefile.in
accessible/src/windows/msaa/Makefile.in
accessible/src/windows/sdn/Makefile.in
accessible/src/windows/uia/Makefile.in
accessible/src/xpcom/Makefile.in
accessible/src/xul/Makefile.in
caps/src/Makefile.in
chrome/src/Makefile.in
content/base/src/Makefile.in
content/canvas/src/Makefile.in
content/events/src/Makefile.in
content/html/content/src/Makefile.in
content/html/document/src/Makefile.in
content/mathml/content/src/Makefile.in
content/media/Makefile.in
content/media/dash/Makefile.in
content/media/encoder/Makefile.in
content/media/gstreamer/Makefile.in
content/media/ogg/Makefile.in
content/media/omx/Makefile.in
content/media/plugins/Makefile.in
content/media/raw/Makefile.in
content/media/wave/Makefile.in
content/media/webaudio/Makefile.in
content/media/webaudio/blink/Makefile.in
content/media/webm/Makefile.in
content/media/webrtc/Makefile.in
content/media/webspeech/recognition/Makefile.in
content/media/webspeech/synth/Makefile.in
content/media/wmf/Makefile.in
content/smil/Makefile.in
content/svg/content/src/Makefile.in
content/svg/document/src/Makefile.in
content/xbl/src/Makefile.in
content/xml/content/src/Makefile.in
content/xml/document/src/Makefile.in
content/xslt/src/base/Makefile.in
content/xslt/src/xml/Makefile.in
content/xslt/src/xpath/Makefile.in
content/xslt/src/xslt/Makefile.in
content/xul/content/src/Makefile.in
content/xul/document/src/Makefile.in
content/xul/templates/src/Makefile.in
docshell/base/Makefile.in
docshell/shistory/src/Makefile.in
dom/activities/src/Makefile.in
dom/alarm/Makefile.in
dom/audiochannel/Makefile.in
dom/base/Makefile.in
dom/battery/Makefile.in
dom/bindings/Makefile.in
dom/bindings/test/Makefile.in
dom/bluetooth/Makefile.in
dom/browser-element/Makefile.in
dom/camera/Makefile.in
dom/cellbroadcast/src/Makefile.in
dom/devicestorage/Makefile.in
dom/encoding/Makefile.in
dom/file/Makefile.in
dom/fm/Makefile.in
dom/future/Makefile.in
dom/icc/src/Makefile.in
dom/indexedDB/Makefile.in
dom/indexedDB/ipc/Makefile.in
dom/interfaces/devicestorage/Makefile.in
dom/ipc/Makefile.in
dom/media/Makefile.in
dom/mobilemessage/src/Makefile.in
dom/network/src/Makefile.in
dom/plugins/base/android/Makefile.in
dom/plugins/ipc/Makefile.in
dom/power/Makefile.in
dom/quota/Makefile.in
dom/src/events/Makefile.in
dom/src/geolocation/Makefile.in
dom/src/json/Makefile.in
dom/src/jsurl/Makefile.in
dom/src/notification/Makefile.in
dom/src/offline/Makefile.in
dom/src/storage/Makefile.in
dom/system/Makefile.in
dom/system/android/Makefile.in
dom/system/gonk/Makefile.in
dom/system/unix/Makefile.in
dom/system/windows/Makefile.in
dom/telephony/Makefile.in
dom/time/Makefile.in
dom/voicemail/Makefile.in
dom/wifi/Makefile.in
dom/workers/Makefile.in
editor/libeditor/base/Makefile.in
editor/libeditor/html/Makefile.in
editor/libeditor/text/Makefile.in
editor/txtsvc/src/Makefile.in
embedding/browser/webBrowser/Makefile.in
embedding/components/appstartup/src/Makefile.in
embedding/components/commandhandler/src/Makefile.in
embedding/components/find/src/Makefile.in
embedding/components/printingui/src/mac/Makefile.in
embedding/components/printingui/src/os2/Makefile.in
embedding/components/printingui/src/unixshared/Makefile.in
embedding/components/printingui/src/win/Makefile.in
embedding/components/webbrowserpersist/src/Makefile.in
embedding/components/windowwatcher/src/Makefile.in
extensions/spellcheck/hunspell/src/Makefile.in
extensions/universalchardet/src/base/Makefile.in
gfx/cairo/cairo/src/Makefile.in
gfx/cairo/libpixman/src/Makefile.in
gfx/graphite2/src/Makefile.in
gfx/harfbuzz/src/Makefile.in
gfx/ipc/Makefile.in
gfx/layers/Makefile.in
gfx/ots/src/Makefile.in
gfx/qcms/Makefile.in
hal/Makefile.in
image/decoders/Makefile.in
image/decoders/icon/android/Makefile.in
image/decoders/icon/gtk/Makefile.in
image/decoders/icon/mac/Makefile.in
image/decoders/icon/os2/Makefile.in
image/decoders/icon/qt/Makefile.in
image/decoders/icon/win/Makefile.in
image/encoders/bmp/Makefile.in
image/encoders/ico/Makefile.in
image/encoders/jpeg/Makefile.in
image/encoders/png/Makefile.in
image/src/Makefile.in
intl/locale/src/Makefile.in
intl/locale/src/mac/Makefile.in
intl/locale/src/os2/Makefile.in
intl/locale/src/unix/Makefile.in
intl/locale/src/windows/Makefile.in
intl/lwbrk/src/Makefile.in
intl/strres/src/Makefile.in
intl/uconv/ucvcn/Makefile.in
intl/uconv/ucvibm/Makefile.in
intl/uconv/ucvja/Makefile.in
intl/uconv/ucvko/Makefile.in
intl/uconv/ucvlatin/Makefile.in
intl/uconv/ucvtw/Makefile.in
intl/uconv/ucvtw2/Makefile.in
intl/uconv/util/Makefile.in
intl/unicharutil/src/Makefile.in
ipc/chromium/Makefile.in
ipc/dbus/Makefile.in
ipc/glue/Makefile.in
ipc/ipdl/Makefile.in
ipc/ipdl/test/cxx/Makefile.in
ipc/netd/Makefile.in
ipc/nfc/Makefile.in
ipc/ril/Makefile.in
ipc/testshell/Makefile.in
ipc/unixsocket/Makefile.in
js/ipc/Makefile.in
js/xpconnect/loader/Makefile.in
js/xpconnect/src/Makefile.in
js/xpconnect/wrappers/Makefile.in
layout/base/Makefile.in
layout/forms/Makefile.in
layout/generic/Makefile.in
layout/inspector/src/Makefile.in
layout/ipc/Makefile.in
layout/mathml/Makefile.in
layout/printing/Makefile.in
layout/style/Makefile.in
layout/svg/Makefile.in
layout/tables/Makefile.in
layout/xul/base/src/Makefile.in
layout/xul/grid/Makefile.in
layout/xul/tree/Makefile.in
netwerk/base/src/Makefile.in
netwerk/cache/Makefile.in
netwerk/cookie/Makefile.in
netwerk/dash/mpd/Makefile.in
netwerk/dns/Makefile.in
netwerk/ipc/Makefile.in
netwerk/mime/Makefile.in
netwerk/protocol/about/Makefile.in
netwerk/protocol/data/Makefile.in
netwerk/protocol/device/Makefile.in
netwerk/protocol/file/Makefile.in
netwerk/protocol/ftp/Makefile.in
netwerk/protocol/http/Makefile.in
netwerk/protocol/res/Makefile.in
netwerk/protocol/viewsource/Makefile.in
netwerk/protocol/websocket/Makefile.in
netwerk/protocol/wyciwyg/Makefile.in
netwerk/sctp/datachannel/Makefile.in
netwerk/sctp/src/Makefile.in
netwerk/socket/Makefile.in
netwerk/srtp/src/Makefile.in
netwerk/streamconv/converters/Makefile.in
netwerk/streamconv/src/Makefile.in
netwerk/system/android/Makefile.in
netwerk/system/mac/Makefile.in
netwerk/system/maemo/Makefile.in
netwerk/system/qt/Makefile.in
netwerk/system/win32/Makefile.in
netwerk/wifi/Makefile.in
other-licenses/snappy/Makefile.in
parser/html/Makefile.in
parser/xml/src/Makefile.in
rdf/base/src/Makefile.in
rdf/datasource/src/Makefile.in
storage/src/Makefile.in
toolkit/components/alerts/Makefile.in
toolkit/components/downloads/Makefile.in
toolkit/components/feeds/Makefile.in
toolkit/components/find/Makefile.in
toolkit/components/intl/Makefile.in
toolkit/components/osfile/Makefile.in
toolkit/components/parentalcontrols/Makefile.in
toolkit/components/startup/Makefile.in
toolkit/components/statusfilter/Makefile.in
toolkit/components/typeaheadfind/Makefile.in
toolkit/components/url-classifier/Makefile.in
toolkit/identity/Makefile.in
toolkit/mozapps/update/common/Makefile.in
toolkit/profile/Makefile.in
toolkit/xre/Makefile.in
tools/trace-malloc/lib/Makefile.in
uriloader/base/Makefile.in
uriloader/exthandler/Makefile.in
uriloader/prefetch/Makefile.in
view/src/Makefile.in
widget/shared/Makefile.in
widget/shared/x11/Makefile.in
widget/windows/Makefile.in
widget/xpwidgets/Makefile.in
xpcom/base/Makefile.in
xpcom/components/Makefile.in
xpcom/ds/Makefile.in
xpcom/io/Makefile.in
xpcom/threads/Makefile.in
xpfe/components/directory/Makefile.in
--- a/accessible/src/atk/Makefile.in
+++ b/accessible/src/atk/Makefile.in
@@ -7,19 +7,16 @@ topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 EXPORT_LIBRARY = ..
 LIBXUL_LIBRARY = 1
 
-# we want to force the creation of a static lib.
-FORCE_STATIC_LIB = 1
-
 include $(topsrcdir)/config/rules.mk
 
 ifdef MOZ_ENABLE_GTK
 CFLAGS      += $(TK_CFLAGS)
 CXXFLAGS    += $(TK_CFLAGS)
 endif
 
 ifdef MOZ_ENABLE_DBUS
--- a/accessible/src/base/Makefile.in
+++ b/accessible/src/base/Makefile.in
@@ -6,19 +6,16 @@ DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBXUL_LIBRARY = 1
 
-# we don't want the shared lib, but we want to force the creation of a static lib.
-FORCE_STATIC_LIB = 1
-
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES += \
   -I$(srcdir) \
   -I$(srcdir)/../generic \
   -I$(srcdir)/../html \
   -I$(srcdir)/../xpcom \
   -I$(srcdir)/../xul \
--- a/accessible/src/generic/Makefile.in
+++ b/accessible/src/generic/Makefile.in
@@ -6,19 +6,16 @@ DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBXUL_LIBRARY = 1
 
-# we don't want the shared lib, but we want to force the creation of a static lib.
-FORCE_STATIC_LIB = 1
-
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES = \
   -I$(srcdir)/../xpcom \
   -I$(srcdir)/../base \
   -I$(srcdir)/../html \
   -I$(srcdir)/../xul \
   -I$(srcdir)/../../../content/base/src \
--- a/accessible/src/html/Makefile.in
+++ b/accessible/src/html/Makefile.in
@@ -7,19 +7,16 @@ DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBXUL_LIBRARY = 1
 
-# we don't want the shared lib, but we want to force the creation of a static lib.
-FORCE_STATIC_LIB = 1
-
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES = \
   -I$(srcdir)/../base \
   -I$(srcdir)/../generic \
   -I$(srcdir)/../xpcom \
   -I$(srcdir)/../../../content/base/src \
   -I$(srcdir)/../../../content/html/content/src \
--- a/accessible/src/mac/Makefile.in
+++ b/accessible/src/mac/Makefile.in
@@ -8,19 +8,16 @@ srcdir = @srcdir@
 VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 EXPORT_LIBRARY = ..
 LIBXUL_LIBRARY = 1
 
 
-# we don't want the shared lib, but we want to force the creation of a static lib.
-FORCE_STATIC_LIB = 1
-
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES += \
   -I$(srcdir) \
   -I$(srcdir)/../base \
   -I$(srcdir)/../generic \
   -I$(srcdir)/../html \
   -I$(srcdir)/../xul \
--- a/accessible/src/other/Makefile.in
+++ b/accessible/src/other/Makefile.in
@@ -7,19 +7,16 @@ topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 EXPORT_LIBRARY = ..
 LIBXUL_LIBRARY = 1
 
-# we don't want the shared lib, but we want to force the creation of a static lib.
-FORCE_STATIC_LIB = 1
-
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES += \
   -I$(srcdir) \
   -I$(srcdir)/../base \
   -I$(srcdir)/../generic \
   -I$(srcdir)/../html \
   -I$(srcdir)/../xul \
--- a/accessible/src/windows/ia2/Makefile.in
+++ b/accessible/src/windows/ia2/Makefile.in
@@ -12,19 +12,16 @@ include $(DEPTH)/config/autoconf.mk
 LIBRARY_NAME = accessibility_toolkit_ia2_s
 EXPORT_LIBRARY = 1
 LIBXUL_LIBRARY = 1
 
 # The midl generated code include Windows headers which defines min and max
 # macros which conflicts with std::min/max.  Suppress the macros:
 OS_CXXFLAGS += -DNOMINMAX
 
-# we don't want the shared lib, but we want to force the creation of a static lib.
-FORCE_STATIC_LIB = 1
-
 include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES += \
   -I$(srcdir) \
   -I$(srcdir)/../msaa \
   -I$(srcdir)/../../base \
   -I$(srcdir)/../../generic \
--- a/accessible/src/windows/msaa/Makefile.in
+++ b/accessible/src/windows/msaa/Makefile.in
@@ -8,19 +8,16 @@ srcdir = @srcdir@
 VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME = accessibility_toolkit_msaa_s
 EXPORT_LIBRARY = 1
 LIBXUL_LIBRARY = 1
 
-# we don't want the shared lib, but we want to force the creation of a static lib.
-FORCE_STATIC_LIB = 1
-
 include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES += \
   -I$(srcdir) \
   -I$(srcdir)/../../base \
   -I$(srcdir)/../../generic \
--- a/accessible/src/windows/sdn/Makefile.in
+++ b/accessible/src/windows/sdn/Makefile.in
@@ -11,19 +11,16 @@ include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME = accessibility_toolkit_sdn_s
 EXPORT_LIBRARY = 1
 LIBXUL_LIBRARY = 1
 # The midl generated code include Windows headers which defines min and max
 # macros which conflicts with std::min/max.  Suppress the macros:
 OS_CXXFLAGS += -DNOMINMAX
 
-# we don't want the shared lib, but we want to force the creation of a static lib.
-FORCE_STATIC_LIB = 1
-
 include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES += \
   -I$(srcdir) \
   -I$(srcdir)/../msaa \
   -I$(srcdir)/../../base \
   -I$(srcdir)/../../generic \
--- a/accessible/src/windows/uia/Makefile.in
+++ b/accessible/src/windows/uia/Makefile.in
@@ -11,19 +11,16 @@ include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME = accessibility_toolkit_uia_s
 EXPORT_LIBRARY = ..
 LIBXUL_LIBRARY = 1
 # The midl generated code include Windows headers which defines min and max
 # macros which conflicts with std::min/max.  Suppress the macros:
 OS_CXXFLAGS += -DNOMINMAX
 
-# we don't want the shared lib, but we want to force the creation of a static lib.
-FORCE_STATIC_LIB = 1
-
 include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES += \
   -I$(srcdir) \
   -I$(srcdir)/../msaa \
   -I$(srcdir)/../../base \
   -I$(srcdir)/../../generic \
--- a/accessible/src/xpcom/Makefile.in
+++ b/accessible/src/xpcom/Makefile.in
@@ -7,19 +7,16 @@ DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBXUL_LIBRARY = 1
 
-# we don't want the shared lib, but we want to force the creation of a static lib.
-FORCE_STATIC_LIB = 1
-
 EXTRA_MDDEPEND_FILES = xpcAccEvents.pp
 
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES = \
   -I$(srcdir)/../base \
   -I$(srcdir)/../generic \
   $(NULL)
--- a/accessible/src/xul/Makefile.in
+++ b/accessible/src/xul/Makefile.in
@@ -7,19 +7,16 @@ DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBXUL_LIBRARY = 1
 
-# we don't want the shared lib, but we want to force the creation of a static lib.
-FORCE_STATIC_LIB = 1
-
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES = \
   -I$(srcdir) \
   -I$(srcdir)/../base \
   -I$(srcdir)/../generic \
   -I$(srcdir)/../html \
   -I$(srcdir)/../xpcom \
--- a/caps/src/Makefile.in
+++ b/caps/src/Makefile.in
@@ -6,17 +6,16 @@
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MSVC_ENABLE_PGO := 1
-FORCE_STATIC_LIB = 1
 LIBXUL_LIBRARY = 1
 
 
 include $(topsrcdir)/config/rules.mk
 
 INCLUDES	+= -I$(srcdir)/../include \
 		   -I$(topsrcdir)/js/xpconnect/src \
 		   -I$(topsrcdir)/dom/base
--- a/chrome/src/Makefile.in
+++ b/chrome/src/Makefile.in
@@ -8,17 +8,16 @@ topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME    = chrome_s
 MSVC_ENABLE_PGO := 1
 LIBXUL_LIBRARY  = 1
-FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES += \
 		-I$(topsrcdir)/netwerk/protocol/res \
 		-I$(topsrcdir)/netwerk/base/src \
--- a/content/base/src/Makefile.in
+++ b/content/base/src/Makefile.in
@@ -17,20 +17,16 @@ LIBXUL_LIBRARY	= 1
 ifdef MOZ_WEBRTC
 LOCAL_INCLUDES += \
 		-I$(topsrcdir)/netwerk/sctp/datachannel \
 		$(NULL)
 endif
 
 GQI_SRCS = contentbase.gqi
 
-# we don't want the shared lib, but we want to force the creation of a
-# static lib.
-FORCE_STATIC_LIB = 1
-
 EXTRA_COMPONENTS = \
 		contentSecurityPolicy.manifest \
 		contentAreaDropListener.js \
 		contentAreaDropListener.manifest \
 		messageWakeupService.js \
 		messageWakeupService.manifest \
 		$(NULL)
 
--- a/content/canvas/src/Makefile.in
+++ b/content/canvas/src/Makefile.in
@@ -16,19 +16,16 @@ LIBXUL_LIBRARY  = 1
 FAIL_ON_WARNINGS = 1
 
 ifdef MOZ_WEBGL
 LOCAL_INCLUDES += \
 	-I$(topsrcdir)/js/xpconnect/wrappers \
 	$(NULL)
 endif
 
-# we don't want the shared lib, but we want to force the creation of a static lib.
-FORCE_STATIC_LIB = 1
-
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
 CXXFLAGS	+= $(MOZ_CAIRO_CFLAGS) $(MOZ_PIXMAN_CFLAGS) $(TK_CFLAGS)
 
 INCLUDES	+= \
 		-I$(srcdir)/../../../layout/xul/base/src \
 		-I$(srcdir)/../../../layout/style \
--- a/content/events/src/Makefile.in
+++ b/content/events/src/Makefile.in
@@ -10,19 +10,16 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= gkconevents_s
 MSVC_ENABLE_PGO := 1
 LIBXUL_LIBRARY  = 1
 FAIL_ON_WARNINGS = 1
 
-# we don't want the shared lib, but we want to force the creation of a static lib.
-FORCE_STATIC_LIB = 1
-
 include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES	+= \
              -I$(srcdir)/../../base/src \
              -I$(srcdir)/../../html/content/src \
              -I$(srcdir)/../../xul/content/src \
--- a/content/html/content/src/Makefile.in
+++ b/content/html/content/src/Makefile.in
@@ -10,19 +10,16 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= gkconhtmlcon_s
 MSVC_ENABLE_PGO := 1
 LIBXUL_LIBRARY	= 1
 FAIL_ON_WARNINGS = 1
 
-# we don't want the shared lib, but we want to force the creation of a static lib.
-FORCE_STATIC_LIB = 1
-
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
 INCLUDES	+= \
 		-I$(srcdir)/../../document/src \
 		-I$(srcdir)/../../../base/src \
 		-I$(srcdir)/../../../events/src \
 		-I$(srcdir)/../../../xbl/src \
--- a/content/html/document/src/Makefile.in
+++ b/content/html/document/src/Makefile.in
@@ -9,19 +9,16 @@ srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MSVC_ENABLE_PGO := 1
 LIBXUL_LIBRARY	= 1
 FAIL_ON_WARNINGS = 1
 
-# we don't want the shared lib, but we want to force the creation of a static lib.
-FORCE_STATIC_LIB = 1
-
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES += \
 		-I$(srcdir)/../../../base/src \
 		-I$(srcdir)/../../../events/src \
 		-I$(srcdir)/../../content/src \
 		-I$(topsrcdir)/layout/style \
 		-I$(topsrcdir)/dom/base \
--- a/content/mathml/content/src/Makefile.in
+++ b/content/mathml/content/src/Makefile.in
@@ -12,19 +12,15 @@ include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= gkcontentmathml_s
 LIBXUL_LIBRARY	= 1
 FAIL_ON_WARNINGS = 1
 
 include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
-# we don't want the shared lib, but we want to force the creation of a static 
-# lib.
-FORCE_STATIC_LIB = 1
-
 include $(topsrcdir)/config/rules.mk
 
 INCLUDES += \
   -I$(srcdir)/../../../base/src \
   $(NULL)
 
 DEFINES += -D_IMPL_NS_LAYOUT
--- a/content/media/Makefile.in
+++ b/content/media/Makefile.in
@@ -9,18 +9,16 @@ VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME = gkconmedia_s
 MSVC_ENABLE_PGO := 1
 LIBXUL_LIBRARY = 1
 FAIL_ON_WARNINGS := 1
 
-FORCE_STATIC_LIB = 1
-
 include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 include $(topsrcdir)/config/rules.mk
 
 INCLUDES  += \
   -I$(topsrcdir)/content/base/src \
   -I$(topsrcdir)/layout/generic \
   -I$(topsrcdir)/layout/xul/base/src \
--- a/content/media/dash/Makefile.in
+++ b/content/media/dash/Makefile.in
@@ -12,18 +12,16 @@ DEPTH      := @DEPTH@
 topsrcdir  := @top_srcdir@
 srcdir     := @srcdir@
 VPATH      := @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBXUL_LIBRARY := 1
 
-FORCE_STATIC_LIB := 1
-
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES := \
   -I$(topsrcdir)/netwerk/dash/mpd \
   -I$(srcdir)/../webm \
   -I$(srcdir)/../../base/src \
   -I$(srcdir)/../../html/content/src \
   $(MOZ_LIBVPX_INCLUDES) \
--- a/content/media/encoder/Makefile.in
+++ b/content/media/encoder/Makefile.in
@@ -8,11 +8,9 @@ srcdir    = @srcdir@
 VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBXUL_LIBRARY = 1
 FAIL_ON_WARNINGS := 1
 
 
-FORCE_STATIC_LIB = 1
-
 include $(topsrcdir)/config/rules.mk
--- a/content/media/gstreamer/Makefile.in
+++ b/content/media/gstreamer/Makefile.in
@@ -7,18 +7,16 @@ topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 FAIL_ON_WARNINGS := 1
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBXUL_LIBRARY 	= 1
 
-FORCE_STATIC_LIB = 1
-
 include $(topsrcdir)/config/rules.mk
 
 CFLAGS		+= $(GSTREAMER_CFLAGS)
 CXXFLAGS	+= $(GSTREAMER_CFLAGS)
 
 
 INCLUDES	+= \
 		-I$(srcdir)/../../base/src \
--- a/content/media/ogg/Makefile.in
+++ b/content/media/ogg/Makefile.in
@@ -8,11 +8,9 @@ srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBXUL_LIBRARY 	= 1
 FAIL_ON_WARNINGS := 1
 
 
-FORCE_STATIC_LIB = 1
-
 include $(topsrcdir)/config/rules.mk
--- a/content/media/omx/Makefile.in
+++ b/content/media/omx/Makefile.in
@@ -7,18 +7,16 @@ topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= gkconomx_s
 LIBXUL_LIBRARY 	= 1
 
-FORCE_STATIC_LIB = 1
-
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
 INCLUDES	+= \
  		-I$(srcdir)/mediaresourcemanager \
 		-I$(topsrcdir)/ipc/chromium/src \
 		-I$(srcdir)/../../base/src \
 		-I$(srcdir)/../../html/content/src \
--- a/content/media/plugins/Makefile.in
+++ b/content/media/plugins/Makefile.in
@@ -6,16 +6,14 @@ DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBXUL_LIBRARY 	= 1
 
-FORCE_STATIC_LIB = 1
-
 include $(topsrcdir)/config/rules.mk
 
 INCLUDES	+= \
 		-I$(srcdir)/../../base/src \
 		-I$(srcdir)/../../html/content/src \
 		$(NULL)
--- a/content/media/raw/Makefile.in
+++ b/content/media/raw/Makefile.in
@@ -8,16 +8,14 @@ topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBXUL_LIBRARY = 1
 FAIL_ON_WARNINGS := 1
 
-FORCE_STATIC_LIB = 1
-
 include $(topsrcdir)/config/rules.mk
 
 INCLUDES	+= \
 		-I$(srcdir)/../../base/src \
 		-I$(srcdir)/../../html/content/src \
 		$(NULL)
--- a/content/media/wave/Makefile.in
+++ b/content/media/wave/Makefile.in
@@ -8,11 +8,9 @@ srcdir		= @srcdir@
 VPATH		= @srcdir@
 FAIL_ON_WARNINGS := 1
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBXUL_LIBRARY 	= 1
 
 
-FORCE_STATIC_LIB = 1
-
 include $(topsrcdir)/config/rules.mk
--- a/content/media/webaudio/Makefile.in
+++ b/content/media/webaudio/Makefile.in
@@ -8,12 +8,10 @@ srcdir           := @srcdir@
 VPATH            := @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME   := gkconwebaudio_s
 LIBXUL_LIBRARY := 1
 FAIL_ON_WARNINGS := 1
 
-FORCE_STATIC_LIB := 1
-
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
--- a/content/media/webaudio/blink/Makefile.in
+++ b/content/media/webaudio/blink/Makefile.in
@@ -7,12 +7,10 @@ topsrcdir        := @top_srcdir@
 srcdir           := @srcdir@
 VPATH            := @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME   := gkconwebaudio_blink_s
 LIBXUL_LIBRARY := 1
 
-FORCE_STATIC_LIB := 1
-
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
--- a/content/media/webm/Makefile.in
+++ b/content/media/webm/Makefile.in
@@ -8,18 +8,16 @@ srcdir		= @srcdir@
 VPATH		= @srcdir@
 FAIL_ON_WARNINGS := 1
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBXUL_LIBRARY 	= 1
 
 
-FORCE_STATIC_LIB = 1
-
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES = \
 		$(MOZ_LIBVPX_CFLAGS) \
 		$(NULL)
 
 ifdef MOZ_DASH
 LOCAL_INCLUDES += \
--- a/content/media/webrtc/Makefile.in
+++ b/content/media/webrtc/Makefile.in
@@ -11,18 +11,16 @@ include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME = gkconwebrtc_s
 LIBXUL_LIBRARY = 1
 
 ifeq ($(OS_ARCH),WINNT)
 OS_CXXFLAGS += -DNOMINMAX
 endif
 
-FORCE_STATIC_LIB = 1
-
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
 ifdef MOZ_WEBRTC
 LOCAL_INCLUDES += \
   -I$(topsrcdir)/media/webrtc/trunk/webrtc \
   -I$(topsrcdir)/media/webrtc/signaling/src/common \
   -I$(topsrcdir)/media/webrtc/signaling/src/common/browser_logging \
--- a/content/media/webspeech/recognition/Makefile.in
+++ b/content/media/webspeech/recognition/Makefile.in
@@ -14,13 +14,11 @@ VPATH += \
   $(srcdir)/test \
   $(NULL)
 
 LIBRARY_NAME   := gkconwebspeechrecognition_s
 LIBXUL_LIBRARY := 1
 
 LOCAL_INCLUDES += $(VPATH:%=-I%)
 
-FORCE_STATIC_LIB := 1
-
 include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 include $(topsrcdir)/config/rules.mk
--- a/content/media/webspeech/synth/Makefile.in
+++ b/content/media/webspeech/synth/Makefile.in
@@ -17,13 +17,11 @@ VPATH += \
   $(NULL)
 
 LIBRARY_NAME   := gkconwebspeechsynth_s
 EXPORT_LIBRARY  = 1
 LIBXUL_LIBRARY  = 1
 
 LOCAL_INCLUDES += $(VPATH:%=-I%)
 
-FORCE_STATIC_LIB := 1
-
 include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 include $(topsrcdir)/config/rules.mk
--- a/content/media/wmf/Makefile.in
+++ b/content/media/wmf/Makefile.in
@@ -11,11 +11,9 @@ FAIL_ON_WARNINGS := 1
 include $(DEPTH)/config/autoconf.mk
 
 LIBXUL_LIBRARY 	= 1
 
 ifeq ($(OS_ARCH),WINNT)
 OS_CXXFLAGS += -DNOMINMAX
 endif
 
-FORCE_STATIC_LIB = 1
-
 include $(topsrcdir)/config/rules.mk
--- a/content/smil/Makefile.in
+++ b/content/smil/Makefile.in
@@ -11,19 +11,16 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= gkconsmil_s
 LIBXUL_LIBRARY	= 1
 FAIL_ON_WARNINGS = 1
 
 include $(topsrcdir)/config/config.mk
 
-# we don't want the shared lib, but we want to force the creation of a static lib.
-FORCE_STATIC_LIB = 1
-
 INCLUDES += 	\
 		-I$(srcdir)/../base/src \
 		-I$(srcdir)/../../layout/style \
 		-I$(srcdir)/../events/src \
 		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
--- a/content/svg/content/src/Makefile.in
+++ b/content/svg/content/src/Makefile.in
@@ -12,19 +12,16 @@ include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= gkcontentsvg_s
 LIBXUL_LIBRARY	= 1
 FAIL_ON_WARNINGS	= 1
 
 include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
-# we don't want the shared lib, but we want to force the creation of a static lib.
-FORCE_STATIC_LIB = 1
-
 include $(topsrcdir)/config/rules.mk
 
 INCLUDES += 	\
 		-I$(srcdir)/../../../xml/content/src \
 		-I$(srcdir)/../../../../dom \
 		-I$(srcdir)/../../../base/src \
 		-I$(srcdir)/../../../../layout/generic \
 		-I$(srcdir)/../../../../layout/xul/base/src \
--- a/content/svg/document/src/Makefile.in
+++ b/content/svg/document/src/Makefile.in
@@ -8,19 +8,16 @@ topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBXUL_LIBRARY	= 1
 FAIL_ON_WARNINGS = 1
 
-# we don't want the shared lib, but we want to force the creation of a static lib.
-FORCE_STATIC_LIB = 1
-
 include $(topsrcdir)/config/rules.mk
 
 INCLUDES	+= \
 		-I$(srcdir) \
 		-I$(srcdir)/../../../xml/document/src \
 		-I$(srcdir)/../../../html/document/src \
 		-I$(srcdir)/../../../../layout/style \
 		-I$(srcdir)/../../../base/src \
--- a/content/xbl/src/Makefile.in
+++ b/content/xbl/src/Makefile.in
@@ -12,19 +12,16 @@ include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= gkconxbl_s
 MSVC_ENABLE_PGO := 1
 LIBXUL_LIBRARY	= 1
 FAIL_ON_WARNINGS = 1
 
 include $(topsrcdir)/config/config.mk
 
-# we don't want the shared lib, but we want to force the creation of a static lib.
-FORCE_STATIC_LIB = 1
-
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES	= \
 		-I$(srcdir)/../../base/src \
 		-I$(srcdir)/../../html/document/src \
 		-I$(srcdir)/../../xml/document/src \
 		-I$(srcdir)/../../xul/content/src \
 		-I$(srcdir)/../../xul/document/src \
--- a/content/xml/content/src/Makefile.in
+++ b/content/xml/content/src/Makefile.in
@@ -9,19 +9,16 @@ srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MSVC_ENABLE_PGO := 1
 LIBXUL_LIBRARY	= 1
 FAIL_ON_WARNINGS = 1
 
-# we don't want the shared lib, but we want to force the creation of a static lib.
-FORCE_STATIC_LIB = 1
-
 include $(topsrcdir)/config/rules.mk
 
 INCLUDES	+= \
 		-I$(srcdir)/../../../base/src \
 		$(NULL)
 
 EXPORT_RESOURCE_CONTENT = \
 		$(srcdir)/htmlmathml-f.ent \
--- a/content/xml/document/src/Makefile.in
+++ b/content/xml/document/src/Makefile.in
@@ -9,19 +9,16 @@ srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MSVC_ENABLE_PGO := 1
 LIBXUL_LIBRARY	= 1
 FAIL_ON_WARNINGS = 1
 
-# we don't want the shared lib, but we want to force the creation of a static lib.
-FORCE_STATIC_LIB = 1
-
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES	= \
 		-I$(srcdir) \
 		-I$(srcdir)/../../../html/document/src \
 		-I$(srcdir)/../../../../layout/style \
 		-I$(srcdir)/../../../base/src \
 		-I$(srcdir)/../../../xul/content/src \
--- a/content/xslt/src/base/Makefile.in
+++ b/content/xslt/src/base/Makefile.in
@@ -7,20 +7,16 @@ topsrcdir       = @top_srcdir@
 srcdir          = @srcdir@
 VPATH           = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBXUL_LIBRARY = 1
 FAIL_ON_WARNINGS = 1
 
-# we don't want the shared lib, but we want to force the creation of a
-# static lib.
-FORCE_STATIC_LIB = 1
-
 include $(topsrcdir)/config/rules.mk
 
 INCLUDES += \
 	-I$(srcdir)/../../public \
 	-I$(srcdir) \
 	-I$(srcdir)/../xml \
 	-I$(srcdir)/../xpath \
 	-I$(srcdir)/../xslt \
--- a/content/xslt/src/xml/Makefile.in
+++ b/content/xslt/src/xml/Makefile.in
@@ -7,20 +7,16 @@ topsrcdir       = @top_srcdir@
 srcdir          = @srcdir@
 VPATH           = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBXUL_LIBRARY = 1
 FAIL_ON_WARNINGS = 1
 
-# we don't want the shared lib, but we want to force the creation of a
-# static lib.
-FORCE_STATIC_LIB = 1
-
 include $(topsrcdir)/config/rules.mk
 
 INCLUDES += \
 	-I$(srcdir)/../base \
 	-I$(srcdir) \
 	-I$(srcdir)/../xpath \
 	-I$(srcdir)/../xslt \
 	-I$(srcdir)/../../../base/src \
--- a/content/xslt/src/xpath/Makefile.in
+++ b/content/xslt/src/xpath/Makefile.in
@@ -7,20 +7,16 @@ topsrcdir       = @top_srcdir@
 srcdir          = @srcdir@
 VPATH           = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBXUL_LIBRARY = 1
 FAIL_ON_WARNINGS = 1
 
-# we don't want the shared lib, but we want to force the creation of a
-# static lib.
-FORCE_STATIC_LIB = 1
-
 include $(topsrcdir)/config/rules.mk
 
 INCLUDES += \
 	-I$(srcdir)/../base \
 	-I$(srcdir)/../xml \
 	-I$(srcdir) \
 	-I$(srcdir)/../xslt \
 	$(NULL)
--- a/content/xslt/src/xslt/Makefile.in
+++ b/content/xslt/src/xslt/Makefile.in
@@ -12,20 +12,16 @@ include $(DEPTH)/config/autoconf.mk
 LIBXUL_LIBRARY = 1
 FAIL_ON_WARNINGS = 1
 
 # For nsDependentJSString
 LOCAL_INCLUDES += \
   -I$(topsrcdir)/dom/base \
   $(NULL)
 
-# we don't want the shared lib, but we want to force the creation of a
-# static lib.
-FORCE_STATIC_LIB = 1
-
 EXTRA_COMPONENTS = \
   txEXSLTRegExFunctions.js \
   txEXSLTRegExFunctions.manifest \
   $(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
 INCLUDES += \
--- a/content/xul/content/src/Makefile.in
+++ b/content/xul/content/src/Makefile.in
@@ -11,20 +11,16 @@ FAIL_ON_WARNINGS = 1
 
 include $(DEPTH)/config/autoconf.mk
 
 ifdef MOZ_XUL
 MSVC_ENABLE_PGO := 1
 LIBXUL_LIBRARY	= 1
 endif
 
-# we don't want the shared lib, but we want to force the creation of a
-# static lib.
-FORCE_STATIC_LIB = 1
-
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES	= \
 	-I$(srcdir)/../../document/src \
 	-I$(srcdir)/../../templates/src \
 	-I$(srcdir)/../../../xml/content/src \
 	-I$(srcdir)/../../../base/src \
 	-I$(srcdir)/../../../xml/document/src \
--- a/content/xul/document/src/Makefile.in
+++ b/content/xul/document/src/Makefile.in
@@ -8,20 +8,16 @@ topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MSVC_ENABLE_PGO := 1
 LIBXUL_LIBRARY	= 1
 
-# we don't want the shared lib, but we want to force the creation of a
-# static lib.
-FORCE_STATIC_LIB = 1
-
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES	= -I$(srcdir)/../../../base/src \
 		  -I$(srcdir)/../../content/src \
 		  -I$(srcdir)/../../templates/src \
 		  -I$(srcdir)/../../../../layout/base \
 		  -I$(srcdir)/../../../../layout/generic \
 		  -I$(srcdir)/../../../../layout/style \
--- a/content/xul/templates/src/Makefile.in
+++ b/content/xul/templates/src/Makefile.in
@@ -8,19 +8,16 @@ topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MSVC_ENABLE_PGO := 1
 LIBXUL_LIBRARY	= 1
 
-# we don't want the shared lib, but we want to force the creation of a static lib.
-FORCE_STATIC_LIB = 1
-
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES	= -I$(srcdir)/../../../base/src \
 		  -I$(srcdir)/../../content/src \
 		  -I$(srcdir)/../../../../dom/base \
 		  -I$(srcdir)/../../../../layout/xul/tree/ \
 		  $(NULL)
 
--- a/docshell/base/Makefile.in
+++ b/docshell/base/Makefile.in
@@ -14,20 +14,16 @@ FAIL_ON_WARNINGS := 1
 LIBRARY_NAME   = basedocshell_s
 MSVC_ENABLE_PGO := 1
 LIBXUL_LIBRARY = 1
 
 ifdef MOZ_TOOLKIT_SEARCH
 DEFINES += -DMOZ_TOOLKIT_SEARCH
 endif
 
-# we don't want the shared lib, but we want to force the creation of a
-# static lib.
-FORCE_STATIC_LIB = 1
-
 include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES += \
   -I$(srcdir)/../shistory/src \
   -I$(topsrcdir)/dom/base \
   -I$(topsrcdir)/layout/base \
--- a/docshell/shistory/src/Makefile.in
+++ b/docshell/shistory/src/Makefile.in
@@ -6,15 +6,14 @@
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MSVC_ENABLE_PGO := 1
-FORCE_STATIC_LIB = 1
 LIBXUL_LIBRARY	= 1
 FAIL_ON_WARNINGS = 1
 
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES += -I$(srcdir)/../../base
--- a/dom/activities/src/Makefile.in
+++ b/dom/activities/src/Makefile.in
@@ -6,16 +6,15 @@ DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME     = dom_activities_s
 LIBXUL_LIBRARY   = 1
-FORCE_STATIC_LIB = 1
 FAIL_ON_WARNINGS := 1
 
 include $(topsrcdir)/dom/dom-config.mk
 
 
 include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
--- a/dom/alarm/Makefile.in
+++ b/dom/alarm/Makefile.in
@@ -6,17 +6,16 @@ DEPTH       = @DEPTH@
 topsrcdir   = @top_srcdir@
 srcdir      = @srcdir@
 VPATH       = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME        = domalarm_s
 LIBXUL_LIBRARY      = 1
-FORCE_STATIC_LIB    = 1
 FAIL_ON_WARNINGS := 1
 
 include $(topsrcdir)/dom/dom-config.mk
 
 
 include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 include $(topsrcdir)/config/rules.mk
--- a/dom/audiochannel/Makefile.in
+++ b/dom/audiochannel/Makefile.in
@@ -16,16 +16,15 @@ DEPTH            = @DEPTH@
 topsrcdir        = @top_srcdir@
 srcdir           = @srcdir@
 VPATH            = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME     = domaudiochannel_s
 LIBXUL_LIBRARY = 1
-FORCE_STATIC_LIB = 1
 EXPORT_LIBRARY = 1
 FAIL_ON_WARNINGS := 1
 
 include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 include $(topsrcdir)/config/rules.mk
 
--- a/dom/base/Makefile.in
+++ b/dom/base/Makefile.in
@@ -7,17 +7,16 @@ topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= jsdombase_s
 MSVC_ENABLE_PGO := 1
 LIBXUL_LIBRARY	= 1
-FORCE_STATIC_LIB = 1
 FAIL_ON_WARNINGS := 1
 
 
 include $(topsrcdir)/dom/dom-config.mk
 
 ifdef MOZ_JSDEBUGGER
 DEFINES += -DMOZ_JSDEBUGGER
 endif
--- a/dom/battery/Makefile.in
+++ b/dom/battery/Makefile.in
@@ -6,17 +6,16 @@ DEPTH            = @DEPTH@
 topsrcdir        = @top_srcdir@
 srcdir           = @srcdir@
 VPATH            = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME     = dom_battery_s
 LIBXUL_LIBRARY   = 1
-FORCE_STATIC_LIB = 1
 FAIL_ON_WARNINGS := 1
 
 include $(topsrcdir)/dom/dom-config.mk
 
 LOCAL_INCLUDES = \
   -I$(topsrcdir)/content/events/src \
   $(NULL)
 
--- a/dom/bindings/Makefile.in
+++ b/dom/bindings/Makefile.in
@@ -5,17 +5,16 @@
 DEPTH            = @DEPTH@
 topsrcdir        = @top_srcdir@
 srcdir           = @srcdir@
 VPATH            = @srcdir@
 
 LIBRARY_NAME     = dombindings_s
 MSVC_ENABLE_PGO := 1
 LIBXUL_LIBRARY   = 1
-FORCE_STATIC_LIB = 1
 EXPORT_LIBRARY   = 1
 FAIL_ON_WARNINGS := 1
 
 include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
 # Need this to find all our DOM source files.
 include $(topsrcdir)/dom/dom-config.mk
--- a/dom/bindings/test/Makefile.in
+++ b/dom/bindings/test/Makefile.in
@@ -5,17 +5,16 @@
 DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
 relativesrcdir = @relativesrcdir@
 
 LIBRARY_NAME     = dombindings_test_s
 LIBXUL_LIBRARY   = 1
-FORCE_STATIC_LIB = 1
 # Do NOT export this library.  We don't actually want our test code
 # being added to libxul or anything.
 
 # pymake can't handle descending into dom/bindings several times simultaneously
 ifdef .PYMAKE
 .NOTPARALLEL:
 endif
 
--- a/dom/bluetooth/Makefile.in
+++ b/dom/bluetooth/Makefile.in
@@ -22,17 +22,16 @@ include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/dom/dom-config.mk
 
 VPATH += $(srcdir)/ipc
 
 ifneq (,$(MOZ_B2G_BT))
 
 LIBRARY_NAME     = dombluetooth_s
 LIBXUL_LIBRARY   = 1
-FORCE_STATIC_LIB = 1
 
 ifeq (gonk,$(MOZ_WIDGET_TOOLKIT))
 VPATH += \
   $(srcdir)/linux \
   $(srcdir)/gonk \
   $(NULL)
 LOCAL_INCLUDES += $(MOZ_DBUS_CFLAGS)
 DEFINES += -DMOZ_BLUETOOTH_GONK
--- a/dom/browser-element/Makefile.in
+++ b/dom/browser-element/Makefile.in
@@ -6,17 +6,16 @@ DEPTH            = @DEPTH@
 topsrcdir        = @top_srcdir@
 srcdir           = @srcdir@
 VPATH            = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME     = dom_browserelement_s
 LIBXUL_LIBRARY   = 1
-FORCE_STATIC_LIB = 1
 FAIL_ON_WARNINGS := 1
 
 include $(topsrcdir)/dom/dom-config.mk
 
 
 include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 include $(topsrcdir)/config/rules.mk
--- a/dom/camera/Makefile.in
+++ b/dom/camera/Makefile.in
@@ -6,15 +6,14 @@ DEPTH            = @DEPTH@
 topsrcdir        = @top_srcdir@
 srcdir           = @srcdir@
 VPATH            = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME     = domcamera_s
 LIBXUL_LIBRARY   = 1
-FORCE_STATIC_LIB = 1
 FAIL_ON_WARNINGS := 1
 
 include $(topsrcdir)/dom/dom-config.mk
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
--- a/dom/cellbroadcast/src/Makefile.in
+++ b/dom/cellbroadcast/src/Makefile.in
@@ -6,14 +6,13 @@ DEPTH            = @DEPTH@
 topsrcdir        = @top_srcdir@
 srcdir           = @srcdir@
 VPATH            = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME     = dom_cellbroadcast_s
 LIBXUL_LIBRARY   = 1
-FORCE_STATIC_LIB = 1
 FAIL_ON_WARNINGS := 1
 
 include $(topsrcdir)/dom/dom-config.mk
 
 include $(topsrcdir)/config/rules.mk
--- a/dom/devicestorage/Makefile.in
+++ b/dom/devicestorage/Makefile.in
@@ -6,17 +6,16 @@ DEPTH            = @DEPTH@
 topsrcdir        = @top_srcdir@
 srcdir           = @srcdir@
 VPATH            = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME     = domdevicestorage_s
 LIBXUL_LIBRARY   = 1
-FORCE_STATIC_LIB = 1
 FAIL_ON_WARNINGS := 1
 
 include $(topsrcdir)/dom/dom-config.mk
 
 LOCAL_INCLUDES = \
 		-I$(topsrcdir)/dom/base \
 		-I$(topsrcdir)/dom/ipc \
 		-I$(topsrcdir)/content/base/src \
--- a/dom/encoding/Makefile.in
+++ b/dom/encoding/Makefile.in
@@ -7,17 +7,16 @@ topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 FAIL_ON_WARNINGS := 1
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= domencoding_s
 LIBXUL_LIBRARY	= 1
-FORCE_STATIC_LIB = 1
 
 LOCAL_INCLUDES = \
 	-I$(topsrcdir)/intl/locale/src \
 	$(NULL)
 
 include $(topsrcdir)/dom/dom-config.mk
 include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
--- a/dom/file/Makefile.in
+++ b/dom/file/Makefile.in
@@ -6,15 +6,14 @@ DEPTH            = @DEPTH@
 topsrcdir        = @top_srcdir@
 srcdir           = @srcdir@
 VPATH            = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME     = domfile_s
 LIBXUL_LIBRARY   = 1
-FORCE_STATIC_LIB = 1
 FAIL_ON_WARNINGS := 1
 
 include $(topsrcdir)/dom/dom-config.mk
 
 include $(topsrcdir)/config/rules.mk
 
--- a/dom/fm/Makefile.in
+++ b/dom/fm/Makefile.in
@@ -6,17 +6,16 @@ DEPTH            = ../..
 topsrcdir        = @top_srcdir@
 srcdir           = @srcdir@
 VPATH            = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME     = domfm_s
 LIBXUL_LIBRARY   = 1
-FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/dom/dom-config.mk
 
 EXTRA_COMPONENTS =      \
   DOMFMRadioChild.js       \
   DOMFMRadio.manifest \
   $(NULL)
 
--- a/dom/future/Makefile.in
+++ b/dom/future/Makefile.in
@@ -6,13 +6,12 @@ DEPTH            = @DEPTH@
 topsrcdir        = @top_srcdir@
 srcdir           = @srcdir@
 VPATH            = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME     = domfuture_s
 LIBXUL_LIBRARY = 1
-FORCE_STATIC_LIB = 1
 FAIL_ON_WARNINGS := 1
 
 include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
--- a/dom/icc/src/Makefile.in
+++ b/dom/icc/src/Makefile.in
@@ -6,17 +6,16 @@ DEPTH            = @DEPTH@
 topsrcdir        = @top_srcdir@
 srcdir           = @srcdir@
 VPATH            = $(srcdir)
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME     = dom_icc_s
 LIBXUL_LIBRARY   = 1
-FORCE_STATIC_LIB = 1
 FAIL_ON_WARNINGS := 1
 
 include $(topsrcdir)/dom/dom-config.mk
 
 LOCAL_INCLUDES = \
   -I$(topsrcdir)/content/events/src \
   $(NULL)
 
--- a/dom/indexedDB/Makefile.in
+++ b/dom/indexedDB/Makefile.in
@@ -6,17 +6,16 @@ DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME = dom_indexeddb_s
 LIBXUL_LIBRARY = 1
-FORCE_STATIC_LIB = 1
 FAIL_ON_WARNINGS := 1
 
 LOCAL_INCLUDES = \
   -I$(topsrcdir)/caps/include \
   -I$(topsrcdir)/content/base/src \
   -I$(topsrcdir)/content/events/src \
   -I$(topsrcdir)/db/sqlite3/src \
   -I$(topsrcdir)/dom/base \
--- a/dom/indexedDB/ipc/Makefile.in
+++ b/dom/indexedDB/ipc/Makefile.in
@@ -8,17 +8,16 @@ srcdir = @srcdir@
 relativesrcdir = @relativesrcdir@
 VPATH = @srcdir@
 FAIL_ON_WARNINGS := 1
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME = dom_indexeddb_ipc_s
 LIBXUL_LIBRARY = 1
-FORCE_STATIC_LIB = 1
 
 LOCAL_INCLUDES += \
   -I$(topsrcdir)/dom/indexedDB \
   -I$(topsrcdir)/content/events/src \
   $(NULL)
 
 DEFINES += -D_IMPL_NS_LAYOUT
 
--- a/dom/interfaces/devicestorage/Makefile.in
+++ b/dom/interfaces/devicestorage/Makefile.in
@@ -6,15 +6,14 @@ DEPTH            = @DEPTH@
 topsrcdir        = @top_srcdir@
 srcdir           = @srcdir@
 VPATH            = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME     = domdevicestorage_s
 LIBXUL_LIBRARY   = 1
-FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/dom/dom-config.mk
 
 include $(topsrcdir)/config/rules.mk
 
 
--- a/dom/ipc/Makefile.in
+++ b/dom/ipc/Makefile.in
@@ -6,17 +6,16 @@ DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME = domipc_s
 LIBXUL_LIBRARY = 1
-FORCE_STATIC_LIB = 1
 EXPORT_LIBRARY = 1
 FAIL_ON_WARNINGS := 1
 
 include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES += \
--- a/dom/media/Makefile.in
+++ b/dom/media/Makefile.in
@@ -7,17 +7,16 @@ topsrcdir        = @top_srcdir@
 srcdir           = @srcdir@
 VPATH            = @srcdir@
 relativesrcdir   = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME     = dom_media_s
 LIBXUL_LIBRARY   = 1
-FORCE_STATIC_LIB = 1
 FAIL_ON_WARNINGS := 1
 
 include $(topsrcdir)/dom/dom-config.mk
 
 
 ifdef MOZ_WEBRTC
 LOCAL_INCLUDES += \
   -I$(topsrcdir)/media/webrtc/trunk/webrtc \
--- a/dom/mobilemessage/src/Makefile.in
+++ b/dom/mobilemessage/src/Makefile.in
@@ -18,17 +18,16 @@ else ifdef MOZ_B2G_RIL
 VPATH += $(srcdir)/gonk
 else
 VPATH += $(srcdir)/fallback
 endif
 
 LIBRARY_NAME     = dom_mobilemessage_s
 MSVC_ENABLE_PGO := 1
 LIBXUL_LIBRARY   = 1
-FORCE_STATIC_LIB = 1
 FAIL_ON_WARNINGS := 1
 
 include $(topsrcdir)/dom/dom-config.mk
 
 LOCAL_INCLUDES = \
   -I$(topsrcdir)/content/events/src \
   -I$(topsrcdir)/dom/base \
   $(NULL)
--- a/dom/network/src/Makefile.in
+++ b/dom/network/src/Makefile.in
@@ -6,17 +6,16 @@ DEPTH            = @DEPTH@
 topsrcdir        = @top_srcdir@
 srcdir           = @srcdir@
 VPATH            = $(srcdir)
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME     = dom_network_s
 LIBXUL_LIBRARY   = 1
-FORCE_STATIC_LIB = 1
 FAIL_ON_WARNINGS := 1
 
 
 ifdef MOZ_B2G_RIL
 endif
 
 include $(topsrcdir)/dom/dom-config.mk
 
--- a/dom/plugins/base/android/Makefile.in
+++ b/dom/plugins/base/android/Makefile.in
@@ -7,17 +7,16 @@ DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= gkpluginandroid_s
 LIBXUL_LIBRARY   = 1
-FORCE_STATIC_LIB = 1
 EXPORT_LIBRARY = 1
 FAIL_ON_WARNINGS := 1
 
 include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
 LOCAL_INCLUDES += \
   -I$(topsrcdir)/widget/android \
--- a/dom/plugins/ipc/Makefile.in
+++ b/dom/plugins/ipc/Makefile.in
@@ -8,17 +8,16 @@ srcdir = @srcdir@
 VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 FAIL_ON_WARNINGS := 1
 
 LIBRARY_NAME     = domplugins_s
 LIBXUL_LIBRARY   = 1
-FORCE_STATIC_LIB = 1
 EXPORT_LIBRARY = 1
 
 ifeq (WINNT,$(OS_ARCH))
 DEFINES += \
   -DMOZ_HANGUI_PROCESS_NAME=\"plugin-hang-ui$(BIN_SUFFIX)\" \
   $(NULL)
 endif
 
--- a/dom/power/Makefile.in
+++ b/dom/power/Makefile.in
@@ -6,16 +6,15 @@ DEPTH            = @DEPTH@
 topsrcdir        = @top_srcdir@
 srcdir           = @srcdir@
 VPATH            = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME     = dom_power_s
 LIBXUL_LIBRARY   = 1
-FORCE_STATIC_LIB = 1
 FAIL_ON_WARNINGS := 1
 
 include $(topsrcdir)/dom/dom-config.mk
 
 include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 include $(topsrcdir)/config/rules.mk
--- a/dom/quota/Makefile.in
+++ b/dom/quota/Makefile.in
@@ -7,17 +7,16 @@ topsrcdir        = @top_srcdir@
 srcdir           = @srcdir@
 VPATH            = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME     = domquota_s
 MSVC_ENABLE_PGO := 1
 LIBXUL_LIBRARY   = 1
-FORCE_STATIC_LIB = 1
 FAIL_ON_WARNINGS := 1
 
 include $(topsrcdir)/dom/dom-config.mk
 
 LOCAL_INCLUDES = \
   -I$(topsrcdir)/caps/include \
   $(NULL)
 
--- a/dom/src/events/Makefile.in
+++ b/dom/src/events/Makefile.in
@@ -9,15 +9,12 @@ srcdir		= @srcdir@
 VPATH		= @srcdir@
 FAIL_ON_WARNINGS := 1
 
 include $(DEPTH)/config/autoconf.mk
 
 MSVC_ENABLE_PGO := 1
 LIBXUL_LIBRARY	= 1
 
-# we don't want the shared lib, but we want to force the creation of a static lib.
-FORCE_STATIC_LIB = 1
-
 include $(topsrcdir)/config/rules.mk
 
 INCLUDES	+= -I$(topsrcdir)/dom/base
 
--- a/dom/src/geolocation/Makefile.in
+++ b/dom/src/geolocation/Makefile.in
@@ -7,18 +7,16 @@ topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME   = jsdomgeolocation_s
 LIBXUL_LIBRARY = 1
 
-# we don't want the shared lib, but we want to force the creation of a static lib.
-FORCE_STATIC_LIB = 1
 FAIL_ON_WARNINGS := 1
 
 LOCAL_INCLUDES = \
 		-I$(topsrcdir)/dom/base \
 		-I$(topsrcdir)/dom/ipc \
 		-I$(topsrcdir)/content/base/src \
 		-I$(topsrcdir)/content/events/src \
 		$(NULL)
--- a/dom/src/json/Makefile.in
+++ b/dom/src/json/Makefile.in
@@ -8,18 +8,15 @@ topsrcdir      = @top_srcdir@
 srcdir         = @srcdir@
 VPATH          = @srcdir@
 FAIL_ON_WARNINGS := 1
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBXUL_LIBRARY = 1
 
-
-FORCE_STATIC_LIB = 1
-
 LOCAL_INCLUDES = \
 		-I$(srcdir)/../base \
 		-I$(topsrcdir)/content/events/src
 
 DEFINES += -D_IMPL_NS_LAYOUT
 
 include $(topsrcdir)/config/rules.mk
--- a/dom/src/jsurl/Makefile.in
+++ b/dom/src/jsurl/Makefile.in
@@ -6,17 +6,16 @@
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 FAIL_ON_WARNINGS := 1
 
 include $(DEPTH)/config/autoconf.mk
 
-FORCE_STATIC_LIB = 1
 LIBXUL_LIBRARY	= 1
 
 LOCAL_INCLUDES += \
 		-I$(srcdir) \
 		-I$(topsrcdir)/dom/base \
 		-I$(topsrcdir)/netwerk/base/src \
 
 ifdef BUILD_DEBUG_GC
--- a/dom/src/notification/Makefile.in
+++ b/dom/src/notification/Makefile.in
@@ -7,18 +7,16 @@ topsrcdir   = @top_srcdir@
 srcdir      = @srcdir@
 VPATH       = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME   = jsdomnotification_s
 LIBXUL_LIBRARY = 1
 
-# we don't want the shared lib, but we want to force the creation of a static lib.
-FORCE_STATIC_LIB = 1
 FAIL_ON_WARNINGS := 1
 
 LOCAL_INCLUDES = \
   -I$(topsrcdir)/dom/base \
   -I$(topsrcdir)/dom/ipc \
   -I$(topsrcdir)/content/base/src \
   -I$(topsrcdir)/content/events/src \
   $(NULL)
--- a/dom/src/offline/Makefile.in
+++ b/dom/src/offline/Makefile.in
@@ -8,19 +8,16 @@ topsrcdir      = @top_srcdir@
 srcdir         = @srcdir@
 VPATH          = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBXUL_LIBRARY = 1
 FAIL_ON_WARNINGS := 1
 
-# we don't want the shared lib, but we want to force the creation of a static lib.
-FORCE_STATIC_LIB = 1
-
 LOCAL_INCLUDES = \
 		-I$(topsrcdir)/dom/base \
 		-I$(topsrcdir)/content/base/src \
 		-I$(topsrcdir)/content/events/src
 
 DEFINES += -D_IMPL_NS_LAYOUT
 
 include $(topsrcdir)/config/rules.mk
--- a/dom/src/storage/Makefile.in
+++ b/dom/src/storage/Makefile.in
@@ -10,19 +10,16 @@ VPATH          = @srcdir@
 FAIL_ON_WARNINGS := 1
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME   = jsdomstorage_s
 MSVC_ENABLE_PGO := 1
 LIBXUL_LIBRARY = 1
 
-# we don't want the shared lib, but we want to force the creation of a static lib.
-FORCE_STATIC_LIB = 1
-
 LOCAL_INCLUDES = \
                 -I$(topsrcdir)/dom/base \
 		-I$(topsrcdir)/content/events/src
 
 DEFINES += -D_IMPL_NS_LAYOUT
 
 ifdef ENABLE_TESTS
 DEFINES += -DDOM_STORAGE_TESTS
--- a/dom/system/Makefile.in
+++ b/dom/system/Makefile.in
@@ -42,12 +42,11 @@ LOCAL_INCLUDES += \
   -I$(topsrcdir)/content/events/src \
   -I$(topsrcdir)/js/xpconnect/loader \
   $(NULL)
 
 include $(topsrcdir)/config/config.mk
 
 # we don't want the shared lib, but we want to force the creation of a static lib.
 LIBXUL_LIBRARY   = 1
-FORCE_STATIC_LIB = 1
 EXPORT_LIBRARY = 1
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 include $(topsrcdir)/config/rules.mk
--- a/dom/system/android/Makefile.in
+++ b/dom/system/android/Makefile.in
@@ -8,17 +8,16 @@ srcdir      = @srcdir@
 VPATH       = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME    = domsystemandroid_s
 
 # we don't want the shared lib, but we want to force the creation of a static lib.
 LIBXUL_LIBRARY   = 1
-FORCE_STATIC_LIB = 1
 EXPORT_LIBRARY = 1
 FAIL_ON_WARNINGS := 1
 
 include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
 LOCAL_INCLUDES  += -I$(topsrcdir)/dom/src/geolocation \
                      -I$(topsrcdir)/content/events/src
--- a/dom/system/gonk/Makefile.in
+++ b/dom/system/gonk/Makefile.in
@@ -18,17 +18,16 @@ srcdir           = @srcdir@
 VPATH            = @srcdir@
 
 relativesrcdir   = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME     = domsystemgonk_s
 LIBXUL_LIBRARY   = 1
-FORCE_STATIC_LIB = 1
 FAIL_ON_WARNINGS := 1
 
 include $(topsrcdir)/dom/dom-config.mk
 
 LOCAL_INCLUDES = \
   -I$(topsrcdir)/dom/base \
   -I$(topsrcdir)/dom/src/geolocation \
   -I$(topsrcdir)/dom/telephony \
--- a/dom/system/unix/Makefile.in
+++ b/dom/system/unix/Makefile.in
@@ -8,17 +8,16 @@ srcdir      = @srcdir@
 VPATH       = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME    = domsystemunix_s
 
 # we don't want the shared lib, but we want to force the creation of a static lib.
 LIBXUL_LIBRARY   = 1
-FORCE_STATIC_LIB = 1
 EXPORT_LIBRARY = 1
 FAIL_ON_WARNINGS := 1
 
 include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
 
 ifdef MOZ_MAEMO_LIBLOCATION
--- a/dom/system/windows/Makefile.in
+++ b/dom/system/windows/Makefile.in
@@ -8,17 +8,16 @@ srcdir      = @srcdir@
 VPATH       = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME    = domsystemwindows_s
 
 # we don't want the shared lib, but we want to force the creation of a static lib.
 LIBXUL_LIBRARY   = 1
-FORCE_STATIC_LIB = 1
 EXPORT_LIBRARY = 1
 FAIL_ON_WARNINGS := 1
 
 # We fire the nsDOMDeviceAcceleration
 LOCAL_INCLUDES += -I$(topsrcdir)/content/events/src
 
 include $(topsrcdir)/config/config.mk
 
--- a/dom/telephony/Makefile.in
+++ b/dom/telephony/Makefile.in
@@ -6,15 +6,14 @@ DEPTH            = @DEPTH@
 topsrcdir        = @top_srcdir@
 srcdir           = @srcdir@
 VPATH            = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME     = domtelephony_s
 LIBXUL_LIBRARY   = 1
-FORCE_STATIC_LIB = 1
 FAIL_ON_WARNINGS := 1
 
 include $(topsrcdir)/dom/dom-config.mk
 
 include $(topsrcdir)/config/rules.mk
 
--- a/dom/time/Makefile.in
+++ b/dom/time/Makefile.in
@@ -6,16 +6,15 @@ DEPTH            = ../..
 topsrcdir        = @top_srcdir@
 srcdir           = @srcdir@
 VPATH            = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME     = dom_time_s
 LIBXUL_LIBRARY   = 1
-FORCE_STATIC_LIB = 1
 FAIL_ON_WARNINGS := 1
 
 include $(topsrcdir)/dom/dom-config.mk
 
 include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 include $(topsrcdir)/config/rules.mk
--- a/dom/voicemail/Makefile.in
+++ b/dom/voicemail/Makefile.in
@@ -6,15 +6,14 @@ DEPTH            = @DEPTH@
 topsrcdir        = @top_srcdir@
 srcdir           = @srcdir@
 VPATH            = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME     = domvoicemail_s
 LIBXUL_LIBRARY   = 1
-FORCE_STATIC_LIB = 1
 FAIL_ON_WARNINGS := 1
 
 include $(topsrcdir)/dom/dom-config.mk
 
 include $(topsrcdir)/config/rules.mk
 
--- a/dom/wifi/Makefile.in
+++ b/dom/wifi/Makefile.in
@@ -6,17 +6,16 @@ DEPTH            = @DEPTH@
 topsrcdir        = @top_srcdir@
 srcdir           = @srcdir@
 VPATH            = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME     = domwifi_s
 LIBXUL_LIBRARY   = 1
-FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/dom/dom-config.mk
 
 EXTRA_COMPONENTS = \
   WifiWorker.js \
   WifiWorker.manifest \
   DOMWifiManager.js \
   DOMWifiManager.manifest \
--- a/dom/workers/Makefile.in
+++ b/dom/workers/Makefile.in
@@ -6,17 +6,16 @@ DEPTH            = @DEPTH@
 topsrcdir        = @top_srcdir@
 srcdir           = @srcdir@
 VPATH            = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MSVC_ENABLE_PGO := 1
 LIBXUL_LIBRARY   = 1
-FORCE_STATIC_LIB = 1
 FAIL_ON_WARNINGS := 1
 
 LOCAL_INCLUDES = \
   -I$(topsrcdir)/content/base/src \
   -I$(topsrcdir)/content/events/src \
   -I$(topsrcdir)/dom/base \
   -I$(topsrcdir)/dom/system \
   -I$(topsrcdir)/xpcom/build \
--- a/editor/libeditor/base/Makefile.in
+++ b/editor/libeditor/base/Makefile.in
@@ -12,19 +12,16 @@ include $(DEPTH)/config/autoconf.mk
 
 LIBXUL_LIBRARY	= 1
 FAIL_ON_WARNINGS = 1
 
 
 # Internal header files, needed by other editor sublibs:
 INTERNAL_HDR_DIR = ../internal
 
-# don't want the shared lib; force the creation of a static lib.
-FORCE_STATIC_LIB = 1
-
 include $(topsrcdir)/config/rules.mk
 
 INCLUDES	+= \
 		-I$(topsrcdir)/editor/libeditor/text \
 		-I$(topsrcdir)/editor/txmgr/src \
 		-I$(topsrcdir)/content/base/src \
 		-I$(topsrcdir)/content/events/src \
 		-I$(topsrcdir)/layout/style \
--- a/editor/libeditor/html/Makefile.in
+++ b/editor/libeditor/html/Makefile.in
@@ -17,19 +17,16 @@ LIBXUL_LIBRARY	= 1
 # Building the full blown HTML Editor  so add its source files and objects:
 
 ifdef ENABLE_EDITOR_API_LOG
 DEFINES += -DENABLE_EDITOR_API_LOG
 endif
 
 DEFINES += -D_IMPL_NS_LAYOUT
 
-# don't want the shared lib; force the creation of a static lib.
-FORCE_STATIC_LIB = 1
-
 include $(topsrcdir)/config/rules.mk
 
 INCLUDES        += -I$(topsrcdir)/editor/libeditor/base \
                    -I$(topsrcdir)/editor/libeditor/text \
                    -I$(topsrcdir)/editor/txmgr/src \
                    -I$(topsrcdir)/content/base/src \
                    -I$(topsrcdir)/layout/style \
                    $(NULL)
--- a/editor/libeditor/text/Makefile.in
+++ b/editor/libeditor/text/Makefile.in
@@ -8,18 +8,15 @@ topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 FAIL_ON_WARNINGS = 1
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBXUL_LIBRARY	= 1
 
-# don't want the shared lib; force the creation of a static lib.
-FORCE_STATIC_LIB = 1
-
 include $(topsrcdir)/config/rules.mk
 
 INCLUDES	+= \
 		-I$(topsrcdir)/editor/libeditor/base \
 		-I$(topsrcdir)/editor/txmgr/src \
 		-I$(topsrcdir)/content/base/src \
 		$(NULL)
--- a/editor/txtsvc/src/Makefile.in
+++ b/editor/txtsvc/src/Makefile.in
@@ -6,14 +6,13 @@
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 FAIL_ON_WARNINGS = 1
 
 include $(DEPTH)/config/autoconf.mk
 
-FORCE_STATIC_LIB = 1
 LIBXUL_LIBRARY	= 1
 
 
 include $(topsrcdir)/config/rules.mk
 
--- a/embedding/browser/webBrowser/Makefile.in
+++ b/embedding/browser/webBrowser/Makefile.in
@@ -14,13 +14,9 @@ LIBXUL_LIBRARY	= 1
 FAIL_ON_WARNINGS = 1
 
 
 LOCAL_INCLUDES	= \
 		-I$(srcdir)/../../../content/base/src \
 		-I$(srcdir)/../../../content/svg/content/src \
 		$(NULL)
 		
-# we don't want the shared lib, but we want to force the creation of a
-# static lib.
-FORCE_STATIC_LIB = 1
-
 include $(topsrcdir)/config/rules.mk
--- a/embedding/components/appstartup/src/Makefile.in
+++ b/embedding/components/appstartup/src/Makefile.in
@@ -8,14 +8,10 @@ topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBXUL_LIBRARY	= 1
 FAIL_ON_WARNINGS = 1
 
-# we don't want the shared lib, but we want to force the creation of a
-# static lib.
-FORCE_STATIC_LIB = 1
-
 include $(topsrcdir)/config/rules.mk
 
--- a/embedding/components/commandhandler/src/Makefile.in
+++ b/embedding/components/commandhandler/src/Makefile.in
@@ -8,14 +8,10 @@ topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBXUL_LIBRARY	= 1
 FAIL_ON_WARNINGS = 1
 
-# we don't want the shared lib, but we want to force the creation of a
-# static lib.
-FORCE_STATIC_LIB = 1
-
 include $(topsrcdir)/config/rules.mk
 
--- a/embedding/components/find/src/Makefile.in
+++ b/embedding/components/find/src/Makefile.in
@@ -8,14 +8,10 @@ topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBXUL_LIBRARY	= 1
 FAIL_ON_WARNINGS = 1
 
-# we don't want the shared lib, but we want to force the creation of a
-# static lib.
-FORCE_STATIC_LIB = 1
-
 include $(topsrcdir)/config/rules.mk
 
--- a/embedding/components/printingui/src/mac/Makefile.in
+++ b/embedding/components/printingui/src/mac/Makefile.in
@@ -14,14 +14,10 @@ EXPORT_LIBRARY	= ..
 LIBXUL_LIBRARY	= 1
 FAIL_ON_WARNINGS = 1
 
 
 
 LOCAL_INCLUDES	= \
 		$(NULL)
 
-# we don't want the shared lib, but we want to force the creation of a
-# static lib.
-FORCE_STATIC_LIB = 1
-
 include $(topsrcdir)/config/rules.mk
 
--- a/embedding/components/printingui/src/os2/Makefile.in
+++ b/embedding/components/printingui/src/os2/Makefile.in
@@ -8,14 +8,10 @@ topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 EXPORT_LIBRARY	= ..
 LIBXUL_LIBRARY	= 1
 
-# we don't want the shared lib, but we want to force the creation of a
-# static lib.
-FORCE_STATIC_LIB = 1
-
 include $(topsrcdir)/config/rules.mk
 
--- a/embedding/components/printingui/src/unixshared/Makefile.in
+++ b/embedding/components/printingui/src/unixshared/Makefile.in
@@ -9,14 +9,10 @@ srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 EXPORT_LIBRARY	= ..
 LIBXUL_LIBRARY	= 1
 FAIL_ON_WARNINGS = 1
 
-# we don't want the shared lib, but we want to force the creation of a
-# static lib.
-FORCE_STATIC_LIB = 1
-
 include $(topsrcdir)/config/rules.mk
 
--- a/embedding/components/printingui/src/win/Makefile.in
+++ b/embedding/components/printingui/src/win/Makefile.in
@@ -9,14 +9,10 @@ srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 EXPORT_LIBRARY	= ..
 LIBXUL_LIBRARY	= 1
 FAIL_ON_WARNINGS = 1
 
-# we don't want the shared lib, but we want to force the creation of a
-# static lib.
-FORCE_STATIC_LIB = 1
-
 include $(topsrcdir)/config/rules.mk
 
--- a/embedding/components/webbrowserpersist/src/Makefile.in
+++ b/embedding/components/webbrowserpersist/src/Makefile.in
@@ -8,14 +8,10 @@ topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBXUL_LIBRARY	= 1
 FAIL_ON_WARNINGS = 1
 
-# we don't want the shared lib, but we want to force the creation of a
-# static lib.
-FORCE_STATIC_LIB = 1
-
 include $(topsrcdir)/config/rules.mk
 
--- a/embedding/components/windowwatcher/src/Makefile.in
+++ b/embedding/components/windowwatcher/src/Makefile.in
@@ -8,16 +8,12 @@ topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBXUL_LIBRARY	= 1
 FAIL_ON_WARNINGS = 1
 
-# we don't want the shared lib, but we want to force the creation of a
-# static lib.
-FORCE_STATIC_LIB = 1
-
 # For nsJSUtils
 LOCAL_INCLUDES += -I$(topsrcdir)/dom/base \
 
 include $(topsrcdir)/config/rules.mk
--- a/extensions/spellcheck/hunspell/src/Makefile.in
+++ b/extensions/spellcheck/hunspell/src/Makefile.in
@@ -4,17 +4,16 @@
 
 DEPTH           = @DEPTH@
 topsrcdir       = @top_srcdir@
 srcdir          = @srcdir@
 VPATH           = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-FORCE_STATIC_LIB = 1
 LIBXUL_LIBRARY   = 1
 
 
 ifndef MOZ_NATIVE_HUNSPELL
 # This variable is referenced in configure.in.  Make sure to change that file
 # too if you need to change this variable.
 DEFINES = -DHUNSPELL_STATIC
 endif
--- a/extensions/universalchardet/src/base/Makefile.in
+++ b/extensions/universalchardet/src/base/Makefile.in
@@ -5,12 +5,11 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-FORCE_STATIC_LIB = 1
 LIBXUL_LIBRARY = 1
 
 include $(topsrcdir)/config/rules.mk
--- a/gfx/cairo/cairo/src/Makefile.in
+++ b/gfx/cairo/cairo/src/Makefile.in
@@ -168,18 +168,16 @@ endif
 
 ifdef MOZ_ENABLE_CAIRO_FT
 CSRCS   += cairo-ft-font.c cairo-type1-subset.c
 OS_INCLUDES += $(CAIRO_FT_CFLAGS)
 endif
 
 LOCAL_INCLUDES  += -I$(srcdir)
 
-FORCE_STATIC_LIB = 1
-
 include $(topsrcdir)/config/rules.mk
 
 ifdef GNU_CC
 # Disable spammy "missing initializer" GCC warning
 CFLAGS += -Wno-missing-field-initializers
 
 # Disable spammy "implicit conversion from enumeration type 'cairo_" warnings.
 CFLAGS += -Wno-conversion
--- a/gfx/cairo/libpixman/src/Makefile.in
+++ b/gfx/cairo/libpixman/src/Makefile.in
@@ -145,18 +145,16 @@ CSRCS += pixman-arm-neon.c
 DISABLED_SSRCS += pixman-arm-neon-asm.S
 DISABLED_SSRCS += pixman-arm-neon-asm-bilinear.S
 DEFINES += -DUSE_ARM_NEON
 ARM_NEON_CFLAGS = -mfpu=neon
 endif
 
 LOCAL_INCLUDES	+= -I$(srcdir) -I$(srcdir)/../../cairo/src
 
-FORCE_STATIC_LIB = 1
-
 include $(topsrcdir)/config/config.mk
 
 include $(topsrcdir)/config/rules.mk
 
 CFLAGS += -DPACKAGE="mozpixman" -D_USE_MATH_DEFINES
 
 # Disable spammy "missing initializer" GCC warning
 ifdef GNU_CC
--- a/gfx/graphite2/src/Makefile.in
+++ b/gfx/graphite2/src/Makefile.in
@@ -21,23 +21,23 @@ endif
 # get the lists of source files and exported headers
 include $(srcdir)/files.mk
 
 MSVC_ENABLE_PGO := 1
 
 # on Windows, we're going to link graphite with gkmedias instead of libxul
 ifeq (WINNT,$(OS_TARGET))
 VISIBILITY_FLAGS =
+FORCE_STATIC_LIB = 1
 else
 LIBXUL_LIBRARY = 1
 endif
 
 # MSVC doesn't like the paths in _SOURCES, so strip off the prefix
 # and leave bare filenames
-FORCE_STATIC_LIB = 1
 FORCE_USE_PIC = 1
 
 ifeq (WINNT,$(OS_TARGET))
 DEFINES += -DGRAPHITE2_EXPORTING
 else
 # tell graphite2 not to export symbols, we'll be linking it directly with thebes
 DEFINES += -DGRAPHITE2_STATIC
 endif
--- a/gfx/harfbuzz/src/Makefile.in
+++ b/gfx/harfbuzz/src/Makefile.in
@@ -30,21 +30,22 @@ topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MSVC_ENABLE_PGO := 1
 ifneq ($(OS_ARCH),WINNT)
 LIBXUL_LIBRARY = 1
+else
+FORCE_STATIC_LIB = 1
 endif
 
 LOCAL_INCLUDES  += -I$(srcdir) 
 
-FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
 
 DEFINES += -DPACKAGE_VERSION="\"moz\""
 DEFINES += -DPACKAGE_BUGREPORT="\"http://bugzilla.mozilla.org/\""
 DEFINES += -DHAVE_OT=1 -DHB_NO_MT -DHB_NO_UNICODE_FUNCS
 
 # Cancel the effect of the -DDEBUG macro if present,
--- a/gfx/ipc/Makefile.in
+++ b/gfx/ipc/Makefile.in
@@ -6,17 +6,16 @@
 DEPTH       = @DEPTH@
 topsrcdir   = @top_srcdir@
 srcdir      = @srcdir@
 VPATH       = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME       = gfxipc_s
-FORCE_STATIC_LIB   = 1
 LIBXUL_LIBRARY     = 1
 EXPORT_LIBRARY     = 1
 
 include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
 include $(topsrcdir)/config/rules.mk
 
--- a/gfx/layers/Makefile.in
+++ b/gfx/layers/Makefile.in
@@ -18,17 +18,16 @@ VPATH       = \
   $(srcdir)/ipc \
   $(NULL)
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME   = layers
 MSVC_ENABLE_PGO := 1
 LIBXUL_LIBRARY = 1
-FORCE_STATIC_LIB = 1
 
 DEFINES += -DIMPL_THEBES
 ifdef MOZ_DEBUG
 DEFINES += -DD3D_DEBUG_INFO
 endif
 
 ifdef MOZ_ENABLE_D3D10_LAYER
 DEFINES	+= -DMOZ_ENABLE_D3D10_LAYER
--- a/gfx/ots/src/Makefile.in
+++ b/gfx/ots/src/Makefile.in
@@ -28,20 +28,20 @@
 DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MSVC_ENABLE_PGO := 1
-FORCE_STATIC_LIB = 1
 
 ifeq (WINNT,$(OS_TARGET))
 VISIBILITY_FLAGS =
+FORCE_STATIC_LIB = 1
 else
 LIBXUL_LIBRARY = 1
 endif
 
 CSRCS =   \
   $(NULL)
 
 include $(topsrcdir)/config/rules.mk
--- a/gfx/qcms/Makefile.in
+++ b/gfx/qcms/Makefile.in
@@ -52,18 +52,16 @@ else
 ifeq (ppc,$(findstring ppc,$(CPU_ARCH)))
 ifdef GNU_CC
 	CSRCS += transform-altivec.c
 	ALTIVEC_FLAGS=-maltivec
 endif
 endif
 endif
 
-FORCE_STATIC_LIB = 1
-
 include $(topsrcdir)/config/rules.mk
 
 CFLAGS          += -DMOZ_QCMS
 
 # Disable spammy "missing initializer" GCC warning
 ifdef GNU_CC
 CFLAGS += -Wno-missing-field-initializers
 endif # GNU_CC
--- a/hal/Makefile.in
+++ b/hal/Makefile.in
@@ -17,17 +17,16 @@ VPATH       = \
   $(srcdir)/cocoa \
   $(NULL)
 
 relativesrcdir   = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME   = hal_s
-FORCE_STATIC_LIB = 1
 LIBXUL_LIBRARY = 1
 EXPORT_LIBRARY = 1
 FAIL_ON_WARNINGS = 1
 
 MOCHITEST_BROWSER_FILES += \
 	tests/browser_alarms.js \
 	$(NULL)
 
--- a/image/decoders/Makefile.in
+++ b/image/decoders/Makefile.in
@@ -5,17 +5,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-FORCE_STATIC_LIB = 1
 LIBXUL_LIBRARY  = 1
 FAIL_ON_WARNINGS = 1
 
 CSRCS   = iccjpeg.c \
           $(NULL)
 
 # Decoders need RasterImage.h
 LOCAL_INCLUDES += -I$(topsrcdir)/image/src/
--- a/image/decoders/icon/android/Makefile.in
+++ b/image/decoders/icon/android/Makefile.in
@@ -8,14 +8,11 @@ srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= imgiconandroid_s
 LIBXUL_LIBRARY = 1
 FAIL_ON_WARNINGS := 1
 
-# we don't want the shared lib, but we want to force the creation of a static lib.
-FORCE_STATIC_LIB = 1
-
 include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 include $(topsrcdir)/config/rules.mk
--- a/image/decoders/icon/gtk/Makefile.in
+++ b/image/decoders/icon/gtk/Makefile.in
@@ -14,13 +14,10 @@ LIBXUL_LIBRARY  = 1
 FAIL_ON_WARNINGS = 1
 
 ifdef MOZ_ENABLE_GNOMEUI
 LOCAL_INCLUDES += $(MOZ_GNOMEUI_CFLAGS)
 else
 LOCAL_INCLUDES += $(TK_CFLAGS)
 endif
 
-# we don't want the shared lib, but we want to force the creation of a static lib.
-FORCE_STATIC_LIB = 1
-
 include $(topsrcdir)/config/rules.mk
 
--- a/image/decoders/icon/mac/Makefile.in
+++ b/image/decoders/icon/mac/Makefile.in
@@ -9,12 +9,9 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBXUL_LIBRARY = 1
 FAIL_ON_WARNINGS = 1
 
 
 
-# we don't want the shared lib, but we want to force the creation of a static lib.
-FORCE_STATIC_LIB = 1
-
 include $(topsrcdir)/config/rules.mk
--- a/image/decoders/icon/os2/Makefile.in
+++ b/image/decoders/icon/os2/Makefile.in
@@ -7,13 +7,10 @@ DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBXUL_LIBRARY = 1
 
-# we don't want the shared lib, but we want to force the creation of a static lib.
-FORCE_STATIC_LIB = 1
-
 include $(topsrcdir)/config/rules.mk
 
--- a/image/decoders/icon/qt/Makefile.in
+++ b/image/decoders/icon/qt/Makefile.in
@@ -9,15 +9,12 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBXUL_LIBRARY	= 1
 
 
 LOCAL_INCLUDES += $(MOZ_QT_CFLAGS)
 
-# we don't want the shared lib, but we want to force the creation of a static lib.
-FORCE_STATIC_LIB = 1
-
 EXTRA_COMPONENTS = gtkqticonsconverter.manifest
 
 include $(topsrcdir)/config/rules.mk
 
--- a/image/decoders/icon/win/Makefile.in
+++ b/image/decoders/icon/win/Makefile.in
@@ -8,13 +8,10 @@ topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBXUL_LIBRARY = 1
 FAIL_ON_WARNINGS = 1
 
-# we don't want the shared lib, but we want to force the creation of a static lib.
-FORCE_STATIC_LIB = 1
-
 include $(topsrcdir)/config/rules.mk
 
--- a/image/encoders/bmp/Makefile.in
+++ b/image/encoders/bmp/Makefile.in
@@ -4,17 +4,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-FORCE_STATIC_LIB = 1
 LIBXUL_LIBRARY = 1
 FAIL_ON_WARNINGS = 1
 
 LOCAL_INCLUDES += -I$(topsrcdir)/image/src/
 
 include $(topsrcdir)/config/rules.mk
 
 
--- a/image/encoders/ico/Makefile.in
+++ b/image/encoders/ico/Makefile.in
@@ -4,17 +4,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-FORCE_STATIC_LIB = 1
 LIBXUL_LIBRARY = 1
 FAIL_ON_WARNINGS = 1
 
 # Decoders need RasterImage.h
 LOCAL_INCLUDES += -I$(topsrcdir)/image/src/
 LOCAL_INCLUDES += -I$(topsrcdir)/image/encoders/bmp/
 LOCAL_INCLUDES += -I$(topsrcdir)/image/encoders/png/
 
--- a/image/encoders/jpeg/Makefile.in
+++ b/image/encoders/jpeg/Makefile.in
@@ -4,15 +4,14 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-FORCE_STATIC_LIB = 1
 LIBXUL_LIBRARY = 1
 FAIL_ON_WARNINGS = 1
 
 include $(topsrcdir)/config/rules.mk
 
 
--- a/image/encoders/png/Makefile.in
+++ b/image/encoders/png/Makefile.in
@@ -4,17 +4,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-FORCE_STATIC_LIB = 1
 LIBXUL_LIBRARY = 1
 FAIL_ON_WARNINGS = 1
 
 DEFINES		+= -DMOZ_PNG_WRITE \
 	-DMOZ_PNG_READ \
 	$(NULL)
 
 LOCAL_INCLUDES += -I$(topsrcdir)/image/src/
--- a/image/src/Makefile.in
+++ b/image/src/Makefile.in
@@ -6,17 +6,16 @@
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= imglib2_s
-FORCE_STATIC_LIB = 1
 LIBXUL_LIBRARY  = 1
 FAIL_ON_WARNINGS = 1
 
 # We need to instantiate the decoders
 LOCAL_INCLUDES += -I$(topsrcdir)/image/decoders
 
 # For URI-related functionality
 LOCAL_INCLUDES += -I$(topsrcdir)/netwerk/base/src
--- a/intl/locale/src/Makefile.in
+++ b/intl/locale/src/Makefile.in
@@ -17,18 +17,16 @@ ifeq ($(MOZ_WIDGET_TOOLKIT), qt)
 OS_INCLUDES	+= $(MOZ_QT_CFLAGS)
 endif
 
 EXPORT_RESOURCE = \
 		$(srcdir)/langGroups.properties \
 		$(srcdir)/language.properties \
 		$(NULL)
 
-# we don't want the shared lib, but we want to force the creation of a static lib.
-FORCE_STATIC_LIB = 1
 
 LOCAL_INCLUDES = \
 	-I$(topsrcdir)/intl/uconv/src \
 	$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
 nsCharsetAlias.$(OBJ_SUFFIX): charsetalias.properties.h
--- a/intl/locale/src/mac/Makefile.in
+++ b/intl/locale/src/mac/Makefile.in
@@ -4,15 +4,14 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-FORCE_STATIC_LIB	= 1
 LIBXUL_LIBRARY  = 1
 
 
 include $(topsrcdir)/config/rules.mk
 
 INCLUDES	+= -I$(srcdir)/..
--- a/intl/locale/src/os2/Makefile.in
+++ b/intl/locale/src/os2/Makefile.in
@@ -6,17 +6,16 @@
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 EXPORT_LIBRARY = 1
-FORCE_STATIC_LIB	= 1
 LIBXUL_LIBRARY  = 1
 
 
 include $(topsrcdir)/config/rules.mk
 
 INCLUDES	+= -I$(srcdir)/..
 
 nsOS2Charset.$(OBJ_SUFFIX): os2charset.properties.h
--- a/intl/locale/src/unix/Makefile.in
+++ b/intl/locale/src/unix/Makefile.in
@@ -5,17 +5,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-FORCE_STATIC_LIB= 1
 LIBXUL_LIBRARY  = 1
 
 include $(topsrcdir)/config/rules.mk
 
 INCLUDES	+= -I$(srcdir)/..
 
 # CODESET is not automatically defined on some older versions of Redhat.
 # Define _XOPEN_SOURCE so CODESET will get defined and thus allow
--- a/intl/locale/src/windows/Makefile.in
+++ b/intl/locale/src/windows/Makefile.in
@@ -5,17 +5,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-FORCE_STATIC_LIB	= 1
 LIBXUL_LIBRARY  = 1
 
 
 include $(topsrcdir)/config/rules.mk
 
 INCLUDES	+= -I$(srcdir)/..
 
 nsWinCharset.$(OBJ_SUFFIX): wincharset.properties.h
--- a/intl/lwbrk/src/Makefile.in
+++ b/intl/lwbrk/src/Makefile.in
@@ -6,17 +6,16 @@
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MSVC_ENABLE_PGO := 1
-FORCE_STATIC_LIB = 1
 LIBXUL_LIBRARY  = 1
 
 
 ifeq  ($(MOZ_WIDGET_TOOLKIT),gtk2)
 else
 ifeq  ($(MOZ_WIDGET_TOOLKIT),gtk3)
 else
 ifeq  ($(MOZ_WIDGET_TOOLKIT),windows)
--- a/intl/strres/src/Makefile.in
+++ b/intl/strres/src/Makefile.in
@@ -6,13 +6,12 @@
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MSVC_ENABLE_PGO := 1
-FORCE_STATIC_LIB = 1
 LIBXUL_LIBRARY  = 1
 
 
 include $(topsrcdir)/config/rules.mk
--- a/intl/uconv/ucvcn/Makefile.in
+++ b/intl/uconv/ucvcn/Makefile.in
@@ -5,15 +5,14 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-FORCE_STATIC_LIB=1
 LIBXUL_LIBRARY = 1
 
 
 LOCAL_INCLUDES = -I$(srcdir)/../util
 
 include $(topsrcdir)/config/rules.mk
--- a/intl/uconv/ucvibm/Makefile.in
+++ b/intl/uconv/ucvibm/Makefile.in
@@ -5,14 +5,13 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-FORCE_STATIC_LIB = 1
 LIBXUL_LIBRARY = 1
 
 LOCAL_INCLUDES = -I$(srcdir)/../util
 
 include $(topsrcdir)/config/rules.mk
--- a/intl/uconv/ucvja/Makefile.in
+++ b/intl/uconv/ucvja/Makefile.in
@@ -5,16 +5,15 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-FORCE_STATIC_LIB = 1
 LIBXUL_LIBRARY = 1
 
 
 LOCAL_INCLUDES	= -I$(srcdir)/../util
 
 include $(topsrcdir)/config/rules.mk
 
--- a/intl/uconv/ucvko/Makefile.in
+++ b/intl/uconv/ucvko/Makefile.in
@@ -5,16 +5,15 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-FORCE_STATIC_LIB=1
 LIBXUL_LIBRARY = 1
 
 
 LOCAL_INCLUDES = -I$(srcdir)/../util
 
 include $(topsrcdir)/config/rules.mk
 
--- a/intl/uconv/ucvlatin/Makefile.in
+++ b/intl/uconv/ucvlatin/Makefile.in
@@ -5,15 +5,14 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-FORCE_STATIC_LIB = 1
 LIBXUL_LIBRARY = 1
 
 
 LOCAL_INCLUDES = -I$(srcdir)/../util -I$(srcdir)/../src
 
 include $(topsrcdir)/config/rules.mk
--- a/intl/uconv/ucvtw/Makefile.in
+++ b/intl/uconv/ucvtw/Makefile.in
@@ -5,15 +5,14 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-FORCE_STATIC_LIB=1
 LIBXUL_LIBRARY = 1
 
 
 LOCAL_INCLUDES = -I$(srcdir)/../util
 
 include $(topsrcdir)/config/rules.mk
--- a/intl/uconv/ucvtw2/Makefile.in
+++ b/intl/uconv/ucvtw2/Makefile.in
@@ -5,16 +5,15 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-FORCE_STATIC_LIB=1
 LIBXUL_LIBRARY = 1
 
 
 LOCAL_INCLUDES	= -I$(srcdir)/../util
 
 include $(topsrcdir)/config/rules.mk
 
--- a/intl/uconv/util/Makefile.in
+++ b/intl/uconv/util/Makefile.in
@@ -7,17 +7,16 @@ DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MSVC_ENABLE_PGO := 1
 EXPORT_LIBRARY = 1
-FORCE_STATIC_LIB = 1
 LIBXUL_LIBRARY = 1
 
 CSRCS		= \
 		ugen.c \
 		uscan.c \
 		umap.c \
 		$(NULL)
 
--- a/intl/unicharutil/src/Makefile.in
+++ b/intl/unicharutil/src/Makefile.in
@@ -5,12 +5,11 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-FORCE_STATIC_LIB = 1
 LIBXUL_LIBRARY = 1
 
 include $(topsrcdir)/config/rules.mk
--- a/ipc/chromium/Makefile.in
+++ b/ipc/chromium/Makefile.in
@@ -7,17 +7,16 @@ topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 OS_CXXFLAGS := $(filter-out -fshort-wchar,$(OS_CXXFLAGS))
 
 LIBRARY_NAME = chromium_s
-FORCE_STATIC_LIB = 1
 LIBXUL_LIBRARY = 1
 EXPORT_LIBRARY = 1
 
 ACDEFINES =
 
 ifndef MOZ_NATIVE_LIBEVENT # {
 vpath %.c \
   $(srcdir)/src/third_party/libevent \
--- a/ipc/dbus/Makefile.in
+++ b/ipc/dbus/Makefile.in
@@ -5,17 +5,16 @@
 DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME = mozdbus_s
-FORCE_STATIC_LIB = 1
 LIBXUL_LIBRARY = 1
 EXPORT_LIBRARY = 1
 
 ifdef MOZ_ENABLE_DBUS
 	LOCAL_INCLUDES += $(MOZ_DBUS_CFLAGS)
 endif
 
 include $(topsrcdir)/config/config.mk
--- a/ipc/glue/Makefile.in
+++ b/ipc/glue/Makefile.in
@@ -7,17 +7,16 @@ topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/crashreporter
 
 LIBRARY_NAME = mozipc_s
-FORCE_STATIC_LIB = 1
 LIBXUL_LIBRARY = 1
 EXPORT_LIBRARY = 1
 
 DEFINES += -DMOZ_CHILD_PROCESS_NAME=\"$(MOZ_CHILD_PROCESS_NAME)\"
 DEFINES += -DMOZ_CHILD_PROCESS_BUNDLE=\"$(MOZ_CHILD_PROCESS_BUNDLE)\"
 
 include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
--- a/ipc/ipdl/Makefile.in
+++ b/ipc/ipdl/Makefile.in
@@ -8,17 +8,16 @@ srcdir = @srcdir@
 VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 GARBAGE_DIRS += _ipdlheaders
 GARBAGE += ipdl_lextab.py ipdl_yacctab.py $(wildcard *.pyc $(srcdir)/ipdl/*.pyc $(srcdir)/ipdl/cxx/*.pyc)
 
 LIBRARY_NAME = mozipdlgen_s
-FORCE_STATIC_LIB = 1
 LIBXUL_LIBRARY = 1
 EXPORT_LIBRARY = 1
 
 # This file is generated by the moz.build backend.
 include ipdlsrcs.mk
 
 GARBAGE += $(CPPSRCS)
 
--- a/ipc/ipdl/test/cxx/Makefile.in
+++ b/ipc/ipdl/test/cxx/Makefile.in
@@ -6,17 +6,16 @@ DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME = $(MODULE)_s
 LIBXUL_LIBRARY = 1
-FORCE_STATIC_LIB = 1
 EXPORT_LIBRARY = 1
 
 IPDLTESTS = \
   TestActorPunning \
   TestBridgeMain \
   TestCrashCleanup \
   TestDataStructures \
   TestDesc \
--- a/ipc/netd/Makefile.in
+++ b/ipc/netd/Makefile.in
@@ -5,16 +5,15 @@
 DEPTH = ../..
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME = moznetd_s
-FORCE_STATIC_LIB = 1
 LIBXUL_LIBRARY = 1
 EXPORT_LIBRARY = 1
 
 include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
 include $(topsrcdir)/config/rules.mk
--- a/ipc/nfc/Makefile.in
+++ b/ipc/nfc/Makefile.in
@@ -5,17 +5,16 @@
 DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME = moznfc_s
-FORCE_STATIC_LIB = 1
 LIBXUL_LIBRARY = 1
 EXPORT_LIBRARY = 1
 
 EXPORTS_NAMESPACES = mozilla/ipc
 
 include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
--- a/ipc/ril/Makefile.in
+++ b/ipc/ril/Makefile.in
@@ -5,16 +5,15 @@
 DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME = mozril_s
-FORCE_STATIC_LIB = 1
 LIBXUL_LIBRARY = 1
 EXPORT_LIBRARY = 1
 
 include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
 include $(topsrcdir)/config/rules.mk
--- a/ipc/testshell/Makefile.in
+++ b/ipc/testshell/Makefile.in
@@ -7,17 +7,16 @@ topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
 relativesrcdir = @relativesrcdir@
 FAIL_ON_WARNINGS = 1
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME = ipcshell_s
-FORCE_STATIC_LIB = 1
 LIBXUL_LIBRARY = 1
 EXPORT_LIBRARY = 1
 
 # For xpcshell error messages and nsDependentJSString
 LOCAL_INCLUDES += \
   -I$(topsrcdir)/js/xpconnect/shell \
   -I$(topsrcdir)/dom/base \
   $(NULL)
--- a/ipc/unixsocket/Makefile.in
+++ b/ipc/unixsocket/Makefile.in
@@ -5,17 +5,16 @@
 DEPTH = ../..
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME = mozipcunixsocket_s
-FORCE_STATIC_LIB = 1
 LIBXUL_LIBRARY = 1
 EXPORT_LIBRARY = 1
 FAIL_ON_WARNINGS = 1
 
 include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
 include $(topsrcdir)/config/rules.mk
--- a/js/ipc/Makefile.in
+++ b/js/ipc/Makefile.in
@@ -6,17 +6,16 @@ DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME = jsipc_s
 LIBXUL_LIBRARY = 1
-FORCE_STATIC_LIB = 1
 EXPORT_LIBRARY = 1
 FAIL_ON_WARNINGS = 1
 
 EXPORTS_mozilla/jsipc = \
   JavaScriptParent.h \
   $(NULL)
 
 LOCAL_INCLUDES += \
--- a/js/xpconnect/loader/Makefile.in
+++ b/js/xpconnect/loader/Makefile.in
@@ -6,17 +6,16 @@ DEPTH 		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 FAIL_ON_WARNINGS := 1
 MSVC_ENABLE_PGO := 1
-FORCE_STATIC_LIB = 1
 LIBXUL_LIBRARY = 1
 LOCAL_INCLUDES += \
   -I$(srcdir)/../src \
   -I$(srcdir)/../wrappers \
   -I$(topsrcdir)/content/base/src \
   $(NULL)
 
 include $(topsrcdir)/config/rules.mk
--- a/js/xpconnect/src/Makefile.in
+++ b/js/xpconnect/src/Makefile.in
@@ -7,17 +7,16 @@ DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME    = xpconnect_s
 MSVC_ENABLE_PGO := 1
-FORCE_STATIC_LIB = 1
 LIBXUL_LIBRARY = 1
 FAIL_ON_WARNINGS := 1
 
 include $(topsrcdir)/config/config.mk
 
 LOCAL_INCLUDES = \
 		-I$(srcdir)/../wrappers \
 		-I$(srcdir)/../loader \
--- a/js/xpconnect/wrappers/Makefile.in
+++ b/js/xpconnect/wrappers/Makefile.in
@@ -5,17 +5,16 @@
 DEPTH 		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MSVC_ENABLE_PGO := 1
-FORCE_STATIC_LIB = 1
 LIBXUL_LIBRARY = 1
 ifndef _MSC_VER # warning C4661 for FilteringWrapper
 FAIL_ON_WARNINGS := 1
 endif # !_MSC_VER
 
 LOCAL_INCLUDES = \
                 -I$(srcdir)/../src \
                 -I$(srcdir)/../../../dom/base \
--- a/layout/base/Makefile.in
+++ b/layout/base/Makefile.in
@@ -10,18 +10,16 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= gkbase_s
 MSVC_ENABLE_PGO := 1
 LIBXUL_LIBRARY	= 1
 FAIL_ON_WARNINGS = 1
 
-FORCE_STATIC_LIB = 1
-
 include $(topsrcdir)/config/rules.mk
 
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
 LOCAL_INCLUDES += \
 		-I$(srcdir) \
 		-I$(srcdir)/../style \
 		-I$(srcdir)/../generic \
--- a/layout/forms/Makefile.in
+++ b/layout/forms/Makefile.in
@@ -9,19 +9,16 @@ srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MSVC_ENABLE_PGO := 1
 LIBXUL_LIBRARY	= 1
 FAIL_ON_WARNINGS = 1
 
-# we don't want the shared lib, but we want to force the creation of a static lib.
-FORCE_STATIC_LIB = 1
-
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES	= \
 		-I$(srcdir)/../base \
 		-I$(srcdir)/../generic \
 		-I$(srcdir)/../xul/base/src \
 		-I$(srcdir)/../../content/base/src \
 		-I$(srcdir)/../../content/html/content/src \
--- a/layout/generic/Makefile.in
+++ b/layout/generic/Makefile.in
@@ -15,18 +15,16 @@ LIBXUL_LIBRARY	= 1
 ifndef _MSC_VER
 FAIL_ON_WARNINGS = 1
 endif # !_MSC_VER
 
 RESOURCES_HTML = \
 		$(srcdir)/folder.png \
 		$(NULL)
 
-FORCE_STATIC_LIB = 1
-
 include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES += \
 		-I$(srcdir) \
 		-I$(srcdir)/../base \
 		-I$(srcdir)/../forms \
--- a/layout/inspector/src/Makefile.in
+++ b/layout/inspector/src/Makefile.in
@@ -8,18 +8,16 @@ topsrcdir=@top_srcdir@
 srcdir=@srcdir@
 VPATH=@srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBXUL_LIBRARY = 1
 FAIL_ON_WARNINGS = 1
 
-FORCE_STATIC_LIB = 1
-
 LOCAL_INCLUDES	+= \
 		-I$(srcdir)/../../style \
 		-I$(topsrcdir)/content/base/src \
 		-I$(topsrcdir)/content/xbl/src \
 		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
--- a/layout/ipc/Makefile.in
+++ b/layout/ipc/Makefile.in
@@ -6,17 +6,16 @@ DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME = gkipc_s
 LIBXUL_LIBRARY = 1
-FORCE_STATIC_LIB = 1
 EXPORT_LIBRARY = 1
 FAIL_ON_WARNINGS = 1
 
 include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES += \
--- a/layout/mathml/Makefile.in
+++ b/layout/mathml/Makefile.in
@@ -23,20 +23,16 @@ LOCAL_INCLUDES = \
 	-I$(srcdir)/../tables \
 	-I$(topsrcdir)/content/base/src \
 	-I$(topsrcdir)/content/mathml/content/src \
 	-I$(srcdir)/../xul/base/src \
 	$(NULL)
 
 include $(topsrcdir)/config/config.mk
 
-# we don't want the shared lib, but we want to force the creation of a static lib.
-# do we still want this? - DJF
-FORCE_STATIC_LIB = 1
-
 include $(topsrcdir)/config/rules.mk
 
 font_properties = \
 	mathfontMathJax_Main.properties \
 	mathfontUnicode.properties \
 	mathfontSTIXNonUnicode.properties \
 	mathfontSTIXSize1.properties \
 	mathfontSTIXSizeOneSym.properties \
--- a/layout/printing/Makefile.in
+++ b/layout/printing/Makefile.in
@@ -7,18 +7,16 @@ topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBXUL_LIBRARY	= 1
 FAIL_ON_WARNINGS = 1
 
-FORCE_STATIC_LIB = 1
-
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES += \
 		-I$(srcdir)/../base \
 		-I$(srcdir)/../../content/base/src \
 		$(NULL)
 
 DEFINES += -D_IMPL_NS_LAYOUT
--- a/layout/style/Makefile.in
+++ b/layout/style/Makefile.in
@@ -14,18 +14,16 @@ MSVC_ENABLE_PGO := 1
 LIBXUL_LIBRARY	= 1
 FAIL_ON_WARNINGS = 1
 
 ifdef GNU_CC
 OS_CFLAGS := $(OS_CFLAGS) -Wshadow
 OS_CXXFLAGS := $(OS_CXXFLAGS) -Wshadow
 endif
 
-FORCE_STATIC_LIB = 1
-
 include $(topsrcdir)/config/rules.mk
 
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
 LOCAL_INCLUDES	+= \
 		-I$(srcdir)/../base \
 		-I$(topsrcdir)/dom/base \
 		-I$(srcdir)/../generic \
--- a/layout/svg/Makefile.in
+++ b/layout/svg/Makefile.in
@@ -12,19 +12,16 @@ include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= gksvgbase_s
 LIBXUL_LIBRARY	= 1
 FAIL_ON_WARNINGS = 1
 
 
 include $(topsrcdir)/config/config.mk
 
-# we don't want the shared lib, but we want to force the creation of a static lib.
-FORCE_STATIC_LIB = 1
-
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES	= \
 		-I$(srcdir)/../base \
 		-I$(srcdir)/../generic \
 		-I$(srcdir)/../style \
 		-I$(srcdir)/../xul/base/src \
 		-I$(srcdir)/../../content/svg/content/src \
--- a/layout/tables/Makefile.in
+++ b/layout/tables/Makefile.in
@@ -9,19 +9,16 @@ srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MSVC_ENABLE_PGO := 1
 LIBXUL_LIBRARY	= 1
 FAIL_ON_WARNINGS = 1
 
-# we don't want the shared lib, but we want to force the creation of a static lib.
-FORCE_STATIC_LIB = 1
-
 include $(topsrcdir)/config/rules.mk
 
 DEFINES         += -DDEBUG_TABLE_STRATEGY_off -D_IMPL_NS_LAYOUT
 
 LOCAL_INCLUDES	= \
 		-I$(srcdir)/../base \
 		-I$(srcdir)/../generic \
 		-I$(srcdir)/../style \
--- a/layout/xul/base/src/Makefile.in
+++ b/layout/xul/base/src/Makefile.in
@@ -11,19 +11,16 @@ include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= gkxulbase_s
 MSVC_ENABLE_PGO := 1
 LIBXUL_LIBRARY	= 1
 FAIL_ON_WARNINGS = 1
 
 include $(topsrcdir)/config/config.mk
 
-# we don't want the shared lib, but we want to force the creation of a static lib.
-FORCE_STATIC_LIB = 1
-
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES	= \
 		-I$(srcdir) \
 		-I$(srcdir)/../../../base \
 		-I$(srcdir)/../../../../content/base/src \
 		-I$(srcdir)/../../../../content/events/src \
 		-I$(srcdir)/../../../generic \
--- a/layout/xul/grid/Makefile.in
+++ b/layout/xul/grid/Makefile.in
@@ -16,14 +16,11 @@ FAIL_ON_WARNINGS = 1
 LOCAL_INCLUDES	= \
 		-I$(srcdir) \
 		-I$(srcdir)/../base/src \
 		-I$(srcdir)/../../generic \
 		-I$(srcdir)/../../style \
 		-I$(srcdir)/../../forms \
 		$(NULL)
 
-# we don't want the shared lib, but we want to force the creation of a static lib.
-FORCE_STATIC_LIB = 1
-
 include $(topsrcdir)/config/rules.mk
 
 DEFINES += -D_IMPL_NS_LAYOUT
--- a/layout/xul/tree/Makefile.in
+++ b/layout/xul/tree/Makefile.in
@@ -19,14 +19,11 @@ LOCAL_INCLUDES	= \
 		-I$(topsrcdir)/content/base/src \
 		-I$(srcdir)/../base/src \
 		-I$(srcdir)/../../base \
 		-I$(srcdir)/../../generic \
 		-I$(srcdir)/../../style \
 		-I$(srcdir)/../../forms \
 		$(NULL)
 
-# we don't want the shared lib, but we want to force the creation of a static lib.
-FORCE_STATIC_LIB = 1
-
 include $(topsrcdir)/config/rules.mk
 
 DEFINES += -D_IMPL_NS_LAYOUT
--- a/netwerk/base/src/Makefile.in
+++ b/netwerk/base/src/Makefile.in
@@ -23,20 +23,16 @@ ifdef MOZ_ENABLE_LIBCONIC
 	LOCAL_INCLUDES += -I$(srcdir)/../../system/maemo
 endif
 ifdef MOZ_ENABLE_QTNETWORK
 	LOCAL_INCLUDES += -I$(srcdir)/../../system/qt
 	OS_INCLUDES += $(MOZ_QT_CFLAGS)
 endif
 endif
 
-# we don't want the shared lib, but we want to force the creation of a
-# static lib.
-FORCE_STATIC_LIB = 1
-
 include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 include $(topsrcdir)/config/rules.mk
 
 ifeq ($(OS_TARGET),Android)
 # this works around a "branch out of range" error when compiling this file opt
 nsURLParsers.$(OBJ_SUFFIX): MOZ_OPTIMIZE_FLAGS=
 endif
--- a/netwerk/cache/Makefile.in
+++ b/netwerk/cache/Makefile.in
@@ -9,17 +9,15 @@ srcdir    = @srcdir@
 VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MSVC_ENABLE_PGO := 1
 LIBXUL_LIBRARY = 1
 FAIL_ON_WARNINGS := 1
 
-FORCE_STATIC_LIB = 1
-
 LOCAL_INCLUDES = \
   -I$(srcdir)/../base/src \
   $(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
 DEFINES += -DIMPL_NS_NET
--- a/netwerk/cookie/Makefile.in
+++ b/netwerk/cookie/Makefile.in
@@ -13,17 +13,16 @@ include $(DEPTH)/config/autoconf.mk
 
 # export required interfaces, even if --disable-cookies has been given
 FAIL_ON_WARNINGS := 1
 
 ifdef NECKO_COOKIES
 LIBRARY_NAME     = neckocookie_s
 MSVC_ENABLE_PGO := 1
 LIBXUL_LIBRARY   = 1
-FORCE_STATIC_LIB = 1
 
 LOCAL_INCLUDES	= \
 		-I$(topsrcdir)/intl/uconv/src \
 		$(NULL)
 
 endif
 
 
--- a/netwerk/dash/mpd/Makefile.in
+++ b/netwerk/dash/mpd/Makefile.in
@@ -11,17 +11,16 @@
 DEPTH     := @DEPTH@
 topsrcdir := @top_srcdir@
 srcdir    := @srcdir@
 VPATH     := @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBXUL_LIBRARY := 1
-FORCE_STATIC_LIB := 1
 
 LOCAL_INCLUDES := \
   -I$(topsrcdir)/content/base/src \
   -I$(topsrcdir)/content/html/content/public \
   -I$(topsrcdir)/content/html/content/src \
   $(NULL)
 
 include $(topsrcdir)/config/rules.mk
--- a/netwerk/dns/Makefile.in
+++ b/netwerk/dns/Makefile.in
@@ -15,20 +15,16 @@ LIBXUL_LIBRARY = 1
 FAIL_ON_WARNINGS := 1
 
 DISABLED_CSRCS = \
   race.c \
   nameprep.c \
   punycode.c \
   $(NULL)
 
-# we don't want the shared lib, but we want to force the creation of a
-# static lib.
-FORCE_STATIC_LIB = 1
-
 # need to include etld_data.inc
 LOCAL_INCLUDES = \
   -I$(srcdir)/../base/src \
   -I. \
   $(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
--- a/netwerk/ipc/Makefile.in
+++ b/netwerk/ipc/Makefile.in
@@ -7,17 +7,16 @@ topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
 FAIL_ON_WARNINGS := 1
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME = neckoipc_s
 LIBXUL_LIBRARY = 1
-FORCE_STATIC_LIB = 1
 EXPORT_LIBRARY = 1
 LOCAL_INCLUDES +=                  \
   -I$(srcdir)/../protocol/http \
   -I$(srcdir)/../base/src          \
   -I$(topsrcdir)/modules/libjar    \
   $(NULL)
 
 include $(topsrcdir)/config/config.mk
--- a/netwerk/mime/Makefile.in
+++ b/netwerk/mime/Makefile.in
@@ -9,14 +9,13 @@ srcdir    = @srcdir@
 VPATH     = @srcdir@
 FAIL_ON_WARNINGS := 1
 
 include $(DEPTH)/config/autoconf.mk
 
 MSVC_ENABLE_PGO := 1
 LIBXUL_LIBRARY = 1
 
-FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
 
 DEFINES += -DIMPL_NS_NET
 
--- a/netwerk/protocol/about/Makefile.in
+++ b/netwerk/protocol/about/Makefile.in
@@ -9,18 +9,16 @@ srcdir    = @srcdir@
 VPATH     = @srcdir@
 FAIL_ON_WARNINGS := 1
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME   = nkabout_s
 LIBXUL_LIBRARY = 1
 
-FORCE_STATIC_LIB = 1
-
 LOCAL_INCLUDES = \
   -I$(srcdir)/../../base/src \
   $(NULL)
 
 include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 include $(topsrcdir)/config/rules.mk
 
--- a/netwerk/protocol/data/Makefile.in
+++ b/netwerk/protocol/data/Makefile.in
@@ -8,15 +8,13 @@ topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 FAIL_ON_WARNINGS = 1
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBXUL_LIBRARY = 1
 
-FORCE_STATIC_LIB = 1
-
 LOCAL_INCLUDES = \
   -I$(srcdir)/../../base/src \
   $(NULL)
 
 include $(topsrcdir)/config/rules.mk
--- a/netwerk/protocol/device/Makefile.in
+++ b/netwerk/protocol/device/Makefile.in
@@ -6,17 +6,16 @@ DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 FAIL_ON_WARNINGS = 1
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME = nkdevice_s
-FORCE_STATIC_LIB = 1
 LIBXUL_LIBRARY = 1
 
 LOCAL_INCLUDES = -I$(srcdir)/../../base/src/ \
                  $(NULL)
 
 include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 include $(topsrcdir)/config/rules.mk
--- a/netwerk/protocol/file/Makefile.in
+++ b/netwerk/protocol/file/Makefile.in
@@ -9,18 +9,16 @@ srcdir    = @srcdir@
 VPATH     = @srcdir@
 FAIL_ON_WARNINGS = 1
 
 include $(DEPTH)/config/autoconf.mk
 
 MSVC_ENABLE_PGO := 1
 LIBXUL_LIBRARY = 1
 
-FORCE_STATIC_LIB = 1
-
 LOCAL_INCLUDES = \
   -I$(srcdir)/../../base/src \
   -I$(topsrcdir)/xpcom/ds \
   $(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
 DEFINES += -DIMPL_NS_NET
--- a/netwerk/protocol/ftp/Makefile.in
+++ b/netwerk/protocol/ftp/Makefile.in
@@ -10,18 +10,16 @@ VPATH     = @srcdir@
 FAIL_ON_WARNINGS = 1
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME   = nkftp_s
 MSVC_ENABLE_PGO := 1
 LIBXUL_LIBRARY = 1
 
-FORCE_STATIC_LIB = 1
-
 LOCAL_INCLUDES = \
   -I$(srcdir)/../../base/src \
   -I$(topsrcdir)/xpcom/ds \
   $(NULL)
 
 include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 include $(topsrcdir)/config/rules.mk
--- a/netwerk/protocol/http/Makefile.in
+++ b/netwerk/protocol/http/Makefile.in
@@ -8,17 +8,16 @@ topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME   = nkhttp_s
 MSVC_ENABLE_PGO := 1
 LIBXUL_LIBRARY = 1
-FORCE_STATIC_LIB = 1
 FAIL_ON_WARNINGS := 1
 
 LOCAL_INCLUDES = \
   -I$(srcdir)/../../base/src \
   -I$(topsrcdir)/xpcom/ds \
   -I$(topsrcdir)/content/base/src \
   -I$(topsrcdir)/content/events/src \
   $(NULL)
--- a/netwerk/protocol/res/Makefile.in
+++ b/netwerk/protocol/res/Makefile.in
@@ -10,18 +10,16 @@ VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME   = nkres_s
 MSVC_ENABLE_PGO := 1
 LIBXUL_LIBRARY = 1
 FAIL_ON_WARNINGS = 1
 
-FORCE_STATIC_LIB = 1
-
 LOCAL_INCLUDES = \
   -I$(topsrcdir)/netwerk/base/src \
   $(NULL)
 
 include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 include $(topsrcdir)/config/rules.mk
 
--- a/netwerk/protocol/viewsource/Makefile.in
+++ b/netwerk/protocol/viewsource/Makefile.in
@@ -8,16 +8,14 @@ topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 FAIL_ON_WARNINGS = 1
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBXUL_LIBRARY = 1
 
-FORCE_STATIC_LIB = 1
-
 LOCAL_INCLUDES = \
   -I$(srcdir)/../../base/src \
   $(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
--- a/netwerk/protocol/websocket/Makefile.in
+++ b/netwerk/protocol/websocket/Makefile.in
@@ -7,17 +7,16 @@ topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME   = nkwebsocket_s
 MSVC_ENABLE_PGO := 1
 LIBXUL_LIBRARY = 1
-FORCE_STATIC_LIB = 1
 FAIL_ON_WARNINGS = 1
 
 LOCAL_INCLUDES = \
   -I$(srcdir)/../../base/src \
   -I$(topsrcdir)/content/base/src \
   -I$(topsrcdir)/content/events/src \
   -I$(topsrcdir)/xpcom/ds \
   $(NULL)
--- a/netwerk/protocol/wyciwyg/Makefile.in
+++ b/netwerk/protocol/wyciwyg/Makefile.in
@@ -6,17 +6,16 @@ DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= nkwyciwyg_s
 LIBXUL_LIBRARY	= 1
-FORCE_STATIC_LIB = 1
 FAIL_ON_WARNINGS = 1
 
 LOCAL_INCLUDES = \
   -I$(srcdir)/../../base/src \
   $(NULL)
 
 include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
--- a/netwerk/sctp/datachannel/Makefile.in
+++ b/netwerk/sctp/datachannel/Makefile.in
@@ -7,17 +7,16 @@ DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME   = nkdatachan_s
 LIBXUL_LIBRARY = 1
-FORCE_STATIC_LIB = 1
 NO_PROFILE_GUIDED_OPTIMIZE = 1 # Don't PGO
 FAIL_ON_WARNINGS = 1
 
 LOCAL_INCLUDES = \
   -I$(topsrcdir)/xpcom/ds \
   -I$(srcdir)/../src \
   -I$(DEPTH)/dist/include/mozilla/net \
   -I$(topsrcdir)/media/webrtc/trunk/third_party/libjingle/source \
--- a/netwerk/sctp/src/Makefile.in
+++ b/netwerk/sctp/src/Makefile.in
@@ -11,17 +11,16 @@ VPATH     = \
   @srcdir@/netinet \
   @srcdir@/netinet6 \
   $(NULL)
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME   = nksctp_s
 LIBXUL_LIBRARY = 1
-FORCE_STATIC_LIB = 1
 NO_PROFILE_GUIDED_OPTIMIZE = 1 # Don't PGO
 
 DISABLED_CSRCS = \
   user_environment.c \
   user_mbuf.c \
   user_recv_thread.c \
   user_sctp_timer_iterate.c \
   user_socket.c \
--- a/netwerk/socket/Makefile.in
+++ b/netwerk/socket/Makefile.in
@@ -8,13 +8,12 @@ topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 FAIL_ON_WARNINGS := 1
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBXUL_LIBRARY = 1
 
-FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
 
 DEFINES += -DIMPL_NS_NET
--- a/netwerk/srtp/src/Makefile.in
+++ b/netwerk/srtp/src/Makefile.in
@@ -17,17 +17,16 @@ VPATH = \
   @srcdir@/crypto/replay \
   @srcdir@/crypto/rng \
   $(NULL)
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME = nksrtp_s
 LIBXUL_LIBRARY = 1
-FORCE_STATIC_LIB = 1
 
 DISABLED_CSRCS := \
   ekt.c \
   srtp.c \
   aes.c \
   aes_cbc.c \
   aes_icm.c \
   cipher.c \
--- a/netwerk/streamconv/converters/Makefile.in
+++ b/netwerk/streamconv/converters/Makefile.in
@@ -9,19 +9,15 @@ srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MSVC_ENABLE_PGO := 1
 LIBXUL_LIBRARY = 1
 FAIL_ON_WARNINGS := 1
 
-# we don't want the shared lib, but we want to force the creation of a
-# static lib.
-FORCE_STATIC_LIB = 1
-
 LOCAL_INCLUDES =                        \
         -I$(topsrcdir)/netwerk/base/src \
         $(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
 DEFINES += -DIMPL_NS_NET
--- a/netwerk/streamconv/src/Makefile.in
+++ b/netwerk/streamconv/src/Makefile.in
@@ -15,15 +15,11 @@ LIBXUL_LIBRARY  = 1
 
 ifneq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 ifeq (x86_64,$(OS_TEST))
 # nsAppleFileDecoder.cpp has warnings I don't understand.
 FAIL_ON_WARNINGS := 1
 endif
 endif
 
-# we don't want the shared lib, but we want to force the creation of a
-# static lib.
-FORCE_STATIC_LIB = 1
-
 include $(topsrcdir)/config/rules.mk
 
 DEFINES += -DIMPL_NS_NET
--- a/netwerk/system/android/Makefile.in
+++ b/netwerk/system/android/Makefile.in
@@ -7,16 +7,14 @@ topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 FAIL_ON_WARNINGS := 1
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBXUL_LIBRARY = 1
 
-FORCE_STATIC_LIB = 1
-
 include $(topsrcdir)/config/rules.mk
 
 DEFINES += -DIMPL_NS_NET
 
 LOCAL_INCLUDES += -I$(srcdir)/../../base/src
  
--- a/netwerk/system/mac/Makefile.in
+++ b/netwerk/system/mac/Makefile.in
@@ -8,13 +8,10 @@ topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 FAIL_ON_WARNINGS := 1
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBXUL_LIBRARY = 1
 
-FORCE_STATIC_LIB = 1
-
-
 include $(topsrcdir)/config/rules.mk
 
--- a/netwerk/system/maemo/Makefile.in
+++ b/netwerk/system/maemo/Makefile.in
@@ -7,17 +7,15 @@ topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 FAIL_ON_WARNINGS := 1
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBXUL_LIBRARY = 1
 
-FORCE_STATIC_LIB = 1
-
 include $(topsrcdir)/config/rules.mk
 
 DEFINES += -DIMPL_NS_NET
 
 OS_INCLUDES += $(GLIB_CFLAGS) $(LIBCONIC_CFLAGS)
 LOCAL_INCLUDES += -I$(srcdir)/../../base/src
  
--- a/netwerk/system/qt/Makefile.in
+++ b/netwerk/system/qt/Makefile.in
@@ -8,16 +8,14 @@ topsrcdir	= @top_srcdir@
 srcdir	 = @srcdir@
 VPATH		= @srcdir@
 FAIL_ON_WARNINGS := 1
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBXUL_LIBRARY = 1
 
-FORCE_STATIC_LIB = 1
-
 include $(topsrcdir)/config/rules.mk
 
 DEFINES += -DIMPL_NS_NET
 
 OS_INCLUDES += $(MOZ_QT_CFLAGS)
 LOCAL_INCLUDES += -I$(srcdir)/../../base/src
--- a/netwerk/system/win32/Makefile.in
+++ b/netwerk/system/win32/Makefile.in
@@ -8,13 +8,11 @@ topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 FAIL_ON_WARNINGS := 1
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBXUL_LIBRARY = 1
 
-FORCE_STATIC_LIB = 1
-
 include $(topsrcdir)/config/rules.mk
 
 DEFINES += -DIMPL_NS_NET
--- a/netwerk/wifi/Makefile.in
+++ b/netwerk/wifi/Makefile.in
@@ -6,18 +6,16 @@ DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBXUL_LIBRARY = 1
 
-FORCE_STATIC_LIB = 1
-
 ifneq ($(OS_ARCH),Darwin)
 # osx_corewlan.mm has warnings I don't understand.
 FAIL_ON_WARNINGS := 1
 endif
 
 ifeq ($(OS_ARCH),SunOS)
 OS_INCLUDES += $(GLIB_CFLAGS)
 endif
--- a/other-licenses/snappy/Makefile.in
+++ b/other-licenses/snappy/Makefile.in
@@ -8,13 +8,12 @@ srcdir    = @srcdir@
 
 VPATH = \
   @srcdir@ \
   $(topsrcdir)/other-licenses/snappy/src
   $(NULL)
 
 include $(DEPTH)/config/autoconf.mk
 
-FORCE_STATIC_LIB = 1
 LIBXUL_LIBRARY = 1
 EXPORT_LIBRARY = 1
 
 include $(topsrcdir)/config/rules.mk
--- a/parser/html/Makefile.in
+++ b/parser/html/Makefile.in
@@ -7,17 +7,15 @@ topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MSVC_ENABLE_PGO := 1
 LIBXUL_LIBRARY	= 1
 
-FORCE_STATIC_LIB = 1
-
 include $(topsrcdir)/config/rules.mk
 
 INCLUDES	+= \
 		-I$(srcdir)/../../content/base/src \
 		$(NULL)
 
 #DEFINES		+= -DENABLE_VOID_MENUITEM
--- a/parser/xml/src/Makefile.in
+++ b/parser/xml/src/Makefile.in
@@ -9,12 +9,9 @@ VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MSVC_ENABLE_PGO := 1
 
 MOZILLA_INTERNAL_API = 1
 LIBXUL_LIBRARY	= 1
 
-
-FORCE_STATIC_LIB = 1
-
 include $(topsrcdir)/config/rules.mk
--- a/rdf/base/src/Makefile.in
+++ b/rdf/base/src/Makefile.in
@@ -7,13 +7,10 @@ DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBXUL_LIBRARY  = 1
 
-# we don't want the shared lib, but we want to force the creation of a static lib.
-FORCE_STATIC_LIB = 1
-
 include $(topsrcdir)/config/rules.mk
 
--- a/rdf/datasource/src/Makefile.in
+++ b/rdf/datasource/src/Makefile.in
@@ -7,17 +7,14 @@ DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBXUL_LIBRARY  = 1
 
-# we don't want the shared lib, but we want to force the creation of a static lib.
-FORCE_STATIC_LIB = 1
-
 include $(topsrcdir)/config/rules.mk
 
 # XXX This is a dependency on rdfutil.h: it'll go away once that becomes
 # a first-class XPCOM interface.
 INCLUDES	+= -I$(srcdir)/../../base/src
 
--- a/storage/src/Makefile.in
+++ b/storage/src/Makefile.in
@@ -5,17 +5,16 @@
 
 DEPTH   = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH   = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-FORCE_STATIC_LIB = 1
 LIBXUL_LIBRARY = 1
 
 # TODO: we do this in crashreporter and xpcom/base too, should be centralized
 ifeq ($(OS_ARCH),Linux)
 DEFINES += -DXP_LINUX
 endif
 
 # Don't use the jemalloc allocator on Android, because we can't guarantee
--- a/toolkit/components/alerts/Makefile.in
+++ b/toolkit/components/alerts/Makefile.in
@@ -5,16 +5,15 @@
 DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME = alerts_s
-FORCE_STATIC_LIB = 1
 LIBXUL_LIBRARY = 1
 LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/components/build/
 
 include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
 include $(topsrcdir)/config/rules.mk
--- a/toolkit/components/downloads/Makefile.in
+++ b/toolkit/components/downloads/Makefile.in
@@ -6,17 +6,16 @@
 DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME = download_s
-FORCE_STATIC_LIB = 1
 LIBXUL_LIBRARY = 1
 
 # definition of MOZ_SUITE is only added via config.mk
 include $(topsrcdir)/config/config.mk
 
 include $(topsrcdir)/config/rules.mk
 
 CXXFLAGS += $(TK_CFLAGS)
--- a/toolkit/components/feeds/Makefile.in
+++ b/toolkit/components/feeds/Makefile.in
@@ -6,17 +6,16 @@
 DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MOZILLA_INTERNAL_API = 1
-FORCE_STATIC_LIB = 1
 LIBXUL_LIBRARY = 1
 
 
 include $(topsrcdir)/config/rules.mk
 
 ABS_SRCDIR := $(call core_abspath,$(srcdir))
 ifeq ($(OS_ARCH),WINNT)
 
--- a/toolkit/components/find/Makefile.in
+++ b/toolkit/components/find/Makefile.in
@@ -5,12 +5,11 @@
 
 DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-FORCE_STATIC_LIB = 1
 LIBXUL_LIBRARY = 1
 
 include $(topsrcdir)/config/rules.mk
--- a/toolkit/components/intl/Makefile.in
+++ b/toolkit/components/intl/Makefile.in
@@ -5,12 +5,11 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-FORCE_STATIC_LIB  = 1
 LIBXUL_LIBRARY    = 1
 
 include $(topsrcdir)/config/rules.mk
--- a/toolkit/components/osfile/Makefile.in
+++ b/toolkit/components/osfile/Makefile.in
@@ -5,17 +5,16 @@
 DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBXUL_LIBRARY  = 1
-FORCE_STATIC_LIB = 1
 
 EXTRA_PP_JS_MODULES = \
    osfile.jsm \
    $(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
 libs::
--- a/toolkit/components/parentalcontrols/Makefile.in
+++ b/toolkit/components/parentalcontrols/Makefile.in
@@ -7,14 +7,13 @@ DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 ifndef MOZ_DISABLE_PARENTAL_CONTROLS
 ifeq (WINNT,$(OS_ARCH))
-FORCE_STATIC_LIB = 1
 LIBXUL_LIBRARY = 1
 endif
 endif
 
 include $(topsrcdir)/config/rules.mk
--- a/toolkit/components/startup/Makefile.in
+++ b/toolkit/components/startup/Makefile.in
@@ -5,16 +5,15 @@
 DEPTH      = @DEPTH@
 topsrcdir  = @top_srcdir@
 srcdir     = @srcdir@
 VPATH      = @srcdir@
 relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-FORCE_STATIC_LIB = 1
 LIBXUL_LIBRARY = 1
 
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 DISABLE_CMMSRCS += nsUserInfoMac.mm
 endif
 
 include $(topsrcdir)/config/rules.mk
--- a/toolkit/components/statusfilter/Makefile.in
+++ b/toolkit/components/statusfilter/Makefile.in
@@ -5,13 +5,12 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-FORCE_STATIC_LIB = 1
 LIBXUL_LIBRARY = 1
 
 
 include $(topsrcdir)/config/rules.mk
--- a/toolkit/components/typeaheadfind/Makefile.in
+++ b/toolkit/components/typeaheadfind/Makefile.in
@@ -4,12 +4,11 @@
 
 DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-FORCE_STATIC_LIB = 1
 LIBXUL_LIBRARY = 1
 
 include $(topsrcdir)/config/rules.mk
--- a/toolkit/components/url-classifier/Makefile.in
+++ b/toolkit/components/url-classifier/Makefile.in
@@ -7,17 +7,16 @@ DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MSVC_ENABLE_PGO := 1
 LIBXUL_LIBRARY = 1
-FORCE_STATIC_LIB = 1
 FAIL_ON_WARNINGS = 1
 
 LOCAL_INCLUDES = \
   -I$(srcdir)/../build \
   $(SQLITE_CFLAGS) \
   $(NULL)
 
 
--- a/toolkit/identity/Makefile.in
+++ b/toolkit/identity/Makefile.in
@@ -6,13 +6,12 @@ DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 FAIL_ON_WARNINGS := 1
 
-FORCE_STATIC_LIB = 1
 LIBXUL_LIBRARY = 1
 EXPORT_LIBRARY = 1
 
 include $(topsrcdir)/config/rules.mk
--- a/toolkit/mozapps/update/common/Makefile.in
+++ b/toolkit/mozapps/update/common/Makefile.in
@@ -4,16 +4,15 @@
 
 DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-FORCE_STATIC_LIB =1
 LIBXUL_LIBRARY = 1
 ifeq ($(OS_ARCH),WINNT)
 USE_STATIC_LIBS = 1
 endif
 
 include $(topsrcdir)/config/rules.mk
 
--- a/toolkit/profile/Makefile.in
+++ b/toolkit/profile/Makefile.in
@@ -5,17 +5,16 @@
 
 DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-FORCE_STATIC_LIB = 1
 LIBXUL_LIBRARY = 1
 
 LOCAL_INCLUDES = \
   -I$(srcdir)/../xre \
   -I$(topsrcdir)/profile/dirserviceprovider/src \
   $(NULL)
 
 DEFINES += -DIMPL_XREAPI
--- a/toolkit/xre/Makefile.in
+++ b/toolkit/xre/Makefile.in
@@ -16,18 +16,16 @@ USE_RCS_MK=1
 include $(topsrcdir)/config/makefiles/makeutils.mk
 
 milestone_txt = $(topsrcdir)/config/milestone.txt
 
 LIBRARY_NAME = xulapp_s
 MSVC_ENABLE_PGO := 1
 LIBXUL_LIBRARY = 1
 
-FORCE_STATIC_LIB = 1
-
 ifeq ($(MOZ_GL_DEFAULT_PROVIDER),GLX)
 DEFINES += -DUSE_GLX_TEST
 endif
 
 DEFINES += -DIMPL_XREAPI \
   -DMOZ_APP_NAME='"$(MOZ_APP_NAME)"' \
   -DMOZ_APP_VERSION='"$(MOZ_APP_VERSION)"'
 
--- a/tools/trace-malloc/lib/Makefile.in
+++ b/tools/trace-malloc/lib/Makefile.in
@@ -8,18 +8,16 @@ topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 EXPORT_LIBRARY	= 1
 DEFFILE		= $(win_srcdir)/tm.def
 
-FORCE_STATIC_LIB = 1
-
 LIBXUL_LIBRARY	= 1
 
 STL_FLAGS	=
 
 CSRCS		= \
 		nsTraceMalloc.c \
 		$(NULL)
 
--- a/uriloader/base/Makefile.in
+++ b/uriloader/base/Makefile.in
@@ -9,13 +9,10 @@ srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MSVC_ENABLE_PGO := 1
 LIBXUL_LIBRARY  = 1
 FAIL_ON_WARNINGS = 1
 
-# we don't want the shared lib, but we want to force the creation of a static lib.
-FORCE_STATIC_LIB = 1
-
 include $(topsrcdir)/config/rules.mk
 
--- a/uriloader/exthandler/Makefile.in
+++ b/uriloader/exthandler/Makefile.in
@@ -78,17 +78,15 @@ endif
 
 EXTRA_COMPONENTS = \
   nsHandlerService.js \
   nsHandlerService.manifest \
   nsWebHandlerApp.js \
   nsWebHandlerApp.manifest \
   $(NULL)
 
-# we don't want the shared lib, but we want to force the creation of a static lib.
-FORCE_STATIC_LIB = 1
 include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 include $(topsrcdir)/config/rules.mk
 
 ifneq (,$(filter qt gtk2 gtk3, $(MOZ_WIDGET_TOOLKIT)))
 CXXFLAGS += $(TK_CFLAGS) $(MOZ_DBUS_GLIB_CFLAGS)
 endif
--- a/uriloader/prefetch/Makefile.in
+++ b/uriloader/prefetch/Makefile.in
@@ -14,16 +14,13 @@ LIBRARY_NAME	= prefetch_s
 LIBXUL_LIBRARY	= 1
 FAIL_ON_WARNINGS = 1
 
 LOCAL_INCLUDES = \
 		-I$(topsrcdir)/content/base/src \
 		-I$(topsrcdir)/content/events/src \
 		$(NULL)
 
-# we don't want the shared lib, but we want to force the creation of a static lib.
-FORCE_STATIC_LIB = 1
-
 include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 include $(topsrcdir)/config/rules.mk
 
 # vim: ts=4 sw=4 noexpandtab
--- a/view/src/Makefile.in
+++ b/view/src/Makefile.in
@@ -6,17 +6,16 @@
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MSVC_ENABLE_PGO := 1
-FORCE_STATIC_LIB = 1
 LIBXUL_LIBRARY	= 1
 FAIL_ON_WARNINGS := 1
 
 DEFINES += -D_IMPL_NS_LAYOUT
 
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES  = \
--- a/widget/shared/Makefile.in
+++ b/widget/shared/Makefile.in
@@ -13,16 +13,13 @@ include $(DEPTH)/config/autoconf.mk
 LIBRARY_NAME	= widget_shared
 LIBXUL_LIBRARY  = 1
 
 
 DEFINES += \
   -D_IMPL_NS_WIDGET \
   $(NULL)
 
-# we don't want the shared lib, but we want to force the creation of a static lib.
-FORCE_STATIC_LIB = 1
-
 include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 include $(topsrcdir)/config/rules.mk
 
 CXXFLAGS	+= $(TK_CFLAGS)
--- a/widget/shared/x11/Makefile.in
+++ b/widget/shared/x11/Makefile.in
@@ -13,15 +13,12 @@ include $(DEPTH)/config/autoconf.mk
 LIBRARY_NAME   = widget_shared_x11
 LIBXUL_LIBRARY  = 1
 
 
 CSRCS      = \
        keysym2ucs.c \
        $(NULL)
 
-# we don't want the shared lib, but we want to force the creation of a static lib.
-FORCE_STATIC_LIB = 1
-
 include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 
 CXXFLAGS   += $(TK_CFLAGS)
--- a/widget/windows/Makefile.in
+++ b/widget/windows/Makefile.in
@@ -37,16 +37,14 @@ LOCAL_INCLUDES	= \
 		-I$(srcdir) \
 		-I$(topsrcdir)/layout/generic \
 		-I$(topsrcdir)/layout/xul/base/src \
 		-I$(topsrcdir)/toolkit/xre \
 		-I$(topsrcdir)/xpcom/base \
 		-I$(topsrcdir)/content/events/src \
 		$(NULL)
 
-FORCE_STATIC_LIB = 1
-
 include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
 include $(topsrcdir)/config/rules.mk
 
 CXXFLAGS += $(MOZ_CAIRO_CFLAGS) $(MOZ_PIXMAN_CFLAGS)
--- a/widget/xpwidgets/Makefile.in
+++ b/widget/xpwidgets/Makefile.in
@@ -43,16 +43,13 @@ LOCAL_INCLUDES	+= \
 		-I$(topsrcdir)/layout/base \
 		-I$(topsrcdir)/layout/forms \
 		-I$(topsrcdir)/layout/generic \
 		-I$(topsrcdir)/layout/xul/base/src \
 		-I$(topsrcdir)/view/src \
 		-I$(srcdir) \
 		$(NULL)
 
-# we don't want the shared lib, but we want to force the creation of a static lib.
-FORCE_STATIC_LIB = 1
-
 include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 include $(topsrcdir)/config/rules.mk
 
 CXXFLAGS	+= $(TK_CFLAGS)
--- a/xpcom/base/Makefile.in
+++ b/xpcom/base/Makefile.in
@@ -45,19 +45,16 @@ DISABLED_SDK_HEADERS     = \
 		nsObjCExceptions.h \
 
 ifeq ($(OS_ARCH),WINNT)
 DISABLED_SDK_HEADERS += \
 		nsWindowsHelpers.h \
 		$(NULL)
 endif
 
-# we don't want the shared lib, but we want to force the creation of a static lib.
-FORCE_STATIC_LIB = 1
-
 
 include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 include $(topsrcdir)/config/rules.mk
 
 DEFINES		+= -D_IMPL_NS_COM
 
 ifdef MOZ_WIDGET_GTK
--- a/xpcom/components/Makefile.in
+++ b/xpcom/components/Makefile.in
@@ -19,18 +19,15 @@ LOCAL_INCLUDES	= \
 	-I$(srcdir)/../base \
 	-I$(srcdir)/../ds \
 	-I$(srcdir)/../build \
 	-I.. \
 	-I$(topsrcdir)/chrome/src \
 	-I$(topsrcdir)/modules/libjar \
 	$(NULL)
 
-# we don't want the shared lib, but we want to force the creation of a static lib.
-FORCE_STATIC_LIB = 1
-
 include $(topsrcdir)/config/rules.mk
 
 DEFINES	+= -D_IMPL_NS_COM
 
 ifdef MOZ_WIDGET_GTK
 CXXFLAGS        += $(TK_CFLAGS)
 endif
--- a/xpcom/ds/Makefile.in
+++ b/xpcom/ds/Makefile.in
@@ -14,17 +14,14 @@ MSVC_ENABLE_PGO := 1
 LIBXUL_LIBRARY	= 1
 MOZILLA_INTERNAL_API = 1
 
 EXTRA_COMPONENTS = \
   nsINIProcessor.js \
   nsINIProcessor.manifest \
   $(NULL)
 
-# we don't want the shared lib, but we want to force the creation of a static lib.
-FORCE_STATIC_LIB = 1
-
 
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES += -I$(srcdir)/../io
 
 DEFINES		+= -D_IMPL_NS_COM
--- a/xpcom/io/Makefile.in
+++ b/xpcom/io/Makefile.in
@@ -22,19 +22,16 @@ MODULE_OPTIMIZE_FLAGS = $(MOZ_OPTIMIZE_F
 endif
 endif
 
 DISABLED_SDK_HEADERS =  \
 		nsDirectoryServiceDefs.h \
 		nsDirectoryServiceUtils.h \
 		$(NULL)
 
-# we don't want the shared lib, but we want to force the creation of a static lib.
-FORCE_STATIC_LIB = 1
-
 
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
 DEFINES		+= -D_IMPL_NS_COM
 
 ifeq ($(OS_ARCH),Linux)
 ifneq (,$(findstring lib64,$(libdir)))
--- a/xpcom/threads/Makefile.in
+++ b/xpcom/threads/Makefile.in
@@ -12,16 +12,13 @@ include $(DEPTH)/config/autoconf.mk
 
 MSVC_ENABLE_PGO := 1
 MOZILLA_INTERNAL_API = 1
 LIBXUL_LIBRARY = 1
 
 LOCAL_INCLUDES	= -I$(srcdir)/../components
 LOCAL_INCLUDES = -I$(srcdir)/../build
 
-# we don't want the shared lib, but we want to force the creation of a static lib.
-FORCE_STATIC_LIB = 1
-
 
 include $(topsrcdir)/config/rules.mk
 
 DEFINES		+= -D_IMPL_NS_COM
 
--- a/xpfe/components/directory/Makefile.in
+++ b/xpfe/components/directory/Makefile.in
@@ -7,14 +7,10 @@ DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBXUL_LIBRARY	= 1
 
-# we don't want the shared lib, but we want to force the creation of a
-# static lib.
-FORCE_STATIC_LIB = 1
-
 include $(topsrcdir)/config/rules.mk