bug 887483 - rm a bunch of useless assignments to FORCE_STATIC_LIB r=mshal

2025-02-28 21:28:55 +00:00 · 2013-06-25 14:29:26 -04:00 · 2013-06-25 14:29:26 -04:00 · 63ed0e9589
commit 63ed0e9589
parent fec3c935fc
241 changed files with 4 additions and 472 deletions
--- a/accessible/src/atk/Makefile.in
+++ b/accessible/src/atk/Makefile.in
@ -12,9 +12,6 @@ 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
--- a/accessible/src/base/Makefile.in
+++ b/accessible/src/base/Makefile.in
@ -11,9 +11,6 @@ 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 += \
--- a/accessible/src/generic/Makefile.in
+++ b/accessible/src/generic/Makefile.in
@ -11,9 +11,6 @@ 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 = \
--- a/accessible/src/html/Makefile.in
+++ b/accessible/src/html/Makefile.in
@ -12,9 +12,6 @@ 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 = \
--- a/accessible/src/mac/Makefile.in
+++ b/accessible/src/mac/Makefile.in
@ -13,9 +13,6 @@ 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 += \
--- a/accessible/src/other/Makefile.in
+++ b/accessible/src/other/Makefile.in
@ -12,9 +12,6 @@ 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 += \
--- a/accessible/src/windows/ia2/Makefile.in
+++ b/accessible/src/windows/ia2/Makefile.in
@ -17,9 +17,6 @@ LIBXUL_LIBRARY = 1
 # 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

--- a/accessible/src/windows/msaa/Makefile.in
+++ b/accessible/src/windows/msaa/Makefile.in
@ -13,9 +13,6 @@ 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
--- a/accessible/src/windows/sdn/Makefile.in
+++ b/accessible/src/windows/sdn/Makefile.in
@ -16,9 +16,6 @@ LIBXUL_LIBRARY = 1
 # 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

--- a/accessible/src/windows/uia/Makefile.in
+++ b/accessible/src/windows/uia/Makefile.in
@ -16,9 +16,6 @@ LIBXUL_LIBRARY = 1
 # 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

--- a/accessible/src/xpcom/Makefile.in
+++ b/accessible/src/xpcom/Makefile.in
@ -12,9 +12,6 @@ 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
--- a/accessible/src/xul/Makefile.in
+++ b/accessible/src/xul/Makefile.in
@ -12,9 +12,6 @@ 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 = \
--- a/caps/src/Makefile.in
+++ b/caps/src/Makefile.in
@ -11,7 +11,6 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk

 MSVC_ENABLE_PGO := 1
-FORCE_STATIC_LIB = 1
 LIBXUL_LIBRARY = 1


