bug 887483 - remove a bunch of useless assignments to FORCE_STATIC_LI…

…B implied by LIBXUL_LIBRARY=1 r=mshal
mozilla-spidermonkey · Jul 11, 2013 · e2a8be8 · e2a8be8
1 parent 0e78d82
commit e2a8be8
Show file tree

Hide file tree

Showing 241 changed files with 4 additions and 472 deletions.
diff --git 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

diff --git 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 += \

diff --git 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 = \

diff --git 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 = \

diff --git 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 += \

diff --git 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 += \

diff --git 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
 

diff --git 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

diff --git 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
 

diff --git 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
 

diff --git 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

diff --git 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 = \

diff --git 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
 
 

diff --git 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

diff --git 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 \

diff --git 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
 

diff --git 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

diff --git 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
 

diff --git 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 += \

diff --git 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 += \

diff --git 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

diff --git 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 := \

diff --git 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
diff --git 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)

diff --git 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
diff --git 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
 

diff --git 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	+= \

diff --git 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	+= \

diff --git 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
diff --git 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
diff --git 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
diff --git 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 = \

diff --git 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
 

diff --git 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
diff --git 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
diff --git 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
diff --git 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 \

diff --git 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 += 	\

diff --git 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	+= \

diff --git 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	= \

diff --git 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	+= \

diff --git 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	= \
Original file line number	Diff line number	Diff line change
Expand Up		@@ -13,6 +13,4 @@ LIBXUL_LIBRARY = 1
		FAIL_ON_WARNINGS := 1


		FORCE_STATIC_LIB = 1

		include $(topsrcdir)/config/rules.mk
Original file line number	Diff line number	Diff line change
Expand Up		@@ -13,6 +13,4 @@ include $(DEPTH)/config/autoconf.mk
		LIBXUL_LIBRARY = 1


		FORCE_STATIC_LIB = 1

		include $(topsrcdir)/config/rules.mk