Bug 883284 - Part b: Move LIBXUL_LIBRARY into moz.build (a-c); r=joey

2024-11-24 05:11:16 +00:00 · 2013-08-22 08:55:59 +02:00 · 2013-08-22 08:55:59 +02:00 · 6d473220dc
commit 6d473220dc
parent 0747462b80
100 changed files with 105 additions and 116 deletions
--- a/accessible/src/atk/Makefile.in
+++ b/accessible/src/atk/Makefile.in
@ -10,8 +10,6 @@ VPATH = @srcdir@
 include $(DEPTH)/config/autoconf.mk

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

 ifdef MOZ_ENABLE_GTK
--- a/accessible/src/atk/moz.build
+++ b/accessible/src/atk/moz.build
@ -35,3 +35,5 @@ CPP_SOURCES += [

 LIBRARY_NAME = 'accessibility_toolkit_s'

+LIBXUL_LIBRARY = True
+
--- a/accessible/src/base/Makefile.in
+++ b/accessible/src/base/Makefile.in
@ -9,8 +9,6 @@ VPATH = @srcdir@

 include $(DEPTH)/config/autoconf.mk

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

 LOCAL_INCLUDES += \
--- a/accessible/src/base/moz.build
+++ b/accessible/src/base/moz.build
@ -63,3 +63,5 @@ if a11y_log:

 LIBRARY_NAME = 'accessibility_base_s'

+LIBXUL_LIBRARY = True
+
--- a/accessible/src/generic/Makefile.in
+++ b/accessible/src/generic/Makefile.in
@ -9,8 +9,6 @@ VPATH = @srcdir@

 include $(DEPTH)/config/autoconf.mk

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

 LOCAL_INCLUDES = \
--- a/accessible/src/generic/moz.build
+++ b/accessible/src/generic/moz.build
@ -29,3 +29,5 @@ CPP_SOURCES += [

 LIBRARY_NAME = 'accessibility_generic_s'

+LIBXUL_LIBRARY = True
+
--- a/accessible/src/html/Makefile.in
+++ b/accessible/src/html/Makefile.in
@ -10,8 +10,6 @@ VPATH = @srcdir@

 include $(DEPTH)/config/autoconf.mk

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

 LOCAL_INCLUDES = \
--- a/accessible/src/html/moz.build
+++ b/accessible/src/html/moz.build
@ -19,3 +19,5 @@ CPP_SOURCES += [

 LIBRARY_NAME = 'accessibility_html_s'

+LIBXUL_LIBRARY = True
+
--- a/accessible/src/mac/Makefile.in
+++ b/accessible/src/mac/Makefile.in
@ -10,9 +10,6 @@ VPATH = @srcdir@
 include $(DEPTH)/config/autoconf.mk

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

 LOCAL_INCLUDES += \
--- a/accessible/src/mac/moz.build
+++ b/accessible/src/mac/moz.build
@ -29,3 +29,6 @@ CMMSRCS += [
    'mozHTMLAccessible.mm',
    'mozTextAccessible.mm',
 ]
+
+LIBXUL_LIBRARY = True
+
--- a/accessible/src/other/Makefile.in
+++ b/accessible/src/other/Makefile.in
@ -10,8 +10,6 @@ VPATH = @srcdir@
 include $(DEPTH)/config/autoconf.mk

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

 LOCAL_INCLUDES += \
--- a/accessible/src/other/moz.build
+++ b/accessible/src/other/moz.build
@ -18,3 +18,5 @@ CPP_SOURCES += [

 LIBRARY_NAME = 'accessibility_toolkit_s'

+LIBXUL_LIBRARY = True
+
--- a/accessible/src/windows/ia2/Makefile.in
+++ b/accessible/src/windows/ia2/Makefile.in
@ -11,7 +11,6 @@ include $(DEPTH)/config/autoconf.mk

 LIBRARY_NAME = accessibility_toolkit_ia2_s
 EXPORT_LIBRARY = 1
-LIBXUL_LIBRARY = 1

 # The midl generated code include Windows headers which defines min and max
 # macros which conflicts with std::min/max.  Suppress the macros:
--- a/accessible/src/windows/ia2/moz.build
+++ b/accessible/src/windows/ia2/moz.build
@ -30,3 +30,5 @@ CPP_SOURCES += [
    'ia2AccessibleValue.cpp',
 ]

+LIBXUL_LIBRARY = True
+
--- a/accessible/src/windows/msaa/Makefile.in
+++ b/accessible/src/windows/msaa/Makefile.in
@ -11,8 +11,6 @@ include $(DEPTH)/config/autoconf.mk

 LIBRARY_NAME = accessibility_toolkit_msaa_s
 EXPORT_LIBRARY = 1
-LIBXUL_LIBRARY = 1
-
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk

--- a/accessible/src/windows/msaa/moz.build
+++ b/accessible/src/windows/msaa/moz.build
@ -41,3 +41,6 @@ if CONFIG['MOZ_XUL']:
        'XULMenuAccessibleWrap.cpp',
        'XULTreeGridAccessibleWrap.cpp',
    ]
+
+LIBXUL_LIBRARY = True
+
--- a/accessible/src/windows/sdn/Makefile.in
+++ b/accessible/src/windows/sdn/Makefile.in
@ -11,7 +11,7 @@ include $(DEPTH)/config/autoconf.mk

 LIBRARY_NAME = accessibility_toolkit_sdn_s
 EXPORT_LIBRARY = 1
-LIBXUL_LIBRARY = 1
+
 # The midl generated code include Windows headers which defines min and max
 # macros which conflicts with std::min/max.  Suppress the macros:
 OS_CXXFLAGS += -DNOMINMAX
--- a/accessible/src/windows/sdn/moz.build
+++ b/accessible/src/windows/sdn/moz.build
@ -11,3 +11,5 @@ CPP_SOURCES += [
    'sdnTextAccessible.cpp',
 ]

+LIBXUL_LIBRARY = True
+
--- a/accessible/src/windows/uia/Makefile.in
+++ b/accessible/src/windows/uia/Makefile.in
@ -11,7 +11,7 @@ include $(DEPTH)/config/autoconf.mk

 LIBRARY_NAME = accessibility_toolkit_uia_s
 EXPORT_LIBRARY = ..
-LIBXUL_LIBRARY = 1
+
 # The midl generated code include Windows headers which defines min and max
 # macros which conflicts with std::min/max.  Suppress the macros:
 OS_CXXFLAGS += -DNOMINMAX
--- a/accessible/src/windows/uia/moz.build
+++ b/accessible/src/windows/uia/moz.build
@ -10,3 +10,5 @@ CPP_SOURCES += [
    'uiaRawElmProvider.cpp',
 ]

+LIBXUL_LIBRARY = True
+
--- a/accessible/src/xpcom/Makefile.in
+++ b/accessible/src/xpcom/Makefile.in
@ -9,8 +9,6 @@ VPATH = @srcdir@

 include $(DEPTH)/config/autoconf.mk

-LIBXUL_LIBRARY = 1
-
 EXTRA_MDDEPEND_FILES = xpcAccEvents.pp

 include $(topsrcdir)/config/rules.mk
--- a/accessible/src/xpcom/moz.build
+++ b/accessible/src/xpcom/moz.build
@ -19,3 +19,5 @@ CPP_SOURCES += [

 LIBRARY_NAME = 'accessibility_xpcom_s'

+LIBXUL_LIBRARY = True
+
--- a/accessible/src/xul/Makefile.in
+++ b/accessible/src/xul/Makefile.in
@ -10,8 +10,6 @@ VPATH = @srcdir@

 include $(DEPTH)/config/autoconf.mk

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

 LOCAL_INCLUDES = \
--- a/accessible/src/xul/moz.build
+++ b/accessible/src/xul/moz.build
@ -23,3 +23,5 @@ CPP_SOURCES += [

 LIBRARY_NAME = 'accessibility_xul_s'

+LIBXUL_LIBRARY = True
+
--- a/caps/src/Makefile.in
+++ b/caps/src/Makefile.in
@ -11,9 +11,6 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk

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

 INCLUDES	+= -I$(srcdir)/../include \
--- a/caps/src/moz.build
+++ b/caps/src/moz.build
@ -18,3 +18,5 @@ CPP_SOURCES += [

 LIBRARY_NAME = 'caps_s'

+LIBXUL_LIBRARY = True
+
--- a/chrome/src/Makefile.in
+++ b/chrome/src/Makefile.in
@ -12,8 +12,6 @@ include $(DEPTH)/config/autoconf.mk

 LIBRARY_NAME    = chrome_s
 MSVC_ENABLE_PGO := 1
-LIBXUL_LIBRARY  = 1
-
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk

--- a/chrome/src/moz.build
+++ b/chrome/src/moz.build
@ -17,3 +17,5 @@ CPP_SOURCES += [
    'nsChromeRegistryContent.cpp',
 ]

+LIBXUL_LIBRARY = True
+
--- a/content/base/src/Makefile.in
+++ b/content/base/src/Makefile.in
@ -12,7 +12,6 @@ include $(DEPTH)/config/autoconf.mk

 LIBRARY_NAME	= gkconbase_s
 MSVC_ENABLE_PGO := 1
-LIBXUL_LIBRARY	= 1
 ifdef MOZ_WEBRTC
 LOCAL_INCLUDES += \
 		-I$(topsrcdir)/netwerk/sctp/datachannel \
--- a/content/base/src/moz.build
+++ b/content/base/src/moz.build
@ -172,3 +172,5 @@ EXTRA_JS_MODULES += [

 FAIL_ON_WARNINGS = True

+LIBXUL_LIBRARY = True
+
--- a/content/canvas/src/Makefile.in
+++ b/content/canvas/src/Makefile.in
@ -12,7 +12,6 @@ include $(DEPTH)/config/autoconf.mk

 LIBRARY_NAME	= gkconcvs_s
 MSVC_ENABLE_PGO := 1
-LIBXUL_LIBRARY  = 1
 ifdef MOZ_WEBGL
 LOCAL_INCLUDES += \
 	-I$(topsrcdir)/js/xpconnect/wrappers \
--- a/content/canvas/src/moz.build
+++ b/content/canvas/src/moz.build
@ -76,3 +76,5 @@ else:

 FAIL_ON_WARNINGS = True

+LIBXUL_LIBRARY = True
+
--- a/content/events/src/Makefile.in
+++ b/content/events/src/Makefile.in
@ -12,7 +12,6 @@ include $(DEPTH)/config/autoconf.mk

 LIBRARY_NAME	= gkconevents_s
 MSVC_ENABLE_PGO := 1
-LIBXUL_LIBRARY  = 1
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk

--- a/content/events/src/moz.build
+++ b/content/events/src/moz.build
@ -69,3 +69,5 @@ if CONFIG['MOZ_WEBSPEECH']:

 FAIL_ON_WARNINGS = True

+LIBXUL_LIBRARY = True
+
--- a/content/html/content/src/Makefile.in
+++ b/content/html/content/src/Makefile.in
@ -12,7 +12,6 @@ include $(DEPTH)/config/autoconf.mk

 LIBRARY_NAME	= gkconhtmlcon_s
 MSVC_ENABLE_PGO := 1
-LIBXUL_LIBRARY	= 1
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk

--- a/content/html/content/src/moz.build
+++ b/content/html/content/src/moz.build
@ -156,3 +156,5 @@ CPP_SOURCES += [

 FAIL_ON_WARNINGS = True

+LIBXUL_LIBRARY = True
+
--- a/content/html/document/src/Makefile.in
+++ b/content/html/document/src/Makefile.in
@ -11,7 +11,6 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk

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

 LOCAL_INCLUDES += \
--- a/content/html/document/src/moz.build
+++ b/content/html/document/src/moz.build
@ -27,3 +27,5 @@ LIBRARY_NAME = 'gkconhtmldoc_s'

 FAIL_ON_WARNINGS = True

+LIBXUL_LIBRARY = True
+
--- a/content/mathml/content/src/Makefile.in
+++ b/content/mathml/content/src/Makefile.in
@ -11,7 +11,6 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk

 LIBRARY_NAME	= gkcontentmathml_s
-LIBXUL_LIBRARY	= 1
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk

--- a/content/mathml/content/src/moz.build
+++ b/content/mathml/content/src/moz.build
@ -13,3 +13,5 @@ CPP_SOURCES += [

 FAIL_ON_WARNINGS = True

+LIBXUL_LIBRARY = True
+
--- a/content/media/Makefile.in
+++ b/content/media/Makefile.in
@ -11,7 +11,6 @@ include $(DEPTH)/config/autoconf.mk

 LIBRARY_NAME = gkconmedia_s
 MSVC_ENABLE_PGO := 1
-LIBXUL_LIBRARY = 1
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk

--- a/content/media/dash/Makefile.in
+++ b/content/media/dash/Makefile.in
@ -15,8 +15,6 @@ VPATH      := @srcdir@

 include $(DEPTH)/config/autoconf.mk

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

 LOCAL_INCLUDES := \
--- a/content/media/dash/moz.build
+++ b/content/media/dash/moz.build
@ -21,3 +21,5 @@ CPP_SOURCES += [

 LIBRARY_NAME = 'gkcondash_s'

+LIBXUL_LIBRARY = True
+
--- a/content/media/directshow/Makefile.in
+++ b/content/media/directshow/Makefile.in
@ -10,8 +10,6 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk

 LIBRARY_NAME	= gkcondirectshow_s
-LIBXUL_LIBRARY 	= 1
-
 LOCAL_INCLUDES += -I$(topsrcdir)/media/webrtc/trunk/webrtc/modules/video_capture/windows/

 ifeq ($(OS_ARCH),WINNT)
--- a/content/media/directshow/moz.build
+++ b/content/media/directshow/moz.build
@ -36,3 +36,5 @@ if not CONFIG['MOZ_WEBRTC_IN_LIBXUL']:

 FAIL_ON_WARNINGS = True

+LIBXUL_LIBRARY = True
+
--- a/content/media/encoder/Makefile.in
+++ b/content/media/encoder/Makefile.in
@ -1,13 +0,0 @@
-# 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/.
-
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-LIBXUL_LIBRARY = 1
-include $(topsrcdir)/config/rules.mk
--- a/content/media/encoder/moz.build
+++ b/content/media/encoder/moz.build
@ -25,3 +25,5 @@ LIBRARY_NAME = 'gkconencoder_s'

 FAIL_ON_WARNINGS = True

+LIBXUL_LIBRARY = True
+
--- a/content/media/gstreamer/Makefile.in
+++ b/content/media/gstreamer/Makefile.in
@ -8,8 +8,6 @@ srcdir		= @srcdir@
 VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk

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

 CFLAGS		+= $(GSTREAMER_CFLAGS)
--- a/content/media/gstreamer/moz.build
+++ b/content/media/gstreamer/moz.build
@ -25,3 +25,5 @@ LIBRARY_NAME = 'gkcongstreamer_s'

 FAIL_ON_WARNINGS = True

+LIBXUL_LIBRARY = True
+
--- a/content/media/mediasource/Makefile.in
+++ b/content/media/mediasource/Makefile.in
@ -9,6 +9,4 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk

 LIBRARY_NAME	= gkconmediasource_s
-LIBXUL_LIBRARY 	= 1
-
 include $(topsrcdir)/config/rules.mk
--- a/content/media/mediasource/moz.build
+++ b/content/media/mediasource/moz.build
@ -28,3 +28,5 @@ CPP_SOURCES += [

 FAIL_ON_WARNINGS = True

+LIBXUL_LIBRARY = True
+
--- a/content/media/moz.build
+++ b/content/media/moz.build
@ -132,8 +132,10 @@ CPP_SOURCES += [

 FAIL_ON_WARNINGS = True

-
 if CONFIG['CPU_ARCH'] == 'arm' and CONFIG['BUILD_ARM_NEON']:
    CPP_SOURCES += [
        'AudioNodeEngineNEON.cpp',
    ]
+
+LIBXUL_LIBRARY = True
+
--- a/content/media/ogg/Makefile.in
+++ b/content/media/ogg/Makefile.in
@ -1,13 +0,0 @@
-# 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/.
-
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-LIBXUL_LIBRARY 	= 1
-include $(topsrcdir)/config/rules.mk
--- a/content/media/ogg/moz.build
+++ b/content/media/ogg/moz.build
@ -24,3 +24,5 @@ LIBRARY_NAME = 'gkconogg_s'

 FAIL_ON_WARNINGS = True

+LIBXUL_LIBRARY = True
+
--- a/content/media/omx/Makefile.in
+++ b/content/media/omx/Makefile.in
@ -10,8 +10,6 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk

 LIBRARY_NAME	= gkconomx_s
-LIBXUL_LIBRARY 	= 1
-
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk

--- a/content/media/omx/moz.build
+++ b/content/media/omx/moz.build
@ -19,3 +19,5 @@ CPP_SOURCES += [
    'OMXCodecProxy.cpp',
 ]

+LIBXUL_LIBRARY = True
+
--- a/content/media/plugins/Makefile.in
+++ b/content/media/plugins/Makefile.in
@ -9,8 +9,6 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

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

 INCLUDES	+= \
--- a/content/media/plugins/moz.build
+++ b/content/media/plugins/moz.build
@ -21,3 +21,5 @@ CPP_SOURCES += [

 LIBRARY_NAME = 'gkconmediaplugins_s'

+LIBXUL_LIBRARY = True
+
--- a/content/media/raw/Makefile.in
+++ b/content/media/raw/Makefile.in
@ -10,7 +10,6 @@ VPATH = @srcdir@

 include $(DEPTH)/config/autoconf.mk

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

 INCLUDES	+= \
--- a/content/media/raw/moz.build
+++ b/content/media/raw/moz.build
@ -21,3 +21,5 @@ LIBRARY_NAME = 'gkconraw_s'

 FAIL_ON_WARNINGS = True

+LIBXUL_LIBRARY = True
+
--- a/content/media/wave/Makefile.in
+++ b/content/media/wave/Makefile.in
@ -1,14 +0,0 @@
-# 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/.
-
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-include $(DEPTH)/config/autoconf.mk
-
-LIBXUL_LIBRARY 	= 1
-
-
-include $(topsrcdir)/config/rules.mk
--- a/content/media/wave/moz.build
+++ b/content/media/wave/moz.build
@ -20,3 +20,5 @@ LIBRARY_NAME = 'gkconwave_s'

 FAIL_ON_WARNINGS = True

+LIBXUL_LIBRARY = True
+
--- a/content/media/webaudio/Makefile.in
+++ b/content/media/webaudio/Makefile.in
@ -10,6 +10,5 @@ VPATH            := @srcdir@
 include $(DEPTH)/config/autoconf.mk

 LIBRARY_NAME   := gkconwebaudio_s
-LIBXUL_LIBRARY := 1
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
--- a/content/media/webaudio/blink/Makefile.in
+++ b/content/media/webaudio/blink/Makefile.in
@ -10,8 +10,6 @@ VPATH            := @srcdir@
 include $(DEPTH)/config/autoconf.mk

 LIBRARY_NAME   := gkconwebaudio_blink_s
-LIBXUL_LIBRARY := 1
-
 LOCAL_INCLUDES += -I$(topsrcdir)/content/media/webaudio

 include $(topsrcdir)/config/rules.mk
--- a/content/media/webaudio/blink/moz.build
+++ b/content/media/webaudio/blink/moz.build
@ -25,3 +25,5 @@ CPP_SOURCES += [
    'ZeroPole.cpp',
 ]

+LIBXUL_LIBRARY = True
+
--- a/content/media/webaudio/moz.build
+++ b/content/media/webaudio/moz.build
@ -86,3 +86,5 @@ CPP_SOURCES += [

 FAIL_ON_WARNINGS = True

+LIBXUL_LIBRARY = True
+
--- a/content/media/webm/Makefile.in
+++ b/content/media/webm/Makefile.in
@ -8,9 +8,6 @@ srcdir		= @srcdir@
 VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk

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

 LOCAL_INCLUDES = \
--- a/content/media/webm/moz.build
+++ b/content/media/webm/moz.build
@ -21,3 +21,5 @@ LIBRARY_NAME = 'gkconwebm_s'

 FAIL_ON_WARNINGS = True

+LIBXUL_LIBRARY = True
+
--- a/content/media/webrtc/Makefile.in
+++ b/content/media/webrtc/Makefile.in
@ -10,8 +10,6 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk

 LIBRARY_NAME = gkconwebrtc_s
-LIBXUL_LIBRARY = 1
-
 ifeq ($(OS_ARCH),WINNT)
 OS_CXXFLAGS += -DNOMINMAX
 endif
--- a/content/media/webrtc/moz.build
+++ b/content/media/webrtc/moz.build
@ -23,3 +23,5 @@ CPP_SOURCES += [
    'MediaEngineDefault.cpp',
 ]

+LIBXUL_LIBRARY = True
+
--- a/content/media/webspeech/recognition/Makefile.in
+++ b/content/media/webspeech/recognition/Makefile.in
@ -15,8 +15,6 @@ VPATH += \
  $(NULL)

 LIBRARY_NAME   := gkconwebspeechrecognition_s
-LIBXUL_LIBRARY := 1
-
 LOCAL_INCLUDES += $(VPATH:%=-I%)

 include $(topsrcdir)/config/rules.mk
--- a/content/media/webspeech/recognition/moz.build
+++ b/content/media/webspeech/recognition/moz.build
@ -40,3 +40,5 @@ CPP_SOURCES += [
    'energy_endpointer_params.cc',
 ]

+LIBXUL_LIBRARY = True
+
--- a/content/media/webspeech/synth/Makefile.in
+++ b/content/media/webspeech/synth/Makefile.in
@ -15,8 +15,6 @@ VPATH += \

 LIBRARY_NAME   := gkconwebspeechsynth_s
 EXPORT_LIBRARY  = 1
-LIBXUL_LIBRARY  = 1
-
 LOCAL_INCLUDES += $(VPATH:%=-I%)

 include $(topsrcdir)/config/rules.mk
--- a/content/media/webspeech/synth/moz.build
+++ b/content/media/webspeech/synth/moz.build
@ -45,3 +45,5 @@ IPDL_SOURCES += [

 FAIL_ON_WARNINGS = True

+LIBXUL_LIBRARY = True
+
--- a/content/media/wmf/Makefile.in
+++ b/content/media/wmf/Makefile.in
@ -8,8 +8,6 @@ srcdir		= @srcdir@
 VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk

-LIBXUL_LIBRARY 	= 1
-
 ifeq ($(OS_ARCH),WINNT)
 OS_CXXFLAGS += -DNOMINMAX
 endif
--- a/content/media/wmf/moz.build
+++ b/content/media/wmf/moz.build
@ -25,3 +25,5 @@ LIBRARY_NAME = 'gkconwmf_s'

 FAIL_ON_WARNINGS = True

+LIBXUL_LIBRARY = True
+
--- a/content/smil/Makefile.in
+++ b/content/smil/Makefile.in
@ -11,7 +11,6 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk

 LIBRARY_NAME	= gkconsmil_s
-LIBXUL_LIBRARY	= 1
 LOCAL_INCLUDES += 	\
 		-I$(srcdir)/../base/src \
 		-I$(srcdir)/../../layout/style \
--- a/content/smil/moz.build
+++ b/content/smil/moz.build
@ -63,3 +63,5 @@ CPP_SOURCES += [

 FAIL_ON_WARNINGS = True

+LIBXUL_LIBRARY = True
+
--- a/content/svg/content/src/Makefile.in
+++ b/content/svg/content/src/Makefile.in
@ -11,7 +11,6 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk

 LIBRARY_NAME	= gkcontentsvg_s
-LIBXUL_LIBRARY	= 1
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk

--- a/content/svg/content/src/moz.build
+++ b/content/svg/content/src/moz.build
@ -246,3 +246,5 @@ CPP_SOURCES += [

 FAIL_ON_WARNINGS = True

+LIBXUL_LIBRARY = True
+
--- a/content/svg/document/src/Makefile.in
+++ b/content/svg/document/src/Makefile.in
@ -10,7 +10,6 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

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

 INCLUDES	+= \
--- a/content/svg/document/src/moz.build
+++ b/content/svg/document/src/moz.build
@ -18,3 +18,5 @@ LIBRARY_NAME = 'gkconsvgdoc_s'

 FAIL_ON_WARNINGS = True

+LIBXUL_LIBRARY = True
+
--- a/content/xbl/src/Makefile.in
+++ b/content/xbl/src/Makefile.in
@ -12,7 +12,6 @@ include $(DEPTH)/config/autoconf.mk

 LIBRARY_NAME	= gkconxbl_s
 MSVC_ENABLE_PGO := 1
-LIBXUL_LIBRARY	= 1
 include $(topsrcdir)/config/rules.mk

 LOCAL_INCLUDES	= \
--- a/content/xbl/src/moz.build
+++ b/content/xbl/src/moz.build
@ -38,3 +38,5 @@ CPP_SOURCES += [

 FAIL_ON_WARNINGS = True

+LIBXUL_LIBRARY = True
+
--- a/content/xml/content/src/Makefile.in
+++ b/content/xml/content/src/Makefile.in
@ -11,7 +11,6 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk

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

 INCLUDES	+= \
--- a/content/xml/content/src/moz.build
+++ b/content/xml/content/src/moz.build
@ -24,3 +24,5 @@ LIBRARY_NAME = 'gkconxmlcon_s'

 FAIL_ON_WARNINGS = True

+LIBXUL_LIBRARY = True
+
--- a/content/xml/document/src/Makefile.in
+++ b/content/xml/document/src/Makefile.in
@ -11,7 +11,6 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk

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

 LOCAL_INCLUDES	= \
--- a/content/xml/document/src/moz.build
+++ b/content/xml/document/src/moz.build
@ -21,3 +21,5 @@ LIBRARY_NAME = 'gkconxmldoc_s'

 FAIL_ON_WARNINGS = True

+LIBXUL_LIBRARY = True
+
--- a/content/xslt/src/base/Makefile.in
+++ b/content/xslt/src/base/Makefile.in
@ -9,7 +9,6 @@ VPATH           = @srcdir@

 include $(DEPTH)/config/autoconf.mk

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

 INCLUDES += \
--- a/content/xslt/src/base/moz.build
+++ b/content/xslt/src/base/moz.build
@ -18,3 +18,5 @@ LIBRARY_NAME = 'txbase_s'

 FAIL_ON_WARNINGS = True

+LIBXUL_LIBRARY = True
+
--- a/content/xslt/src/xml/Makefile.in
+++ b/content/xslt/src/xml/Makefile.in
@ -9,7 +9,6 @@ VPATH           = @srcdir@

 include $(DEPTH)/config/autoconf.mk

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

 INCLUDES += \
--- a/content/xslt/src/xml/moz.build
+++ b/content/xslt/src/xml/moz.build
@ -15,3 +15,5 @@ LIBRARY_NAME = 'txxml_s'

 FAIL_ON_WARNINGS = True

+LIBXUL_LIBRARY = True
+
--- a/content/xslt/src/xpath/Makefile.in
+++ b/content/xslt/src/xpath/Makefile.in
@ -9,7 +9,6 @@ VPATH           = @srcdir@

 include $(DEPTH)/config/autoconf.mk

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

 INCLUDES += \
--- a/content/xslt/src/xpath/moz.build
+++ b/content/xslt/src/xpath/moz.build
@ -51,3 +51,5 @@ LIBRARY_NAME = 'txxpath_s'

 FAIL_ON_WARNINGS = True

+LIBXUL_LIBRARY = True
+
--- a/content/xslt/src/xslt/Makefile.in
+++ b/content/xslt/src/xslt/Makefile.in
@ -9,8 +9,6 @@ VPATH           = @srcdir@

 include $(DEPTH)/config/autoconf.mk

-LIBXUL_LIBRARY = 1
-
 # For nsDependentJSString
 LOCAL_INCLUDES += \
  -I$(topsrcdir)/dom/base \
--- a/content/xslt/src/xslt/moz.build
+++ b/content/xslt/src/xslt/moz.build
@ -48,3 +48,5 @@ LIBRARY_NAME = 'txxslt_s'

 FAIL_ON_WARNINGS = True

+LIBXUL_LIBRARY = True
+
--- a/content/xul/document/src/Makefile.in
+++ b/content/xul/document/src/Makefile.in
@ -11,7 +11,6 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk

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

 LOCAL_INCLUDES	= -I$(srcdir)/../../../base/src \
--- a/content/xul/document/src/moz.build
+++ b/content/xul/document/src/moz.build
@ -23,3 +23,5 @@ LIBRARY_NAME = 'gkconxuldoc_s'

 FAIL_ON_WARNINGS = True

+LIBXUL_LIBRARY = True
+
--- a/content/xul/templates/src/Makefile.in
+++ b/content/xul/templates/src/Makefile.in
@ -11,8 +11,6 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk

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

 LOCAL_INCLUDES	= -I$(srcdir)/../../../base/src \
--- a/content/xul/templates/src/moz.build
+++ b/content/xul/templates/src/moz.build
@ -37,3 +37,5 @@ CPP_SOURCES += [

 LIBRARY_NAME = 'gkconxultmpl_s'

+LIBXUL_LIBRARY = True
+