--- a/chrome/src/Makefile.in
+++ b/chrome/src/Makefile.in
@ -13,7 +13,6 @@ 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
--- a/content/base/src/Makefile.in
+++ b/content/base/src/Makefile.in
@ -22,10 +22,6 @@ 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 \
--- a/content/canvas/src/Makefile.in
+++ b/content/canvas/src/Makefile.in
@ -21,9 +21,6 @@ LOCAL_INCLUDES += \
 	$(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

--- a/content/events/src/Makefile.in
+++ b/content/events/src/Makefile.in
@ -15,9 +15,6 @@ 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
--- a/content/html/content/src/Makefile.in
+++ b/content/html/content/src/Makefile.in
@ -15,9 +15,6 @@ 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

--- a/content/html/document/src/Makefile.in
+++ b/content/html/document/src/Makefile.in
@ -14,9 +14,6 @@ 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 += \
--- a/content/mathml/content/src/Makefile.in
+++ b/content/mathml/content/src/Makefile.in
@ -17,10 +17,6 @@ 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 += \
--- a/content/media/Makefile.in
+++ b/content/media/Makefile.in
@ -14,8 +14,6 @@ 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
--- a/content/media/dash/Makefile.in
+++ b/content/media/dash/Makefile.in
@ -17,8 +17,6 @@ include $(DEPTH)/config/autoconf.mk

 LIBXUL_LIBRARY := 1

-FORCE_STATIC_LIB := 1
-
 include $(topsrcdir)/config/rules.mk

 LOCAL_INCLUDES := \
--- a/content/media/encoder/Makefile.in
+++ b/content/media/encoder/Makefile.in
@ -13,6 +13,4 @@ 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
@ -12,8 +12,6 @@ include $(DEPTH)/config/autoconf.mk

 LIBXUL_LIBRARY 	= 1

-FORCE_STATIC_LIB = 1
-
 include $(topsrcdir)/config/rules.mk

 CFLAGS		+= $(GSTREAMER_CFLAGS)
--- a/content/media/ogg/Makefile.in
+++ b/content/media/ogg/Makefile.in
@ -13,6 +13,4 @@ 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
@ -12,8 +12,6 @@ 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

--- a/content/media/plugins/Makefile.in
+++ b/content/media/plugins/Makefile.in
@ -11,8 +11,6 @@ include $(DEPTH)/config/autoconf.mk

 LIBXUL_LIBRARY 	= 1

-FORCE_STATIC_LIB = 1
-
 include $(topsrcdir)/config/rules.mk

 INCLUDES	+= \
--- a/content/media/raw/Makefile.in
+++ b/content/media/raw/Makefile.in
@ -13,8 +13,6 @@ include $(DEPTH)/config/autoconf.mk
 LIBXUL_LIBRARY = 1
 FAIL_ON_WARNINGS := 1

-FORCE_STATIC_LIB = 1
-
 include $(topsrcdir)/config/rules.mk

 INCLUDES	+= \
--- a/content/media/wave/Makefile.in
+++ b/content/media/wave/Makefile.in
@ -13,6 +13,4 @@ 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
@ -13,7 +13,5 @@ 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
@ -12,7 +12,5 @@ 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
@ -13,8 +13,6 @@ include $(DEPTH)/config/autoconf.mk
 LIBXUL_LIBRARY 	= 1


-FORCE_STATIC_LIB = 1
-
 include $(topsrcdir)/config/rules.mk

 LOCAL_INCLUDES = \
--- a/content/media/webrtc/Makefile.in
+++ b/content/media/webrtc/Makefile.in
@ -16,8 +16,6 @@ ifeq ($(OS_ARCH),WINNT)
 OS_CXXFLAGS += -DNOMINMAX
 endif

-FORCE_STATIC_LIB = 1
-
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk

--- a/content/media/webspeech/recognition/Makefile.in
+++ b/content/media/webspeech/recognition/Makefile.in
@ -19,8 +19,6 @@ 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
@ -22,8 +22,6 @@ 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
@ -16,6 +16,4 @@ 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
@ -16,9 +16,6 @@ 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 \
--- a/content/svg/content/src/Makefile.in
+++ b/content/svg/content/src/Makefile.in
@ -17,9 +17,6 @@ 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 += 	\
--- a/content/svg/document/src/Makefile.in
+++ b/content/svg/document/src/Makefile.in
@ -13,9 +13,6 @@ 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	+= \
--- a/content/xbl/src/Makefile.in
+++ b/content/xbl/src/Makefile.in
@ -17,9 +17,6 @@ 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	= \
--- a/content/xml/content/src/Makefile.in
+++ b/content/xml/content/src/Makefile.in
@ -14,9 +14,6 @@ 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	+= \
--- a/content/xml/document/src/Makefile.in
+++ b/content/xml/document/src/Makefile.in
@ -14,9 +14,6 @@ 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	= \
--- a/content/xslt/src/base/Makefile.in
+++ b/content/xslt/src/base/Makefile.in
@ -12,10 +12,6 @@ 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 += \
--- a/content/xslt/src/xml/Makefile.in
+++ b/content/xslt/src/xml/Makefile.in
@ -12,10 +12,6 @@ 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 += \
--- a/content/xslt/src/xpath/Makefile.in
+++ b/content/xslt/src/xpath/Makefile.in
@ -12,10 +12,6 @@ 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 += \
--- a/content/xslt/src/xslt/Makefile.in
+++ b/content/xslt/src/xslt/Makefile.in
@ -17,10 +17,6 @@ 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 \
--- a/content/xul/content/src/Makefile.in
+++ b/content/xul/content/src/Makefile.in
@ -16,10 +16,6 @@ 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	= \
--- a/content/xul/document/src/Makefile.in
+++ b/content/xul/document/src/Makefile.in
@ -13,10 +13,6 @@ 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 \
--- a/content/xul/templates/src/Makefile.in
+++ b/content/xul/templates/src/Makefile.in
@ -13,9 +13,6 @@ 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 \
--- a/docshell/base/Makefile.in
+++ b/docshell/base/Makefile.in
@ -19,10 +19,6 @@ 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
--- a/docshell/shistory/src/Makefile.in
+++ b/docshell/shistory/src/Makefile.in
@ -11,7 +11,6 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk

 MSVC_ENABLE_PGO := 1
-FORCE_STATIC_LIB = 1
 LIBXUL_LIBRARY	= 1
 FAIL_ON_WARNINGS = 1

--- a/dom/activities/src/Makefile.in
+++ b/dom/activities/src/Makefile.in
@ -11,7 +11,6 @@ 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
--- a/dom/alarm/Makefile.in
+++ b/dom/alarm/Makefile.in
@ -11,7 +11,6 @@ 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
--- a/dom/audiochannel/Makefile.in
+++ b/dom/audiochannel/Makefile.in
@ -21,7 +21,6 @@ include $(DEPTH)/config/autoconf.mk

 LIBRARY_NAME     = domaudiochannel_s
 LIBXUL_LIBRARY = 1
-FORCE_STATIC_LIB = 1
 EXPORT_LIBRARY = 1
 FAIL_ON_WARNINGS := 1

--- a/dom/base/Makefile.in
+++ b/dom/base/Makefile.in
@ -12,7 +12,6 @@ include $(DEPTH)/config/autoconf.mk
 LIBRARY_NAME	= jsdombase_s
 MSVC_ENABLE_PGO := 1
 LIBXUL_LIBRARY	= 1
-FORCE_STATIC_LIB = 1
 FAIL_ON_WARNINGS := 1


--- a/dom/battery/Makefile.in
+++ b/dom/battery/Makefile.in
@ -11,7 +11,6 @@ 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
--- a/dom/bindings/Makefile.in
+++ b/dom/bindings/Makefile.in
@ -10,7 +10,6 @@ VPATH            = @srcdir@
 LIBRARY_NAME     = dombindings_s
 MSVC_ENABLE_PGO := 1
 LIBXUL_LIBRARY   = 1
-FORCE_STATIC_LIB = 1
 EXPORT_LIBRARY   = 1
 FAIL_ON_WARNINGS := 1

--- a/dom/bindings/test/Makefile.in
+++ b/dom/bindings/test/Makefile.in
@ -10,7 +10,6 @@ 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.

--- a/dom/bluetooth/Makefile.in
+++ b/dom/bluetooth/Makefile.in
@ -27,7 +27,6 @@ ifneq (,$(MOZ_B2G_BT))

 LIBRARY_NAME     = dombluetooth_s
 LIBXUL_LIBRARY   = 1
-FORCE_STATIC_LIB = 1

 ifeq (gonk,$(MOZ_WIDGET_TOOLKIT))
 VPATH += \
--- a/dom/browser-element/Makefile.in
+++ b/dom/browser-element/Makefile.in
@ -11,7 +11,6 @@ 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
--- a/dom/camera/Makefile.in
+++ b/dom/camera/Makefile.in
@ -11,7 +11,6 @@ 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
--- a/dom/cellbroadcast/src/Makefile.in
+++ b/dom/cellbroadcast/src/Makefile.in
@ -11,7 +11,6 @@ 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
--- a/dom/devicestorage/Makefile.in
+++ b/dom/devicestorage/Makefile.in
@ -11,7 +11,6 @@ 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
--- a/dom/encoding/Makefile.in
+++ b/dom/encoding/Makefile.in
@ -12,7 +12,6 @@ include $(DEPTH)/config/autoconf.mk

 LIBRARY_NAME	= domencoding_s
 LIBXUL_LIBRARY	= 1
-FORCE_STATIC_LIB = 1

 LOCAL_INCLUDES = \
 	-I$(topsrcdir)/intl/locale/src \
--- a/dom/file/Makefile.in
+++ b/dom/file/Makefile.in
@ -11,7 +11,6 @@ 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
--- a/dom/fm/Makefile.in
+++ b/dom/fm/Makefile.in
@ -11,7 +11,6 @@ include $(DEPTH)/config/autoconf.mk

 LIBRARY_NAME     = domfm_s
 LIBXUL_LIBRARY   = 1
-FORCE_STATIC_LIB = 1

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

--- a/dom/future/Makefile.in
+++ b/dom/future/Makefile.in
@ -11,7 +11,6 @@ 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
--- a/dom/icc/src/Makefile.in
+++ b/dom/icc/src/Makefile.in
@ -11,7 +11,6 @@ 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
--- a/dom/indexedDB/Makefile.in
+++ b/dom/indexedDB/Makefile.in
@ -11,7 +11,6 @@ include $(DEPTH)/config/autoconf.mk

 LIBRARY_NAME = dom_indexeddb_s
 LIBXUL_LIBRARY = 1
-FORCE_STATIC_LIB = 1
 FAIL_ON_WARNINGS := 1

 LOCAL_INCLUDES = \
--- a/dom/indexedDB/ipc/Makefile.in
+++ b/dom/indexedDB/ipc/Makefile.in
@ -13,7 +13,6 @@ include $(DEPTH)/config/autoconf.mk

 LIBRARY_NAME = dom_indexeddb_ipc_s
 LIBXUL_LIBRARY = 1
-FORCE_STATIC_LIB = 1

 LOCAL_INCLUDES += \
  -I$(topsrcdir)/dom/indexedDB \
--- a/dom/interfaces/devicestorage/Makefile.in
+++ b/dom/interfaces/devicestorage/Makefile.in
@ -11,7 +11,6 @@ include $(DEPTH)/config/autoconf.mk

 LIBRARY_NAME     = domdevicestorage_s
 LIBXUL_LIBRARY   = 1
-FORCE_STATIC_LIB = 1

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

--- a/dom/ipc/Makefile.in
+++ b/dom/ipc/Makefile.in
@ -11,7 +11,6 @@ include $(DEPTH)/config/autoconf.mk

 LIBRARY_NAME = domipc_s
 LIBXUL_LIBRARY = 1
-FORCE_STATIC_LIB = 1
 EXPORT_LIBRARY = 1
 FAIL_ON_WARNINGS := 1

--- a/dom/media/Makefile.in
+++ b/dom/media/Makefile.in
@ -12,7 +12,6 @@ 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
--- a/dom/mobilemessage/src/Makefile.in
+++ b/dom/mobilemessage/src/Makefile.in
@ -23,7 +23,6 @@ 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
--- a/dom/network/src/Makefile.in
+++ b/dom/network/src/Makefile.in
@ -11,7 +11,6 @@ include $(DEPTH)/config/autoconf.mk

 LIBRARY_NAME     = dom_network_s
 LIBXUL_LIBRARY   = 1
-FORCE_STATIC_LIB = 1
 FAIL_ON_WARNINGS := 1


--- a/dom/plugins/base/android/Makefile.in
+++ b/dom/plugins/base/android/Makefile.in
@ -12,7 +12,6 @@ include $(DEPTH)/config/autoconf.mk

 LIBRARY_NAME	= gkpluginandroid_s
 LIBXUL_LIBRARY   = 1
-FORCE_STATIC_LIB = 1
 EXPORT_LIBRARY = 1
 FAIL_ON_WARNINGS := 1

--- a/dom/plugins/ipc/Makefile.in
+++ b/dom/plugins/ipc/Makefile.in
@ -13,7 +13,6 @@ FAIL_ON_WARNINGS := 1

 LIBRARY_NAME     = domplugins_s
 LIBXUL_LIBRARY   = 1
-FORCE_STATIC_LIB = 1
 EXPORT_LIBRARY = 1

 ifeq (WINNT,$(OS_ARCH))
--- a/dom/power/Makefile.in
+++ b/dom/power/Makefile.in
@ -11,7 +11,6 @@ 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
--- a/dom/quota/Makefile.in
+++ b/dom/quota/Makefile.in
@ -12,7 +12,6 @@ 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
--- a/dom/src/events/Makefile.in
+++ b/dom/src/events/Makefile.in
@ -14,9 +14,6 @@ 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
@ -12,8 +12,6 @@ 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 = \
--- a/dom/src/json/Makefile.in
+++ b/dom/src/json/Makefile.in
@ -13,9 +13,6 @@ include $(DEPTH)/config/autoconf.mk

 LIBXUL_LIBRARY = 1

-
-FORCE_STATIC_LIB = 1
-
 LOCAL_INCLUDES = \
 		-I$(srcdir)/../base \
 		-I$(topsrcdir)/content/events/src
--- a/dom/src/jsurl/Makefile.in
+++ b/dom/src/jsurl/Makefile.in
@ -11,7 +11,6 @@ FAIL_ON_WARNINGS := 1

 include $(DEPTH)/config/autoconf.mk

-FORCE_STATIC_LIB = 1
 LIBXUL_LIBRARY	= 1

 LOCAL_INCLUDES += \
--- a/dom/src/notification/Makefile.in
+++ b/dom/src/notification/Makefile.in
@ -12,8 +12,6 @@ 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 = \
--- a/dom/src/offline/Makefile.in
+++ b/dom/src/offline/Makefile.in
@ -13,9 +13,6 @@ 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 \
--- a/dom/src/storage/Makefile.in
+++ b/dom/src/storage/Makefile.in
@ -15,9 +15,6 @@ 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
--- a/dom/system/Makefile.in
+++ b/dom/system/Makefile.in
@ -47,7 +47,6 @@ 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
@ -13,7 +13,6 @@ 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

--- a/dom/system/gonk/Makefile.in
+++ b/dom/system/gonk/Makefile.in
@ -23,7 +23,6 @@ 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
--- a/dom/system/unix/Makefile.in
+++ b/dom/system/unix/Makefile.in
@ -13,7 +13,6 @@ 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

--- a/dom/system/windows/Makefile.in
+++ b/dom/system/windows/Makefile.in
@ -13,7 +13,6 @@ 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

--- a/dom/telephony/Makefile.in
+++ b/dom/telephony/Makefile.in
@ -11,7 +11,6 @@ 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
--- a/dom/time/Makefile.in
+++ b/dom/time/Makefile.in
@ -11,7 +11,6 @@ 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
--- a/dom/voicemail/Makefile.in
+++ b/dom/voicemail/Makefile.in
@ -11,7 +11,6 @@ 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
--- a/dom/wifi/Makefile.in
+++ b/dom/wifi/Makefile.in
@ -11,7 +11,6 @@ include $(DEPTH)/config/autoconf.mk

 LIBRARY_NAME     = domwifi_s
 LIBXUL_LIBRARY   = 1
-FORCE_STATIC_LIB = 1

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

--- a/dom/workers/Makefile.in
+++ b/dom/workers/Makefile.in
@ -11,7 +11,6 @@ include $(DEPTH)/config/autoconf.mk

 MSVC_ENABLE_PGO := 1
 LIBXUL_LIBRARY   = 1
-FORCE_STATIC_LIB = 1
 FAIL_ON_WARNINGS := 1

 LOCAL_INCLUDES = \
--- a/editor/libeditor/base/Makefile.in
+++ b/editor/libeditor/base/Makefile.in
@ -17,9 +17,6 @@ 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	+= \
--- a/editor/libeditor/html/Makefile.in
+++ b/editor/libeditor/html/Makefile.in
@ -22,9 +22,6 @@ 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 \
--- a/editor/libeditor/text/Makefile.in
+++ b/editor/libeditor/text/Makefile.in
@ -13,9 +13,6 @@ 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	+= \
--- a/editor/txtsvc/src/Makefile.in
+++ b/editor/txtsvc/src/Makefile.in
@ -11,7 +11,6 @@ FAIL_ON_WARNINGS = 1

 include $(DEPTH)/config/autoconf.mk

-FORCE_STATIC_LIB = 1
 LIBXUL_LIBRARY	= 1


--- a/Show More
+++ b/Show More