Bug 883284 - Part d: Move LIBXUL_LIBRARY into moz.build (f-j); r=bsmedberg
authorMs2ger <ms2ger@gmail.com>
Thu, 22 Aug 2013 08:56:00 +0200
changeset 157594 043b46d19b1c37a40a8ea651a856908487fb0f41
parent 157593 7ef14b724957931a61a5112d42f425139bc222c1
child 157595 3338bd68d9a49d1aee22f4703729bae7a151c228
push id407
push userlsblakk@mozilla.com
push dateTue, 03 Dec 2013 03:32:50 +0000
treeherdermozilla-release@babf8c9ebc52 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbsmedberg
bugs883284
milestone26.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 883284 - Part d: Move LIBXUL_LIBRARY into moz.build (f-j); r=bsmedberg
gfx/2d/Makefile.in
gfx/2d/moz.build
gfx/angle/Makefile.in
gfx/angle/moz.build
gfx/cairo/cairo/src/Makefile.in
gfx/cairo/cairo/src/moz.build
gfx/cairo/libpixman/src/Makefile.in
gfx/cairo/libpixman/src/moz.build
gfx/gl/Makefile.in
gfx/gl/moz.build
gfx/ipc/Makefile.in
gfx/ipc/moz.build
gfx/layers/Makefile.in
gfx/layers/moz.build
gfx/qcms/Makefile.in
gfx/qcms/moz.build
gfx/skia/Makefile.in
gfx/skia/moz.build
gfx/src/Makefile.in
gfx/src/moz.build
gfx/tests/gtest/Makefile.in
gfx/tests/gtest/moz.build
gfx/thebes/Makefile.in
gfx/thebes/moz.build
gfx/ycbcr/Makefile.in
gfx/ycbcr/moz.build
hal/Makefile.in
hal/moz.build
image/build/Makefile.in
image/build/moz.build
image/decoders/Makefile.in
image/decoders/icon/Makefile.in
image/decoders/icon/android/Makefile.in
image/decoders/icon/android/moz.build
image/decoders/icon/gtk/Makefile.in
image/decoders/icon/gtk/moz.build
image/decoders/icon/mac/Makefile.in
image/decoders/icon/mac/moz.build
image/decoders/icon/moz.build
image/decoders/icon/os2/Makefile.in
image/decoders/icon/os2/moz.build
image/decoders/icon/qt/Makefile.in
image/decoders/icon/qt/moz.build
image/decoders/icon/win/Makefile.in
image/decoders/icon/win/moz.build
image/decoders/moz.build
image/encoders/bmp/Makefile.in
image/encoders/bmp/moz.build
image/encoders/ico/Makefile.in
image/encoders/ico/moz.build
image/encoders/jpeg/Makefile.in
image/encoders/jpeg/moz.build
image/encoders/png/Makefile.in
image/encoders/png/moz.build
image/src/Makefile.in
image/src/moz.build
intl/build/Makefile.in
intl/build/moz.build
intl/chardet/src/Makefile.in
intl/chardet/src/moz.build
intl/hyphenation/src/Makefile.in
intl/hyphenation/src/moz.build
intl/locale/src/Makefile.in
intl/locale/src/mac/Makefile.in
intl/locale/src/mac/moz.build
intl/locale/src/moz.build
intl/locale/src/os2/Makefile.in
intl/locale/src/os2/moz.build
intl/locale/src/unix/Makefile.in
intl/locale/src/unix/moz.build
intl/locale/src/windows/Makefile.in
intl/locale/src/windows/moz.build
intl/lwbrk/src/Makefile.in
intl/lwbrk/src/moz.build
intl/strres/src/Makefile.in
intl/strres/src/moz.build
intl/uconv/src/Makefile.in
intl/uconv/src/moz.build
intl/uconv/ucvcn/Makefile.in
intl/uconv/ucvcn/moz.build
intl/uconv/ucvibm/Makefile.in
intl/uconv/ucvibm/moz.build
intl/uconv/ucvja/Makefile.in
intl/uconv/ucvja/moz.build
intl/uconv/ucvko/Makefile.in
intl/uconv/ucvko/moz.build
intl/uconv/ucvlatin/Makefile.in
intl/uconv/ucvlatin/moz.build
intl/uconv/ucvtw/Makefile.in
intl/uconv/ucvtw/moz.build
intl/uconv/ucvtw2/Makefile.in
intl/uconv/ucvtw2/moz.build
intl/uconv/util/Makefile.in
intl/uconv/util/moz.build
intl/unicharutil/src/Makefile.in
intl/unicharutil/src/moz.build
ipc/chromium/Makefile.in
ipc/chromium/moz.build
ipc/dbus/Makefile.in
ipc/dbus/moz.build
ipc/glue/Makefile.in
ipc/glue/moz.build
ipc/ipdl/Makefile.in
ipc/ipdl/moz.build
ipc/ipdl/test/cxx/Makefile.in
ipc/ipdl/test/cxx/moz.build
ipc/netd/Makefile.in
ipc/netd/moz.build
ipc/nfc/Makefile.in
ipc/nfc/moz.build
ipc/ril/Makefile.in
ipc/ril/moz.build
ipc/testshell/Makefile.in
ipc/testshell/moz.build
ipc/unixsocket/Makefile.in
ipc/unixsocket/moz.build
js/ductwork/debugger/Makefile.in
js/ductwork/debugger/moz.build
js/ipc/Makefile.in
js/ipc/moz.build
js/jsd/Makefile.in
js/jsd/moz.build
js/xpconnect/loader/Makefile.in
js/xpconnect/loader/moz.build
js/xpconnect/src/Makefile.in
js/xpconnect/src/moz.build
js/xpconnect/wrappers/Makefile.in
js/xpconnect/wrappers/moz.build
--- a/gfx/2d/Makefile.in
+++ b/gfx/2d/Makefile.in
@@ -7,17 +7,16 @@ DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		=  $(srcdir) $(srcdir)/unittest
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= gfx2d
 MSVC_ENABLE_PGO := 1
-LIBXUL_LIBRARY	= 1
 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
@@ -92,13 +92,15 @@ CPP_SOURCES += [
     'RecordedEvent.cpp',
     'Scale.cpp',
     'ScaledFontBase.cpp',
     'ScaledFontCairo.cpp',
     'SourceSurfaceCairo.cpp',
     'SourceSurfaceRawData.cpp',
 ]
 
-
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
     CMMSRCS += [
         'QuartzSupport.mm',
     ]
+
+LIBXUL_LIBRARY = True
+
--- a/gfx/angle/Makefile.in
+++ b/gfx/angle/Makefile.in
@@ -5,17 +5,16 @@
 DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MSVC_ENABLE_PGO := 1
