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

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

accessible/src/atk/moz.build

@@ -35,3 +35,5 @@ CPP_SOURCES += [
 
 LIBRARY_NAME = 'accessibility_toolkit_s'
 
+LIBXUL_LIBRARY = True
+

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

accessible/src/base/moz.build

@@ -63,3 +63,5 @@ if a11y_log:
 
 LIBRARY_NAME = 'accessibility_base_s'
 
+LIBXUL_LIBRARY = True
+

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

accessible/src/generic/moz.build

@@ -29,3 +29,5 @@ CPP_SOURCES += [
 
 LIBRARY_NAME = 'accessibility_generic_s'
 
+LIBXUL_LIBRARY = True
+

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

accessible/src/html/moz.build

@@ -19,3 +19,5 @@ CPP_SOURCES += [
 
 LIBRARY_NAME = 'accessibility_html_s'
 
+LIBXUL_LIBRARY = True
+

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

accessible/src/mac/moz.build

@@ -29,3 +29,6 @@ CMMSRCS += [
     'mozHTMLAccessible.mm',
     'mozTextAccessible.mm',
 ]
+
+LIBXUL_LIBRARY = True
+

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

accessible/src/other/moz.build

@@ -18,3 +18,5 @@ CPP_SOURCES += [
 
 LIBRARY_NAME = 'accessibility_toolkit_s'
 
+LIBXUL_LIBRARY = True
+

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:

accessible/src/windows/ia2/moz.build

@@ -30,3 +30,5 @@ CPP_SOURCES += [
     'ia2AccessibleValue.cpp',
 ]
 
+LIBXUL_LIBRARY = True
+

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
 

accessible/src/windows/msaa/moz.build

@@ -41,3 +41,6 @@ if CONFIG['MOZ_XUL']:
         'XULMenuAccessibleWrap.cpp',
         'XULTreeGridAccessibleWrap.cpp',
     ]
+
+LIBXUL_LIBRARY = True
+

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

accessible/src/windows/sdn/moz.build

@@ -11,3 +11,5 @@ CPP_SOURCES += [
     'sdnTextAccessible.cpp',
 ]
 
+LIBXUL_LIBRARY = True
+

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

accessible/src/windows/uia/moz.build

@@ -10,3 +10,5 @@ CPP_SOURCES += [
     'uiaRawElmProvider.cpp',
 ]
 
+LIBXUL_LIBRARY = True
+

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

accessible/src/xpcom/moz.build

@@ -19,3 +19,5 @@ CPP_SOURCES += [
 
 LIBRARY_NAME = 'accessibility_xpcom_s'
 
+LIBXUL_LIBRARY = True
+

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

accessible/src/xul/moz.build

@@ -23,3 +23,5 @@ CPP_SOURCES += [
 
 LIBRARY_NAME = 'accessibility_xul_s'
 
+LIBXUL_LIBRARY = True
+

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 \

caps/src/moz.build

@@ -18,3 +18,5 @@ CPP_SOURCES += [
 
 LIBRARY_NAME = 'caps_s'
 
+LIBXUL_LIBRARY = True
+

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
 

chrome/src/moz.build

@@ -17,3 +17,5 @@ CPP_SOURCES += [
     'nsChromeRegistryContent.cpp',
 ]
 
+LIBXUL_LIBRARY = True
+

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 \

content/base/src/moz.build

@@ -172,3 +172,5 @@ EXTRA_JS_MODULES += [
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+

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 \

content/canvas/src/moz.build

@@ -76,3 +76,5 @@ else:
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+

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
 

content/events/src/moz.build

@@ -69,3 +69,5 @@ if CONFIG['MOZ_WEBSPEECH']:
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+

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
 

content/html/content/src/moz.build

@@ -156,3 +156,5 @@ CPP_SOURCES += [
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+

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

content/html/document/src/moz.build

@@ -27,3 +27,5 @@ LIBRARY_NAME = 'gkconhtmldoc_s'
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+

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
 

content/mathml/content/src/moz.build

@@ -13,3 +13,5 @@ CPP_SOURCES += [
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+

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
 

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

content/media/dash/moz.build

@@ -21,3 +21,5 @@ CPP_SOURCES += [
 
 LIBRARY_NAME = 'gkcondash_s'
 
+LIBXUL_LIBRARY = True
+

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)

content/media/directshow/moz.build

@@ -36,3 +36,5 @@ if not CONFIG['MOZ_WEBRTC_IN_LIBXUL']:
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+

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

content/media/encoder/moz.build

@@ -25,3 +25,5 @@ LIBRARY_NAME = 'gkconencoder_s'
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+

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)

content/media/gstreamer/moz.build

@@ -25,3 +25,5 @@ LIBRARY_NAME = 'gkcongstreamer_s'
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+

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

content/media/mediasource/moz.build

@@ -28,3 +28,5 @@ CPP_SOURCES += [
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+

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
+

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

content/media/ogg/moz.build

@@ -24,3 +24,5 @@ LIBRARY_NAME = 'gkconogg_s'
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+

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
 

content/media/omx/moz.build

@@ -19,3 +19,5 @@ CPP_SOURCES += [
     'OMXCodecProxy.cpp',
 ]
 
+LIBXUL_LIBRARY = True
+

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

content/media/plugins/moz.build

@@ -21,3 +21,5 @@ CPP_SOURCES += [
 
 LIBRARY_NAME = 'gkconmediaplugins_s'
 
+LIBXUL_LIBRARY = True
+

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

content/media/raw/moz.build

@@ -21,3 +21,5 @@ LIBRARY_NAME = 'gkconraw_s'
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+

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

content/media/wave/moz.build

@@ -20,3 +20,5 @@ LIBRARY_NAME = 'gkconwave_s'
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+

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

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

content/media/webaudio/blink/moz.build

@@ -25,3 +25,5 @@ CPP_SOURCES += [
     'ZeroPole.cpp',
 ]
 
+LIBXUL_LIBRARY = True
+

content/media/webaudio/moz.build

@@ -86,3 +86,5 @@ CPP_SOURCES += [
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+

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

content/media/webm/moz.build

@@ -21,3 +21,5 @@ LIBRARY_NAME = 'gkconwebm_s'
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+

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

content/media/webrtc/moz.build

@@ -23,3 +23,5 @@ CPP_SOURCES += [
     'MediaEngineDefault.cpp',
 ]
 
+LIBXUL_LIBRARY = True
+

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

content/media/webspeech/recognition/moz.build

@@ -40,3 +40,5 @@ CPP_SOURCES += [
     'energy_endpointer_params.cc',
 ]
 
+LIBXUL_LIBRARY = True
+

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

content/media/webspeech/synth/moz.build

@@ -45,3 +45,5 @@ IPDL_SOURCES += [
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+

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

content/media/wmf/moz.build

@@ -25,3 +25,5 @@ LIBRARY_NAME = 'gkconwmf_s'
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+

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 \

content/smil/moz.build

@@ -63,3 +63,5 @@ CPP_SOURCES += [
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+

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
 

content/svg/content/src/moz.build

@@ -246,3 +246,5 @@ CPP_SOURCES += [
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+

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

content/svg/document/src/moz.build

@@ -18,3 +18,5 @@ LIBRARY_NAME = 'gkconsvgdoc_s'
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+

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

content/xbl/src/moz.build

@@ -38,3 +38,5 @@ CPP_SOURCES += [
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+

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

content/xml/content/src/moz.build

@@ -24,3 +24,5 @@ LIBRARY_NAME = 'gkconxmlcon_s'
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+

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

content/xml/document/src/moz.build

@@ -21,3 +21,5 @@ LIBRARY_NAME = 'gkconxmldoc_s'
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+

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

content/xslt/src/base/moz.build

@@ -18,3 +18,5 @@ LIBRARY_NAME = 'txbase_s'
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+

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

content/xslt/src/xml/moz.build

@@ -15,3 +15,5 @@ LIBRARY_NAME = 'txxml_s'
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+

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

content/xslt/src/xpath/moz.build

@@ -51,3 +51,5 @@ LIBRARY_NAME = 'txxpath_s'
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+

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 \

content/xslt/src/xslt/moz.build

@@ -48,3 +48,5 @@ LIBRARY_NAME = 'txxslt_s'
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+

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 \

content/xul/document/src/moz.build

@@ -23,3 +23,5 @@ LIBRARY_NAME = 'gkconxuldoc_s'
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+

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 \

content/xul/templates/src/moz.build

@@ -37,3 +37,5 @@ CPP_SOURCES += [
 
 LIBRARY_NAME = 'gkconxultmpl_s'
 
+LIBXUL_LIBRARY = True
+