--- a/accessible/src/windows/ia2/Makefile.in
+++ b/accessible/src/windows/ia2/Makefile.in
@@ -4,17 +4,16 @@
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
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
# macros which conflicts with std::min/max. Suppress the macros:
OS_CXXFLAGS += -DNOMINMAX
include $(topsrcdir)/config/rules.mk
--- a/accessible/src/windows/ia2/moz.build
+++ b/accessible/src/windows/ia2/moz.build
@@ -27,8 +27,10 @@ CPP_SOURCES += [
'ia2AccessibleTable.cpp',
'ia2AccessibleTableCell.cpp',
'ia2AccessibleText.cpp',
'ia2AccessibleValue.cpp',
]
LIBXUL_LIBRARY = True
+LIBRARY_NAME = 'accessibility_toolkit_ia2_s'
+
--- a/accessible/src/windows/msaa/Makefile.in
+++ b/accessible/src/windows/msaa/Makefile.in
@@ -4,17 +4,16 @@
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
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
LOCAL_INCLUDES += \
-I$(srcdir) \
-I$(srcdir)/../../base \
-I$(srcdir)/../../generic \
--- a/accessible/src/windows/msaa/moz.build
+++ b/accessible/src/windows/msaa/moz.build
@@ -39,8 +39,10 @@ if CONFIG['MOZ_XUL']:
CPP_SOURCES += [
'XULListboxAccessibleWrap.cpp',
'XULMenuAccessibleWrap.cpp',
'XULTreeGridAccessibleWrap.cpp',
]
LIBXUL_LIBRARY = True
+LIBRARY_NAME = 'accessibility_toolkit_msaa_s'
+
--- a/accessible/src/windows/sdn/Makefile.in
+++ b/accessible/src/windows/sdn/Makefile.in
@@ -4,17 +4,16 @@
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
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
# macros which conflicts with std::min/max. Suppress the macros:
OS_CXXFLAGS += -DNOMINMAX
include $(topsrcdir)/config/rules.mk
--- a/accessible/src/windows/sdn/moz.build
+++ b/accessible/src/windows/sdn/moz.build
@@ -8,8 +8,10 @@ MODULE = 'accessibility'
CPP_SOURCES += [
'sdnAccessible.cpp',
'sdnTextAccessible.cpp',
]
LIBXUL_LIBRARY = True
+LIBRARY_NAME = 'accessibility_toolkit_sdn_s'
+
--- a/accessible/src/windows/uia/Makefile.in
+++ b/accessible/src/windows/uia/Makefile.in
@@ -4,17 +4,16 @@
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
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
# macros which conflicts with std::min/max. Suppress the macros:
OS_CXXFLAGS += -DNOMINMAX
include $(topsrcdir)/config/rules.mk
--- a/accessible/src/windows/uia/moz.build
+++ b/accessible/src/windows/uia/moz.build
@@ -7,8 +7,10 @@
MODULE = 'accessibility'
CPP_SOURCES += [
'uiaRawElmProvider.cpp',
]
LIBXUL_LIBRARY = True
+LIBRARY_NAME = 'accessibility_toolkit_uia_s'
+
--- a/chrome/src/Makefile.in
+++ b/chrome/src/Makefile.in
@@ -5,17 +5,16 @@
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
-LIBRARY_NAME = chrome_s
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
LOCAL_INCLUDES += \
-I$(topsrcdir)/netwerk/protocol/res \
-I$(topsrcdir)/netwerk/base/src \
$(NULL)
--- a/chrome/src/moz.build
+++ b/chrome/src/moz.build
@@ -16,8 +16,10 @@ CPP_SOURCES += [
'nsChromeRegistryChrome.cpp',
'nsChromeRegistryContent.cpp',
]
LIBXUL_LIBRARY = True
MSVC_ENABLE_PGO = True
+LIBRARY_NAME = 'chrome_s'
+
--- a/content/base/src/Makefile.in
+++ b/content/base/src/Makefile.in
@@ -5,17 +5,16 @@
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
-LIBRARY_NAME = gkconbase_s
ifdef MOZ_WEBRTC
LOCAL_INCLUDES += \
-I$(topsrcdir)/netwerk/sctp/datachannel \
$(NULL)
endif
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
--- a/content/base/src/moz.build
+++ b/content/base/src/moz.build
@@ -171,8 +171,10 @@ EXTRA_JS_MODULES += [
]
FAIL_ON_WARNINGS = True
LIBXUL_LIBRARY = True
MSVC_ENABLE_PGO = True
+LIBRARY_NAME = 'gkconbase_s'
+
--- a/content/canvas/src/Makefile.in
+++ b/content/canvas/src/Makefile.in
@@ -5,17 +5,16 @@
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
-LIBRARY_NAME = gkconcvs_s
ifdef MOZ_WEBGL
LOCAL_INCLUDES += \
-I$(topsrcdir)/js/xpconnect/wrappers \
$(NULL)
endif
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
--- a/content/canvas/src/moz.build
+++ b/content/canvas/src/moz.build
@@ -76,8 +76,10 @@ else:
]
FAIL_ON_WARNINGS = True
LIBXUL_LIBRARY = True
MSVC_ENABLE_PGO = True
+LIBRARY_NAME = 'gkconcvs_s'
+
--- a/content/events/src/Makefile.in
+++ b/content/events/src/Makefile.in
@@ -5,17 +5,16 @@
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
-LIBRARY_NAME = gkconevents_s
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
LOCAL_INCLUDES += \
-I$(srcdir)/../../base/src \
-I$(srcdir)/../../html/content/src \
-I$(srcdir)/../../xul/content/src \
-I$(srcdir)/../../xml/content/src \
--- a/content/events/src/moz.build
+++ b/content/events/src/moz.build
@@ -68,8 +68,10 @@ if CONFIG['MOZ_WEBSPEECH']:
CPP_SOURCES += ['SpeechRecognitionError.cpp']
FAIL_ON_WARNINGS = True
LIBXUL_LIBRARY = True
MSVC_ENABLE_PGO = True
+LIBRARY_NAME = 'gkconevents_s'
+
--- a/content/html/content/src/Makefile.in
+++ b/content/html/content/src/Makefile.in
@@ -5,17 +5,16 @@
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
-LIBRARY_NAME = gkconhtmlcon_s
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/content/src/moz.build
+++ b/content/html/content/src/moz.build
@@ -155,8 +155,10 @@ CPP_SOURCES += [
]
FAIL_ON_WARNINGS = True
LIBXUL_LIBRARY = True
MSVC_ENABLE_PGO = True
+LIBRARY_NAME = 'gkconhtmlcon_s'
+
--- a/content/mathml/content/src/Makefile.in
+++ b/content/mathml/content/src/Makefile.in
@@ -5,15 +5,14 @@
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
-LIBRARY_NAME = gkcontentmathml_s
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
INCLUDES += \
-I$(srcdir)/../../../base/src \
$(NULL)
--- a/content/mathml/content/src/moz.build
+++ b/content/mathml/content/src/moz.build
@@ -10,8 +10,10 @@ CPP_SOURCES += [
'nsMathMLElement.cpp',
'nsMathMLElementFactory.cpp',
]
FAIL_ON_WARNINGS = True
LIBXUL_LIBRARY = True
+LIBRARY_NAME = 'gkcontentmathml_s'
+
--- a/content/media/Makefile.in
+++ b/content/media/Makefile.in
@@ -4,17 +4,16 @@
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
-LIBRARY_NAME = gkconmedia_s
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
LOCAL_INCLUDES += \
-I$(topsrcdir)/content/base/src \
-I$(topsrcdir)/layout/generic \
-I$(topsrcdir)/layout/xul/base/src \
$(NULL)
--- a/content/media/directshow/Makefile.in
+++ b/content/media/directshow/Makefile.in
@@ -4,16 +4,15 @@
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
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)
OS_CXXFLAGS += -DNOMINMAX
endif
include $(topsrcdir)/config/rules.mk
--- a/content/media/directshow/moz.build
+++ b/content/media/directshow/moz.build
@@ -33,8 +33,10 @@ if not CONFIG['MOZ_WEBRTC_IN_LIBXUL']:
TOPSRCDIR + '/media/webrtc/trunk/webrtc/modules/video_capture/windows/BasePin.cpp',
TOPSRCDIR + '/media/webrtc/trunk/webrtc/modules/video_capture/windows/MediaType.cpp',
]
FAIL_ON_WARNINGS = True
LIBXUL_LIBRARY = True
+LIBRARY_NAME = 'gkcondirectshow_s'
+
--- a/content/media/mediasource/Makefile.in
+++ b/content/media/mediasource/Makefile.in
@@ -3,10 +3,9 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
-LIBRARY_NAME = gkconmediasource_s
include $(topsrcdir)/config/rules.mk
--- a/content/media/mediasource/moz.build
+++ b/content/media/mediasource/moz.build
@@ -25,8 +25,10 @@ CPP_SOURCES += [
'SourceBuffer.cpp',
'SourceBufferList.cpp',
]
FAIL_ON_WARNINGS = True
LIBXUL_LIBRARY = True
+LIBRARY_NAME = 'gkconmediasource_s'
+
--- a/content/media/moz.build
+++ b/content/media/moz.build
@@ -136,8 +136,10 @@ if CONFIG['CPU_ARCH'] == 'arm' and CONFI
CPP_SOURCES += [
'AudioNodeEngineNEON.cpp',
]
LIBXUL_LIBRARY = True
MSVC_ENABLE_PGO = True
+LIBRARY_NAME = 'gkconmedia_s'
+
--- a/content/media/omx/Makefile.in
+++ b/content/media/omx/Makefile.in
@@ -4,17 +4,16 @@
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
-LIBRARY_NAME = gkconomx_s
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/omx/mediaresourcemanager/Makefile.in
+++ b/content/media/omx/mediaresourcemanager/Makefile.in
@@ -4,18 +4,16 @@
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
-LIBRARY_NAME = mediaresourcemanager
-
FORCE_STATIC_LIB = 1
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
INCLUDES += \
-I$(srcdir)/ \
-I$(ANDROID_SOURCE)/frameworks/base/include/ \
--- a/content/media/omx/mediaresourcemanager/moz.build
+++ b/content/media/omx/mediaresourcemanager/moz.build
@@ -9,8 +9,10 @@ MODULE = 'content'
CPP_SOURCES += [
'IMediaResourceManagerClient.cpp',
'IMediaResourceManagerDeathNotifier.cpp',
'IMediaResourceManagerService.cpp',
'MediaResourceManagerClient.cpp',
'MediaResourceManagerService.cpp',
]
+LIBRARY_NAME = 'mediaresourcemanager'
+
--- a/content/media/omx/moz.build
+++ b/content/media/omx/moz.build
@@ -16,8 +16,10 @@ CPP_SOURCES += [
'MediaOmxReader.cpp',
'MP3FrameParser.cpp',
'OmxDecoder.cpp',
'OMXCodecProxy.cpp',
]
LIBXUL_LIBRARY = True
+LIBRARY_NAME = 'gkconomx_s'
+
--- a/content/media/webaudio/Makefile.in
+++ b/content/media/webaudio/Makefile.in
@@ -4,11 +4,10 @@
DEPTH := @DEPTH@
topsrcdir := @top_srcdir@
srcdir := @srcdir@
VPATH := @srcdir@
include $(DEPTH)/config/autoconf.mk
-LIBRARY_NAME := gkconwebaudio_s
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
@@ -4,13 +4,12 @@
DEPTH := @DEPTH@
topsrcdir := @top_srcdir@
srcdir := @srcdir@
VPATH := @srcdir@
include $(DEPTH)/config/autoconf.mk
-LIBRARY_NAME := gkconwebaudio_blink_s
LOCAL_INCLUDES += -I$(topsrcdir)/content/media/webaudio
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
--- a/content/media/webaudio/blink/moz.build
+++ b/content/media/webaudio/blink/moz.build
@@ -22,8 +22,10 @@ CPP_SOURCES += [
'ReverbConvolver.cpp',
'ReverbConvolverStage.cpp',
'ReverbInputBuffer.cpp',
'ZeroPole.cpp',
]
LIBXUL_LIBRARY = True
+LIBRARY_NAME = 'gkconwebaudio_blink_s'
+
--- a/content/media/webaudio/moz.build
+++ b/content/media/webaudio/moz.build
@@ -83,8 +83,10 @@ CPP_SOURCES += [
'WaveShaperNode.cpp',
'WebAudioUtils.cpp',
]
FAIL_ON_WARNINGS = True
LIBXUL_LIBRARY = True
+LIBRARY_NAME = 'gkconwebaudio_s'
+
--- a/content/media/webrtc/Makefile.in
+++ b/content/media/webrtc/Makefile.in
@@ -4,17 +4,16 @@
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
-LIBRARY_NAME = gkconwebrtc_s
ifeq ($(OS_ARCH),WINNT)
OS_CXXFLAGS += -DNOMINMAX
endif
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
ifdef MOZ_WEBRTC
--- a/content/media/webrtc/moz.build
+++ b/content/media/webrtc/moz.build
@@ -20,8 +20,10 @@ if CONFIG['MOZ_WEBRTC']:
]
CPP_SOURCES += [
'MediaEngineDefault.cpp',
]
LIBXUL_LIBRARY = True
+LIBRARY_NAME = 'gkconwebrtc_s'
+
--- a/content/media/webspeech/recognition/Makefile.in
+++ b/content/media/webspeech/recognition/Makefile.in
@@ -9,13 +9,12 @@ VPATH := @srcdir@
include $(DEPTH)/config/autoconf.mk
include $(topsrcdir)/dom/dom-config.mk
VPATH += \
$(srcdir)/test \
$(NULL)
-LIBRARY_NAME := gkconwebspeechrecognition_s
LOCAL_INCLUDES += $(VPATH:%=-I%)
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
--- a/content/media/webspeech/recognition/moz.build
+++ b/content/media/webspeech/recognition/moz.build
@@ -37,8 +37,10 @@ CPP_SOURCES += [
'SpeechStreamListener.cpp',
'endpointer.cc',
'energy_endpointer.cc',
'energy_endpointer_params.cc',
]
LIBXUL_LIBRARY = True
+LIBRARY_NAME = 'gkconwebspeechrecognition_s'
+
--- a/content/media/webspeech/synth/Makefile.in
+++ b/content/media/webspeech/synth/Makefile.in
@@ -8,14 +8,13 @@ srcdir := @srcdir@
VPATH := @srcdir@
include $(DEPTH)/config/autoconf.mk
include $(topsrcdir)/dom/dom-config.mk
VPATH += \
$(srcdir)/ipc \
$(NULL)
-LIBRARY_NAME := gkconwebspeechsynth_s
EXPORT_LIBRARY = 1
LOCAL_INCLUDES += $(VPATH:%=-I%)
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
--- a/content/media/webspeech/synth/moz.build
+++ b/content/media/webspeech/synth/moz.build
@@ -42,8 +42,10 @@ IPDL_SOURCES += [
'ipc/PSpeechSynthesis.ipdl',
'ipc/PSpeechSynthesisRequest.ipdl',
]
FAIL_ON_WARNINGS = True
LIBXUL_LIBRARY = True
+LIBRARY_NAME = 'gkconwebspeechsynth_s'
+
--- a/content/smil/Makefile.in
+++ b/content/smil/Makefile.in
@@ -5,16 +5,15 @@
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
-LIBRARY_NAME = gkconsmil_s
LOCAL_INCLUDES += \
-I$(srcdir)/../base/src \
-I$(srcdir)/../../layout/style \
-I$(srcdir)/../events/src \
$(NULL)
include $(topsrcdir)/config/rules.mk
--- a/content/smil/moz.build
+++ b/content/smil/moz.build
@@ -60,8 +60,10 @@ CPP_SOURCES += [
'nsSMILTimedElement.cpp',
'nsSMILValue.cpp',
]
FAIL_ON_WARNINGS = True
LIBXUL_LIBRARY = True
+LIBRARY_NAME = 'gkconsmil_s'
+
--- a/content/svg/content/src/Makefile.in
+++ b/content/svg/content/src/Makefile.in
@@ -5,17 +5,16 @@
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
-LIBRARY_NAME = gkcontentsvg_s
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
INCLUDES += \
-I$(srcdir)/../../../xml/content/src \
-I$(srcdir)/../../../../dom \
-I$(srcdir)/../../../base/src \
-I$(srcdir)/../../../../layout/generic \
--- a/content/svg/content/src/moz.build
+++ b/content/svg/content/src/moz.build
@@ -243,8 +243,10 @@ CPP_SOURCES += [
'nsSVGTransform.cpp',
'nsSVGViewBox.cpp',
]
FAIL_ON_WARNINGS = True
LIBXUL_LIBRARY = True
+LIBRARY_NAME = 'gkcontentsvg_s'
+
--- a/content/xbl/src/Makefile.in
+++ b/content/xbl/src/Makefile.in
@@ -5,17 +5,16 @@
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
-LIBRARY_NAME = gkconxbl_s
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/xbl/src/moz.build
+++ b/content/xbl/src/moz.build
@@ -37,8 +37,10 @@ CPP_SOURCES += [
]
FAIL_ON_WARNINGS = True
LIBXUL_LIBRARY = True
MSVC_ENABLE_PGO = True
+LIBRARY_NAME = 'gkconxbl_s'
+
--- a/docshell/base/Makefile.in
+++ b/docshell/base/Makefile.in
@@ -5,17 +5,16 @@
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
-LIBRARY_NAME = basedocshell_s
ifdef MOZ_TOOLKIT_SEARCH
DEFINES += -DMOZ_TOOLKIT_SEARCH
endif
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
LOCAL_INCLUDES += \
--- a/docshell/base/moz.build
+++ b/docshell/base/moz.build
@@ -63,8 +63,10 @@ CPP_SOURCES += [
]
FAIL_ON_WARNINGS = True
LIBXUL_LIBRARY = True
MSVC_ENABLE_PGO = True
+LIBRARY_NAME = 'basedocshell_s'
+
--- a/dom/activities/src/Makefile.in
+++ b/dom/activities/src/Makefile.in
@@ -4,12 +4,11 @@
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
-LIBRARY_NAME = dom_activities_s
include $(topsrcdir)/dom/dom-config.mk
include $(topsrcdir)/config/rules.mk
--- a/dom/activities/src/moz.build
+++ b/dom/activities/src/moz.build
@@ -27,8 +27,10 @@ EXTRA_JS_MODULES += [
'ActivitiesService.jsm',
'ActivitiesServiceFilter.jsm',
]
FAIL_ON_WARNINGS = True
LIBXUL_LIBRARY = True
+LIBRARY_NAME = 'dom_activities_s'
+
--- a/dom/alarm/Makefile.in
+++ b/dom/alarm/Makefile.in
@@ -4,15 +4,14 @@
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
-LIBRARY_NAME = domalarm_s
include $(topsrcdir)/dom/dom-config.mk
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
--- a/dom/alarm/moz.build
+++ b/dom/alarm/moz.build
@@ -32,8 +32,10 @@ EXTRA_JS_MODULES += [
'AlarmDB.jsm',
'AlarmService.jsm',
]
FAIL_ON_WARNINGS = True
LIBXUL_LIBRARY = True
+LIBRARY_NAME = 'domalarm_s'
+
--- a/dom/audiochannel/Makefile.in
+++ b/dom/audiochannel/Makefile.in
@@ -14,13 +14,12 @@
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
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
--- a/dom/audiochannel/moz.build
+++ b/dom/audiochannel/moz.build
@@ -26,8 +26,10 @@ CPP_SOURCES += [
'AudioChannelService.cpp',
'AudioChannelServiceChild.cpp',
]
FAIL_ON_WARNINGS = True
LIBXUL_LIBRARY = True
+LIBRARY_NAME = 'domaudiochannel_s'
+
--- a/dom/base/Makefile.in
+++ b/dom/base/Makefile.in
@@ -4,17 +4,16 @@
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
-LIBRARY_NAME = jsdombase_s
include $(topsrcdir)/dom/dom-config.mk
ifdef MOZ_JSDEBUGGER
DEFINES += -DMOZ_JSDEBUGGER
endif
ifdef MOZ_B2G_RIL
DEFINES += -DMOZ_B2G_RIL
--- a/dom/base/moz.build
+++ b/dom/base/moz.build
@@ -111,8 +111,10 @@ EXTRA_JS_MODULES += [
]
FAIL_ON_WARNINGS = True
LIBXUL_LIBRARY = True
MSVC_ENABLE_PGO = True
+LIBRARY_NAME = 'jsdombase_s'
+
--- a/dom/battery/Makefile.in
+++ b/dom/battery/Makefile.in
@@ -4,17 +4,16 @@
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
-LIBRARY_NAME = dom_battery_s
include $(topsrcdir)/dom/dom-config.mk
LOCAL_INCLUDES = \
-I$(topsrcdir)/content/events/src \
$(NULL)
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
--- a/dom/battery/moz.build
+++ b/dom/battery/moz.build
@@ -14,8 +14,10 @@ EXPORTS.mozilla.dom.battery += [
CPP_SOURCES += [
'BatteryManager.cpp',
]
FAIL_ON_WARNINGS = True
LIBXUL_LIBRARY = True
+LIBRARY_NAME = 'dom_battery_s'
+
--- a/dom/bindings/Makefile.in
+++ b/dom/bindings/Makefile.in
@@ -4,17 +4,16 @@
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
-LIBRARY_NAME = dombindings_s
EXPORT_LIBRARY = 1
# Need this to find all our DOM source files.
include $(topsrcdir)/dom/dom-config.mk
include $(topsrcdir)/dom/webidl/WebIDL.mk
binding_include_path := mozilla/dom
--- a/dom/bindings/moz.build
+++ b/dom/bindings/moz.build
@@ -30,8 +30,10 @@ EXPORTS.mozilla.dom += [
]
FAIL_ON_WARNINGS = True
LIBXUL_LIBRARY = True
MSVC_ENABLE_PGO = True
+LIBRARY_NAME = 'dombindings_s'
+
--- a/dom/bindings/test/Makefile.in
+++ b/dom/bindings/test/Makefile.in
@@ -3,17 +3,16 @@
# You can obtain one at http://mozilla.org/MPL/2.0/.
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
relativesrcdir = @relativesrcdir@
-LIBRARY_NAME = dombindings_test_s
# 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/bindings/test/moz.build
+++ b/dom/bindings/test/moz.build
@@ -9,8 +9,10 @@ MODULE = 'dom'
CPP_SOURCES += [
'$(subst .webidl,Binding.cpp,$(test_webidl_files))',
]
LIBXUL_LIBRARY = True
# Do NOT export this library. We don't actually want our test code
# being added to libxul or anything.
+LIBRARY_NAME = 'dombindings_test_s'
+
--- a/dom/browser-element/Makefile.in
+++ b/dom/browser-element/Makefile.in
@@ -4,17 +4,16 @@
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
-LIBRARY_NAME = dom_browserelement_s
include $(topsrcdir)/dom/dom-config.mk
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
INCLUDES += \
-I$(topsrcdir)/dom/base \
--- a/dom/browser-element/moz.build
+++ b/dom/browser-element/moz.build
@@ -27,8 +27,10 @@ EXTRA_JS_MODULES += [
'BrowserElementParent.jsm',
'BrowserElementPromptService.jsm',
]
FAIL_ON_WARNINGS = True
LIBXUL_LIBRARY = True
+LIBRARY_NAME = 'dom_browserelement_s'
+
--- a/dom/camera/Makefile.in
+++ b/dom/camera/Makefile.in
@@ -4,13 +4,12 @@
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
-LIBRARY_NAME = domcamera_s
include $(topsrcdir)/dom/dom-config.mk
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
--- a/dom/camera/moz.build
+++ b/dom/camera/moz.build
@@ -44,8 +44,10 @@ else:
'FallbackCameraManager.cpp',
'FallbackCameraControl.cpp',
]
FAIL_ON_WARNINGS = True
LIBXUL_LIBRARY = True
+LIBRARY_NAME = 'domcamera_s'
+
--- a/dom/cellbroadcast/src/Makefile.in
+++ b/dom/cellbroadcast/src/Makefile.in
@@ -4,12 +4,11 @@
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
-LIBRARY_NAME = dom_cellbroadcast_s
include $(topsrcdir)/dom/dom-config.mk
include $(topsrcdir)/config/rules.mk
--- a/dom/cellbroadcast/src/moz.build
+++ b/dom/cellbroadcast/src/moz.build
@@ -13,8 +13,10 @@ EXPORTS.mozilla.dom += [
CPP_SOURCES += [
'CellBroadcast.cpp',
]
FAIL_ON_WARNINGS = True
LIBXUL_LIBRARY = True
+LIBRARY_NAME = 'dom_cellbroadcast_s'
+
--- a/dom/devicestorage/Makefile.in
+++ b/dom/devicestorage/Makefile.in
@@ -4,17 +4,16 @@
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
-LIBRARY_NAME = domdevicestorage_s
include $(topsrcdir)/dom/dom-config.mk
LOCAL_INCLUDES = \
-I$(topsrcdir)/dom/base \
-I$(topsrcdir)/dom/ipc \
-I$(topsrcdir)/content/base/src \
-I$(topsrcdir)/content/events/src \
$(NULL)
--- a/dom/devicestorage/moz.build
+++ b/dom/devicestorage/moz.build
@@ -29,8 +29,10 @@ CPP_SOURCES += [
IPDL_SOURCES += [
'PDeviceStorageRequest.ipdl',
]
FAIL_ON_WARNINGS = True
LIBXUL_LIBRARY = True
+LIBRARY_NAME = 'domdevicestorage_s'
+
--- a/dom/encoding/Makefile.in
+++ b/dom/encoding/Makefile.in
@@ -3,17 +3,16 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
-LIBRARY_NAME = domencoding_s
LOCAL_INCLUDES = \
-I$(topsrcdir)/intl/locale/src \
$(NULL)
include $(topsrcdir)/dom/dom-config.mk
include $(topsrcdir)/config/rules.mk
EncodingUtils.$(OBJ_SUFFIX): labelsencodings.properties.h
--- a/dom/encoding/moz.build
+++ b/dom/encoding/moz.build
@@ -19,8 +19,10 @@ CPP_SOURCES += [
'TextDecoder.cpp',
'TextEncoder.cpp',
]
FAIL_ON_WARNINGS = True
LIBXUL_LIBRARY = True
+LIBRARY_NAME = 'domencoding_s'
+
--- a/dom/file/Makefile.in
+++ b/dom/file/Makefile.in
@@ -4,13 +4,12 @@
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
-LIBRARY_NAME = domfile_s
include $(topsrcdir)/dom/dom-config.mk
include $(topsrcdir)/config/rules.mk
--- a/dom/file/moz.build
+++ b/dom/file/moz.build
@@ -54,8 +54,10 @@ CPP_SOURCES += [
'MemoryStreams.cpp',
'MetadataHelper.cpp',
]
FAIL_ON_WARNINGS = True
LIBXUL_LIBRARY = True
+LIBRARY_NAME = 'domfile_s'
+
--- a/dom/fm/Makefile.in
+++ b/dom/fm/Makefile.in
@@ -4,14 +4,13 @@
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
-LIBRARY_NAME = domfm_s
include $(topsrcdir)/dom/dom-config.mk
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
--- a/dom/fm/moz.build
+++ b/dom/fm/moz.build
@@ -24,8 +24,10 @@ EXTRA_JS_MODULES += [
EXTRA_COMPONENTS += [
'DOMFMRadio.manifest',
'DOMFMRadioChild.js',
]
LIBXUL_LIBRARY = True
+LIBRARY_NAME = 'domfm_s'
+
--- a/dom/gamepad/Makefile.in
+++ b/dom/gamepad/Makefile.in
@@ -4,15 +4,14 @@
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
-LIBRARY_NAME = domgamepad_s
LOCAL_INCLUDES += \
-I$(topsrcdir)/dom/base \
$(NULL)
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
--- a/dom/gamepad/moz.build
+++ b/dom/gamepad/moz.build
@@ -13,8 +13,10 @@ CPP_SOURCES = [
'Gamepad.cpp',
'GamepadService.cpp',
]
FAIL_ON_WARNINGS = True
LIBXUL_LIBRARY = True
+LIBRARY_NAME = 'domgamepad_s'
+
--- a/dom/icc/src/Makefile.in
+++ b/dom/icc/src/Makefile.in
@@ -4,17 +4,16 @@
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = $(srcdir)
include $(DEPTH)/config/autoconf.mk
-LIBRARY_NAME = dom_icc_s
include $(topsrcdir)/dom/dom-config.mk
LOCAL_INCLUDES = \
-I$(topsrcdir)/content/events/src \
$(NULL)
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
--- a/dom/icc/src/moz.build
+++ b/dom/icc/src/moz.build
@@ -12,8 +12,10 @@ CPP_SOURCES += [
'IccManager.cpp',
'StkCommandEvent.cpp',
]
FAIL_ON_WARNINGS = True
LIBXUL_LIBRARY = True
+LIBRARY_NAME = 'dom_icc_s'
+
--- a/dom/indexedDB/Makefile.in
+++ b/dom/indexedDB/Makefile.in
@@ -4,17 +4,16 @@
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
-LIBRARY_NAME = dom_indexeddb_s
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 \
-I$(topsrcdir)/dom/src/storage \
-I$(topsrcdir)/dom/quota \
--- a/dom/indexedDB/ipc/Makefile.in
+++ b/dom/indexedDB/ipc/Makefile.in
@@ -4,17 +4,16 @@
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
relativesrcdir = @relativesrcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
-LIBRARY_NAME = dom_indexeddb_ipc_s
LOCAL_INCLUDES += \
-I$(topsrcdir)/dom/indexedDB \
-I$(topsrcdir)/content/events/src \
$(NULL)
MOCHITEST_FILES = test_ipc.html
include $(topsrcdir)/config/rules.mk
--- a/dom/indexedDB/ipc/moz.build
+++ b/dom/indexedDB/ipc/moz.build
@@ -29,8 +29,10 @@ IPDL_SOURCES += [
'PIndexedDBRequest.ipdl',
'PIndexedDBTransaction.ipdl',
]
FAIL_ON_WARNINGS = True
LIBXUL_LIBRARY = True
+LIBRARY_NAME = 'dom_indexeddb_ipc_s'
+
--- a/dom/indexedDB/moz.build
+++ b/dom/indexedDB/moz.build
@@ -62,8 +62,10 @@ CPP_SOURCES += [
'OpenDatabaseHelper.cpp',
'TransactionThreadPool.cpp',
]
FAIL_ON_WARNINGS = True
LIBXUL_LIBRARY = True
+LIBRARY_NAME = 'dom_indexeddb_s'
+
--- a/dom/interfaces/devicestorage/Makefile.in
+++ b/dom/interfaces/devicestorage/Makefile.in
@@ -4,14 +4,13 @@
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
-LIBRARY_NAME = domdevicestorage_s
include $(topsrcdir)/dom/dom-config.mk
include $(topsrcdir)/config/rules.mk
--- a/dom/interfaces/devicestorage/moz.build
+++ b/dom/interfaces/devicestorage/moz.build
@@ -10,8 +10,10 @@ XPIDL_SOURCES += [
]
XPIDL_MODULE = 'dom_devicestorage'
MODULE = 'dom'
LIBXUL_LIBRARY = True
+LIBRARY_NAME = 'domdevicestorage_s'
+
--- a/dom/ipc/Makefile.in
+++ b/dom/ipc/Makefile.in
@@ -4,17 +4,16 @@
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
-LIBRARY_NAME = domipc_s
EXPORT_LIBRARY = 1
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
LOCAL_INCLUDES += \
-I$(srcdir)/../../content/base/src \
-I$(srcdir)/../../content/events/src \
-I$(srcdir)/../../docshell/base \
--- a/dom/ipc/moz.build
+++ b/dom/ipc/moz.build
@@ -70,8 +70,10 @@ IPDL_SOURCES += [
'PMemoryReportRequest.ipdl',
'PTabContext.ipdlh',
]
FAIL_ON_WARNINGS = True
LIBXUL_LIBRARY = True
+LIBRARY_NAME = 'domipc_s'
+
--- a/dom/media/Makefile.in
+++ b/dom/media/Makefile.in
@@ -5,17 +5,16 @@
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
relativesrcdir = @relativesrcdir@
include $(DEPTH)/config/autoconf.mk
-LIBRARY_NAME = dom_media_s
include $(topsrcdir)/dom/dom-config.mk
ifdef MOZ_WEBRTC
LOCAL_INCLUDES += \
-I$(topsrcdir)/media/webrtc/trunk/webrtc \
-I$(topsrcdir)/media/webrtc/signaling/src/common \
$(NULL)
--- a/dom/media/moz.build
+++ b/dom/media/moz.build
@@ -31,8 +31,10 @@ EXTRA_COMPONENTS += [
'PeerConnection.js',
'PeerConnection.manifest',
]
FAIL_ON_WARNINGS = True
LIBXUL_LIBRARY = True
+LIBRARY_NAME = 'dom_media_s'
+
--- a/dom/mobilemessage/src/Makefile.in
+++ b/dom/mobilemessage/src/Makefile.in
@@ -15,17 +15,16 @@ include $(DEPTH)/config/autoconf.mk
ifeq (android,$(MOZ_WIDGET_TOOLKIT))
VPATH += $(srcdir)/android
else ifdef MOZ_B2G_RIL
VPATH += $(srcdir)/gonk
else
VPATH += $(srcdir)/fallback
endif
-LIBRARY_NAME = dom_mobilemessage_s
include $(topsrcdir)/dom/dom-config.mk
LOCAL_INCLUDES = \
-I$(topsrcdir)/content/events/src \
-I$(topsrcdir)/dom/base \
$(NULL)
# Add VPATH to LOCAL_INCLUDES so we are going to include the correct backend
--- a/dom/mobilemessage/src/moz.build
+++ b/dom/mobilemessage/src/moz.build
@@ -80,8 +80,10 @@ IPDL_SOURCES += [
]
FAIL_ON_WARNINGS = True
LIBXUL_LIBRARY = True
MSVC_ENABLE_PGO = True
+LIBRARY_NAME = 'dom_mobilemessage_s'
+
--- a/dom/network/src/Makefile.in
+++ b/dom/network/src/Makefile.in
@@ -4,17 +4,16 @@
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = $(srcdir)
include $(DEPTH)/config/autoconf.mk
-LIBRARY_NAME = dom_network_s
ifdef MOZ_B2G_RIL
endif
include $(topsrcdir)/dom/dom-config.mk
LOCAL_INCLUDES = \
-I$(topsrcdir)/content/events/src \
$(NULL)
--- a/dom/network/src/moz.build
+++ b/dom/network/src/moz.build
@@ -47,8 +47,10 @@ IPDL_SOURCES += [
'PTCPServerSocket.ipdl',
'PTCPSocket.ipdl',
]
FAIL_ON_WARNINGS = True
LIBXUL_LIBRARY = True
+LIBRARY_NAME = 'dom_network_s'
+
--- a/dom/plugins/base/Makefile.in
+++ b/dom/plugins/base/Makefile.in
@@ -5,17 +5,16 @@
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
-LIBRARY_NAME = gkplugin
EXPORT_LIBRARY = 1
ifeq ($(MOZ_WIDGET_TOOLKIT),android)
LOCAL_INCLUDES += -I$(topsrcdir)/dom/plugins/base/android
endif
ifeq ($(OS_ARCH),WINNT)
LOCAL_INCLUDES += -I$(topsrcdir)/xpcom/base
endif
--- a/dom/plugins/base/android/Makefile.in
+++ b/dom/plugins/base/android/Makefile.in
@@ -5,17 +5,16 @@
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
-LIBRARY_NAME = gkpluginandroid_s
EXPORT_LIBRARY = 1
LOCAL_INCLUDES += \
-I$(topsrcdir)/widget/android \
-I$(topsrcdir)/widget/xpwidgets \
-I$(topsrcdir)/dom/plugins/base \
-I$(topsrcdir)/dom/plugins/base/android/include \
-I$(topsrcdir)/gfx/gl \
$(MOZ_CAIRO_CFLAGS) \
--- a/dom/plugins/base/android/moz.build
+++ b/dom/plugins/base/android/moz.build
@@ -24,8 +24,10 @@ CPP_SOURCES += [
'ANPVideo.cpp',
'ANPWindow.cpp',
]
FAIL_ON_WARNINGS = True
LIBXUL_LIBRARY = True
+LIBRARY_NAME = 'gkpluginandroid_s'
+
--- a/dom/plugins/base/moz.build
+++ b/dom/plugins/base/moz.build
@@ -94,8 +94,10 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'andr
# using #defines, which results in Wswitch warnings in gcc-4.6.
# Therefore, enable FAIL_ON_WARNINGS only on non-Android platforms.
FAIL_ON_WARNINGS = True
LIBXUL_LIBRARY = True
MSVC_ENABLE_PGO = True
+LIBRARY_NAME = 'gkplugin'
+
--- a/dom/plugins/ipc/Makefile.in
+++ b/dom/plugins/ipc/Makefile.in
@@ -4,17 +4,16 @@
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
-LIBRARY_NAME = domplugins_s
EXPORT_LIBRARY = 1
ifeq (WINNT,$(OS_ARCH))
DEFINES += \
-DMOZ_HANGUI_PROCESS_NAME=\"plugin-hang-ui$(BIN_SUFFIX)\" \
$(NULL)
endif
--- a/dom/plugins/ipc/moz.build
+++ b/dom/plugins/ipc/moz.build
@@ -102,8 +102,10 @@ IPDL_SOURCES += [
'PPluginSurface.ipdl',
'PStreamNotify.ipdl',
]
FAIL_ON_WARNINGS = True
LIBXUL_LIBRARY = True
+LIBRARY_NAME = 'domplugins_s'
+
--- a/dom/power/Makefile.in
+++ b/dom/power/Makefile.in
@@ -4,13 +4,12 @@
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
-LIBRARY_NAME = dom_power_s
include $(topsrcdir)/dom/dom-config.mk
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
--- a/dom/power/moz.build
+++ b/dom/power/moz.build
@@ -26,8 +26,10 @@ CPP_SOURCES += [
'PowerManagerService.cpp',
'WakeLock.cpp',
]
FAIL_ON_WARNINGS = True
LIBXUL_LIBRARY = True
+LIBRARY_NAME = 'dom_power_s'
+
--- a/dom/promise/Makefile.in
+++ b/dom/promise/Makefile.in
@@ -4,15 +4,14 @@
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
-LIBRARY_NAME = dompromise_s
LOCAL_INCLUDES += \
-I$(topsrcdir)/dom/workers \
-I$(topsrcdir)/dom/base \
$(NULL)
include $(topsrcdir)/config/rules.mk
--- a/dom/promise/moz.build
+++ b/dom/promise/moz.build
@@ -20,8 +20,10 @@ CPP_SOURCES += [
'PromiseResolver.cpp',
'PromiseCallback.cpp',
]
FAIL_ON_WARNINGS = True
LIBXUL_LIBRARY = True
+LIBRARY_NAME = 'dompromise_s'
+
--- a/dom/quota/Makefile.in
+++ b/dom/quota/Makefile.in
@@ -4,17 +4,16 @@
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
-LIBRARY_NAME = domquota_s
include $(topsrcdir)/dom/dom-config.mk
LOCAL_INCLUDES = \
-I$(topsrcdir)/caps/include \
$(NULL)
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
--- a/dom/quota/moz.build
+++ b/dom/quota/moz.build
@@ -40,8 +40,10 @@ CPP_SOURCES += [
]
FAIL_ON_WARNINGS = True
LIBXUL_LIBRARY = True
MSVC_ENABLE_PGO = True
+LIBRARY_NAME = 'domquota_s'
+
--- a/dom/src/geolocation/Makefile.in
+++ b/dom/src/geolocation/Makefile.in
@@ -4,17 +4,16 @@
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
-LIBRARY_NAME = jsdomgeolocation_s
LOCAL_INCLUDES = \
-I$(topsrcdir)/dom/base \
-I$(topsrcdir)/dom/ipc \
-I$(topsrcdir)/content/base/src \
-I$(topsrcdir)/content/events/src \
$(NULL)
ifdef MOZ_MAEMO_LIBLOCATION
--- a/dom/src/geolocation/moz.build
+++ b/dom/src/geolocation/moz.build
@@ -15,8 +15,10 @@ CPP_SOURCES += [
'nsGeoPosition.cpp',
'nsGeolocation.cpp',
]
FAIL_ON_WARNINGS = True
LIBXUL_LIBRARY = True
+LIBRARY_NAME = 'jsdomgeolocation_s'
+
--- a/dom/src/notification/Makefile.in
+++ b/dom/src/notification/Makefile.in
@@ -4,17 +4,16 @@
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
-LIBRARY_NAME = jsdomnotification_s
LOCAL_INCLUDES = \
-I$(topsrcdir)/dom/base \
-I$(topsrcdir)/dom/ipc \
-I$(topsrcdir)/content/base/src \
-I$(topsrcdir)/content/events/src \
$(NULL)
include $(topsrcdir)/config/rules.mk
--- a/dom/src/notification/moz.build
+++ b/dom/src/notification/moz.build
@@ -15,8 +15,10 @@ CPP_SOURCES += [
'DesktopNotification.cpp',
'Notification.cpp',
]
FAIL_ON_WARNINGS = True
LIBXUL_LIBRARY = True
+LIBRARY_NAME = 'jsdomnotification_s'
+
--- a/dom/src/storage/Makefile.in
+++ b/dom/src/storage/Makefile.in
@@ -4,17 +4,16 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
-LIBRARY_NAME = jsdomstorage_s
LOCAL_INCLUDES = \
-I$(topsrcdir)/dom/base \
-I$(topsrcdir)/content/events/src
ifdef ENABLE_TESTS
DEFINES += -DDOM_STORAGE_TESTS
endif
--- a/dom/src/storage/moz.build
+++ b/dom/src/storage/moz.build
@@ -24,8 +24,10 @@ IPDL_SOURCES += [
]
FAIL_ON_WARNINGS = True
LIBXUL_LIBRARY = True
MSVC_ENABLE_PGO = True
+LIBRARY_NAME = 'jsdomstorage_s'
+
--- a/dom/system/Makefile.in
+++ b/dom/system/Makefile.in
@@ -4,17 +4,16 @@
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
-LIBRARY_NAME = domsystem_s
DEFINES += -DDLL_PREFIX=\"$(DLL_PREFIX)\" -DDLL_SUFFIX=\"$(DLL_SUFFIX)\"
# We fire the nsDOMDeviceAcceleration
LOCAL_INCLUDES += \
-I$(topsrcdir)/content/events/src \
-I$(topsrcdir)/dom/base \
-I$(topsrcdir)/dom/bindings \
-I$(topsrcdir)/js/xpconnect/loader \
--- a/dom/system/android/Makefile.in
+++ b/dom/system/android/Makefile.in
@@ -4,18 +4,16 @@
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
-LIBRARY_NAME = domsystemandroid_s
-
EXPORT_LIBRARY = 1
LOCAL_INCLUDES += -I$(topsrcdir)/dom/src/geolocation \
-I$(topsrcdir)/content/events/src
$(NULL)
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
--- a/dom/system/android/moz.build
+++ b/dom/system/android/moz.build
@@ -10,8 +10,10 @@ CPP_SOURCES += [
'AndroidLocationProvider.cpp',
'nsHapticFeedback.cpp',
]
FAIL_ON_WARNINGS = True
LIBXUL_LIBRARY = True
+LIBRARY_NAME = 'domsystemandroid_s'
+
--- a/dom/system/gonk/Makefile.in
+++ b/dom/system/gonk/Makefile.in
@@ -16,17 +16,16 @@ DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
relativesrcdir = @relativesrcdir@
include $(DEPTH)/config/autoconf.mk
-LIBRARY_NAME = domsystemgonk_s
include $(topsrcdir)/dom/dom-config.mk
LOCAL_INCLUDES = \
-I$(topsrcdir)/dom/base \
-I$(topsrcdir)/dom/src/geolocation \
-I$(topsrcdir)/dom/telephony \
-I$(topsrcdir)/dom/wifi \
-I$(topsrcdir)/dom/bluetooth \
--- a/dom/system/gonk/moz.build
+++ b/dom/system/gonk/moz.build
@@ -79,8 +79,10 @@ EXTRA_JS_MODULES += [
'ril_worker.js',
'systemlibs.js',
]
FAIL_ON_WARNINGS = True
LIBXUL_LIBRARY = True
+LIBRARY_NAME = 'domsystemgonk_s'
+
--- a/dom/system/mac/Makefile.in
+++ b/dom/system/mac/Makefile.in
@@ -4,16 +4,14 @@
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
-LIBRARY_NAME = domsystemmac_s
-
EXPORT_LIBRARY = 1
LOCAL_INCLUDES += -I$(topsrcdir)/dom/src/geolocation \
$(NULL)
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
--- a/dom/system/mac/moz.build
+++ b/dom/system/mac/moz.build
@@ -7,8 +7,10 @@
MODULE = 'dom'
CMMSRCS += ['CoreLocationLocationProvider.mm']
FAIL_ON_WARNINGS = True
LIBXUL_LIBRARY = True
+LIBRARY_NAME = 'domsystemmac_s'
+
--- a/dom/system/moz.build
+++ b/dom/system/moz.build
@@ -48,8 +48,10 @@ if CONFIG['OS_TARGET'] != 'Android' or C
'NetworkGeolocationProvider.js',
'NetworkGeolocationProvider.manifest',
]
FAIL_ON_WARNINGS = True
LIBXUL_LIBRARY = True
+LIBRARY_NAME = 'domsystem_s'
+
--- a/dom/system/unix/Makefile.in
+++ b/dom/system/unix/Makefile.in
@@ -4,18 +4,16 @@
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
-LIBRARY_NAME = domsystemunix_s
-
EXPORT_LIBRARY = 1
ifdef MOZ_MAEMO_LIBLOCATION
LOCAL_INCLUDES += $(MOZ_PLATFORM_MAEMO_CFLAGS) \
-I$(topsrcdir)/dom/src/geolocation \
$(NULL)
endif
ifdef MOZ_PLATFORM_MAEMO
--- a/dom/system/unix/moz.build
+++ b/dom/system/unix/moz.build
@@ -21,8 +21,10 @@ if CONFIG['MOZ_ENABLE_QTMOBILITY']:
'moc_QTMLocationProvider.cpp',
'QTMLocationProvider.cpp',
]
FAIL_ON_WARNINGS = True
LIBXUL_LIBRARY = True
+LIBRARY_NAME = 'domsystemunix_s'
+
--- a/dom/system/windows/Makefile.in
+++ b/dom/system/windows/Makefile.in
@@ -4,16 +4,14 @@
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
-LIBRARY_NAME = domsystemwindows_s
-
EXPORT_LIBRARY = 1
# We fire the nsDOMDeviceAcceleration
LOCAL_INCLUDES += -I$(topsrcdir)/content/events/src
include $(topsrcdir)/config/rules.mk
--- a/dom/system/windows/moz.build
+++ b/dom/system/windows/moz.build
@@ -9,8 +9,10 @@ MODULE = 'dom'
CPP_SOURCES += [
'nsHapticFeedback.cpp',
]
FAIL_ON_WARNINGS = True
LIBXUL_LIBRARY = True
+LIBRARY_NAME = 'domsystemwindows_s'
+
--- a/dom/telephony/Makefile.in
+++ b/dom/telephony/Makefile.in
@@ -4,13 +4,12 @@
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
-LIBRARY_NAME = domtelephony_s
include $(topsrcdir)/dom/dom-config.mk
include $(topsrcdir)/config/rules.mk
--- a/dom/telephony/moz.build
+++ b/dom/telephony/moz.build
@@ -19,8 +19,10 @@ CPP_SOURCES += [
'TelephonyCall.cpp',
'TelephonyCallGroup.cpp',
]
FAIL_ON_WARNINGS = True
LIBXUL_LIBRARY = True
+LIBRARY_NAME = 'domtelephony_s'
+
--- a/dom/time/Makefile.in
+++ b/dom/time/Makefile.in
@@ -4,13 +4,12 @@
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
-LIBRARY_NAME = dom_time_s
include $(topsrcdir)/dom/dom-config.mk
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
--- a/dom/time/moz.build
+++ b/dom/time/moz.build
@@ -25,8 +25,10 @@ CPP_SOURCES += [
'TimeManager.cpp',
'TimeService.cpp',
]
FAIL_ON_WARNINGS = True
LIBXUL_LIBRARY = True
+LIBRARY_NAME = 'dom_time_s'
+
--- a/dom/voicemail/Makefile.in
+++ b/dom/voicemail/Makefile.in
@@ -4,13 +4,12 @@
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
-LIBRARY_NAME = domvoicemail_s
include $(topsrcdir)/dom/dom-config.mk
include $(topsrcdir)/config/rules.mk
--- a/dom/voicemail/moz.build
+++ b/dom/voicemail/moz.build
@@ -22,8 +22,10 @@ EXPORTS.mozilla.dom += [
CPP_SOURCES += [
'Voicemail.cpp',
]
FAIL_ON_WARNINGS = True
LIBXUL_LIBRARY = True
+LIBRARY_NAME = 'domvoicemail_s'
+
--- a/dom/wifi/Makefile.in
+++ b/dom/wifi/Makefile.in
@@ -4,16 +4,15 @@
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
-LIBRARY_NAME = domwifi_s
EXPORT_LIBRARY = 1
include $(topsrcdir)/dom/dom-config.mk
include $(topsrcdir)/config/rules.mk
--- a/dom/wifi/moz.build
+++ b/dom/wifi/moz.build
@@ -26,8 +26,10 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk
CPP_SOURCES = [
'NetUtils.cpp',
'WifiProxyService.cpp',
'WifiUtils.cpp',
]
LIBXUL_LIBRARY = True
+LIBRARY_NAME = 'domwifi_s'
+
--- a/extensions/cookie/Makefile.in
+++ b/extensions/cookie/Makefile.in
@@ -5,12 +5,11 @@
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
-LIBRARY_NAME = cookie
EXPORT_LIBRARY = 1
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
--- a/extensions/cookie/moz.build
+++ b/extensions/cookie/moz.build
@@ -21,8 +21,10 @@ CPP_SOURCES += [
'nsPermissionManager.cpp',
'nsPopupWindowManager.cpp',
]
LIBXUL_LIBRARY = True
MSVC_ENABLE_PGO = True
+LIBRARY_NAME = 'cookie'
+
--- a/extensions/pref/autoconfig/src/Makefile.in
+++ b/extensions/pref/autoconfig/src/Makefile.in
@@ -4,17 +4,16 @@
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
-LIBRARY_NAME = autoconfig
EXPORT_LIBRARY = 1
AUTOCFG_JS_EXPORTS = \
$(srcdir)/prefcalls.js \
$(NULL)
ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
AUTOCFG_JS_EXPORTS += $(srcdir)/mac/platform.js
else
--- a/extensions/pref/autoconfig/src/moz.build
+++ b/extensions/pref/autoconfig/src/moz.build
@@ -10,8 +10,10 @@ CPP_SOURCES += [
'nsAutoConfig.cpp',
'nsConfigFactory.cpp',
'nsJSConfigTriggers.cpp',
'nsReadConfig.cpp',
]
LIBXUL_LIBRARY = True
+LIBRARY_NAME = 'autoconfig'
+
--- a/gfx/2d/Makefile.in
+++ b/gfx/2d/Makefile.in
@@ -5,17 +5,16 @@
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = $(srcdir) $(srcdir)/unittest
include $(DEPTH)/config/autoconf.mk
-LIBRARY_NAME = gfx2d
EXPORT_LIBRARY = 1
DEFINES += -DMOZ_GFX -DUSE_CAIRO -DGFX2D_INTERNAL
ifeq ($(MOZ_WIDGET_TOOLKIT),$(findstring $(MOZ_WIDGET_TOOLKIT),android gtk2 gtk3 gonk qt))
DEFINES += -DMOZ_ENABLE_FREETYPE
OS_CXXFLAGS += $(CAIRO_FT_CFLAGS)
endif
--- a/gfx/2d/moz.build
+++ b/gfx/2d/moz.build
@@ -101,8 +101,10 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'coco
CMMSRCS += [
'QuartzSupport.mm',
]
LIBXUL_LIBRARY = True
MSVC_ENABLE_PGO = True
+LIBRARY_NAME = 'gfx2d'
+
--- a/gfx/cairo/libpixman/src/Makefile.in
+++ b/gfx/cairo/libpixman/src/Makefile.in
@@ -4,17 +4,16 @@
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
-LIBRARY_NAME = mozlibpixman
ifeq ($(OS_TARGET),Android)
MODULE_OPTIMIZE_FLAGS = -O2
endif
ifdef MOZ_USE_PTHREADS
DEFINES += -DHAVE_PTHREAD_SETSPECIFIC
endif
--- a/gfx/cairo/libpixman/src/moz.build
+++ b/gfx/cairo/libpixman/src/moz.build
@@ -59,8 +59,10 @@ CSRCS += [
'pixman-trap.c',
'pixman-utils.c',
'pixman-x86.c',
'pixman.c',
]
MSVC_ENABLE_PGO = True
+LIBRARY_NAME = 'mozlibpixman'
+
--- a/gfx/gl/Makefile.in
+++ b/gfx/gl/Makefile.in
@@ -4,17 +4,16 @@
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
-LIBRARY_NAME = gl
EXPORT_LIBRARY = 1
ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
ifdef MOZ_WEBGL
DEFINES += -DMOZ_D3DCOMPILER_DLL=$(MOZ_D3DCOMPILER_DLL)
endif
endif
ifeq ($(MOZ_WIDGET_TOOLKIT),gonk)
--- a/gfx/gl/moz.build
+++ b/gfx/gl/moz.build
@@ -117,8 +117,10 @@ CPP_SOURCES += [
]
FAIL_ON_WARNINGS = True
LIBXUL_LIBRARY = True
MSVC_ENABLE_PGO = True
+LIBRARY_NAME = 'gl'
+
--- a/gfx/ipc/Makefile.in
+++ b/gfx/ipc/Makefile.in
@@ -5,15 +5,14 @@
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
-LIBRARY_NAME = gfxipc_s
EXPORT_LIBRARY = 1
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
CXXFLAGS += $(MOZ_CAIRO_CFLAGS) $(MOZ_PIXMAN_CFLAGS) $(TK_CFLAGS)
--- a/gfx/ipc/moz.build
+++ b/gfx/ipc/moz.build
@@ -25,8 +25,10 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'wind
]
CPP_SOURCES += [
'SharedDIB.cpp',
]
LIBXUL_LIBRARY = True
+LIBRARY_NAME = 'gfxipc_s'
+
--- a/gfx/layers/Makefile.in
+++ b/gfx/layers/Makefile.in
@@ -15,17 +15,16 @@ VPATH = \
$(srcdir)/d3d9 \
$(srcdir)/d3d10 \
$(srcdir)/d3d11 \
$(srcdir)/ipc \
$(NULL)
include $(DEPTH)/config/autoconf.mk
-LIBRARY_NAME = layers
ifdef MOZ_DEBUG
DEFINES += -DD3D_DEBUG_INFO
endif
ifdef MOZ_ENABLE_D3D10_LAYER
DEFINES += -DMOZ_ENABLE_D3D10_LAYER
endif
--- a/gfx/layers/moz.build
+++ b/gfx/layers/moz.build
@@ -267,8 +267,10 @@ IPDL_SOURCES = [
'ipc/PLayer.ipdl',
'ipc/PLayerTransaction.ipdl',
]
LIBXUL_LIBRARY = True
MSVC_ENABLE_PGO = True
+LIBRARY_NAME = 'layers'
+
--- a/gfx/thebes/Makefile.in
+++ b/gfx/thebes/Makefile.in
@@ -4,17 +4,16 @@
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
-LIBRARY_NAME = thebes
EXPORT_LIBRARY = 1
# gfxSVGGlyphs needs nsDOMParser.h
LOCAL_INCLUDES += \
-I$(topsrcdir)/content/base/public \
-I$(topsrcdir)/content/xml/document/src \
$(NULL)
--- a/gfx/thebes/moz.build
+++ b/gfx/thebes/moz.build
@@ -269,8 +269,10 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'coco
]
FAIL_ON_WARNINGS = not CONFIG['_MSC_VER']
LIBXUL_LIBRARY = True
MSVC_ENABLE_PGO = True
+LIBRARY_NAME = 'thebes'
+
--- a/hal/Makefile.in
+++ b/hal/Makefile.in
@@ -16,17 +16,16 @@ VPATH = \
$(srcdir)/windows \
$(srcdir)/cocoa \
$(NULL)
relativesrcdir = @relativesrcdir@
include $(DEPTH)/config/autoconf.mk
-LIBRARY_NAME = hal_s
EXPORT_LIBRARY = 1
MOCHITEST_BROWSER_FILES += \
tests/browser_alarms.js \
$(NULL)
ifdef MOZ_GAMEPAD
LOCAL_INCLUDES = -I$(topsrcdir)/dom/base
endif
--- a/hal/moz.build
+++ b/hal/moz.build
@@ -149,8 +149,10 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'coco
IPDL_SOURCES = [
'sandbox/PHal.ipdl',
]
FAIL_ON_WARNINGS = True
LIBXUL_LIBRARY = True
+LIBRARY_NAME = 'hal_s'
+
--- a/image/decoders/icon/android/Makefile.in
+++ b/image/decoders/icon/android/Makefile.in
@@ -4,11 +4,10 @@
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
-LIBRARY_NAME = imgiconandroid_s
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
--- a/image/decoders/icon/android/moz.build
+++ b/image/decoders/icon/android/moz.build
@@ -9,8 +9,10 @@ MODULE = 'imgicon'
CPP_SOURCES += [
'nsIconChannel.cpp',
]
FAIL_ON_WARNINGS = True
LIBXUL_LIBRARY = True
+LIBRARY_NAME = 'imgiconandroid_s'
+
--- a/image/src/Makefile.in
+++ b/image/src/Makefile.in
@@ -5,17 +5,16 @@
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
-LIBRARY_NAME = imglib2_s
# We need to instantiate the decoders
LOCAL_INCLUDES += -I$(topsrcdir)/image/decoders
# For URI-related functionality
LOCAL_INCLUDES += -I$(topsrcdir)/netwerk/base/src
# Because SVGDocumentWrapper.cpp includes "mozilla/dom/SVGSVGElement.h"
--- a/image/src/moz.build
+++ b/image/src/moz.build
@@ -39,8 +39,10 @@ CPP_SOURCES += [
'imgStatusTracker.cpp',
'imgTools.cpp',
]
FAIL_ON_WARNINGS = True
LIBXUL_LIBRARY = True
+LIBRARY_NAME = 'imglib2_s'
+
--- a/ipc/chromium/Makefile.in
+++ b/ipc/chromium/Makefile.in
@@ -6,17 +6,16 @@ DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
OS_CXXFLAGS := $(filter-out -fshort-wchar,$(OS_CXXFLAGS))
-LIBRARY_NAME = chromium_s
EXPORT_LIBRARY = 1
ACDEFINES =
ifndef MOZ_NATIVE_LIBEVENT # {
vpath %.c \
$(srcdir)/src/third_party/libevent \
$(NULL)
--- a/ipc/chromium/moz.build
+++ b/ipc/chromium/moz.build
@@ -229,8 +229,10 @@ if CONFIG['_MSC_VER']:
ost = CONFIG['OS_TEST']
if ost.find('86') == -1 and ost.find('arm') == -1 and ost.find('mips') == -1:
CPP_SOURCES += [
'atomicops_internals_mutex.cc',
]
LIBXUL_LIBRARY = True
+LIBRARY_NAME = 'chromium_s'
+
--- a/ipc/dbus/Makefile.in
+++ b/ipc/dbus/Makefile.in
@@ -4,17 +4,16 @@
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
-LIBRARY_NAME = mozdbus_s
EXPORT_LIBRARY = 1
ifdef MOZ_ENABLE_DBUS
LOCAL_INCLUDES += $(MOZ_DBUS_CFLAGS)
endif
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
--- a/ipc/dbus/moz.build
+++ b/ipc/dbus/moz.build
@@ -15,8 +15,10 @@ EXPORTS.mozilla.ipc += [
CPP_SOURCES += [
'DBusThread.cpp',
'DBusUtils.cpp',
'RawDBusConnection.cpp',
]
LIBXUL_LIBRARY = True
+LIBRARY_NAME = 'mozdbus_s'
+
--- a/ipc/glue/Makefile.in
+++ b/ipc/glue/Makefile.in
@@ -6,16 +6,15 @@ DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/crashreporter
-LIBRARY_NAME = mozipc_s
EXPORT_LIBRARY = 1
DEFINES += -DMOZ_CHILD_PROCESS_NAME=\"$(MOZ_CHILD_PROCESS_NAME)\"
DEFINES += -DMOZ_CHILD_PROCESS_BUNDLE=\"$(MOZ_CHILD_PROCESS_BUNDLE)\"
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
--- a/ipc/glue/moz.build
+++ b/ipc/glue/moz.build
@@ -98,8 +98,10 @@ CPP_SOURCES += [
IPDL_SOURCES = [
'InputStreamParams.ipdlh',
'URIParams.ipdlh',
]
LIBXUL_LIBRARY = True
+LIBRARY_NAME = 'mozipc_s'
+
--- a/ipc/ipdl/Makefile.in
+++ b/ipc/ipdl/Makefile.in
@@ -7,17 +7,16 @@ topsrcdir = @top_srcdir@
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
EXPORT_LIBRARY = 1
# This file is generated by the moz.build backend.
include ipdlsrcs.mk
GARBAGE += $(CPPSRCS)
LOCAL_INCLUDES += -I$(DEPTH)/ipc/ipdl/_ipdlheaders
--- a/ipc/ipdl/moz.build
+++ b/ipc/ipdl/moz.build
@@ -6,8 +6,10 @@
if CONFIG['MOZ_IPDL_TESTS']:
DIRS += ['test']
MODULE = 'ipdlgen'
LIBXUL_LIBRARY = True
+LIBRARY_NAME = 'mozipdlgen_s'
+
--- a/ipc/netd/Makefile.in
+++ b/ipc/netd/Makefile.in
@@ -4,13 +4,12 @@
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
-LIBRARY_NAME = moznetd_s
EXPORT_LIBRARY = 1
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
--- a/ipc/netd/moz.build
+++ b/ipc/netd/moz.build
@@ -11,8 +11,10 @@ EXPORTS.mozilla.ipc += [
]
CPP_SOURCES += [
'Netd.cpp',
]
LIBXUL_LIBRARY = True
+LIBRARY_NAME = 'moznetd_s'
+
--- a/ipc/nfc/Makefile.in
+++ b/ipc/nfc/Makefile.in
@@ -4,13 +4,12 @@
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
-LIBRARY_NAME = moznfc_s
EXPORT_LIBRARY = 1
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
--- a/ipc/nfc/moz.build
+++ b/ipc/nfc/moz.build
@@ -9,8 +9,10 @@ if CONFIG['MOZ_B2G_NFC']:
'Nfc.h',
]
CPP_SOURCES += [
'Nfc.cpp',
]
LIBXUL_LIBRARY = True
+LIBRARY_NAME = 'moznfc_s'
+
--- a/ipc/ril/Makefile.in
+++ b/ipc/ril/Makefile.in
@@ -4,13 +4,12 @@
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
-LIBRARY_NAME = mozril_s
EXPORT_LIBRARY = 1
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
--- a/ipc/ril/moz.build
+++ b/ipc/ril/moz.build
@@ -11,8 +11,10 @@ EXPORTS.mozilla.ipc += [
]
CPP_SOURCES += [
'Ril.cpp',
]
LIBXUL_LIBRARY = True
+LIBRARY_NAME = 'mozril_s'
+
--- a/ipc/testshell/Makefile.in
+++ b/ipc/testshell/Makefile.in
@@ -4,17 +4,16 @@
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
relativesrcdir = @relativesrcdir@
include $(DEPTH)/config/autoconf.mk
-LIBRARY_NAME = ipcshell_s
EXPORT_LIBRARY = 1
# For xpcshell error messages and nsDependentJSString
LOCAL_INCLUDES += \
-I$(topsrcdir)/js/xpconnect/shell \
-I$(topsrcdir)/dom/base \
$(NULL)
--- a/ipc/testshell/moz.build
+++ b/ipc/testshell/moz.build
@@ -26,8 +26,10 @@ IPDL_SOURCES = [
'PTestShell.ipdl',
'PTestShellCommand.ipdl',
]
FAIL_ON_WARNINGS = True
LIBXUL_LIBRARY = True
+LIBRARY_NAME = 'ipcshell_s'
+
--- a/ipc/unixsocket/Makefile.in
+++ b/ipc/unixsocket/Makefile.in
@@ -4,12 +4,11 @@
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
-LIBRARY_NAME = mozipcunixsocket_s
EXPORT_LIBRARY = 1
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
--- a/ipc/unixsocket/moz.build
+++ b/ipc/unixsocket/moz.build
@@ -13,8 +13,10 @@ EXPORTS.mozilla.ipc += [
CPP_SOURCES += [
'UnixSocket.cpp',
]
FAIL_ON_WARNINGS = True
LIBXUL_LIBRARY = True
+LIBRARY_NAME = 'mozipcunixsocket_s'
+
--- a/js/ipc/Makefile.in
+++ b/js/ipc/Makefile.in
@@ -4,17 +4,16 @@
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
-LIBRARY_NAME = jsipc_s
EXPORT_LIBRARY = 1
LOCAL_INCLUDES += \
-I$(topsrcdir)/dom/base \
-I$(topsrcdir)/js/ipc \
-I$(topsrcdir)/js/public \
-I$(topsrcdir)/js/xpconnect/src \
$(NULL)
--- a/js/ipc/moz.build
+++ b/js/ipc/moz.build
@@ -16,8 +16,10 @@ IPDL_SOURCES += [
'JavaScriptTypes.ipdlh',
'PJavaScript.ipdl',
]
FAIL_ON_WARNINGS = True
LIBXUL_LIBRARY = True
+LIBRARY_NAME = 'jsipc_s'
+
--- a/js/xpconnect/src/Makefile.in
+++ b/js/xpconnect/src/Makefile.in
@@ -5,17 +5,16 @@
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
-LIBRARY_NAME = xpconnect_s
LOCAL_INCLUDES = \
-I$(srcdir)/../wrappers \
-I$(srcdir)/../loader \
-I$(topsrcdir)/caps/include \
-I$(topsrcdir)/content/base/src \
-I$(topsrcdir)/content/base/public \
-I$(topsrcdir)/content/events/src \
-I$(topsrcdir)/content/html/content/src \
--- a/js/xpconnect/src/moz.build
+++ b/js/xpconnect/src/moz.build
@@ -55,8 +55,10 @@ CPP_SOURCES += [
]
FAIL_ON_WARNINGS = True
LIBXUL_LIBRARY = True
MSVC_ENABLE_PGO = True
+LIBRARY_NAME = 'xpconnect_s'
+
--- a/js/xpconnect/tests/components/js/Makefile.in
+++ b/js/xpconnect/tests/components/js/Makefile.in
@@ -5,17 +5,16 @@
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
-LIBRARY_NAME = xpctest
IS_COMPONENT = 1
MODULE_NAME = xpconnect_test
JS_FILES = \
xpctest_attributes.js \
xpctest_bug809674.js \
xpctest_interfaces.js \
xpctest_params.js \
--- a/js/xpconnect/tests/components/js/moz.build
+++ b/js/xpconnect/tests/components/js/moz.build
@@ -2,8 +2,10 @@
# vim: set filetype=python:
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
MODULE = 'xpctest'
NO_DIST_INSTALL = True
+LIBRARY_NAME = 'xpctest'
+
--- a/js/xpconnect/tests/components/native/Makefile.in
+++ b/js/xpconnect/tests/components/native/Makefile.in
@@ -5,17 +5,16 @@
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
-LIBRARY_NAME = xpctest
IS_COMPONENT = 1
MODULE_NAME = xpconnect_test
FORCE_SHARED_LIB = 1
MANIFEST_FILE = xpctest.manifest
EXTRA_DSO_LDOPTS += \
$(XPCOM_GLUE_LDOPTS) \
--- a/js/xpconnect/tests/components/native/moz.build
+++ b/js/xpconnect/tests/components/native/moz.build
@@ -8,8 +8,10 @@ MODULE = 'xpctest'
NO_DIST_INSTALL = True
CPP_SOURCES += [
'xpctest_attributes.cpp',
'xpctest_module.cpp',
'xpctest_params.cpp',
]
+LIBRARY_NAME = 'xpctest'
+
--- a/layout/base/Makefile.in
+++ b/layout/base/Makefile.in
@@ -5,17 +5,16 @@
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
-LIBRARY_NAME = gkbase_s
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
LOCAL_INCLUDES += \
-I$(srcdir) \
-I$(srcdir)/../style \
-I$(srcdir)/../generic \
-I$(srcdir)/../forms \
--- a/layout/base/moz.build
+++ b/layout/base/moz.build
@@ -101,8 +101,10 @@ CPP_SOURCES += [
]
FAIL_ON_WARNINGS = True
LIBXUL_LIBRARY = True
MSVC_ENABLE_PGO = True
+LIBRARY_NAME = 'gkbase_s'
+
--- a/layout/build/Makefile.in
+++ b/layout/build/Makefile.in
@@ -10,17 +10,16 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
# Solaris sh blows
ifeq ($(OS_ARCH),SunOS)
SHELL := ksh
endif
-LIBRARY_NAME = gklayout
EXPORT_LIBRARY = 1
SHARED_LIBRARY_LIBS = \
../base/$(LIB_PREFIX)gkbase_s.$(LIB_SUFFIX) \
../forms/$(LIB_PREFIX)gkforms_s.$(LIB_SUFFIX) \
../generic/$(LIB_PREFIX)gkgeneric_s.$(LIB_SUFFIX) \
../ipc/$(LIB_PREFIX)gkipc_s.$(LIB_SUFFIX) \
../style/$(LIB_PREFIX)gkstyle_s.$(LIB_SUFFIX) \
../tables/$(LIB_PREFIX)gktable_s.$(LIB_SUFFIX) \
--- a/layout/build/moz.build
+++ b/layout/build/moz.build
@@ -19,8 +19,10 @@ CPP_SOURCES += [
]
FAIL_ON_WARNINGS = True
LIBXUL_LIBRARY = True
MSVC_ENABLE_PGO = True
+LIBRARY_NAME = 'gklayout'
+
--- a/layout/generic/Makefile.in
+++ b/layout/generic/Makefile.in
@@ -4,17 +4,16 @@
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
-LIBRARY_NAME = gkgeneric_s
RESOURCES_HTML = \
$(srcdir)/folder.png \
$(NULL)
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
LOCAL_INCLUDES += \
--- a/layout/generic/moz.build
+++ b/layout/generic/moz.build
@@ -95,8 +95,10 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'coco
]
FAIL_ON_WARNINGS = not CONFIG['_MSC_VER']
LIBXUL_LIBRARY = True
MSVC_ENABLE_PGO = True
+LIBRARY_NAME = 'gkgeneric_s'
+
--- a/layout/ipc/Makefile.in
+++ b/layout/ipc/Makefile.in
@@ -4,17 +4,16 @@
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
-LIBRARY_NAME = gkipc_s
EXPORT_LIBRARY = 1
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
LOCAL_INCLUDES += \
-I$(topsrcdir)/content/base/src \
-I$(topsrcdir)/layout/base \
-I$(topsrcdir)/layout/generic \
--- a/layout/ipc/moz.build
+++ b/layout/ipc/moz.build
@@ -20,8 +20,10 @@ CPP_SOURCES += [
IPDL_SOURCES = [
'PRenderFrame.ipdl',
]
FAIL_ON_WARNINGS = True
LIBXUL_LIBRARY = True
+LIBRARY_NAME = 'gkipc_s'
+
--- a/layout/mathml/Makefile.in
+++ b/layout/mathml/Makefile.in
@@ -6,17 +6,16 @@
DEPTH=@DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
-LIBRARY_NAME = gkmathml_s
LOCAL_INCLUDES = \
-I$(srcdir)/../style \
-I$(srcdir)/../base \
-I$(srcdir)/../generic \
-I$(srcdir)/../tables \
-I$(topsrcdir)/content/base/src \
-I$(topsrcdir)/content/mathml/content/src \
-I$(srcdir)/../xul/base/src \
--- a/layout/mathml/moz.build
+++ b/layout/mathml/moz.build
@@ -30,8 +30,10 @@ CPP_SOURCES += [
'nsMathMLmunderoverFrame.cpp',
'nsMathMLsemanticsFrame.cpp',
]
FAIL_ON_WARNINGS = True
LIBXUL_LIBRARY = True
+LIBRARY_NAME = 'gkmathml_s'
+
--- a/layout/style/Makefile.in
+++ b/layout/style/Makefile.in
@@ -4,17 +4,16 @@
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
-LIBRARY_NAME = gkstyle_s
ifdef GNU_CC
OS_CFLAGS := $(OS_CFLAGS) -Wshadow
OS_CXXFLAGS := $(OS_CXXFLAGS) -Wshadow
endif
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
--- a/layout/style/moz.build
+++ b/layout/style/moz.build
@@ -124,8 +124,10 @@ CPP_SOURCES += [
]
FAIL_ON_WARNINGS = True
LIBXUL_LIBRARY = True
MSVC_ENABLE_PGO = True
+LIBRARY_NAME = 'gkstyle_s'
+
--- a/layout/svg/Makefile.in
+++ b/layout/svg/Makefile.in
@@ -5,17 +5,16 @@
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
-LIBRARY_NAME = gksvgbase_s
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/svg/moz.build
+++ b/layout/svg/moz.build
@@ -52,8 +52,10 @@ CPP_SOURCES += [
'nsSVGUseFrame.cpp',
'nsSVGUtils.cpp',
]
FAIL_ON_WARNINGS = True
LIBXUL_LIBRARY = True
+LIBRARY_NAME = 'gksvgbase_s'
+
--- a/layout/xul/base/src/Makefile.in
+++ b/layout/xul/base/src/Makefile.in
@@ -4,17 +4,16 @@
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
-LIBRARY_NAME = gkxulbase_s
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/base/src/moz.build
+++ b/layout/xul/base/src/moz.build
@@ -55,8 +55,10 @@ if CONFIG['MOZ_XUL']:
]
FAIL_ON_WARNINGS = True
LIBXUL_LIBRARY = True
MSVC_ENABLE_PGO = True
+LIBRARY_NAME = 'gkxulbase_s'
+
--- a/memory/replace/dmd/Makefile.in
+++ b/memory/replace/dmd/Makefile.in
@@ -5,17 +5,16 @@
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
-LIBRARY_NAME = dmd
FORCE_SHARED_LIB= 1
DEFINES += -DMOZ_NO_MOZALLOC
VPATH += $(topsrcdir)/xpcom/base
VPATH += $(topsrcdir)/nsprpub/lib/libc/src
VPATH += $(topsrcdir)/mfbt
--- a/memory/replace/dmd/moz.build
+++ b/memory/replace/dmd/moz.build
@@ -14,8 +14,11 @@ CPP_SOURCES += [
'DMD.cpp',
'HashFunctions.cpp',
'nsStackWalk.cpp',
]
CSRCS += [
'strcpy.c',
]
+
+LIBRARY_NAME = 'dmd'
+
--- a/modules/libpref/src/Makefile.in
+++ b/modules/libpref/src/Makefile.in
@@ -5,17 +5,16 @@
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
-LIBRARY_NAME = pref
EXPORT_LIBRARY = 1
DEFINES += -DOS_ARCH=$(OS_ARCH) \
-DMOZ_WIDGET_TOOLKIT=$(MOZ_WIDGET_TOOLKIT) \
$(NULL)
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
--- a/modules/libpref/src/moz.build
+++ b/modules/libpref/src/moz.build
@@ -13,8 +13,10 @@ CPP_SOURCES += [
'prefapi.cpp',
'prefread.cpp',
]
LIBXUL_LIBRARY = True
MSVC_ENABLE_PGO = True
+LIBRARY_NAME = 'pref'
+
--- a/netwerk/base/src/Makefile.in
+++ b/netwerk/base/src/Makefile.in
@@ -6,17 +6,16 @@
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
-LIBRARY_NAME = neckobase_s
LOCAL_INCLUDES += -I$(topsrcdir)/dom/base
ifdef MOZ_PLATFORM_MAEMO
ifdef MOZ_ENABLE_LIBCONIC
LOCAL_INCLUDES += -I$(srcdir)/../../system/maemo
endif
ifdef MOZ_ENABLE_QTNETWORK
LOCAL_INCLUDES += -I$(srcdir)/../../system/qt
--- a/netwerk/base/src/moz.build
+++ b/netwerk/base/src/moz.build
@@ -112,8 +112,10 @@ EXTRA_JS_MODULES += [
]
FAIL_ON_WARNINGS = True
LIBXUL_LIBRARY = True
MSVC_ENABLE_PGO = True
+LIBRARY_NAME = 'neckobase_s'
+
--- a/netwerk/build/Makefile.in
+++ b/netwerk/build/Makefile.in
@@ -5,17 +5,16 @@
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
-LIBRARY_NAME = necko
EXPORT_LIBRARY = 1
SHARED_LIBRARY_LIBS = \
../base/src/$(LIB_PREFIX)neckobase_s.$(LIB_SUFFIX) \
../dns/$(LIB_PREFIX)neckodns_s.$(LIB_SUFFIX) \
../socket/$(LIB_PREFIX)neckosocket_s.$(LIB_SUFFIX) \
../streamconv/src/$(LIB_PREFIX)nkconv_s.$(LIB_SUFFIX) \
../streamconv/converters/$(LIB_PREFIX)nkcnvts_s.$(LIB_SUFFIX) \
../mime/$(LIB_PREFIX)nkmime_s.$(LIB_SUFFIX) \
--- a/netwerk/build/moz.build
+++ b/netwerk/build/moz.build
@@ -15,8 +15,10 @@ CPP_SOURCES += [
]
FAIL_ON_WARNINGS = True
LIBXUL_LIBRARY = True
MSVC_ENABLE_PGO = True
+LIBRARY_NAME = 'necko'
+
--- a/netwerk/ipc/Makefile.in
+++ b/netwerk/ipc/Makefile.in
@@ -3,17 +3,16 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
-LIBRARY_NAME = neckoipc_s
EXPORT_LIBRARY = 1
LOCAL_INCLUDES += \
-I$(srcdir)/../protocol/http \
-I$(srcdir)/../base/src \
-I$(topsrcdir)/modules/libjar \
$(NULL)
include $(topsrcdir)/config/rules.mk
--- a/netwerk/ipc/moz.build
+++ b/netwerk/ipc/moz.build
@@ -36,8 +36,10 @@ IPDL_SOURCES = [
'PNecko.ipdl',
'PRemoteOpenFile.ipdl',
]
FAIL_ON_WARNINGS = True
LIBXUL_LIBRARY = True
+LIBRARY_NAME = 'neckoipc_s'
+
--- a/netwerk/protocol/about/Makefile.in
+++ b/netwerk/protocol/about/Makefile.in
@@ -4,16 +4,15 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
-LIBRARY_NAME = nkabout_s
LOCAL_INCLUDES = \
-I$(srcdir)/../../base/src \
$(NULL)
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
--- a/netwerk/protocol/about/moz.build
+++ b/netwerk/protocol/about/moz.build
@@ -23,8 +23,10 @@ CPP_SOURCES += [
'nsAboutCacheEntry.cpp',
'nsAboutProtocolHandler.cpp',
]
FAIL_ON_WARNINGS = True
LIBXUL_LIBRARY = True
+LIBRARY_NAME = 'nkabout_s'
+
--- a/netwerk/protocol/device/Makefile.in
+++ b/netwerk/protocol/device/Makefile.in
@@ -3,15 +3,14 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
-LIBRARY_NAME = nkdevice_s
LOCAL_INCLUDES = -I$(srcdir)/../../base/src/ \
$(NULL)
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
--- a/netwerk/protocol/device/moz.build
+++ b/netwerk/protocol/device/moz.build
@@ -19,8 +19,10 @@ CPP_SOURCES += [
'nsDeviceChannel.cpp',
'nsDeviceProtocolHandler.cpp',
]
FAIL_ON_WARNINGS = True
LIBXUL_LIBRARY = True
+LIBRARY_NAME = 'nkdevice_s'
+
--- a/netwerk/protocol/ftp/Makefile.in
+++ b/netwerk/protocol/ftp/Makefile.in
@@ -4,17 +4,16 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
-LIBRARY_NAME = nkftp_s
LOCAL_INCLUDES = \
-I$(srcdir)/../../base/src \
-I$(topsrcdir)/xpcom/ds \
$(NULL)
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
--- a/netwerk/protocol/ftp/moz.build
+++ b/netwerk/protocol/ftp/moz.build
@@ -35,8 +35,10 @@ IPDL_SOURCES += [
]
FAIL_ON_WARNINGS = True
LIBXUL_LIBRARY = True
MSVC_ENABLE_PGO = True
+LIBRARY_NAME = 'nkftp_s'
+
--- a/netwerk/protocol/http/Makefile.in
+++ b/netwerk/protocol/http/Makefile.in
@@ -5,17 +5,16 @@
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
-LIBRARY_NAME = nkhttp_s
LOCAL_INCLUDES = \
-I$(srcdir)/../../base/src \
-I$(topsrcdir)/xpcom/ds \
-I$(topsrcdir)/content/base/src \
-I$(topsrcdir)/content/events/src \
$(NULL)
include $(topsrcdir)/config/rules.mk
--- a/netwerk/protocol/http/moz.build
+++ b/netwerk/protocol/http/moz.build
@@ -81,8 +81,10 @@ EXTRA_JS_MODULES += [
]
FAIL_ON_WARNINGS = True
LIBXUL_LIBRARY = True
MSVC_ENABLE_PGO = True
+LIBRARY_NAME = 'nkhttp_s'
+
--- a/netwerk/protocol/res/Makefile.in
+++ b/netwerk/protocol/res/Makefile.in
@@ -5,16 +5,15 @@
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
-LIBRARY_NAME = nkres_s
LOCAL_INCLUDES = \
-I$(topsrcdir)/netwerk/base/src \
$(NULL)
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
--- a/netwerk/protocol/res/moz.build
+++ b/netwerk/protocol/res/moz.build
@@ -17,8 +17,10 @@ CPP_SOURCES += [
]
FAIL_ON_WARNINGS = True
LIBXUL_LIBRARY = True
MSVC_ENABLE_PGO = True
+LIBRARY_NAME = 'nkres_s'
+
--- a/netwerk/protocol/websocket/Makefile.in
+++ b/netwerk/protocol/websocket/Makefile.in
@@ -4,17 +4,16 @@
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
-LIBRARY_NAME = nkwebsocket_s
LOCAL_INCLUDES = \
-I$(srcdir)/../../base/src \
-I$(topsrcdir)/content/base/src \
-I$(topsrcdir)/content/events/src \
-I$(topsrcdir)/xpcom/ds \
$(NULL)
include $(topsrcdir)/config/rules.mk
--- a/netwerk/protocol/websocket/moz.build
+++ b/netwerk/protocol/websocket/moz.build
@@ -32,8 +32,10 @@ IPDL_SOURCES += [
]
FAIL_ON_WARNINGS = True
LIBXUL_LIBRARY = True
MSVC_ENABLE_PGO = True
+LIBRARY_NAME = 'nkwebsocket_s'
+
--- a/netwerk/protocol/wyciwyg/Makefile.in
+++ b/netwerk/protocol/wyciwyg/Makefile.in
@@ -4,16 +4,15 @@
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
-LIBRARY_NAME = nkwyciwyg_s
LOCAL_INCLUDES = \
-I$(srcdir)/../../base/src \
$(NULL)
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
--- a/netwerk/protocol/wyciwyg/moz.build
+++ b/netwerk/protocol/wyciwyg/moz.build
@@ -28,8 +28,10 @@ CPP_SOURCES += [
IPDL_SOURCES += [
'PWyciwygChannel.ipdl',
]
FAIL_ON_WARNINGS = True
LIBXUL_LIBRARY = True
+LIBRARY_NAME = 'nkwyciwyg_s'
+
--- a/netwerk/sctp/datachannel/Makefile.in
+++ b/netwerk/sctp/datachannel/Makefile.in
@@ -5,17 +5,16 @@
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
-LIBRARY_NAME = nkdatachan_s
NO_PROFILE_GUIDED_OPTIMIZE = 1 # Don't PGO
LOCAL_INCLUDES = \
-I$(topsrcdir)/xpcom/ds \
-I$(srcdir)/../src \
-I$(DEPTH)/dist/include/mozilla/net \
-I$(topsrcdir)/media/webrtc/trunk/third_party/libjingle/source \
-I$(topsrcdir)/media/mtransport \
$(NULL)
--- a/netwerk/sctp/datachannel/moz.build
+++ b/netwerk/sctp/datachannel/moz.build
@@ -16,8 +16,10 @@ EXPORTS.mozilla.net += [
CPP_SOURCES += [
'DataChannel.cpp',
]
FAIL_ON_WARNINGS = True
LIBXUL_LIBRARY = True
+LIBRARY_NAME = 'nkdatachan_s'
+
--- a/netwerk/sctp/src/Makefile.in
+++ b/netwerk/sctp/src/Makefile.in
@@ -9,17 +9,16 @@ srcdir = @srcdir@
VPATH = \
@srcdir@ \
@srcdir@/netinet \
@srcdir@/netinet6 \
$(NULL)
include $(DEPTH)/config/autoconf.mk
-LIBRARY_NAME = nksctp_s
NO_PROFILE_GUIDED_OPTIMIZE = 1 # Don't PGO
LOCAL_INCLUDES = \
-I$(srcdir)/../../base/src \
-I$(topsrcdir)/content/base/src \
-I$(topsrcdir)/content/events/src \
-I$(topsrcdir)/xpcom/ds \
$(NULL)
--- a/netwerk/sctp/src/moz.build
+++ b/netwerk/sctp/src/moz.build
@@ -42,8 +42,10 @@ CSRCS += [
if CONFIG['OS_TARGET'] == 'Android':
CPP_SOURCES += [
'ifaddrs_android.cpp',
]
LIBXUL_LIBRARY = True
+LIBRARY_NAME = 'nksctp_s'
+
--- a/netwerk/srtp/src/Makefile.in
+++ b/netwerk/srtp/src/Makefile.in
@@ -15,17 +15,16 @@ VPATH = \
@srcdir@/crypto/kernel \
@srcdir@/crypto/math \
@srcdir@/crypto/replay \
@srcdir@/crypto/rng \
$(NULL)
include $(DEPTH)/config/autoconf.mk
-LIBRARY_NAME = nksrtp_s
LOCAL_INCLUDES = \
-I$(srcdir)/include \
-I$(srcdir)/crypto/include \
$(NULL)
DEFINES += \
-DHAVE_STDLIB_H=1 \
-DHAVE_UINT8_T=1 \
--- a/netwerk/srtp/src/moz.build
+++ b/netwerk/srtp/src/moz.build
@@ -32,8 +32,10 @@ CSRCS += [
'sha1.c',
'srtp.c',
'stat.c',
'ut_sim.c',
]
LIBXUL_LIBRARY = True
+LIBRARY_NAME = 'nksrtp_s'
+
--- a/security/sandbox/Makefile.in
+++ b/security/sandbox/Makefile.in
@@ -4,15 +4,14 @@
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
-LIBRARY_NAME = sandbox_s
EXPORT_LIBRARY = 1
FAIL_ON_WARNINGS = 1
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
--- a/security/sandbox/moz.build
+++ b/security/sandbox/moz.build
@@ -11,8 +11,10 @@ EXPORTS.mozilla += [
]
CPP_SOURCES += [
'Sandbox.cpp',
]
LIBXUL_LIBRARY = True
+LIBRARY_NAME = 'sandbox_s'
+
--- a/toolkit/components/alerts/Makefile.in
+++ b/toolkit/components/alerts/Makefile.in
@@ -4,13 +4,12 @@
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
-LIBRARY_NAME = alerts_s
LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/components/build/
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
--- a/toolkit/components/alerts/moz.build
+++ b/toolkit/components/alerts/moz.build
@@ -14,8 +14,10 @@ MODULE = 'alerts'
CPP_SOURCES += [
'nsAlertsService.cpp',
'nsXULAlerts.cpp',
]
LIBXUL_LIBRARY = True
+LIBRARY_NAME = 'alerts_s'
+
--- a/toolkit/components/build/Makefile.in
+++ b/toolkit/components/build/Makefile.in
@@ -5,17 +5,16 @@
DEPTH=@DEPTH@
topsrcdir=@top_srcdir@
srcdir=@srcdir@
VPATH=@srcdir@
include $(DEPTH)/config/autoconf.mk
-LIBRARY_NAME = toolkitcomps
EXPORT_LIBRARY = 1
LOCAL_INCLUDES = \
-I$(srcdir)/../alerts \
-I$(srcdir)/../downloads \
-I$(srcdir)/../feeds \
-I$(srcdir)/../find \
-I$(srcdir)/../intl \
-I$(srcdir)/../protobuf \
--- a/toolkit/components/build/moz.build
+++ b/toolkit/components/build/moz.build
@@ -11,8 +11,10 @@ EXPORTS += [
]
CPP_SOURCES += [
'nsToolkitCompsModule.cpp',
]
LIBXUL_LIBRARY = True
+LIBRARY_NAME = 'toolkitcomps'
+
--- a/toolkit/components/diskspacewatcher/Makefile.in
+++ b/toolkit/components/diskspacewatcher/Makefile.in
@@ -4,12 +4,11 @@
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
-LIBRARY_NAME = diskspacewatcher
EXPORT_LIBRARY = 1
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
--- a/toolkit/components/diskspacewatcher/moz.build
+++ b/toolkit/components/diskspacewatcher/moz.build
@@ -16,8 +16,10 @@ XPIDL_MODULE = 'diskspacewatcher'
MODULE = 'toolkitcomps'
CPP_SOURCES = [
'DiskSpaceWatcher.cpp',
]
LIBXUL_LIBRARY = True
+LIBRARY_NAME = 'diskspacewatcher'
+
--- a/toolkit/components/downloads/Makefile.in
+++ b/toolkit/components/downloads/Makefile.in
@@ -5,16 +5,15 @@
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
-LIBRARY_NAME = download_s
include $(topsrcdir)/config/rules.mk
CXXFLAGS += $(TK_CFLAGS) -DGOOGLE_PROTOBUF_NO_RTTI
LOCAL_INCLUDES += \
-I$(srcdir)/../protobuf \
$(NULL)
--- a/toolkit/components/downloads/moz.build
+++ b/toolkit/components/downloads/moz.build
@@ -35,8 +35,10 @@ if not CONFIG['MOZ_SUITE']:
'nsDownloadManagerUI.js',
'nsDownloadManagerUI.manifest',
]
FAIL_ON_WARNINGS = True
LIBXUL_LIBRARY = True
+LIBRARY_NAME = 'download_s'
+
--- a/toolkit/components/mediasniffer/Makefile.in
+++ b/toolkit/components/mediasniffer/Makefile.in
@@ -4,12 +4,11 @@
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
-LIBRARY_NAME = mediasniffer
EXPORT_LIBRARY = 1
include $(topsrcdir)/config/rules.mk
--- a/toolkit/components/mediasniffer/moz.build
+++ b/toolkit/components/mediasniffer/moz.build
@@ -18,8 +18,10 @@ CPP_SOURCES += [
]
CSRCS += [
'mp3sniff.c',
]
LIBXUL_LIBRARY = True
+LIBRARY_NAME = 'mediasniffer'
+
--- a/toolkit/components/protobuf/Makefile.in
+++ b/toolkit/components/protobuf/Makefile.in
@@ -12,17 +12,16 @@ include $(DEPTH)/config/autoconf.mk
VPATH = \
@srcdir@ \
@srcdir@/google/protobuf \
@srcdir@/google/protobuf/io \
@srcdir@/google/protobuf/stubs \
$(NULL)
-LIBRARY_NAME = protobuf_s
FORCE_STATIC_LIB = 1
LOCAL_INCLUDES = \
-I$(srcdir) \
$(NULL)
include $(topsrcdir)/config/rules.mk
--- a/toolkit/components/protobuf/moz.build
+++ b/toolkit/components/protobuf/moz.build
@@ -40,8 +40,10 @@ CPP_SOURCES += [
'message_lite.cc',
'once.cc',
'repeated_field.cc',
'wire_format_lite.cc',
'zero_copy_stream.cc',
'zero_copy_stream_impl_lite.cc',
]
+LIBRARY_NAME = 'protobuf_s'
+
--- a/toolkit/components/telemetry/Makefile.in
+++ b/toolkit/components/telemetry/Makefile.in
@@ -8,17 +8,16 @@ topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
USE_RCS_MK := 1
include $(topsrcdir)/config/makefiles/rcs.mk
EXPORT_LIBRARY = 1
-LIBRARY_NAME = telemetry
LOCAL_INCLUDES += -I$(topsrcdir)/xpcom/build
LOCAL_INCLUDES += -I$(topsrcdir)/xpcom/threads
EXTRA_DSO_LDOPTS += \
$(MOZ_COMPONENT_LIBS) \
$(MOZ_JS_LIBS) \
$(NULL)
--- a/toolkit/components/telemetry/moz.build
+++ b/toolkit/components/telemetry/moz.build
@@ -38,8 +38,10 @@ EXTRA_JS_MODULES += [
]
FAIL_ON_WARNINGS = True
LIBXUL_LIBRARY = True
MSVC_ENABLE_PGO = True
+LIBRARY_NAME = 'telemetry'
+
--- a/toolkit/crashreporter/Makefile.in
+++ b/toolkit/crashreporter/Makefile.in
@@ -4,17 +4,16 @@
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
-LIBRARY_NAME = exception_handler_s
ifeq ($(OS_ARCH),Linux)
# MOZ_APP_NAME is needed on Android, where we
# need to launch by package name.
DEFINES += \
-DANDROID_PACKAGE_NAME=\"$(ANDROID_PACKAGE_NAME)\"
$(NULL)
endif
--- a/toolkit/crashreporter/injector/Makefile.in
+++ b/toolkit/crashreporter/injector/Makefile.in
@@ -4,17 +4,16 @@
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
-LIBRARY_NAME = breakpadinjector
FORCE_SHARED_LIB = 1
USE_STATIC_LIBS = 1
STL_FLAGS =
MOZ_GLUE_LDFLAGS =
SHARED_LIBRARY_LIBS += ../breakpad-windows-standalone/$(LIB_PREFIX)google_breakpad_standalone_s.$(LIB_SUFFIX)
include $(topsrcdir)/config/rules.mk
--- a/toolkit/crashreporter/injector/moz.build
+++ b/toolkit/crashreporter/injector/moz.build
@@ -3,8 +3,10 @@
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
CPP_SOURCES += [
'injector.cpp',
]
+LIBRARY_NAME = 'breakpadinjector'
+
--- a/toolkit/crashreporter/moz.build
+++ b/toolkit/crashreporter/moz.build
@@ -76,8 +76,10 @@ EXTRA_JS_MODULES += [
'CrashSubmit.jsm',
'KeyValueParser.jsm',
]
LIBXUL_LIBRARY = True
MSVC_ENABLE_PGO = True
+LIBRARY_NAME = 'exception_handler_s'
+
--- a/toolkit/xre/Makefile.in
+++ b/toolkit/xre/Makefile.in
@@ -12,17 +12,16 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
USE_RCS_MK=1
include $(topsrcdir)/config/makefiles/makeutils.mk
milestone_txt = $(topsrcdir)/config/milestone.txt
-LIBRARY_NAME = xulapp_s
ifeq ($(MOZ_GL_DEFAULT_PROVIDER),GLX)
DEFINES += -DUSE_GLX_TEST
endif
DEFINES += \
-DMOZ_APP_NAME='"$(MOZ_APP_NAME)"' \
-DMOZ_APP_VERSION='"$(MOZ_APP_VERSION)"' \
$(NULL)
--- a/toolkit/xre/moz.build
+++ b/toolkit/xre/moz.build
@@ -93,8 +93,10 @@ if CONFIG['MOZ_UPDATER']:
CPP_SOURCES += [
'nsUpdateDriver.cpp',
]
LIBXUL_LIBRARY = True
MSVC_ENABLE_PGO = True
+LIBRARY_NAME = 'xulapp_s'
+
--- a/uriloader/exthandler/Makefile.in
+++ b/uriloader/exthandler/Makefile.in
@@ -28,17 +28,16 @@ OSDIR = unix
endif
endif
endif
endif
endif
VPATH := $(srcdir) $(srcdir)/$(OSDIR)
-LIBRARY_NAME = exthandler_s
ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
CMMSRCS = nsOSHelperAppService.mm \
nsMIMEInfoMac.mm \
nsLocalHandlerAppMac.mm \
$(NULL)
endif
--- a/uriloader/exthandler/moz.build
+++ b/uriloader/exthandler/moz.build
@@ -122,8 +122,10 @@ EXTRA_COMPONENTS += [
IPDL_SOURCES += [
'PExternalHelperApp.ipdl',
]
FAIL_ON_WARNINGS = True
LIBXUL_LIBRARY = True
+LIBRARY_NAME = 'exthandler_s'
+
--- a/uriloader/prefetch/Makefile.in
+++ b/uriloader/prefetch/Makefile.in
@@ -5,17 +5,16 @@
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
-LIBRARY_NAME = prefetch_s
LOCAL_INCLUDES = \
-I$(topsrcdir)/content/base/src \
-I$(topsrcdir)/content/events/src \
$(NULL)
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
--- a/uriloader/prefetch/moz.build
+++ b/uriloader/prefetch/moz.build
@@ -32,8 +32,10 @@ CPP_SOURCES += [
IPDL_SOURCES += [
'POfflineCacheUpdate.ipdl',
]
FAIL_ON_WARNINGS = True
LIBXUL_LIBRARY = True
+LIBRARY_NAME = 'prefetch_s'
+
--- a/widget/android/Makefile.in
+++ b/widget/android/Makefile.in
@@ -4,17 +4,16 @@
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
-LIBRARY_NAME = widget_android
EXPORT_LIBRARY = 1
SHARED_LIBRARY_LIBS = ../xpwidgets/libxpwidgets_s.a
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
#DEFINES += -DDEBUG_WIDGETS
--- a/widget/android/moz.build
+++ b/widget/android/moz.build
@@ -37,8 +37,10 @@ CPP_SOURCES += [
'nsWidgetFactory.cpp',
'nsWindow.cpp',
]
FAIL_ON_WARNINGS = True
LIBXUL_LIBRARY = True
+LIBRARY_NAME = 'widget_android'
+
--- a/widget/gonk/Makefile.in
+++ b/widget/gonk/Makefile.in
@@ -17,17 +17,16 @@ topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = \
$(srcdir) \
$(srcdir)/libui \
$(NULL)
include $(DEPTH)/config/autoconf.mk
-LIBRARY_NAME = widget_gonk
EXPORT_LIBRARY = 1
SHARED_LIBRARY_LIBS = ../xpwidgets/libxpwidgets_s.a
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
DEFINES += -DHAVE_OFF64_T -DSK_BUILD_FOR_ANDROID_NDK
--- a/widget/gonk/libdisplay/Makefile.in
+++ b/widget/gonk/libdisplay/Makefile.in
@@ -16,17 +16,16 @@ DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = \
$(srcdir) \
$(NULL)
include $(DEPTH)/config/autoconf.mk
-LIBRARY_NAME = display
FORCE_STATIC_LIB= 1
STL_FLAGS=
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
DEFINES += -DXPCOM_GLUE
--- a/widget/gonk/libdisplay/moz.build
+++ b/widget/gonk/libdisplay/moz.build
@@ -27,8 +27,11 @@ if CONFIG['ANDROID_VERSION'] == '18':
'GonkDisplayJB.cpp',
]
elif CONFIG['ANDROID_VERSION'] == '15':
CPP_SOURCES += [
'GonkDisplayICS.cpp'
]
else:
error('Unsupported platform version: %s' % (CONFIG['ANDROID_VERSION']))
+
+LIBRARY_NAME = 'display'
+
--- a/widget/gonk/moz.build
+++ b/widget/gonk/moz.build
@@ -58,8 +58,10 @@ CPP_SOURCES += [
if CONFIG['ANDROID_VERSION'] == '15':
CPP_SOURCES += [
'HwcComposer2D.cpp'
]
LIBXUL_LIBRARY = True
+LIBRARY_NAME = 'widget_gonk'
+
--- a/widget/gonk/nativewindow/Makefile.in
+++ b/widget/gonk/nativewindow/Makefile.in
@@ -13,13 +13,12 @@
# limitations under the License.
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
-LIBRARY_NAME = nativewindow
STL_FLAGS=
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
--- a/widget/gonk/nativewindow/moz.build
+++ b/widget/gonk/nativewindow/moz.build
@@ -31,8 +31,10 @@ if CONFIG['MOZ_B2G_CAMERA'] or CONFIG['M
'GonkNativeWindowICS.cpp',
'GonkNativeWindowClientICS.cpp',
]
FAIL_ON_WARNINGS = True
LIBXUL_LIBRARY = True
+LIBRARY_NAME = 'nativewindow'
+
--- a/widget/qt/Makefile.in
+++ b/widget/qt/Makefile.in
@@ -5,17 +5,16 @@
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
-LIBRARY_NAME = widget_qt
EXPORT_LIBRARY = 1
SHARED_LIBRARY_LIBS = ../xpwidgets/libxpwidgets_s.a
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
CXXFLAGS += $(MOZ_QT_CFLAGS) $(GLIB_CFLAGS) $(MOZ_CAIRO_CFLAGS) \
$(MOZ_PIXMAN_CFLAGS) $(MOZ_PLATFORM_MAEMO_CFLAGS)
--- a/widget/qt/moz.build
+++ b/widget/qt/moz.build
@@ -48,8 +48,10 @@ if CONFIG['MOZ_ENABLE_CONTENTMANAGER']:
if CONFIG[' MOZ_ENABLE_QTMOBILITY']:
CPP_SOURCES += [
'moc_mozqorientationsensorfilter.cpp',
'mozqorientationsensorfilter.cpp',
]
LIBXUL_LIBRARY = True
+LIBRARY_NAME = 'widget_qt'
+
--- a/widget/shared/Makefile.in
+++ b/widget/shared/Makefile.in
@@ -5,13 +5,12 @@
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
-LIBRARY_NAME = widget_shared
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
CXXFLAGS += $(TK_CFLAGS)
--- a/widget/shared/moz.build
+++ b/widget/shared/moz.build
@@ -11,8 +11,10 @@ MODULE = 'widget'
CPP_SOURCES += [
'WidgetUtils.cpp',
'nsShmImage.cpp',
]
LIBXUL_LIBRARY = True
+LIBRARY_NAME = 'widget_shared'
+
--- a/widget/shared/x11/Makefile.in
+++ b/widget/shared/x11/Makefile.in
@@ -5,12 +5,11 @@
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
-LIBRARY_NAME = widget_shared_x11
include $(topsrcdir)/config/rules.mk
CXXFLAGS += $(TK_CFLAGS)
--- a/widget/shared/x11/moz.build
+++ b/widget/shared/x11/moz.build
@@ -7,8 +7,10 @@
MODULE = 'widget'
CSRCS += [
'keysym2ucs.c',
]
LIBXUL_LIBRARY = True
+LIBRARY_NAME = 'widget_shared_x11'
+
--- a/widget/windows/Makefile.in
+++ b/widget/windows/Makefile.in
@@ -5,17 +5,16 @@
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
-LIBRARY_NAME = widget_windows
EXPORT_LIBRARY = 1
RESFILE = widget.res
DEFINES += -DMOZ_UNICODE
ifdef MOZ_ENABLE_D3D9_LAYER
DEFINES += -DMOZ_ENABLE_D3D9_LAYER
endif
--- a/widget/windows/moz.build
+++ b/widget/windows/moz.build
@@ -81,8 +81,10 @@ if CONFIG['NS_ENABLE_TSF']:
CPP_SOURCES += [
'nsTextStore.cpp',
]
LIBXUL_LIBRARY = True
MSVC_ENABLE_PGO = True
+LIBRARY_NAME = 'widget_windows'
+
--- a/widget/windows/winrt/Makefile.in
+++ b/widget/windows/winrt/Makefile.in
@@ -4,17 +4,16 @@
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
-LIBRARY_NAME = widget_winrt
EXPORT_LIBRARY = 1
DEFINES += -DMOZ_UNICODE
ifdef MOZ_ENABLE_D3D9_LAYER
DEFINES += -DMOZ_ENABLE_D3D9_LAYER
endif
ifdef MOZ_ENABLE_D3D10_LAYER
--- a/widget/windows/winrt/moz.build
+++ b/widget/windows/winrt/moz.build
@@ -24,8 +24,10 @@ CPP_SOURCES += [
EXTRA_COMPONENTS += [
'MetroUIUtils.js',
'MetroUIUtils.manifest',
]
LIBXUL_LIBRARY = True
+LIBRARY_NAME = 'widget_winrt'
+
--- a/widget/xpwidgets/Makefile.in
+++ b/widget/xpwidgets/Makefile.in
@@ -5,17 +5,16 @@
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
-LIBRARY_NAME = xpwidgets_s
SHARED_LIBRARY_LIBS = ../shared/$(LIB_PREFIX)widget_shared.$(LIB_SUFFIX)
ifdef MOZ_X11
SHARED_LIBRARY_LIBS += ../shared/x11/$(LIB_PREFIX)widget_shared_x11.$(LIB_SUFFIX)
endif
ifdef MOZ_ENABLE_D3D10_LAYER
DEFINES += -DMOZ_ENABLE_D3D10_LAYER
endif
--- a/widget/xpwidgets/moz.build
+++ b/widget/xpwidgets/moz.build
@@ -54,8 +54,10 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('qt'
CPP_SOURCES += [
'nsNativeTheme.cpp',
]
LIBXUL_LIBRARY = True
MSVC_ENABLE_PGO = True
+LIBRARY_NAME = 'xpwidgets_s'
+
--- a/xpcom/base/Makefile.in
+++ b/xpcom/base/Makefile.in
@@ -5,17 +5,16 @@
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
-LIBRARY_NAME = xpcombase_s
MOZILLA_INTERNAL_API =1
ifeq ($(OS_ARCH),WINNT)
ifdef MOZ_DEBUG
CSRCS += pure_api.c
endif
endif #if OS_ARCH == WINNT
--- a/xpcom/base/moz.build
+++ b/xpcom/base/moz.build
@@ -130,8 +130,10 @@ CSRCS += [
'nsErrorAssertsC.c',
]
LIBXUL_LIBRARY = True
MSVC_ENABLE_PGO = True
+LIBRARY_NAME = 'xpcombase_s'
+
--- a/xpcom/build/Makefile.in
+++ b/xpcom/build/Makefile.in
@@ -9,17 +9,16 @@ topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
include $(srcdir)/../glue/objs.mk
EXTRA_DEPS += $(srcdir)/../glue/objs.mk
-LIBRARY_NAME = xpcom_core
EXPORT_LIBRARY = 1
MOZILLA_INTERNAL_API = 1
ifeq (Darwin, $(OS_ARCH))
CSRCS = mach_override.c
endif
--- a/xpcom/build/moz.build
+++ b/xpcom/build/moz.build
@@ -51,8 +51,10 @@ CPP_SOURCES += [
'nsXPCOMStrings.cpp',
'nsXPComInit.cpp',
]
LIBXUL_LIBRARY = True
MSVC_ENABLE_PGO = True
+LIBRARY_NAME = 'xpcom_core'
+
--- a/xpcom/io/Makefile.in
+++ b/xpcom/io/Makefile.in
@@ -4,17 +4,16 @@
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
-LIBRARY_NAME = xpcomio_s
MOZILLA_INTERNAL_API = 1
include $(topsrcdir)/config/rules.mk
include $(topsrcdir)/ipc/chromium/chromium-config.mk
ifeq ($(OS_ARCH),Linux)
ifneq (,$(findstring lib64,$(libdir)))
DEFINES += -DHAVE_USR_LIB64_DIR
endif
--- a/xpcom/io/moz.build
+++ b/xpcom/io/moz.build
@@ -121,8 +121,10 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'coco
CMMSRCS += [
'CocoaFileUtils.mm',
]
LIBXUL_LIBRARY = True
MSVC_ENABLE_PGO = True
+LIBRARY_NAME = 'xpcomio_s'
+
--- a/xpcom/reflect/xptcall/src/md/os2/Makefile.in
+++ b/xpcom/reflect/xptcall/src/md/os2/Makefile.in
@@ -5,17 +5,16 @@
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
-LIBRARY_NAME = xptcmd
EXPORT_LIBRARY = ../..
MOZILLA_INTERNAL_API = 1
LOCAL_INCLUDES = \
-I$(srcdir)/../unix \
-I$(srcdir)/../../../../xptinfo/src \
$(NULL)
DEFINES += -DMOZ_NEED_LEADING_UNDERSCORE
--- a/xpcom/reflect/xptcall/src/md/os2/moz.build
+++ b/xpcom/reflect/xptcall/src/md/os2/moz.build
@@ -6,8 +6,10 @@
MODULE = 'xpcom'
CPP_SOURCES += [
'../unix/xptcinvoke_gcc_x86_unix.cpp',
'xptcstubs_gcc_x86_os2.cpp',
]
+LIBRARY_NAME = 'xptcmd'
+
--- a/xpcom/reflect/xptcall/src/md/unix/Makefile.in
+++ b/xpcom/reflect/xptcall/src/md/unix/Makefile.in
@@ -6,17 +6,16 @@
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
NO_PROFILE_GUIDED_OPTIMIZE = 1
include $(DEPTH)/config/autoconf.mk
-LIBRARY_NAME = xptcmd
EXPORT_LIBRARY = ../..
MOZILLA_INTERNAL_API = 1
#
# The default is this buildable, but non-functioning code.
#
ifeq ($(OS_ARCH),SunOS)
ifneq (86,$(findstring 86,$(OS_TEST)))
--- a/xpcom/reflect/xptcall/src/md/unix/moz.build
+++ b/xpcom/reflect/xptcall/src/md/unix/moz.build
@@ -259,8 +259,11 @@ if CONFIG['OS_ARCH'] == 'Linux':
'xptcinvoke_linux_s390.cpp',
'xptcstubs_linux_s390.cpp',
]
elif CONFIG['OS_TEST'] == 's390x':
CPP_SOURCES += [
'xptcinvoke_linux_s390x.cpp',
'xptcstubs_linux_s390x.cpp',
]
+
+LIBRARY_NAME = 'xptcmd'
+
--- a/xpcom/reflect/xptcall/src/md/win32/Makefile.in
+++ b/xpcom/reflect/xptcall/src/md/win32/Makefile.in
@@ -5,17 +5,16 @@
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
-LIBRARY_NAME = xptcmd
EXPORT_LIBRARY = ../..
MOZILLA_INTERNAL_API = 1
LOCAL_INCLUDES += -I$(srcdir)/../../../../xptinfo/src
ifneq ($(TARGET_CPU),x86_64)
ifndef GNU_CXX
--- a/xpcom/reflect/xptcall/src/md/win32/moz.build
+++ b/xpcom/reflect/xptcall/src/md/win32/moz.build
@@ -30,8 +30,11 @@ else:
'xptcinvoke_x86_gnu.cpp',
'xptcstubs.cpp',
]
else:
CPP_SOURCES += [
'xptcinvoke.cpp',
'xptcstubs.cpp',
]
+
+LIBRARY_NAME = 'xptcmd'
+
--- a/xpcom/sample/Makefile.in
+++ b/xpcom/sample/Makefile.in
@@ -5,20 +5,16 @@
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
-# LIBRARY_NAME names the library generated by this makefile,
-# i.e. dist/bin/components/libxpcomsample.so
-LIBRARY_NAME = xpcomsample
-
# On OS/2, SHORT_LIBNAME is used to generate a library with an 8.3 filename,
# e.g. dist/bin/components/xpcomsmp.dll
SHORT_LIBNAME = xpcomsmp
# IS_COMPONENT indicates that this makefile builds a component shared library.
IS_COMPONENT = 1
# If this is Makefile builds a component, MODULE_NAME must match the module
--- a/xpcom/sample/moz.build
+++ b/xpcom/sample/moz.build
@@ -21,8 +21,13 @@ CPP_SOURCES += [
]
# EXTRA_COMPONENTS installs components written JavaScript to
# dist/bin/components
EXTRA_COMPONENTS += [
'nsSample.js',
'nsSample.manifest',
]
+
+# LIBRARY_NAME names the library generated by this makefile,
+# i.e. dist/bin/components/libxpcomsample.so
+LIBRARY_NAME = 'xpcomsample'
+
--- a/xpcom/tests/bug656331_component/Makefile.in
+++ b/xpcom/tests/bug656331_component/Makefile.in
@@ -7,17 +7,16 @@
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
-LIBRARY_NAME = test656331
IS_COMPONENT = 1
FORCE_SHARED_LIB = 1
MANIFEST_FILE = bug656331.manifest
EXTRA_DSO_LDOPTS = \
$(DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) \
$(XPCOM_FROZEN_LDOPTS) \
--- a/xpcom/tests/bug656331_component/moz.build
+++ b/xpcom/tests/bug656331_component/moz.build
@@ -5,8 +5,10 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
NO_DIST_INSTALL = True
CPP_SOURCES += [
'TestComponent.cpp',
]
+LIBRARY_NAME = 'test656331'
+
--- a/xpcom/tests/component/Makefile.in
+++ b/xpcom/tests/component/Makefile.in
@@ -5,17 +5,16 @@
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
-LIBRARY_NAME = testcomponent
IS_COMPONENT = 1
FORCE_SHARED_LIB = 1
MANIFEST_FILE = testcomponent.manifest
EXTRA_DSO_LDOPTS = \
$(DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) \
$(XPCOM_FROZEN_LDOPTS) \
--- a/xpcom/tests/component/moz.build
+++ b/xpcom/tests/component/moz.build
@@ -5,8 +5,10 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
NO_DIST_INSTALL = True
CPP_SOURCES += [
'TestComponent.cpp',
]
+LIBRARY_NAME = 'testcomponent'
+
--- a/xpcom/tests/component_no_aslr/Makefile.in
+++ b/xpcom/tests/component_no_aslr/Makefile.in
@@ -5,17 +5,16 @@
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
-LIBRARY_NAME = testcompnoaslr
IS_COMPONENT = 1
FORCE_SHARED_LIB = 1
MANIFEST_FILE = testcompnoaslr.manifest
EXTRA_DSO_LDOPTS = \
$(DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) \
$(XPCOM_FROZEN_LDOPTS) \
--- a/xpcom/tests/component_no_aslr/moz.build
+++ b/xpcom/tests/component_no_aslr/moz.build
@@ -5,8 +5,10 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
NO_DIST_INSTALL = True
CPP_SOURCES += [
'TestComponent.cpp',
]
+LIBRARY_NAME = 'testcompnoaslr'
+
--- a/xpfe/components/build/Makefile.in
+++ b/xpfe/components/build/Makefile.in
@@ -5,14 +5,13 @@
DEPTH = @DEPTH@
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
-LIBRARY_NAME = appcomps
EXPORT_LIBRARY = 1
SHARED_LIBRARY_LIBS += ../directory/$(LIB_PREFIX)directory_s.$(LIB_SUFFIX)
LOCAL_INCLUDES += -I$(srcdir)/../directory
include $(topsrcdir)/config/rules.mk
--- a/xpfe/components/build/moz.build
+++ b/xpfe/components/build/moz.build
@@ -7,8 +7,10 @@
MODULE = 'appcomps'
CPP_SOURCES += [
'nsModule.cpp',
]
LIBXUL_LIBRARY = True
+LIBRARY_NAME = 'appcomps'
+