-LIBXUL_LIBRARY = 1
 ifeq (WINNT,$(OS_TARGET))
 VISIBILITY_FLAGS =
 endif
 
 # The below is a rough translation of build_angle.gypi:
 DEFINES += -DANGLE_DISABLE_TRACE
 DEFINES += -DANGLE_COMPILE_OPTIMIZATION_LEVEL=D3DCOMPILE_OPTIMIZATION_LEVEL1
 
--- a/gfx/angle/moz.build
+++ b/gfx/angle/moz.build
@@ -105,8 +105,10 @@ CPP_SOURCES += [
     'ShaderLang.cpp',
     'TranslatorESSL.cpp',
     'TranslatorGLSL.cpp',
     'VersionGLSL.cpp',
 ]
 
 LIBRARY_NAME = 'angle'
 
+LIBXUL_LIBRARY = True
+
--- a/gfx/cairo/cairo/src/Makefile.in
+++ b/gfx/cairo/cairo/src/Makefile.in
@@ -5,18 +5,16 @@
 DEPTH           = @DEPTH@
 topsrcdir       = @top_srcdir@
 srcdir          = @srcdir@
 VPATH           = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MSVC_ENABLE_PGO := 1
-LIBXUL_LIBRARY = 1
-
 ifdef GNU_CC
 ifeq ($(OS_TARGET),Android)
 MODULE_OPTIMIZE_FLAGS = -O2
 endif
 endif
 
 
 CSRCS   = \
--- a/gfx/cairo/cairo/src/moz.build
+++ b/gfx/cairo/cairo/src/moz.build
@@ -75,8 +75,10 @@ if CONFIG['MOZ_X11']:
 
 if CONFIG['MOZ_ENABLE_CAIRO_FT']:
     EXPORTS.cairo += [
         'cairo-ft.h',
     ]
 
 LIBRARY_NAME = 'mozcairo'
 
+LIBXUL_LIBRARY = True
+
--- a/gfx/cairo/libpixman/src/Makefile.in
+++ b/gfx/cairo/libpixman/src/Makefile.in
@@ -6,18 +6,16 @@ DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= mozlibpixman
 MSVC_ENABLE_PGO := 1
-LIBXUL_LIBRARY = 1
-
 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
@@ -21,8 +21,11 @@ if CONFIG['OS_ARCH'] != 'Darwin' and CON
             'pixman-arm-neon-asm-bilinear.S',
             'pixman-arm-neon-asm.S',
         ]
     if CONFIG['HAVE_ARM_SIMD']:
         SSRCS += [
             'pixman-arm-simd-asm-scaled.S',
             'pixman-arm-simd-asm.S',
         ]
+
+LIBXUL_LIBRARY = True
+
--- a/gfx/gl/Makefile.in
+++ b/gfx/gl/Makefile.in
@@ -6,17 +6,16 @@ DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME     = gl
 MSVC_ENABLE_PGO := 1
-LIBXUL_LIBRARY   = 1
 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
@@ -111,8 +111,10 @@ CPP_SOURCES += [
     'SharedSurfaceEGL.cpp',
     'SharedSurfaceGL.cpp',
     'SurfaceFactory.cpp',
     'SurfaceStream.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+
--- a/gfx/ipc/Makefile.in
+++ b/gfx/ipc/Makefile.in
@@ -6,15 +6,14 @@
 DEPTH       = @DEPTH@
 topsrcdir   = @top_srcdir@
 srcdir      = @srcdir@
 VPATH       = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME       = gfxipc_s
-LIBXUL_LIBRARY     = 1
 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
@@ -23,8 +23,10 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'wind
         'SharedDIBWin.cpp',
         'SharedDIBSurface.cpp',
     ]
 
 CPP_SOURCES += [
     'SharedDIB.cpp',
 ]
 
+LIBXUL_LIBRARY = True
+
--- a/gfx/layers/Makefile.in
+++ b/gfx/layers/Makefile.in
@@ -17,18 +17,16 @@ VPATH       = \
   $(srcdir)/d3d11 \
   $(srcdir)/ipc \
   $(NULL)
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME   = layers
 MSVC_ENABLE_PGO := 1
-LIBXUL_LIBRARY = 1
-
 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
@@ -262,8 +262,11 @@ IPDL_SOURCES = [
     'ipc/LayersSurfaces.ipdlh',
     'ipc/PCompositable.ipdl',
     'ipc/PCompositor.ipdl',
     'ipc/PGrallocBuffer.ipdl',
     'ipc/PImageBridge.ipdl',
     'ipc/PLayer.ipdl',
     'ipc/PLayerTransaction.ipdl',
 ]
+
+LIBXUL_LIBRARY = True
+
--- a/gfx/qcms/Makefile.in
+++ b/gfx/qcms/Makefile.in
@@ -5,18 +5,16 @@
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MSVC_ENABLE_PGO := 1
-LIBXUL_LIBRARY = 1
-
 CSRCS = \
   chain.c \
   iccread.c \
   matrix.c \
   transform.c \
   transform_util.c \
   $(NULL)
 
--- a/gfx/qcms/moz.build
+++ b/gfx/qcms/moz.build
@@ -8,8 +8,10 @@ MODULE = 'qcms'
 
 EXPORTS += [
     'qcms.h',
     'qcmstypes.h',
 ]
 
 LIBRARY_NAME = 'mozqcms'
 
+LIBXUL_LIBRARY = True
+
--- a/gfx/skia/Makefile.in
+++ b/gfx/skia/Makefile.in
@@ -6,17 +6,16 @@
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MSVC_ENABLE_PGO := 1
-LIBXUL_LIBRARY  = 1
 EXPORT_LIBRARY  = 1
 
 DEFINES += -DSK_A32_SHIFT=24 -DSK_R32_SHIFT=16 -DSK_G32_SHIFT=8 -DSK_B32_SHIFT=0
 
 LOCAL_INCLUDES += \
 	-I$(srcdir)/include/core \
 	-I$(srcdir)/include/config \
 	-I$(srcdir)/include/gpu \
