Bug 875934 - Move LIBRARY_NAME to moz.build, batch 3; r=mshal

Brli · Aug 15, 2013 · ca6ac83 · ca6ac83
1 parent b3eacb8
commit ca6ac83
Show file tree

Hide file tree

Showing 294 changed files with 301 additions and 155 deletions.
diff --git a/accessible/src/windows/ia2/Makefile.in b/accessible/src/windows/ia2/Makefile.in
@@ -9,7 +9,6 @@ VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME = accessibility_toolkit_ia2_s
 EXPORT_LIBRARY = 1
 
 # The midl generated code include Windows headers which defines min and max

diff --git a/accessible/src/windows/ia2/moz.build b/accessible/src/windows/ia2/moz.build
@@ -32,3 +32,5 @@ CPP_SOURCES += [
 
 LIBXUL_LIBRARY = True
 
+LIBRARY_NAME = 'accessibility_toolkit_ia2_s'
+
diff --git a/accessible/src/windows/msaa/Makefile.in b/accessible/src/windows/msaa/Makefile.in
@@ -9,7 +9,6 @@ VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME = accessibility_toolkit_msaa_s
 EXPORT_LIBRARY = 1
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk

diff --git a/accessible/src/windows/msaa/moz.build b/accessible/src/windows/msaa/moz.build
@@ -44,3 +44,5 @@ if CONFIG['MOZ_XUL']:
 
 LIBXUL_LIBRARY = True
 
+LIBRARY_NAME = 'accessibility_toolkit_msaa_s'
+
diff --git a/accessible/src/windows/sdn/Makefile.in b/accessible/src/windows/sdn/Makefile.in
@@ -9,7 +9,6 @@ VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME = accessibility_toolkit_sdn_s
 EXPORT_LIBRARY = 1
 
 # The midl generated code include Windows headers which defines min and max

diff --git a/accessible/src/windows/sdn/moz.build b/accessible/src/windows/sdn/moz.build
@@ -13,3 +13,5 @@ CPP_SOURCES += [
 
 LIBXUL_LIBRARY = True
 
+LIBRARY_NAME = 'accessibility_toolkit_sdn_s'
+
diff --git a/accessible/src/windows/uia/Makefile.in b/accessible/src/windows/uia/Makefile.in
@@ -9,7 +9,6 @@ VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME = accessibility_toolkit_uia_s
 EXPORT_LIBRARY = ..
 
 # The midl generated code include Windows headers which defines min and max

diff --git a/accessible/src/windows/uia/moz.build b/accessible/src/windows/uia/moz.build
@@ -12,3 +12,5 @@ CPP_SOURCES += [
 
 LIBXUL_LIBRARY = True
 
+LIBRARY_NAME = 'accessibility_toolkit_uia_s'
+
diff --git a/chrome/src/Makefile.in b/chrome/src/Makefile.in
@@ -10,7 +10,6 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME    = chrome_s
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 

diff --git a/chrome/src/moz.build b/chrome/src/moz.build
@@ -21,3 +21,5 @@ LIBXUL_LIBRARY = True
 
 MSVC_ENABLE_PGO = True
 
+LIBRARY_NAME = 'chrome_s'
+
diff --git a/content/base/src/Makefile.in b/content/base/src/Makefile.in
@@ -10,7 +10,6 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME	= gkconbase_s
 ifdef MOZ_WEBRTC
 LOCAL_INCLUDES += \
 		-I$(topsrcdir)/netwerk/sctp/datachannel \

diff --git a/content/base/src/moz.build b/content/base/src/moz.build
@@ -176,3 +176,5 @@ LIBXUL_LIBRARY = True
 
 MSVC_ENABLE_PGO = True
 
+LIBRARY_NAME = 'gkconbase_s'
+
diff --git a/content/canvas/src/Makefile.in b/content/canvas/src/Makefile.in
@@ -10,7 +10,6 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME	= gkconcvs_s
 ifdef MOZ_WEBGL
 LOCAL_INCLUDES += \
 	-I$(topsrcdir)/js/xpconnect/wrappers \

diff --git a/content/canvas/src/moz.build b/content/canvas/src/moz.build
@@ -81,3 +81,5 @@ LIBXUL_LIBRARY = True
 
 MSVC_ENABLE_PGO = True
 
+LIBRARY_NAME = 'gkconcvs_s'
+
diff --git a/content/events/src/Makefile.in b/content/events/src/Makefile.in
@@ -10,7 +10,6 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME	= gkconevents_s
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 

diff --git a/content/events/src/moz.build b/content/events/src/moz.build
@@ -73,3 +73,5 @@ LIBXUL_LIBRARY = True
 
 MSVC_ENABLE_PGO = True
 
+LIBRARY_NAME = 'gkconevents_s'
+
diff --git a/content/html/content/src/Makefile.in b/content/html/content/src/Makefile.in
@@ -10,7 +10,6 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME	= gkconhtmlcon_s
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 

diff --git a/content/html/content/src/moz.build b/content/html/content/src/moz.build
@@ -160,3 +160,5 @@ LIBXUL_LIBRARY = True
 
 MSVC_ENABLE_PGO = True
 
+LIBRARY_NAME = 'gkconhtmlcon_s'
+
diff --git a/content/mathml/content/src/Makefile.in b/content/mathml/content/src/Makefile.in
@@ -10,7 +10,6 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME	= gkcontentmathml_s
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 

diff --git a/content/mathml/content/src/moz.build b/content/mathml/content/src/moz.build
@@ -15,3 +15,5 @@ FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
 
+LIBRARY_NAME = 'gkcontentmathml_s'
+
diff --git a/content/media/Makefile.in b/content/media/Makefile.in
@@ -9,7 +9,6 @@ VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME = gkconmedia_s
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 

diff --git a/content/media/directshow/Makefile.in b/content/media/directshow/Makefile.in
@@ -9,7 +9,6 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME	= gkcondirectshow_s
 LOCAL_INCLUDES += -I$(topsrcdir)/media/webrtc/trunk/webrtc/modules/video_capture/windows/
 
 ifeq ($(OS_ARCH),WINNT)

diff --git a/content/media/directshow/moz.build b/content/media/directshow/moz.build
@@ -38,3 +38,5 @@ FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
 
+LIBRARY_NAME = 'gkcondirectshow_s'
+
diff --git a/content/media/mediasource/Makefile.in b/content/media/mediasource/Makefile.in
@@ -8,5 +8,4 @@ srcdir		= @srcdir@
 VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME	= gkconmediasource_s
 include $(topsrcdir)/config/rules.mk
diff --git a/content/media/mediasource/moz.build b/content/media/mediasource/moz.build
@@ -30,3 +30,5 @@ FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
 
+LIBRARY_NAME = 'gkconmediasource_s'
+
diff --git a/content/media/moz.build b/content/media/moz.build
@@ -141,3 +141,5 @@ LIBXUL_LIBRARY = True
 
 MSVC_ENABLE_PGO = True
 
+LIBRARY_NAME = 'gkconmedia_s'
+
diff --git a/content/media/omx/Makefile.in b/content/media/omx/Makefile.in
@@ -9,7 +9,6 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME	= gkconomx_s
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 

diff --git a/content/media/omx/mediaresourcemanager/Makefile.in b/content/media/omx/mediaresourcemanager/Makefile.in
@@ -9,8 +9,6 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME	= mediaresourcemanager
-
 FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk

diff --git a/content/media/omx/mediaresourcemanager/moz.build b/content/media/omx/mediaresourcemanager/moz.build
@@ -14,3 +14,5 @@ CPP_SOURCES += [
     'MediaResourceManagerService.cpp',
 ]
 
+LIBRARY_NAME = 'mediaresourcemanager'
+
diff --git a/content/media/omx/moz.build b/content/media/omx/moz.build
@@ -21,3 +21,5 @@ CPP_SOURCES += [
 
 LIBXUL_LIBRARY = True
 
+LIBRARY_NAME = 'gkconomx_s'
+
diff --git a/content/media/webaudio/Makefile.in b/content/media/webaudio/Makefile.in
@@ -9,6 +9,5 @@ VPATH            := @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME   := gkconwebaudio_s
 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
@@ -9,7 +9,6 @@ VPATH            := @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME   := gkconwebaudio_blink_s
 LOCAL_INCLUDES += -I$(topsrcdir)/content/media/webaudio
 
 include $(topsrcdir)/config/rules.mk

diff --git a/content/media/webaudio/blink/moz.build b/content/media/webaudio/blink/moz.build
@@ -27,3 +27,5 @@ CPP_SOURCES += [
 
 LIBXUL_LIBRARY = True
 
+LIBRARY_NAME = 'gkconwebaudio_blink_s'
+
diff --git a/content/media/webaudio/moz.build b/content/media/webaudio/moz.build
@@ -88,3 +88,5 @@ FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
 
+LIBRARY_NAME = 'gkconwebaudio_s'
+
diff --git a/content/media/webrtc/Makefile.in b/content/media/webrtc/Makefile.in
@@ -9,7 +9,6 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME = gkconwebrtc_s
 ifeq ($(OS_ARCH),WINNT)
 OS_CXXFLAGS += -DNOMINMAX
 endif

diff --git a/content/media/webrtc/moz.build b/content/media/webrtc/moz.build
@@ -25,3 +25,5 @@ CPP_SOURCES += [
 
 LIBXUL_LIBRARY = True
 
+LIBRARY_NAME = 'gkconwebrtc_s'
+
diff --git a/content/media/webspeech/recognition/Makefile.in b/content/media/webspeech/recognition/Makefile.in
@@ -14,7 +14,6 @@ VPATH += \
   $(srcdir)/test \
   $(NULL)
 
-LIBRARY_NAME   := gkconwebspeechrecognition_s
 LOCAL_INCLUDES += $(VPATH:%=-I%)
 
 include $(topsrcdir)/config/rules.mk

diff --git a/content/media/webspeech/recognition/moz.build b/content/media/webspeech/recognition/moz.build
@@ -42,3 +42,5 @@ CPP_SOURCES += [
 
 LIBXUL_LIBRARY = True
 
+LIBRARY_NAME = 'gkconwebspeechrecognition_s'
+
diff --git a/content/media/webspeech/synth/Makefile.in b/content/media/webspeech/synth/Makefile.in
@@ -13,7 +13,6 @@ VPATH += \
   $(srcdir)/ipc \
   $(NULL)
 
-LIBRARY_NAME   := gkconwebspeechsynth_s
 EXPORT_LIBRARY  = 1
 LOCAL_INCLUDES += $(VPATH:%=-I%)
 

diff --git a/content/media/webspeech/synth/moz.build b/content/media/webspeech/synth/moz.build
@@ -47,3 +47,5 @@ FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
 
+LIBRARY_NAME = 'gkconwebspeechsynth_s'
+
diff --git a/content/smil/Makefile.in b/content/smil/Makefile.in
@@ -10,7 +10,6 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME	= gkconsmil_s
 LOCAL_INCLUDES += 	\
 		-I$(srcdir)/../base/src \
 		-I$(srcdir)/../../layout/style \

diff --git a/content/smil/moz.build b/content/smil/moz.build
@@ -65,3 +65,5 @@ FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
 
+LIBRARY_NAME = 'gkconsmil_s'
+
diff --git a/content/svg/content/src/Makefile.in b/content/svg/content/src/Makefile.in
@@ -10,7 +10,6 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME	= gkcontentsvg_s
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 

diff --git a/content/svg/content/src/moz.build b/content/svg/content/src/moz.build
@@ -248,3 +248,5 @@ FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
 
+LIBRARY_NAME = 'gkcontentsvg_s'
+
diff --git a/content/xbl/src/Makefile.in b/content/xbl/src/Makefile.in
@@ -10,7 +10,6 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME	= gkconxbl_s
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES	= \

diff --git a/content/xbl/src/moz.build b/content/xbl/src/moz.build
@@ -42,3 +42,5 @@ LIBXUL_LIBRARY = True
 
 MSVC_ENABLE_PGO = True
 
+LIBRARY_NAME = 'gkconxbl_s'
+
diff --git a/docshell/base/Makefile.in b/docshell/base/Makefile.in
@@ -10,7 +10,6 @@ VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME   = basedocshell_s
 ifdef MOZ_TOOLKIT_SEARCH
 DEFINES += -DMOZ_TOOLKIT_SEARCH
 endif

diff --git a/docshell/base/moz.build b/docshell/base/moz.build
@@ -68,3 +68,5 @@ LIBXUL_LIBRARY = True
 
 MSVC_ENABLE_PGO = True
 
+LIBRARY_NAME = 'basedocshell_s'
+
diff --git a/dom/activities/src/Makefile.in b/dom/activities/src/Makefile.in
@@ -9,7 +9,6 @@ VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME     = dom_activities_s
 include $(topsrcdir)/dom/dom-config.mk
 
 include $(topsrcdir)/config/rules.mk
diff --git a/dom/activities/src/moz.build b/dom/activities/src/moz.build
@@ -32,3 +32,5 @@ FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
 
+LIBRARY_NAME = 'dom_activities_s'
+
diff --git a/dom/alarm/Makefile.in b/dom/alarm/Makefile.in
@@ -9,7 +9,6 @@ VPATH       = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME        = domalarm_s
 include $(topsrcdir)/dom/dom-config.mk
 
 

diff --git a/dom/alarm/moz.build b/dom/alarm/moz.build
@@ -37,3 +37,5 @@ FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
 
+LIBRARY_NAME = 'domalarm_s'
+
diff --git a/dom/audiochannel/Makefile.in b/dom/audiochannel/Makefile.in
@@ -19,7 +19,6 @@ VPATH            = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME     = domaudiochannel_s
 EXPORT_LIBRARY = 1
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk

diff --git a/dom/audiochannel/moz.build b/dom/audiochannel/moz.build
@@ -31,3 +31,5 @@ FAIL_ON_WARNINGS = True
 
 LIBXUL_LIBRARY = True
 
+LIBRARY_NAME = 'domaudiochannel_s'
+
diff --git a/dom/base/Makefile.in b/dom/base/Makefile.in
@@ -9,7 +9,6 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME	= jsdombase_s
 include $(topsrcdir)/dom/dom-config.mk
 
 ifdef MOZ_JSDEBUGGER

diff --git a/dom/base/moz.build b/dom/base/moz.build
@@ -116,3 +116,5 @@ LIBXUL_LIBRARY = True
 
 MSVC_ENABLE_PGO = True
 
+LIBRARY_NAME = 'jsdombase_s'
+
diff --git a/dom/battery/Makefile.in b/dom/battery/Makefile.in
@@ -9,7 +9,6 @@ VPATH            = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBRARY_NAME     = dom_battery_s
 include $(topsrcdir)/dom/dom-config.mk
 
 LOCAL_INCLUDES = \
Original file line number	Diff line number	Diff line change
Expand Up		@@ -32,3 +32,5 @@ CPP_SOURCES += [

		LIBXUL_LIBRARY = True

		LIBRARY_NAME = 'accessibility_toolkit_ia2_s'
Original file line number	Diff line number	Diff line change
Expand Up		@@ -44,3 +44,5 @@ if CONFIG['MOZ_XUL']:

		LIBXUL_LIBRARY = True

		LIBRARY_NAME = 'accessibility_toolkit_msaa_s'
Original file line number	Diff line number	Diff line change
Expand Up		@@ -13,3 +13,5 @@ CPP_SOURCES += [

		LIBXUL_LIBRARY = True

		LIBRARY_NAME = 'accessibility_toolkit_sdn_s'
Original file line number	Diff line number	Diff line change
Expand Up		@@ -12,3 +12,5 @@ CPP_SOURCES += [

		LIBXUL_LIBRARY = True

		LIBRARY_NAME = 'accessibility_toolkit_uia_s'
Original file line number	Diff line number	Diff line change
Expand Up		@@ -21,3 +21,5 @@ LIBXUL_LIBRARY = True

		MSVC_ENABLE_PGO = True

		LIBRARY_NAME = 'chrome_s'
Original file line number	Diff line number	Diff line change
Expand Up		@@ -176,3 +176,5 @@ LIBXUL_LIBRARY = True

		MSVC_ENABLE_PGO = True

		LIBRARY_NAME = 'gkconbase_s'
Original file line number	Diff line number	Diff line change
Expand Up		@@ -81,3 +81,5 @@ LIBXUL_LIBRARY = True

		MSVC_ENABLE_PGO = True

		LIBRARY_NAME = 'gkconcvs_s'
Original file line number	Diff line number	Diff line change
Expand Up		@@ -73,3 +73,5 @@ LIBXUL_LIBRARY = True

		MSVC_ENABLE_PGO = True

		LIBRARY_NAME = 'gkconevents_s'
Original file line number	Diff line number	Diff line change
Expand Up		@@ -160,3 +160,5 @@ LIBXUL_LIBRARY = True

		MSVC_ENABLE_PGO = True

		LIBRARY_NAME = 'gkconhtmlcon_s'
Original file line number	Diff line number	Diff line change
Expand Up		@@ -15,3 +15,5 @@ FAIL_ON_WARNINGS = True

		LIBXUL_LIBRARY = True

		LIBRARY_NAME = 'gkcontentmathml_s'