--- a/gfx/skia/moz.build
+++ b/gfx/skia/moz.build
@@ -544,8 +544,10 @@ CPP_SOURCES += [
 
 if not CONFIG['INTEL_ARCHITECTURE'] and CONFIG['CPU_ARCH'] == 'arm' and CONFIG['GNU_CC']:
     SSRCS += [
         'memset.arm.S',
     ]
 
 LIBRARY_NAME = 'skia'
 
+LIBXUL_LIBRARY = True
+
--- a/gfx/src/Makefile.in
+++ b/gfx/src/Makefile.in
@@ -7,17 +7,16 @@ DEPTH       = @DEPTH@
 topsrcdir   = @top_srcdir@
 srcdir      = @srcdir@
 VPATH       = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MSVC_ENABLE_PGO := 1
 EXPORT_LIBRARY = 1
-LIBXUL_LIBRARY = 1
 include $(topsrcdir)/config/rules.mk
 
 CXXFLAGS += $(MOZ_CAIRO_CFLAGS) $(MOZ_PIXMAN_CFLAGS) $(TK_CFLAGS)
 
 ifdef MOZ_WIDGET_GTK
 CXXFLAGS += $(MOZ_PANGO_CFLAGS)
 endif
 
--- a/gfx/src/moz.build
+++ b/gfx/src/moz.build
@@ -54,8 +54,10 @@ CPP_SOURCES += [
     'nsThebesGfxFactory.cpp',
     'nsTransform2D.cpp',
 ]
 
 LIBRARY_NAME = 'gkgfx'
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+
--- a/gfx/tests/gtest/Makefile.in
+++ b/gfx/tests/gtest/Makefile.in
@@ -9,17 +9,16 @@ srcdir         = @srcdir@
 VPATH          = @srcdir@ $(srcdir)/$(DEPTH)/gfx/2d/unittest
 relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 CXXFLAGS += $(MOZ_CAIRO_CFLAGS) $(MOZ_PIXMAN_CFLAGS) $(TK_CFLAGS) 
 
 # Create a GTest library
-LIBXUL_LIBRARY = 1
 EXPORT_LIBRARY = 1
 
 LOCAL_INCLUDES = \
   -I$(topsrcdir)/gfx/layers \
   -I$(topsrcdir)/gfx/2d \
   -I$(topsrcdir)/gfx/2d/unittest \
   $(NULL)
 
--- a/gfx/tests/gtest/moz.build
+++ b/gfx/tests/gtest/moz.build
@@ -27,8 +27,11 @@ GTEST_CPP_SOURCES += [
 if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'windows':
     GTEST_CPP_SOURCES += [
         'TestBase.cpp',
         'TestMoz2D.cpp',
         'TestRect.cpp',
         'TestPoint.cpp',
         'TestScaling.cpp',
     ]
+
+LIBXUL_LIBRARY = True
+
--- a/gfx/thebes/Makefile.in
+++ b/gfx/thebes/Makefile.in
@@ -6,17 +6,16 @@ DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= thebes
 MSVC_ENABLE_PGO := 1
-LIBXUL_LIBRARY	= 1
 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
@@ -258,15 +258,17 @@ CPP_SOURCES += [
     'gfxScriptItemizer.cpp',
     'gfxSkipChars.cpp',
     'gfxTeeSurface.cpp',
     'gfxUserFontSet.cpp',
     'gfxUtils.cpp',
     'nsSurfaceTexture.cpp',
 ]
 
-
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
     CMMSRCS += [
         'gfxMacPlatformFontList.mm',
     ]
 
 FAIL_ON_WARNINGS = not CONFIG['_MSC_VER']
+
+LIBXUL_LIBRARY = True
+
--- a/gfx/ycbcr/Makefile.in
+++ b/gfx/ycbcr/Makefile.in
@@ -1,16 +1,15 @@
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBXUL_LIBRARY = 1
 EXPORT_LIBRARY = 1
 
 include $(topsrcdir)/config/rules.mk
 
 # These files use MMX and SSE2 intrinsics, so they need special compile flags
 # on some compilers.
 ifneq (,$(INTEL_ARCHITECTURE))
 ifdef GNU_CC
--- a/gfx/ycbcr/moz.build
+++ b/gfx/ycbcr/moz.build
@@ -66,8 +66,10 @@ if CONFIG['CPU_ARCH'] == 'arm' and CONFI
         'yuv_row_arm.s',
     ]
     CPP_SOURCES += [
         'yuv_convert_arm.cpp',
     ]
 
 LIBRARY_NAME = 'ycbcr'
 
+LIBXUL_LIBRARY = True
+
--- a/hal/Makefile.in
+++ b/hal/Makefile.in
@@ -17,17 +17,16 @@ VPATH       = \
   $(srcdir)/cocoa \
   $(NULL)
 
 relativesrcdir   = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME   = hal_s
-LIBXUL_LIBRARY = 1
 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
@@ -147,8 +147,10 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'coco
     ]
 
 IPDL_SOURCES = [
     'sandbox/PHal.ipdl',
 ]
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+
--- a/image/build/Makefile.in
+++ b/image/build/Makefile.in
@@ -6,17 +6,16 @@
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 EXPORT_LIBRARY = 1
-LIBXUL_LIBRARY = 1
 LOCAL_INCLUDES	= \
 		-I. \
 		-I$(srcdir)/../src \
 		-I$(srcdir)/../encoders/ico \
 		-I$(srcdir)/../encoders/png \
 		-I$(srcdir)/../encoders/jpeg \
 		-I$(srcdir)/../encoders/bmp \
 		$(NULL)
--- a/image/build/moz.build
+++ b/image/build/moz.build
@@ -9,8 +9,10 @@ MODULE = 'imglib2'
 CPP_SOURCES += [
     'nsImageModule.cpp',
 ]
 
 LIBRARY_NAME = 'imglib2'
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+
--- a/image/decoders/Makefile.in
+++ b/image/decoders/Makefile.in
@@ -5,17 +5,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBXUL_LIBRARY  = 1
 CSRCS   = iccjpeg.c \
           $(NULL)
 
 # Decoders need RasterImage.h
 LOCAL_INCLUDES += -I$(topsrcdir)/image/src/
 
 # PNG read/write stuff
 DEFINES		+= -DMOZ_PNG_WRITE \
--- a/image/decoders/icon/Makefile.in
+++ b/image/decoders/icon/Makefile.in
@@ -5,17 +5,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBXUL_LIBRARY = 1
 EXPORT_LIBRARY = 1
 ifdef MOZ_WIDGET_GTK
 PLATFORM = gtk
 endif
 
 ifneq (,$(filter qt,$(MOZ_WIDGET_TOOLKIT)))
 PLATFORM = qt
 endif
--- a/image/decoders/icon/android/Makefile.in
+++ b/image/decoders/icon/android/Makefile.in
@@ -5,11 +5,10 @@
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= imgiconandroid_s
-LIBXUL_LIBRARY = 1
 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
@@ -7,8 +7,10 @@
 MODULE = 'imgicon'
 
 CPP_SOURCES += [
     'nsIconChannel.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+
--- a/image/decoders/icon/gtk/Makefile.in
+++ b/image/decoders/icon/gtk/Makefile.in
@@ -5,17 +5,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBXUL_LIBRARY  = 1
 ifdef MOZ_ENABLE_GNOMEUI
 LOCAL_INCLUDES += $(MOZ_GNOMEUI_CFLAGS)
 else
 LOCAL_INCLUDES += $(TK_CFLAGS)
 endif
 
 include $(topsrcdir)/config/rules.mk
 
--- a/image/decoders/icon/gtk/moz.build
+++ b/image/decoders/icon/gtk/moz.build
@@ -9,8 +9,10 @@ MODULE = 'imgicon'
 CPP_SOURCES += [
     'nsIconChannel.cpp',
 ]
 
 LIBRARY_NAME = 'imgicongtk_s'
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+
deleted file mode 100644
--- a/image/decoders/icon/mac/Makefile.in
+++ /dev/null
@@ -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/image/decoders/icon/mac/moz.build
+++ b/image/decoders/icon/mac/moz.build
@@ -9,8 +9,10 @@ MODULE = 'imgicon'
 LIBRARY_NAME = 'imgiconmac_s'
 
 CMMSRCS += [
     'nsIconChannelCocoa.mm',
 ]
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+
--- a/image/decoders/icon/moz.build
+++ b/image/decoders/icon/moz.build
@@ -15,8 +15,10 @@ CPP_SOURCES += [
     'nsIconProtocolHandler.cpp',
     'nsIconURI.cpp',
 ]
 
 LIBRARY_NAME = 'imgicon'
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+
deleted file mode 100644
--- a/image/decoders/icon/os2/Makefile.in
+++ /dev/null
@@ -1,16 +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/image/decoders/icon/os2/moz.build
+++ b/image/decoders/icon/os2/moz.build
@@ -7,8 +7,10 @@
 MODULE = 'imgicon'
 
 CPP_SOURCES += [
     'nsIconChannel.cpp',
 ]
 
 LIBRARY_NAME = 'imgiconos2_s'
 
+LIBXUL_LIBRARY = True
+
--- a/image/decoders/icon/qt/Makefile.in
+++ b/image/decoders/icon/qt/Makefile.in
@@ -4,15 +4,12 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBXUL_LIBRARY	= 1
-
-
 LOCAL_INCLUDES += $(MOZ_QT_CFLAGS)
 
 include $(topsrcdir)/config/rules.mk
 
--- a/image/decoders/icon/qt/moz.build
+++ b/image/decoders/icon/qt/moz.build
@@ -17,8 +17,10 @@ EXTRA_COMPONENTS += [
 ]
 
 EXTRA_PP_COMPONENTS += [
     'gtkqticonsconverter.js',
 ]
 
 LIBRARY_NAME = 'imgiconqt_s'
 
+LIBXUL_LIBRARY = True
+
deleted file mode 100644
--- a/image/decoders/icon/win/Makefile.in
+++ /dev/null
@@ -1,15 +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/image/decoders/icon/win/moz.build
+++ b/image/decoders/icon/win/moz.build
@@ -9,8 +9,10 @@ MODULE = 'imgicon'
 CPP_SOURCES += [
     'nsIconChannel.cpp',
 ]
 
 LIBRARY_NAME = 'imgiconwin_s'
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+
--- a/image/decoders/moz.build
+++ b/image/decoders/moz.build
@@ -33,8 +33,10 @@ CPP_SOURCES += [
     'nsJPEGDecoder.cpp',
     'nsPNGDecoder.cpp',
 ]
 
 LIBRARY_NAME = 'imgdecoders_s'
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+
--- a/image/encoders/bmp/Makefile.in
+++ b/image/encoders/bmp/Makefile.in
@@ -4,14 +4,13 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBXUL_LIBRARY = 1
 LOCAL_INCLUDES += -I$(topsrcdir)/image/src/
 
 include $(topsrcdir)/config/rules.mk
 
 
--- a/image/encoders/bmp/moz.build
+++ b/image/encoders/bmp/moz.build
@@ -9,8 +9,10 @@ MODULE = 'imgbmpe'
 CPP_SOURCES += [
     'nsBMPEncoder.cpp',
 ]
 
 LIBRARY_NAME = 'imgbmpe_s'
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+
--- a/image/encoders/ico/Makefile.in
+++ b/image/encoders/ico/Makefile.in
@@ -4,18 +4,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBXUL_LIBRARY = 1
-
 # Decoders need RasterImage.h
 LOCAL_INCLUDES += -I$(topsrcdir)/image/src/
 LOCAL_INCLUDES += -I$(topsrcdir)/image/encoders/bmp/
 LOCAL_INCLUDES += -I$(topsrcdir)/image/encoders/png/
 
 include $(topsrcdir)/config/rules.mk
 
 
--- a/image/encoders/ico/moz.build
+++ b/image/encoders/ico/moz.build
@@ -9,8 +9,10 @@ MODULE = 'imgicoe'
 CPP_SOURCES += [
     'nsICOEncoder.cpp',
 ]
 
 LIBRARY_NAME = 'imgicoe_s'
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+
deleted file mode 100644
--- a/image/encoders/jpeg/Makefile.in
+++ /dev/null
@@ -1,15 +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/image/encoders/jpeg/moz.build
+++ b/image/encoders/jpeg/moz.build
@@ -9,8 +9,10 @@ MODULE = 'imgjpege'
 CPP_SOURCES += [
     'nsJPEGEncoder.cpp',
 ]
 
 LIBRARY_NAME = 'imgjpege_s'
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+
--- a/image/encoders/png/Makefile.in
+++ b/image/encoders/png/Makefile.in
@@ -4,17 +4,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBXUL_LIBRARY = 1
 DEFINES		+= -DMOZ_PNG_WRITE \
 	-DMOZ_PNG_READ \
 	$(NULL)
 
 LOCAL_INCLUDES += -I$(topsrcdir)/image/src/
 
 include $(topsrcdir)/config/rules.mk
 
--- a/image/encoders/png/moz.build
+++ b/image/encoders/png/moz.build
@@ -9,8 +9,10 @@ MODULE = 'imgpnge'
 CPP_SOURCES += [
     'nsPNGEncoder.cpp',
 ]
 
 LIBRARY_NAME = 'imgpnge_s'
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+
--- a/image/src/Makefile.in
+++ b/image/src/Makefile.in
@@ -6,17 +6,16 @@
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= imglib2_s
-LIBXUL_LIBRARY  = 1
 
 # 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
@@ -35,8 +35,10 @@ CPP_SOURCES += [
     'imgRequest.cpp',
     'imgRequestProxy.cpp',
     'imgStatusTracker.cpp',
     'imgTools.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+
--- a/intl/build/Makefile.in
+++ b/intl/build/Makefile.in
@@ -5,17 +5,16 @@
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 EXPORT_LIBRARY = 1
-LIBXUL_LIBRARY = 1
 
 # see also intl/locale/src/Makefile.in
 ifneq (,$(filter os2 windows, $(MOZ_WIDGET_TOOLKIT)))
 LOCALE_DIR		= $(MOZ_WIDGET_TOOLKIT)
 else
 ifeq ($(OS_ARCH), Darwin)
 LOCALE_DIR		= mac
 else
--- a/intl/build/moz.build
+++ b/intl/build/moz.build
@@ -7,8 +7,10 @@
 MODULE = 'i18n'
 
 CPP_SOURCES += [
     'nsI18nModule.cpp',
 ]
 
 LIBRARY_NAME = 'i18n'
 
+LIBXUL_LIBRARY = True
+
--- a/intl/chardet/src/Makefile.in
+++ b/intl/chardet/src/Makefile.in
@@ -6,12 +6,9 @@
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 EXPORT_LIBRARY = 1
-LIBXUL_LIBRARY  = 1
-
-
 include $(topsrcdir)/config/rules.mk
--- a/intl/chardet/src/moz.build
+++ b/intl/chardet/src/moz.build
@@ -8,8 +8,10 @@ MODULE = 'chardet'
 
 CPP_SOURCES += [
     'nsChardetModule.cpp',
     'nsCyrillicDetector.cpp',
 ]
 
 LIBRARY_NAME = 'chardet'
 
+LIBXUL_LIBRARY = True
+
--- a/intl/hyphenation/src/Makefile.in
+++ b/intl/hyphenation/src/Makefile.in
@@ -5,14 +5,12 @@
 DEPTH           = @DEPTH@
 topsrcdir       = @top_srcdir@
 srcdir          = @srcdir@
 VPATH           = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MSVC_ENABLE_PGO := 1
-LIBXUL_LIBRARY   = 1
-
 CSRCS            = hyphen.c \
                    $(NULL)
 
 include $(topsrcdir)/config/rules.mk
--- a/intl/hyphenation/src/moz.build
+++ b/intl/hyphenation/src/moz.build
@@ -9,8 +9,10 @@ MODULE = 'hyphenation'
 CPP_SOURCES += [
     'hnjstdio.cpp',
     'nsHyphenationManager.cpp',
     'nsHyphenator.cpp',
 ]
 
 LIBRARY_NAME = 'hyphenation_s'
 
+LIBXUL_LIBRARY = True
+
--- a/intl/locale/src/Makefile.in
+++ b/intl/locale/src/Makefile.in
@@ -6,18 +6,16 @@
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MSVC_ENABLE_PGO := 1
-LIBXUL_LIBRARY  = 1
-
 ifeq ($(MOZ_WIDGET_TOOLKIT), qt)
 OS_INCLUDES	+= $(MOZ_QT_CFLAGS)
 endif
 
 EXPORT_RESOURCE = \
 		$(srcdir)/langGroups.properties \
 		$(srcdir)/language.properties \
 		$(NULL)
--- a/intl/locale/src/mac/Makefile.in
+++ b/intl/locale/src/mac/Makefile.in
@@ -4,14 +4,11 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBXUL_LIBRARY  = 1
-
-
 include $(topsrcdir)/config/rules.mk
 
 INCLUDES	+= -I$(srcdir)/..
--- a/intl/locale/src/mac/moz.build
+++ b/intl/locale/src/mac/moz.build
@@ -9,8 +9,10 @@ MODULE = 'locale'
 CPP_SOURCES += [
     'nsCollationMacUC.cpp',
     'nsDateTimeFormatMac.cpp',
     'nsMacCharset.cpp',
 ]
 
 LIBRARY_NAME = 'platlocale_s'
 
+LIBXUL_LIBRARY = True
+
--- a/intl/locale/src/moz.build
+++ b/intl/locale/src/moz.build
@@ -29,8 +29,11 @@ CPP_SOURCES += [
     'nsUConvPropertySearch.cpp',
 ]
 
 LIBRARY_NAME = 'nslocale_s'
 
 EXTRA_JS_MODULES += [
     'PluralForm.jsm',
 ]
+
+LIBXUL_LIBRARY = True
+
--- a/intl/locale/src/os2/Makefile.in
+++ b/intl/locale/src/os2/Makefile.in
@@ -6,19 +6,16 @@
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 EXPORT_LIBRARY = 1
-LIBXUL_LIBRARY  = 1
-
-
 include $(topsrcdir)/config/rules.mk
 
 INCLUDES	+= -I$(srcdir)/..
 
 nsOS2Charset.$(OBJ_SUFFIX): os2charset.properties.h
 
 os2charset.properties.h: $(srcdir)/../props2arrays.py os2charset.properties
 	$(PYTHON) $^ $@
--- a/intl/locale/src/os2/moz.build
+++ b/intl/locale/src/os2/moz.build
@@ -10,8 +10,10 @@ CPP_SOURCES += [
     'nsCollationOS2.cpp',
     'nsDateTimeFormatOS2.cpp',
     'nsOS2Charset.cpp',
     'nsOS2Locale.cpp',
 ]
 
 LIBRARY_NAME = 'platlocale_s'
 
+LIBXUL_LIBRARY = True
+
--- a/intl/locale/src/unix/Makefile.in
+++ b/intl/locale/src/unix/Makefile.in
@@ -5,18 +5,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBXUL_LIBRARY  = 1
-
 include $(topsrcdir)/config/rules.mk
 
 INCLUDES	+= -I$(srcdir)/..
 
 # CODESET is not automatically defined on some older versions of Redhat.
 # Define _XOPEN_SOURCE so CODESET will get defined and thus allow
 # nl_langinfo(CODESET) to compile on these systems.
 ifeq ($(OS_ARCH), Linux)
--- a/intl/locale/src/unix/moz.build
+++ b/intl/locale/src/unix/moz.build
@@ -18,8 +18,10 @@ if CONFIG['OS_TARGET'] == 'Android':
     ]
 else:
     CPP_SOURCES += [
         'nsUNIXCharset.cpp',
     ]
 
 LIBRARY_NAME = 'platlocale_s'
 
+LIBXUL_LIBRARY = True
+
--- a/intl/locale/src/windows/Makefile.in
+++ b/intl/locale/src/windows/Makefile.in
@@ -5,19 +5,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBXUL_LIBRARY  = 1
-
-
 include $(topsrcdir)/config/rules.mk
 
 INCLUDES	+= -I$(srcdir)/..
 
 nsWinCharset.$(OBJ_SUFFIX): wincharset.properties.h
 
 wincharset.properties.h: $(srcdir)/../props2arrays.py wincharset.properties
 	$(PYTHON) $^ $@
--- a/intl/locale/src/windows/moz.build
+++ b/intl/locale/src/windows/moz.build
@@ -10,8 +10,10 @@ CPP_SOURCES += [
     'nsCollationWin.cpp',
     'nsDateTimeFormatWin.cpp',
     'nsWin32Locale.cpp',
     'nsWinCharset.cpp',
 ]
 
 LIBRARY_NAME = 'platlocale_s'
 
+LIBXUL_LIBRARY = True
+
--- a/intl/lwbrk/src/Makefile.in
+++ b/intl/lwbrk/src/Makefile.in
@@ -6,19 +6,16 @@
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MSVC_ENABLE_PGO := 1
-LIBXUL_LIBRARY  = 1
-
-
 ifeq  ($(MOZ_WIDGET_TOOLKIT),gtk2)
 else
 ifeq  ($(MOZ_WIDGET_TOOLKIT),gtk3)
 else
 ifeq  ($(MOZ_WIDGET_TOOLKIT),windows)
 else
 ifeq ($(MOZ_WIDGET_TOOLKIT), cocoa)
 else
--- a/intl/lwbrk/src/moz.build
+++ b/intl/lwbrk/src/moz.build
@@ -26,8 +26,10 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'co
     ]
 else:
     CPP_SOURCES += [
         'nsRuleBreaker.cpp',
     ]
 
 LIBRARY_NAME = 'lwbrk_s'
 
+LIBXUL_LIBRARY = True
+
--- a/intl/strres/src/Makefile.in
+++ b/intl/strres/src/Makefile.in
@@ -6,12 +6,9 @@
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MSVC_ENABLE_PGO := 1
-LIBXUL_LIBRARY  = 1
-
-
 include $(topsrcdir)/config/rules.mk
--- a/intl/strres/src/moz.build
+++ b/intl/strres/src/moz.build
@@ -8,8 +8,10 @@ MODULE = 'intl'
 
 CPP_SOURCES += [
     'nsStringBundle.cpp',
     'nsStringBundleTextOverride.cpp',
 ]
 
 LIBRARY_NAME = 'strres_s'
 
+LIBXUL_LIBRARY = True
+
--- a/intl/uconv/src/Makefile.in
+++ b/intl/uconv/src/Makefile.in
@@ -7,18 +7,16 @@ DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MSVC_ENABLE_PGO := 1
 EXPORT_LIBRARY  = 1
-LIBXUL_LIBRARY = 1
-
 LOCAL_INCLUDES	= -I$(srcdir)/../util \
 		  -I$(srcdir)/../ucvlatin \
 		  -I$(srcdir)/../ucvibm \
 		  -I$(srcdir)/../ucvja \
 		  -I$(srcdir)/../ucvtw2 \
 		  -I$(srcdir)/../ucvtw \
 		  -I$(srcdir)/../ucvko \
 		  -I$(srcdir)/../ucvcn \
--- a/intl/uconv/src/moz.build
+++ b/intl/uconv/src/moz.build
@@ -26,8 +26,10 @@ CPP_SOURCES += [
 
 if CONFIG['INTEL_ARCHITECTURE']:
     CPP_SOURCES += [
         'nsUTF8ToUnicodeSSE2.cpp',
     ]
 
 LIBRARY_NAME = 'uconv'
 
+LIBXUL_LIBRARY = True
+
--- a/intl/uconv/ucvcn/Makefile.in
+++ b/intl/uconv/ucvcn/Makefile.in
@@ -5,14 +5,11 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBXUL_LIBRARY = 1
-
-
 LOCAL_INCLUDES = -I$(srcdir)/../util
 
 include $(topsrcdir)/config/rules.mk
--- a/intl/uconv/ucvcn/moz.build
+++ b/intl/uconv/ucvcn/moz.build
@@ -18,8 +18,10 @@ CPP_SOURCES += [
     'nsUnicodeToGB2312V2.cpp',
     'nsUnicodeToGBK.cpp',
     'nsUnicodeToHZ.cpp',
     'nsUnicodeToISO2022CN.cpp',
 ]
 
 LIBRARY_NAME = 'ucvcn_s'
 
+LIBXUL_LIBRARY = True
+
--- a/intl/uconv/ucvibm/Makefile.in
+++ b/intl/uconv/ucvibm/Makefile.in
@@ -5,13 +5,11 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBXUL_LIBRARY = 1
-
 LOCAL_INCLUDES = -I$(srcdir)/../util
 
 include $(topsrcdir)/config/rules.mk
--- a/intl/uconv/ucvibm/moz.build
+++ b/intl/uconv/ucvibm/moz.build
@@ -32,8 +32,10 @@ if CONFIG['OS_ARCH'] == 'OS2':
         'nsCP1125ToUnicode.cpp',
         'nsUnicodeToCP1125.cpp',
         'nsCP1131ToUnicode.cpp',
         'nsUnicodeToCP1131.cpp',
     ]
 
 LIBRARY_NAME = 'ucvibm_s'
 
+LIBXUL_LIBRARY = True
+
--- a/intl/uconv/ucvja/Makefile.in
+++ b/intl/uconv/ucvja/Makefile.in
@@ -5,15 +5,12 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBXUL_LIBRARY = 1
-
-
 LOCAL_INCLUDES	= -I$(srcdir)/../util
 
 include $(topsrcdir)/config/rules.mk
 
--- a/intl/uconv/ucvja/moz.build
+++ b/intl/uconv/ucvja/moz.build
@@ -16,8 +16,10 @@ CPP_SOURCES += [
     'nsUnicodeToEUCJP.cpp',
     'nsUnicodeToISO2022JP.cpp',
     'nsUnicodeToJISx0201.cpp',
     'nsUnicodeToSJIS.cpp',
 ]
 
 LIBRARY_NAME = 'ucvja_s'
 
+LIBXUL_LIBRARY = True
+
--- a/intl/uconv/ucvko/Makefile.in
+++ b/intl/uconv/ucvko/Makefile.in
@@ -5,15 +5,12 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBXUL_LIBRARY = 1
-
-
 LOCAL_INCLUDES = -I$(srcdir)/../util
 
 include $(topsrcdir)/config/rules.mk
 
--- a/intl/uconv/ucvko/moz.build
+++ b/intl/uconv/ucvko/moz.build
@@ -15,8 +15,10 @@ CPP_SOURCES += [
     'nsISO2022KRToUnicode.cpp',
     'nsJohabToUnicode.cpp',
     'nsUnicodeToCP949.cpp',
     'nsUnicodeToJohab.cpp',
 ]
 
 LIBRARY_NAME = 'ucvko_s'
 
+LIBXUL_LIBRARY = True
+
--- a/intl/uconv/ucvlatin/Makefile.in
+++ b/intl/uconv/ucvlatin/Makefile.in
@@ -5,14 +5,11 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBXUL_LIBRARY = 1
-
-
 LOCAL_INCLUDES = -I$(srcdir)/../util -I$(srcdir)/../src
 
 include $(topsrcdir)/config/rules.mk
--- a/intl/uconv/ucvlatin/moz.build
+++ b/intl/uconv/ucvlatin/moz.build
@@ -124,8 +124,10 @@ CPP_SOURCES += [
     'nsUnicodeToZapfDingbat.cpp',
     'nsUserDefinedToUnicode.cpp',
     'nsVISCIIToUnicode.cpp',
     'nsVPSToUnicode.cpp',
 ]
 
 LIBRARY_NAME = 'ucvlatin_s'
 
+LIBXUL_LIBRARY = True
+
--- a/intl/uconv/ucvtw/Makefile.in
+++ b/intl/uconv/ucvtw/Makefile.in
@@ -5,14 +5,11 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBXUL_LIBRARY = 1
-
-
 LOCAL_INCLUDES = -I$(srcdir)/../util
 
 include $(topsrcdir)/config/rules.mk
--- a/intl/uconv/ucvtw/moz.build
+++ b/intl/uconv/ucvtw/moz.build
@@ -15,8 +15,10 @@ CPP_SOURCES += [
     'nsBIG5ToUnicode.cpp',
     'nsUnicodeToBIG5.cpp',
     'nsUnicodeToBIG5HKSCS.cpp',
     'nsUnicodeToHKSCS.cpp',
 ]
 
 LIBRARY_NAME = 'ucvtw_s'
 
+LIBXUL_LIBRARY = True
+
--- a/intl/uconv/ucvtw2/Makefile.in
+++ b/intl/uconv/ucvtw2/Makefile.in
@@ -5,15 +5,12 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBXUL_LIBRARY = 1
-
-
 LOCAL_INCLUDES	= -I$(srcdir)/../util
 
 include $(topsrcdir)/config/rules.mk
 
--- a/intl/uconv/ucvtw2/moz.build
+++ b/intl/uconv/ucvtw2/moz.build
@@ -12,8 +12,10 @@ EXPORTS += [
 
 CPP_SOURCES += [
     'nsEUCTWToUnicode.cpp',
     'nsUnicodeToEUCTW.cpp',
 ]
 
 LIBRARY_NAME = 'ucvtw2_s'
 
+LIBXUL_LIBRARY = True
+
--- a/intl/uconv/util/Makefile.in
+++ b/intl/uconv/util/Makefile.in
@@ -7,18 +7,16 @@ DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MSVC_ENABLE_PGO := 1
 EXPORT_LIBRARY = 1
-LIBXUL_LIBRARY = 1
-
 CSRCS		= \
 		ugen.c \
 		uscan.c \
 		umap.c \
 		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
--- a/intl/uconv/util/moz.build
+++ b/intl/uconv/util/moz.build
@@ -10,8 +10,10 @@ CPP_SOURCES += [
     'nsUCConstructors.cpp',
     'nsUCSupport.cpp',
     'nsUnicodeDecodeHelper.cpp',
     'nsUnicodeEncodeHelper.cpp',
 ]
 
 LIBRARY_NAME = 'ucvutil_s'
 
+LIBXUL_LIBRARY = True
+
deleted file mode 100644
--- a/intl/unicharutil/src/Makefile.in
+++ /dev/null
@@ -1,15 +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/intl/unicharutil/src/moz.build
+++ b/intl/unicharutil/src/moz.build
@@ -11,8 +11,10 @@ CPP_SOURCES += [
     'nsCategoryImp.cpp',
     'nsEntityConverter.cpp',
     'nsSaveAsCharset.cpp',
     'nsUnicodeNormalizer.cpp',
 ]
 
 LIBRARY_NAME = 'ucharucomp_s'
 
+LIBXUL_LIBRARY = True
+
--- a/ipc/chromium/Makefile.in
+++ b/ipc/chromium/Makefile.in
@@ -7,17 +7,16 @@ topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 OS_CXXFLAGS := $(filter-out -fshort-wchar,$(OS_CXXFLAGS))
 
 LIBRARY_NAME = chromium_s
-LIBXUL_LIBRARY = 1
 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
@@ -226,8 +226,11 @@ if CONFIG['_MSC_VER']:
         'debug_on_start.cc',
     ]
 
 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
+
--- a/ipc/dbus/Makefile.in
+++ b/ipc/dbus/Makefile.in
@@ -5,17 +5,16 @@
 DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME = mozdbus_s
-LIBXUL_LIBRARY = 1
 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
@@ -13,8 +13,10 @@ EXPORTS.mozilla.ipc += [
 ]
 
 CPP_SOURCES += [
     'DBusThread.cpp',
     'DBusUtils.cpp',
     'RawDBusConnection.cpp',
 ]
 
+LIBXUL_LIBRARY = True
+
--- a/ipc/glue/Makefile.in
+++ b/ipc/glue/Makefile.in
@@ -7,16 +7,15 @@ topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/crashreporter
 
 LIBRARY_NAME = mozipc_s
-LIBXUL_LIBRARY = 1
 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
@@ -95,8 +95,11 @@ CPP_SOURCES += [
     'SyncChannel.cpp',
     'URIUtils.cpp',
 ]
 
 IPDL_SOURCES = [
     'InputStreamParams.ipdlh',
     'URIParams.ipdlh',
 ]
+
+LIBXUL_LIBRARY = True
+
--- a/ipc/ipdl/Makefile.in
+++ b/ipc/ipdl/Makefile.in
@@ -8,17 +8,16 @@ 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
-LIBXUL_LIBRARY = 1
 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
@@ -3,8 +3,11 @@
 # 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/.
 
 if CONFIG['MOZ_IPDL_TESTS']:
     DIRS += ['test']
 
 MODULE = 'ipdlgen'
+
+LIBXUL_LIBRARY = True
+
--- a/ipc/ipdl/test/cxx/Makefile.in
+++ b/ipc/ipdl/test/cxx/Makefile.in
@@ -5,17 +5,16 @@
 DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME = $(MODULE)_s
-LIBXUL_LIBRARY = 1
 EXPORT_LIBRARY = 1
 
 IPDLTESTS = \
   TestActorPunning \
   TestBridgeMain \
   TestCrashCleanup \
   TestDataStructures \
   TestDesc \
--- a/ipc/ipdl/test/cxx/moz.build
+++ b/ipc/ipdl/test/cxx/moz.build
@@ -74,8 +74,11 @@ IPDL_SOURCES += [
     'PTestShutdownSubsub.ipdl',
     'PTestStackHooks.ipdl',
     'PTestSyncError.ipdl',
     'PTestSyncHang.ipdl',
     'PTestSyncWakeup.ipdl',
     'PTestSysVShmem.ipdl',
     'PTestUrgency.ipdl',
 ]
+
+LIBXUL_LIBRARY = True
+
--- a/ipc/netd/Makefile.in
+++ b/ipc/netd/Makefile.in
@@ -5,13 +5,12 @@
 DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME = moznetd_s
-LIBXUL_LIBRARY = 1
 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
@@ -9,8 +9,10 @@ MODULE = 'ipc'
 EXPORTS.mozilla.ipc += [
     'Netd.h',
 ]
 
 CPP_SOURCES += [
     'Netd.cpp',
 ]
 
+LIBXUL_LIBRARY = True
+
--- a/ipc/nfc/Makefile.in
+++ b/ipc/nfc/Makefile.in
@@ -5,13 +5,12 @@
 DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME = moznfc_s
-LIBXUL_LIBRARY = 1
 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
@@ -6,8 +6,11 @@
 if CONFIG['MOZ_B2G_NFC']:
     MODULE = 'ipc'
     EXPORTS.mozilla.ipc += [
         'Nfc.h',
     ]
     CPP_SOURCES += [
         'Nfc.cpp',
     ]
+
+LIBXUL_LIBRARY = True
+
--- a/ipc/ril/Makefile.in
+++ b/ipc/ril/Makefile.in
@@ -5,13 +5,12 @@
 DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME = mozril_s
-LIBXUL_LIBRARY = 1
 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
@@ -9,8 +9,10 @@ MODULE = 'ipc'
 EXPORTS.mozilla.ipc += [
     'Ril.h',
 ]
 
 CPP_SOURCES += [
     'Ril.cpp',
 ]
 
+LIBXUL_LIBRARY = True
+
--- a/ipc/testshell/Makefile.in
+++ b/ipc/testshell/Makefile.in
@@ -5,17 +5,16 @@
 DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
 relativesrcdir = @relativesrcdir@
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME = ipcshell_s
-LIBXUL_LIBRARY = 1
 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
@@ -24,8 +24,10 @@ CPP_SOURCES += [
 
 IPDL_SOURCES = [
     'PTestShell.ipdl',
     'PTestShellCommand.ipdl',
 ]
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+
--- a/ipc/unixsocket/Makefile.in
+++ b/ipc/unixsocket/Makefile.in
@@ -5,12 +5,11 @@
 DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME = mozipcunixsocket_s
-LIBXUL_LIBRARY = 1
 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
@@ -11,8 +11,10 @@ EXPORTS.mozilla.ipc += [
 ]
 
 CPP_SOURCES += [
     'UnixSocket.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+
--- a/js/ductwork/debugger/Makefile.in
+++ b/js/ductwork/debugger/Makefile.in
@@ -5,17 +5,16 @@
 DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
 relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBXUL_LIBRARY = 1
 EXPORT_LIBRARY = 1
 
 EXTRA_DSO_LDOPTS += \
   $(MOZ_COMPONENT_LIBS) \
   $(MOZ_JS_LIBS) \
   $(NULL)
 
 include $(topsrcdir)/config/rules.mk
--- a/js/ductwork/debugger/moz.build
+++ b/js/ductwork/debugger/moz.build
@@ -16,8 +16,11 @@ CPP_SOURCES += [
     'JSDebugger.cpp',
 ]
 
 LIBRARY_NAME = 'jsdebugger'
 
 EXTRA_JS_MODULES += [
     'jsdebugger.jsm',
 ]
+
+LIBXUL_LIBRARY = True
+
--- a/js/ipc/Makefile.in
+++ b/js/ipc/Makefile.in
@@ -5,17 +5,16 @@
 DEPTH     = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME = jsipc_s
-LIBXUL_LIBRARY = 1
 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
@@ -14,8 +14,10 @@ CPP_SOURCES += [
 
 IPDL_SOURCES += [
     'JavaScriptTypes.ipdlh',
     'PJavaScript.ipdl',
 ]
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+
--- a/js/jsd/Makefile.in
+++ b/js/jsd/Makefile.in
@@ -9,18 +9,16 @@
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 VPATH		= @srcdir@
 srcdir		= @srcdir@
 relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-LIBXUL_LIBRARY = 1
-
 EXPORT_LIBRARY = 1
 
 # REQUIRES	= java js
 
 ifdef JS_THREADSAFE
 DEFINES         += -DJS_THREADSAFE
 endif
 
--- a/js/jsd/moz.build
+++ b/js/jsd/moz.build
@@ -28,8 +28,10 @@ CPP_SOURCES += [
     'jsd_val.cpp',
     'jsd_xpc.cpp',
     'jsdebug.cpp',
     'jshash.cpp',
 ]
 
 LIBRARY_NAME = 'jsd'
 
+LIBXUL_LIBRARY = True
+
--- a/js/xpconnect/loader/Makefile.in
+++ b/js/xpconnect/loader/Makefile.in
@@ -5,17 +5,16 @@
 DEPTH 		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MSVC_ENABLE_PGO := 1
-LIBXUL_LIBRARY = 1
 LOCAL_INCLUDES += \
   -I$(srcdir)/../src \
   -I$(srcdir)/../wrappers \
   -I$(topsrcdir)/content/base/src \
   $(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
--- a/js/xpconnect/loader/moz.build
+++ b/js/xpconnect/loader/moz.build
@@ -16,8 +16,10 @@ LIBRARY_NAME = 'jsloader_s'
 
 EXTRA_JS_MODULES += [
     'ISO8601DateUtils.jsm',
     'XPCOMUtils.jsm',
 ]
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+
--- a/js/xpconnect/src/Makefile.in
+++ b/js/xpconnect/src/Makefile.in
@@ -7,17 +7,16 @@ DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME    = xpconnect_s
 MSVC_ENABLE_PGO := 1
-LIBXUL_LIBRARY = 1
 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
@@ -50,8 +50,10 @@ CPP_SOURCES += [
     'dom_quickstubs.cpp',
     'nsCxPusher.cpp',
     'nsScriptError.cpp',
     'nsXPConnect.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
+LIBXUL_LIBRARY = True
+
--- a/js/xpconnect/wrappers/Makefile.in
+++ b/js/xpconnect/wrappers/Makefile.in
@@ -5,15 +5,13 @@
 DEPTH 		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MSVC_ENABLE_PGO := 1
-LIBXUL_LIBRARY = 1
-
 LOCAL_INCLUDES = \
                 -I$(srcdir)/../src \
                 -I$(srcdir)/../../../dom/base \
 
 include $(topsrcdir)/config/rules.mk
--- a/js/xpconnect/wrappers/moz.build
+++ b/js/xpconnect/wrappers/moz.build
@@ -18,8 +18,11 @@ CPP_SOURCES += [
     'WrapperFactory.cpp',
     'XrayWrapper.cpp',
 ]
 
 LIBRARY_NAME = 'xpcwrappers_s'
 
 # warning C4661 for FilteringWrapper
 FAIL_ON_WARNINGS = not CONFIG['_MSC_VER']
+
+LIBXUL_LIBRARY = True
+