mozilla-central: changeset 131750:0db9c45c8bde2a553cf4f8bcb62707ad359838c0

--- a/accessible/build/Makefile.in
+++ b/accessible/build/Makefile.in
@@ -11,16 +11,18 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= accessibility
 EXPORT_LIBRARY = 1
 IS_COMPONENT	= 1
 MODULE_NAME	= nsAccessibilityModule
 LIBXUL_LIBRARY	= 1
 
+CPPSRCS		= nsAccessibilityFactory.cpp
+
 LOCAL_INCLUDES	= -I$(srcdir)/../src
 
 SHARED_LIBRARY_LIBS = \
   ../src/base/$(LIB_PREFIX)accessibility_base_s.$(LIB_SUFFIX) \
   ../src/generic/$(LIB_PREFIX)accessibility_generic_s.$(LIB_SUFFIX) \
   ../src/html/$(LIB_PREFIX)accessibility_html_s.$(LIB_SUFFIX) \
   ../src/xpcom/$(LIB_PREFIX)accessibility_xpcom_s.$(LIB_SUFFIX) \
   $(NULL)

--- a/accessible/build/moz.build
+++ b/accessible/build/moz.build
@@ -1,12 +1,8 @@
 # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # 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 = 'accessibility'
 
-CPP_SOURCES += [
-    'nsAccessibilityFactory.cpp',
-]
-

--- a/accessible/src/atk/Makefile.in
+++ b/accessible/src/atk/Makefile.in
@@ -8,16 +8,39 @@ srcdir = @srcdir@
 VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME = accessibility_toolkit_s
 EXPORT_LIBRARY = ..
 LIBXUL_LIBRARY = 1
 
+
+CPPSRCS = \
+  AccessibleWrap.cpp \
+  ApplicationAccessibleWrap.cpp \
+  AtkSocketAccessible.cpp \
+  DocAccessibleWrap.cpp \
+  nsMaiInterfaceComponent.cpp \
+  nsMaiInterfaceAction.cpp \
+  nsMaiInterfaceText.cpp \
+  nsMaiInterfaceEditableText.cpp \
+  nsMaiInterfaceSelection.cpp \
+  nsMaiInterfaceValue.cpp \
+  nsMaiHyperlink.cpp \
+  nsMaiInterfaceHypertext.cpp \
+  nsMaiInterfaceHyperlinkImpl.cpp \
+  nsMaiInterfaceTable.cpp \
+  nsMaiInterfaceDocument.cpp \
+  nsMaiInterfaceImage.cpp \
+  Platform.cpp \
+  RootAccessibleWrap.cpp \
+  UtilInterface.cpp \
+  $(NULL)
+
 # we want to force the creation of a static lib.
 FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
 
 CFLAGS  	+= $(MOZ_GTK2_CFLAGS)
 CXXFLAGS  += $(MOZ_GTK2_CFLAGS)

--- a/accessible/src/atk/moz.build
+++ b/accessible/src/atk/moz.build
@@ -6,30 +6,8 @@
 
 MODULE = 'accessibility'
 
 EXPORTS.mozilla.a11y += [
     'AccessibleWrap.h',
     'HyperTextAccessibleWrap.h',
 ]
 
-CPP_SOURCES += [
-    'AccessibleWrap.cpp',
-    'ApplicationAccessibleWrap.cpp',
-    'AtkSocketAccessible.cpp',
-    'DocAccessibleWrap.cpp',
-    'Platform.cpp',
-    'RootAccessibleWrap.cpp',
-    'UtilInterface.cpp',
-    'nsMaiHyperlink.cpp',
-    'nsMaiInterfaceAction.cpp',
-    'nsMaiInterfaceComponent.cpp',
-    'nsMaiInterfaceDocument.cpp',
-    'nsMaiInterfaceEditableText.cpp',
-    'nsMaiInterfaceHyperlinkImpl.cpp',
-    'nsMaiInterfaceHypertext.cpp',
-    'nsMaiInterfaceImage.cpp',
-    'nsMaiInterfaceSelection.cpp',
-    'nsMaiInterfaceTable.cpp',
-    'nsMaiInterfaceText.cpp',
-    'nsMaiInterfaceValue.cpp',
-]
-

--- a/accessible/src/base/Makefile.in
+++ b/accessible/src/base/Makefile.in
@@ -7,16 +7,50 @@ topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME = accessibility_base_s
 LIBXUL_LIBRARY = 1
 
+
+CPPSRCS = \
+  AccCollector.cpp \
+  AccEvent.cpp \
+  AccGroupInfo.cpp \
+  AccIterator.cpp \
+  Filters.cpp \
+  ARIAMap.cpp \
+  ARIAStateMap.cpp \
+  DocManager.cpp \
+  EventQueue.cpp \
+  FocusManager.cpp \
+  NotificationController.cpp \
+  nsAccessNode.cpp \
+  nsCoreUtils.cpp \
+  nsAccUtils.cpp \
+  nsAccessibilityService.cpp \
+  nsAccessiblePivot.cpp \
+  nsEventShell.cpp \
+  nsTextEquivUtils.cpp \
+  RoleAsserts.cpp \
+  SelectionManager.cpp \
+  StyleInfo.cpp \
+  TextAttrs.cpp \
+  TextUpdater.cpp \
+  TreeWalker.cpp \
+  $(NULL)
+
+ifneq ($(A11Y_LOG),0)
+CPPSRCS += \
+  Logging.cpp \
+  $(NULL)
+endif
+
 # we don't want the shared lib, but we want to force the creation of a static lib.
 FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES += \
   -I$(srcdir) \
   -I$(srcdir)/../generic \

--- a/accessible/src/base/moz.build
+++ b/accessible/src/base/moz.build
@@ -1,16 +1,14 @@
 # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # 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/.
 
-include('../shared.mozbuild')
-
 MODULE = 'accessibility'
 
 EXPORTS += [
     'AccEvent.h',
     'nsAccessNode.h',
     'nsAccessibilityService.h',
 ]
 
@@ -23,40 +21,8 @@ EXPORTS.mozilla.a11y += [
     'SelectionManager.h',
     'States.h',
 ]
 
 if CONFIG['MOZ_DEBUG']:
     EXPORTS.mozilla.a11y += [
         'Logging.h',
     ]
-
-CPP_SOURCES += [
-    'AccCollector.cpp',
-    'AccEvent.cpp',
-    'AccGroupInfo.cpp',
-    'AccIterator.cpp',
-    'ARIAMap.cpp',
-    'ARIAStateMap.cpp',
-    'DocManager.cpp',
-    'EventQueue.cpp',
-    'Filters.cpp',
-    'FocusManager.cpp',
-    'NotificationController.cpp',
-    'nsAccessibilityService.cpp',
-    'nsAccessiblePivot.cpp',
-    'nsAccessNode.cpp',
-    'nsAccUtils.cpp',
-    'nsCoreUtils.cpp',
-    'nsEventShell.cpp',
-    'nsTextEquivUtils.cpp',
-    'RoleAsserts.cpp',
-    'SelectionManager.cpp',
-    'StyleInfo.cpp',
-    'TextAttrs.cpp',
-    'TextUpdater.cpp',
-    'TreeWalker.cpp',
-]
-
-if a11y_log:
-    CPP_SOURCES += [
-        'Logging.cpp',
-    ]

--- a/accessible/src/generic/Makefile.in
+++ b/accessible/src/generic/Makefile.in
@@ -7,16 +7,32 @@ topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME = accessibility_generic_s
 LIBXUL_LIBRARY = 1
 
+
+CPPSRCS = \
+  Accessible.cpp \
+  ApplicationAccessible.cpp \
+  ARIAGridAccessible.cpp \
+  BaseAccessibles.cpp \
+  DocAccessible.cpp \
+  FormControlAccessible.cpp \
+  HyperTextAccessible.cpp \
+  ImageAccessible.cpp \
+  OuterDocAccessible.cpp \
+  RootAccessible.cpp \
+  TableCellAccessible.cpp \
+  TextLeafAccessible.cpp \
+  $(NULL)
+
 # we don't want the shared lib, but we want to force the creation of a static lib.
 FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES = \
   -I$(srcdir)/../xpcom \
   -I$(srcdir)/../base \

--- a/accessible/src/generic/moz.build
+++ b/accessible/src/generic/moz.build
@@ -7,23 +7,8 @@
 MODULE = 'accessibility'
 
 EXPORTS.mozilla.a11y += [
     'Accessible.h',
     'DocAccessible.h',
     'HyperTextAccessible.h',
 ]
 
-CPP_SOURCES += [
-    'ARIAGridAccessible.cpp',
-    'Accessible.cpp',
-    'ApplicationAccessible.cpp',
-    'BaseAccessibles.cpp',
-    'DocAccessible.cpp',
-    'FormControlAccessible.cpp',
-    'HyperTextAccessible.cpp',
-    'ImageAccessible.cpp',
-    'OuterDocAccessible.cpp',
-    'RootAccessible.cpp',
-    'TableCellAccessible.cpp',
-    'TextLeafAccessible.cpp',
-]
-

--- a/accessible/src/html/Makefile.in
+++ b/accessible/src/html/Makefile.in
@@ -8,16 +8,29 @@ topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME = accessibility_html_s
 LIBXUL_LIBRARY = 1
 
+
+
+CPPSRCS = \
+  HTMLCanvasAccessible.cpp \
+  HTMLElementAccessibles.cpp \
+  HTMLFormControlAccessible.cpp \
+  HTMLImageMapAccessible.cpp \
+  HTMLLinkAccessible.cpp \
+  HTMLListAccessible.cpp \
+  HTMLSelectAccessible.cpp \
+  HTMLTableAccessible.cpp \
+  $(NULL)
+
 # we don't want the shared lib, but we want to force the creation of a static lib.
 FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES = \
   -I$(srcdir)/../base \
   -I$(srcdir)/../generic \

--- a/accessible/src/html/moz.build
+++ b/accessible/src/html/moz.build
@@ -1,19 +1,8 @@
 # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # 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 = 'accessibility'
 
-CPP_SOURCES += [
-    'HTMLCanvasAccessible.cpp',
-    'HTMLElementAccessibles.cpp',
-    'HTMLFormControlAccessible.cpp',
-    'HTMLImageMapAccessible.cpp',
-    'HTMLLinkAccessible.cpp',
-    'HTMLListAccessible.cpp',
-    'HTMLSelectAccessible.cpp',
-    'HTMLTableAccessible.cpp',
-]
-

--- a/accessible/src/other/Makefile.in
+++ b/accessible/src/other/Makefile.in
@@ -8,16 +8,22 @@ srcdir = @srcdir@
 VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME = accessibility_toolkit_s
 EXPORT_LIBRARY = ..
 LIBXUL_LIBRARY = 1
 
+
+CPPSRCS = \
+  AccessibleWrap.cpp \
+  Platform.cpp \
+  $(NULL)
+
 # we don't want the shared lib, but we want to force the creation of a static lib.
 FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES += \
   -I$(srcdir) \
   -I$(srcdir)/../base \

--- a/accessible/src/other/moz.build
+++ b/accessible/src/other/moz.build
@@ -6,13 +6,8 @@
 
 MODULE = 'accessibility'
 
 EXPORTS.mozilla.a11y += [
     'AccessibleWrap.h',
     'HyperTextAccessibleWrap.h',
 ]
 
-CPP_SOURCES += [
-    'AccessibleWrap.cpp',
-    'Platform.cpp',
-]
-

deleted file mode 100644
--- a/accessible/src/shared.mozbuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# 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/.
-
-a11y_log = 0
-if CONFIG['MOZ_DEBUG']:
-    a11y_log = 1
-
-if CONFIG['MOZ_UPDATE_CHANNEL'] not in ('aurora', 'beta', 'release', 'esr'):
-    a11y_log = 1

--- a/accessible/src/windows/ia2/Makefile.in
+++ b/accessible/src/windows/ia2/Makefile.in
@@ -8,16 +8,31 @@ srcdir = @srcdir@
 VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME = accessibility_toolkit_ia2_s
 EXPORT_LIBRARY = 1
 LIBXUL_LIBRARY = 1
 
+
+CPPSRCS += \
+  ia2AccessibleAction.cpp \
+  ia2AccessibleComponent.cpp \
+  ia2AccessibleEditableText.cpp \
+  ia2AccessibleHyperlink.cpp \
+  ia2AccessibleHypertext.cpp \
+  ia2AccessibleImage.cpp \
+  ia2AccessibleRelation.cpp \
+  ia2AccessibleTable.cpp \
+  ia2AccessibleTableCell.cpp \
+  ia2AccessibleText.cpp \
+  ia2AccessibleValue.cpp \
+  $(NULL)
+
 # 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
 
 # we don't want the shared lib, but we want to force the creation of a static lib.
 FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/config.mk

--- a/accessible/src/windows/ia2/moz.build
+++ b/accessible/src/windows/ia2/moz.build
@@ -11,22 +11,8 @@ EXPORTS += [
     'ia2AccessibleComponent.h',
     'ia2AccessibleEditableText.h',
     'ia2AccessibleHyperlink.h',
     'ia2AccessibleHypertext.h',
     'ia2AccessibleText.h',
     'ia2AccessibleValue.h',
 ]
 
-CPP_SOURCES += [
-    'ia2AccessibleAction.cpp',
-    'ia2AccessibleComponent.cpp',
-    'ia2AccessibleEditableText.cpp',
-    'ia2AccessibleHyperlink.cpp',
-    'ia2AccessibleHypertext.cpp',
-    'ia2AccessibleImage.cpp',
-    'ia2AccessibleRelation.cpp',
-    'ia2AccessibleTable.cpp',
-    'ia2AccessibleTableCell.cpp',
-    'ia2AccessibleText.cpp',
-    'ia2AccessibleValue.cpp',
-]
-

--- a/accessible/src/windows/msaa/Makefile.in
+++ b/accessible/src/windows/msaa/Makefile.in
@@ -8,16 +8,44 @@ srcdir = @srcdir@
 VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME = accessibility_toolkit_msaa_s
 EXPORT_LIBRARY = 1
 LIBXUL_LIBRARY = 1
 
+
+CPPSRCS = \
+  AccessibleWrap.cpp \
+  ApplicationAccessibleWrap.cpp \
+  ARIAGridAccessibleWrap.cpp \
+  DocAccessibleWrap.cpp \
+  HTMLTableAccessibleWrap.cpp \
+  HTMLWin32ObjectAccessible.cpp \
+  HyperTextAccessibleWrap.cpp \
+  ImageAccessibleWrap.cpp \
+  IUnknownImpl.cpp \
+  nsWinUtils.cpp \
+  Compatibility.cpp \
+  EnumVariant.cpp \
+  Platform.cpp \
+  ServiceProvider.cpp \
+  RootAccessibleWrap.cpp \
+  TextLeafAccessibleWrap.cpp \
+  $(NULL)
+
+ifdef MOZ_XUL
+CPPSRCS += \
+  XULListboxAccessibleWrap.cpp \
+  XULMenuAccessibleWrap.cpp \
+  XULTreeGridAccessibleWrap.cpp \
+  $(NULL)
+endif
+
 # we don't want the shared lib, but we want to force the creation of a static lib.
 FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES += \

--- a/accessible/src/windows/msaa/moz.build
+++ b/accessible/src/windows/msaa/moz.build
@@ -11,33 +11,8 @@ EXPORTS += [
 ]
 
 EXPORTS.mozilla.a11y += [
     'AccessibleWrap.h',
     'Compatibility.h',
     'HyperTextAccessibleWrap.h',
 ]
 
-CPP_SOURCES += [
-    'AccessibleWrap.cpp',
-    'ApplicationAccessibleWrap.cpp',
-    'ARIAGridAccessibleWrap.cpp',
-    'DocAccessibleWrap.cpp',
-    'HTMLTableAccessibleWrap.cpp',
-    'HTMLWin32ObjectAccessible.cpp',
-    'HyperTextAccessibleWrap.cpp',
-    'ImageAccessibleWrap.cpp',
-    'IUnknownImpl.cpp',
-    'nsWinUtils.cpp',
-    'Compatibility.cpp',
-    'EnumVariant.cpp',
-    'Platform.cpp',
-    'ServiceProvider.cpp',
-    'RootAccessibleWrap.cpp',
-    'TextLeafAccessibleWrap.cpp',
-]
-
-if CONFIG['MOZ_XUL']:
-    CPP_SOURCES += [
-        'XULListboxAccessibleWrap.cpp',
-        'XULMenuAccessibleWrap.cpp',
-        'XULTreeGridAccessibleWrap.cpp',
-    ]

--- a/accessible/src/windows/sdn/Makefile.in
+++ b/accessible/src/windows/sdn/Makefile.in
@@ -11,16 +11,21 @@ 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
 
+CPPSRCS += \
+  sdnAccessible.cpp \
+  sdnTextAccessible.cpp \
+  $(NULL)
+
 # we don't want the shared lib, but we want to force the creation of a static lib.
 FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES += \
   -I$(srcdir) \

--- a/accessible/src/windows/sdn/moz.build
+++ b/accessible/src/windows/sdn/moz.build
@@ -1,13 +1,8 @@
 # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # 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 = 'accessibility'
 
-CPP_SOURCES += [
-    'sdnAccessible.cpp',
-    'sdnTextAccessible.cpp',
-]
-

--- a/accessible/src/windows/uia/Makefile.in
+++ b/accessible/src/windows/uia/Makefile.in
@@ -11,16 +11,21 @@ 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
 
+
+CPPSRCS += \
+  uiaRawElmProvider.cpp \
+  $(NULL)
+
 # we don't want the shared lib, but we want to force the creation of a static lib.
 FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES += \
   -I$(srcdir) \

--- a/accessible/src/windows/uia/moz.build
+++ b/accessible/src/windows/uia/moz.build
@@ -1,12 +1,8 @@
 # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # 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 = 'accessibility'
 
-CPP_SOURCES += [
-    'uiaRawElmProvider.cpp',
-]
-

--- a/accessible/src/xpcom/Makefile.in
+++ b/accessible/src/xpcom/Makefile.in
@@ -8,16 +8,23 @@ topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME = accessibility_xpcom_s
 LIBXUL_LIBRARY = 1
 
+CPPSRCS = \
+  xpcAccEvents.cpp \
+  nsAccessibleRelation.cpp \
+  xpcAccessibleTable.cpp \
+  xpcAccessibleTableCell.cpp \
+  $(NULL)
+
 # we don't want the shared lib, but we want to force the creation of a static lib.
 FORCE_STATIC_LIB = 1
 
 EXTRA_MDDEPEND_FILES = xpcAccEvents.pp
 
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES = \

--- a/accessible/src/xpcom/moz.build
+++ b/accessible/src/xpcom/moz.build
@@ -5,15 +5,8 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULE = 'accessibility'
 
 EXPORTS += [
     'xpcAccEvents.h',
 ]
 
-CPP_SOURCES += [
-    'nsAccessibleRelation.cpp',
-    'xpcAccEvents.cpp',
-    'xpcAccessibleTable.cpp',
-    'xpcAccessibleTableCell.cpp',
-]
-

--- a/accessible/src/xul/Makefile.in
+++ b/accessible/src/xul/Makefile.in
@@ -8,16 +8,33 @@ topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME = accessibility_xul_s
 LIBXUL_LIBRARY = 1
 
+
+
+CPPSRCS = \
+  XULAlertAccessible.cpp \
+  XULColorPickerAccessible.cpp \
+  XULComboboxAccessible.cpp \
+  XULElementAccessibles.cpp \
+  XULFormControlAccessible.cpp \
+  XULListboxAccessible.cpp \
+  XULMenuAccessible.cpp \
+  XULSelectControlAccessible.cpp \
+  XULSliderAccessible.cpp \
+  XULTabAccessible.cpp \
+  XULTreeAccessible.cpp \
+  XULTreeGridAccessible.cpp \
+  $(NULL)
+
 # we don't want the shared lib, but we want to force the creation of a static lib.
 FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES = \
   -I$(srcdir) \
   -I$(srcdir)/../base \

--- a/accessible/src/xul/moz.build
+++ b/accessible/src/xul/moz.build
@@ -1,23 +1,8 @@
 # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # 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 = 'accessibility'
 
-CPP_SOURCES += [
-    'XULAlertAccessible.cpp',
-    'XULColorPickerAccessible.cpp',
-    'XULComboboxAccessible.cpp',
-    'XULElementAccessibles.cpp',
-    'XULFormControlAccessible.cpp',
-    'XULListboxAccessible.cpp',
-    'XULMenuAccessible.cpp',
-    'XULSelectControlAccessible.cpp',
-    'XULSliderAccessible.cpp',
-    'XULTabAccessible.cpp',
-    'XULTreeAccessible.cpp',
-    'XULTreeGridAccessible.cpp',
-]
-

--- a/b2g/app/Makefile.in
+++ b/b2g/app/Makefile.in
@@ -14,17 +14,20 @@ include $(topsrcdir)/config/makefiles/rc
 PREF_JS_EXPORTS = $(srcdir)/b2g.js
 
 ifdef ENABLE_MARIONETTE
 DEFINES += -DENABLE_MARIONETTE=1
 endif
 
 ifndef LIBXUL_SDK
 
+CPPSRCS = nsBrowserApp.cpp
+
 ifeq (gonk,$(MOZ_WIDGET_TOOLKIT))
+CPPSRCS += BootAnimation.cpp
 LIBS += \
   -lui \
   -lhardware_legacy \
   -lhardware \
   -lcutils \
   $(DEPTH)/media/libpng/$(LIB_PREFIX)mozpng.$(LIB_SUFFIX) \
   $(MOZ_ZLIB_LIBS) \
   $(NULL)

--- a/b2g/app/moz.build
+++ b/b2g/app/moz.build
@@ -4,15 +4,8 @@
 # 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 not CONFIG['LIBXUL_SDK']:
     if CONFIG['GAIADIR']:
         PROGRAM = CONFIG['MOZ_APP_NAME'] + "-bin"
     else:
         PROGRAM = CONFIG['MOZ_APP_NAME']
-    CPP_SOURCES += [
-        'nsBrowserApp.cpp',
-    ]
-    if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
-        CPP_SOURCES += [
-            'BootAnimation.cpp',
-        ]

--- a/b2g/gaia/Makefile.in
+++ b/b2g/gaia/Makefile.in
@@ -7,16 +7,17 @@ topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 GAIA_PATH := gaia/profile
 
 ifeq ($(OS_ARCH),WINNT)
+CPPSRCS = run-b2g.cpp
 DEFINES += \
   -DB2G_NAME=L\"$(MOZ_APP_NAME)-bin$(BIN_SUFFIX)\" \
   -DGAIA_PATH=L\"$(subst /,\\\\,$(GAIA_PATH))\" \
   $(NULL)
 GAIA_MAKE=make
 else # Non-windows machines use the same wrapper program
 CSRCS = run-b2g.c
 DEFINES += \

--- a/b2g/gaia/moz.build
+++ b/b2g/gaia/moz.build
@@ -1,12 +1,8 @@
 # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # 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/.
 
 PROGRAM = CONFIG['MOZ_APP_NAME']
 
-if CONFIG['OS_ARCH'] == 'WINNT':
-    CPP_SOURCES += [
-        'run-b2g.cpp',
-    ]

--- a/browser/app/Makefile.in
+++ b/browser/app/Makefile.in
@@ -38,16 +38,18 @@ endif
 
 ifdef LIBXUL_SDK #{
 PREF_JS_EXPORTS += $(srcdir)/profile/channel-prefs.js
 DEFINES += -DLIBXUL_SDK
 endif #} LIBXUL_SDK
 
 # Build a binary bootstrapping with XRE_main
 
+CPPSRCS = nsBrowserApp.cpp
+
 LOCAL_INCLUDES += \
   -I$(topsrcdir)/toolkit/xre \
   -I$(topsrcdir)/xpcom/base \
   -I$(topsrcdir)/xpcom/build \
   -I$(DEPTH)/build \
   $(NULL)
 
 DEFINES += -DXPCOM_GLUE

--- a/browser/app/moz.build
+++ b/browser/app/moz.build
@@ -3,11 +3,8 @@
 # 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/.
 
 DIRS += ['profile/extensions']
 
 PROGRAM = CONFIG['MOZ_APP_NAME']
 
-CPP_SOURCES += [
-    'nsBrowserApp.cpp',
-]

--- a/browser/components/about/Makefile.in
+++ b/browser/components/about/Makefile.in
@@ -9,11 +9,13 @@ VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME = browserabout_s
 
 FORCE_STATIC_LIB = 1
 USE_STATIC_LIBS = 1
 
+CPPSRCS = AboutRedirector.cpp
+
 LOCAL_INCLUDES = -I$(srcdir)/../build
 
 include $(topsrcdir)/config/rules.mk

--- a/browser/components/about/moz.build
+++ b/browser/components/about/moz.build
@@ -5,12 +5,8 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULE = 'browserabout'
 
 EXPORTS.mozilla.browser += [
     'AboutRedirector.h',
 ]
 
-CPP_SOURCES += [
-    'AboutRedirector.cpp',
-]
-

--- a/browser/components/build/Makefile.in
+++ b/browser/components/build/Makefile.in
@@ -12,16 +12,19 @@ include $(DEPTH)/config/autoconf.mk
 LIBRARY_NAME = browsercomps
 SHORT_LIBNAME = brwsrcmp
 IS_COMPONENT = 1
 MODULE_NAME = nsBrowserCompsModule
 FORCE_SHARED_LIB = 1
 
 USE_STATIC_LIBS = 1
 
+CPPSRCS = nsModule.cpp \
+          $(NULL)
+
 ifeq ($(OS_ARCH),WINNT)
 OS_LIBS	+= $(call EXPAND_LIBNAME,ole32 shell32 shlwapi)
 endif
 
 LOCAL_INCLUDES = \
 	-I$(srcdir)/../shell/src \
 	-I$(srcdir)/../feeds/src \
 	-I$(srcdir)/../about \

--- a/browser/components/build/moz.build
+++ b/browser/components/build/moz.build
@@ -5,12 +5,8 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULE = 'browsercomps'
 
 EXPORTS += [
     'nsBrowserCompsCID.h',
 ]
 
-CPP_SOURCES += [
-    'nsModule.cpp',
-]
-

--- a/browser/components/dirprovider/Makefile.in
+++ b/browser/components/dirprovider/Makefile.in
@@ -9,16 +9,18 @@ VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME = browserdir_s
 
 FORCE_STATIC_LIB = 1
 USE_STATIC_LIBS = 1
 
+CPPSRCS = DirectoryProvider.cpp
+
 LOCAL_INCLUDES = -I$(srcdir)/../build
 
 EXTRA_DSO_LDOPTS = \
 	$(XPCOM_GLUE_LDOPTS) \
 	$(NSPR_LIBS) \
 	$(NULL)
 
 include $(topsrcdir)/config/rules.mk

--- a/browser/components/dirprovider/moz.build
+++ b/browser/components/dirprovider/moz.build
@@ -7,12 +7,8 @@
 TEST_DIRS += ['tests']
 
 MODULE = 'browserdir'
 
 EXPORTS.mozilla.browser += [
     'DirectoryProvider.h',
 ]
 
-CPP_SOURCES += [
-    'DirectoryProvider.cpp',
-]
-

--- a/browser/components/feeds/src/Makefile.in
+++ b/browser/components/feeds/src/Makefile.in
@@ -25,11 +25,13 @@ EXTRA_COMPONENTS = \
 	WebContentConverter.js \
   $(NULL)
 
 EXTRA_PP_COMPONENTS = \
 	FeedWriter.js \
 	$(NULL)
 
 
+CPPSRCS = nsFeedSniffer.cpp
+
 LOCAL_INCLUDES = -I$(srcdir)/../../build
 
 include $(topsrcdir)/config/rules.mk

--- a/browser/components/feeds/src/moz.build
+++ b/browser/components/feeds/src/moz.build
@@ -1,12 +1,8 @@
 # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # 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 = 'browser_feeds'
 
-CPP_SOURCES += [
-    'nsFeedSniffer.cpp',
-]
-

--- a/browser/components/migration/src/Makefile.in
+++ b/browser/components/migration/src/Makefile.in
@@ -19,16 +19,18 @@ EXTRA_COMPONENTS = \
   FirefoxProfileMigrator.js \
   $(NULL)
 
 EXTRA_PP_COMPONENTS = \
   ChromeProfileMigrator.js \
   $(NULL)
 
 ifeq ($(OS_ARCH),WINNT)
+CPPSRCS += nsIEHistoryEnumerator.cpp
+
 EXTRA_COMPONENTS += IEProfileMigrator.js \
                     $(NULL)
 
 EXTRA_PP_COMPONENTS += SafariProfileMigrator.js \
                        $(NULL)
 
 DEFINES += -DHAS_IE_MIGRATOR -DHAS_SAFARI_MIGRATOR
 endif

--- a/browser/components/migration/src/moz.build
+++ b/browser/components/migration/src/moz.build
@@ -1,12 +1,8 @@
 # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # 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 = 'migration'
 
-if CONFIG['OS_ARCH'] == 'WINNT':
-    CPP_SOURCES += [
-        'nsIEHistoryEnumerator.cpp',
-    ]

--- a/browser/components/shell/src/Makefile.in
+++ b/browser/components/shell/src/Makefile.in
@@ -8,33 +8,30 @@ topsrcdir = @top_srcdir@
 srcdir    = @srcdir@
 VPATH   = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 FORCE_STATIC_LIB = 1
 USE_STATIC_LIBS = 1
 
-
-# TODO: Previously, LIBRARY_NAME was set as follows:
-#ifdef CPPSRCS
-#LIBRARY_NAME = shellservice_s
-#endif
-# But now we set CPPSRCS in moz.build, which isn't defined at this point.
-# This can be simplified when LIBRARY_NAME is in moz.build as well.
 ifeq ($(OS_ARCH),WINNT)
-LIBRARY_NAME = shellservice_s
+CPPSRCS = nsWindowsShellService.cpp
 else
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
-LIBRARY_NAME = shellservice_s
+CPPSRCS = nsMacShellService.cpp
 else
 ifeq ($(MOZ_WIDGET_TOOLKIT), gtk2)
-LIBRARY_NAME = shellservice_s
+CPPSRCS = nsGNOMEShellService.cpp
+endif
 endif
 endif
+
+ifdef CPPSRCS
+LIBRARY_NAME = shellservice_s
 endif
 
 EXTRA_COMPONENTS = nsSetDefaultBrowser.js nsSetDefaultBrowser.manifest
 
 include $(topsrcdir)/config/rules.mk
 
 DEFINES += -DMOZ_APP_NAME=\"$(MOZ_APP_NAME)\" \
   -DMOZ_APP_VERSION=\"$(MOZ_APP_VERSION)\"

--- a/browser/components/shell/src/moz.build
+++ b/browser/components/shell/src/moz.build
@@ -1,20 +1,8 @@
 # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # 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 = 'shellservice'
 
-if CONFIG['OS_ARCH'] == 'WINNT':
-    CPP_SOURCES += [
-        'nsWindowsShellService.cpp',
-    ]
-elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
-    CPP_SOURCES += [
-        'nsMacShellService.cpp',
-    ]
-elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk2':
-    CPP_SOURCES += [
-        'nsGNOMEShellService.cpp',
-    ]

--- a/browser/metro/shell/commandexecutehandler/Makefile.in
+++ b/browser/metro/shell/commandexecutehandler/Makefile.in
@@ -17,16 +17,21 @@ include $(topsrcdir)/config/config.mk
 DIST_SUBDIR =
 
 DIST_PROGRAM = CommandExecuteHandler$(BIN_SUFFIX)
 
 # Don't link against mozglue.dll
 MOZ_GLUE_LDFLAGS =
 MOZ_GLUE_PROGRAM_LDFLAGS =
 
+CPPSRCS	= \
+	CommandExecuteHandler.cpp \
+	CEHHelper.cpp \
+	$(NULL)
+
 OS_LIBS = \
 	kernel32.lib \
 	user32.lib \
 	ole32.lib \
 	shlwapi.lib \
 	propsys.lib \
 	advapi32.lib \
 	wininet.lib \

--- a/browser/metro/shell/commandexecutehandler/moz.build
+++ b/browser/metro/shell/commandexecutehandler/moz.build
@@ -1,12 +1,7 @@
 # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # 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/.
 
 PROGRAM = 'CommandExecuteHandler'
-
-CPP_SOURCES += [
-    'CEHHelper.cpp',
-    'CommandExecuteHandler.cpp',
-]

--- a/browser/metro/shell/linktool/Makefile.in
+++ b/browser/metro/shell/linktool/Makefile.in
@@ -10,16 +10,18 @@ VPATH      = @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 NO_PROFILE_GUIDED_OPTIMIZE = 1
 
 include $(topsrcdir)/config/config.mk
 
 DIST_SUBDIR = metro/install
 
+CPPSRCS    = linktool.cpp
+
 OS_LIBS = \
 	kernel32.lib \
 	user32.lib \
 	ole32.lib \
 	shlwapi.lib \
 	shell32.lib \
 	propsys.lib \
 	$(NULL)

--- a/browser/metro/shell/linktool/moz.build
+++ b/browser/metro/shell/linktool/moz.build
@@ -1,11 +1,8 @@
 # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # 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/.
 
 PROGRAM = 'linktool'
 
-CPP_SOURCES += [
-    'linktool.cpp',
-]

--- a/browser/metro/shell/testing/Makefile.in
+++ b/browser/metro/shell/testing/Makefile.in
@@ -18,16 +18,20 @@ MOZ_GLUE_PROGRAM_LDFLAGS =
 
 NO_PROFILE_GUIDED_OPTIMIZE = 1
 
 include $(topsrcdir)/config/config.mk
 
 # We want this exe in dist/bin
 DIST_SUBDIR =
 
+CPPSRCS	= \
+	metrotestharness.cpp \
+	$(NULL)
+
 OS_LIBS = \
 	kernel32.lib \
 	user32.lib \
 	ole32.lib \
 	shlwapi.lib \
 	propsys.lib \
 	advapi32.lib \
 	$(NULL)

--- a/browser/metro/shell/testing/moz.build
+++ b/browser/metro/shell/testing/moz.build
@@ -1,11 +1,8 @@
 # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # 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/.
 
 PROGRAM = 'metrotestharness'
 
-CPP_SOURCES += [
-    'metrotestharness.cpp',
-]

--- a/build/stlport/Makefile.in
+++ b/build/stlport/Makefile.in
@@ -15,15 +15,16 @@ FORCE_STATIC_LIB = 1
 STL_FLAGS =
 
 # Force to build a static library, instead of a fake library, without
 # installing it in dist/lib.
 LIBRARY = $(LIB_PREFIX)$(LIBRARY_NAME).$(LIB_SUFFIX)
 
 VPATH += $(STLPORT_SOURCES)/src
 
+CPPSRCS = $(notdir $(wildcard $(STLPORT_SOURCES)/src/*.cpp))
 CSRCS = $(notdir $(wildcard $(STLPORT_SOURCES)/src/*.c))
 
 include $(topsrcdir)/config/rules.mk
 
 DEFINES += -D_GNU_SOURCE
 CXXFLAGS += -fuse-cxa-atexit
 INCLUDES += -I$(STLPORT_SOURCES)/stlport

--- a/build/stlport/moz.build
+++ b/build/stlport/moz.build
@@ -1,12 +1,8 @@
 # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # 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/.
 
 CONFIGURE_SUBST_FILES += ['stl/config/_android.h']
 
-CPP_SOURCES += [
-    '$(notdir $(wildcard $(STLPORT_SOURCES)/src/*.cpp))',
-]
-

--- a/build/unix/stdc++compat/Makefile.in
+++ b/build/unix/stdc++compat/Makefile.in
@@ -11,16 +11,18 @@ include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= stdc++compat
 HOST_LIBRARY_NAME = host_stdc++compat
 FORCE_STATIC_LIB= 1
 STL_FLAGS =
 NO_EXPAND_LIBS = 1
 NO_PROFILE_GUIDED_OPTIMIZE = 1
 
+CPPSRCS = \
+  stdc++compat.cpp
   $(NULL)
 
 HOST_CPPSRCS = $(CPPSRCS)
 
 include $(topsrcdir)/config/rules.mk
 
 CXXFLAGS += -DMOZ_LIBSTDCXX_VERSION=$(MOZ_LIBSTDCXX_TARGET_VERSION)
 HOST_CXXFLAGS += -DMOZ_LIBSTDCXX_VERSION=$(MOZ_LIBSTDCXX_TARGET_VERSION)

--- a/build/unix/stdc++compat/moz.build
+++ b/build/unix/stdc++compat/moz.build
@@ -1,12 +1,8 @@
 # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # 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 = 'build'
 
-CPP_SOURCES += [
-    'stdc++compat.cpp',
-]
-

--- a/build/win32/Makefile.in
+++ b/build/win32/Makefile.in
@@ -9,16 +9,17 @@ VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 NO_PROFILE_GUIDED_OPTIMIZE = 1
 
 ifdef ENABLE_TESTS
 
 USE_STATIC_LIBS = 1
+CPPSRCS = crashinject.cpp
 
 endif # ENABLE_TESTS
 
 MOZ_GLUE_LDFLAGS =
 
 include $(topsrcdir)/config/rules.mk
 
 ifdef WIN32_REDIST_DIR

--- a/build/win32/crashinjectdll/Makefile.in
+++ b/build/win32/crashinjectdll/Makefile.in
@@ -9,11 +9,13 @@ VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME = crashinjectdll
 DEFFILE = $(srcdir)/crashinjectdll.def
 FORCE_SHARED_LIB = 1
 USE_STATIC_LIBS = 1
 
+CPPSRCS = crashinjectdll.cpp
+
 MOZ_GLUE_LDFLAGS =
 
 include $(topsrcdir)/config/rules.mk

--- a/build/win32/crashinjectdll/moz.build
+++ b/build/win32/crashinjectdll/moz.build
@@ -1,10 +1,6 @@
 # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # 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/.
 
-CPP_SOURCES += [
-    'crashinjectdll.cpp',
-]
-

--- a/build/win32/moz.build
+++ b/build/win32/moz.build
@@ -6,11 +6,8 @@
 
 if CONFIG['_MSC_VER'] and CONFIG['OS_TEST'] != 'x86_64':
     TEST_DIRS += ['vmwarerecordinghelper']
 
 TEST_DIRS += ['crashinjectdll']
 
 if CONFIG['ENABLE_TESTS']:
     PROGRAM = 'crashinject'
-    CPP_SOURCES += [
-        'crashinject.cpp',
-    ]

--- a/build/win32/vmwarerecordinghelper/Makefile.in
+++ b/build/win32/vmwarerecordinghelper/Makefile.in
@@ -10,11 +10,13 @@ VPATH = @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME = vmwarerecordinghelper
 DEFFILE = $(srcdir)/$(LIBRARY_NAME).def
 
 FORCE_SHARED_LIB = 1
 USE_STATIC_LIBS = 1
 
+CPPSRCS = $(LIBRARY_NAME).cpp
+
 MOZ_GLUE_LDFLAGS =
 
 include $(topsrcdir)/config/rules.mk

--- a/build/win32/vmwarerecordinghelper/moz.build
+++ b/build/win32/vmwarerecordinghelper/moz.build
@@ -1,10 +1,6 @@
 # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # 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/.
 
-CPP_SOURCES += [
-    'vmwarerecordinghelper.cpp',
-]
-

--- a/caps/src/Makefile.in
+++ b/caps/src/Makefile.in
@@ -10,14 +10,24 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= caps_s
 FORCE_STATIC_LIB = 1
 LIBXUL_LIBRARY = 1
 
 
+CPPSRCS		= \
+		nsPrincipal.cpp \
+		nsSystemPrincipal.cpp \
+		nsNullPrincipal.cpp \
+		nsNullPrincipalURI.cpp \
+		nsJSPrincipals.cpp \
+		nsScriptSecurityManager.cpp \
+		nsSecurityManagerFactory.cpp \
+		$(NULL)
+
 include $(topsrcdir)/config/rules.mk
 
 INCLUDES	+= -I$(srcdir)/../include \
 		   -I$(topsrcdir)/js/xpconnect/src \
 		   -I$(topsrcdir)/dom/base

--- a/caps/src/moz.build
+++ b/caps/src/moz.build
@@ -1,18 +1,8 @@
 # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # 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 = 'caps'
 
-CPP_SOURCES += [
-    'nsJSPrincipals.cpp',
-    'nsNullPrincipal.cpp',
-    'nsNullPrincipalURI.cpp',
-    'nsPrincipal.cpp',
-    'nsScriptSecurityManager.cpp',
-    'nsSecurityManagerFactory.cpp',
-    'nsSystemPrincipal.cpp',
-]
-

--- a/chrome/src/Makefile.in
+++ b/chrome/src/Makefile.in
@@ -9,16 +9,23 @@ srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME    = chrome_s
 LIBXUL_LIBRARY  = 1
 FORCE_STATIC_LIB = 1
 
+CPPSRCS		= \
+		nsChromeRegistry.cpp \
+		nsChromeRegistryChrome.cpp \
+		nsChromeProtocolHandler.cpp \
+		nsChromeRegistryContent.cpp \
+		$(NULL)
+
 include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES += \
 		-I$(topsrcdir)/netwerk/protocol/res \
 		-I$(topsrcdir)/netwerk/base/src \
 		$(NULL)

--- a/chrome/src/moz.build
+++ b/chrome/src/moz.build
@@ -5,15 +5,8 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULE = 'chrome'
 
 EXPORTS.mozilla.chrome += [
     'RegistryMessageUtils.h',
 ]
 
-CPP_SOURCES += [
-    'nsChromeProtocolHandler.cpp',
-    'nsChromeRegistry.cpp',
-    'nsChromeRegistryChrome.cpp',
-    'nsChromeRegistryContent.cpp',
-]
-

--- a/content/base/src/Makefile.in
+++ b/content/base/src/Makefile.in
@@ -8,22 +8,119 @@ topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= gkconbase_s
 LIBXUL_LIBRARY	= 1
 
+CPPSRCS		= \
+		Comment.cpp \
+		DirectionalityUtils.cpp \
+		DocumentType.cpp \
+		DOMImplementation.cpp \
+		EventSource.cpp \
+		FileIOObject.cpp \
+		nsAtomListUtils.cpp \
+		nsAttrAndChildArray.cpp \
+		nsAttrValue.cpp \
+		nsAttrValueOrString.cpp \
+		nsCCUncollectableMarker.cpp \
+		nsChannelPolicy.cpp \
+		nsContentAreaDragDrop.cpp \
+		nsContentIterator.cpp \
+		nsContentList.cpp \
+		nsContentPolicy.cpp \
+		nsContentSink.cpp \
+		nsContentUtils.cpp \
+		nsCopySupport.cpp \
+		nsCrossSiteListenerProxy.cpp \
+		nsCSPService.cpp \
+		nsDataDocumentContentPolicy.cpp \
+		Attr.cpp \
+		nsDOMAttributeMap.cpp \
+		nsDOMBlobBuilder.cpp \
+		nsDOMCaretPosition.cpp \
+		nsDOMFile.cpp \
+		nsDOMFileReader.cpp \
+		nsDOMLists.cpp \
+		nsDOMParser.cpp \
+		nsDOMSerializer.cpp \
+		nsDOMTokenList.cpp \
+		nsDOMSettableTokenList.cpp \
+		nsDocument.cpp \
+		nsDocumentEncoder.cpp \
+		DocumentFragment.cpp \
+		nsFrameLoader.cpp \
+		Element.cpp \
+		nsFormData.cpp \
+		nsGenConImageContent.cpp \
+		nsGenericDOMDataNode.cpp \
+		nsGkAtoms.cpp \
+		nsHTMLContentSerializer.cpp \
+		nsImageLoadingContent.cpp \
+		nsINode.cpp \
+		nsLineBreaker.cpp \
+		nsMappedAttributeElement.cpp \
+		nsMappedAttributes.cpp \
+		nsNameSpaceManager.cpp \
+		nsNoDataProtocolContentPolicy.cpp \
+		nsNodeInfo.cpp \
+		nsNodeInfoManager.cpp \
+		NodeIterator.cpp \
+		nsNodeUtils.cpp \
+		nsObjectLoadingContent.cpp \
+		nsPlainTextSerializer.cpp \
+		nsPropertyTable.cpp \
+		nsRange.cpp \
+		nsReferencedElement.cpp \
+		nsScriptElement.cpp \
+		nsScriptLoader.cpp \
+		nsStubDocumentObserver.cpp \
+		nsStubMutationObserver.cpp \
+		nsStyledElement.cpp \
+		nsStyleLinkElement.cpp \
+		nsSyncLoadService.cpp \
+		Text.cpp \
+		nsTextFragment.cpp \
+		nsTextNode.cpp \
+		nsTraversal.cpp \
+		nsTreeSanitizer.cpp \
+		TreeWalker.cpp \
+                nsViewportInfo.cpp \
+		WebSocket.cpp \
+		nsXHTMLContentSerializer.cpp \
+		nsXMLContentSerializer.cpp \
+		nsXMLHttpRequest.cpp \
+		nsXMLNameSpaceMap.cpp \
+		FragmentOrElement.cpp \
+		Link.cpp \
+		nsHostObjectProtocolHandler.cpp \
+		nsHostObjectURI.cpp \
+		nsFrameMessageManager.cpp \
+		nsInProcessTabChildGlobal.cpp \
+		ThirdPartyUtil.cpp \
+		nsDOMMutationObserver.cpp \
+		nsMixedContentBlocker.cpp \
+		$(NULL)
+
 ifdef MOZ_WEBRTC
+CPPSRCS += nsDOMDataChannel.cpp
 LOCAL_INCLUDES += \
 		-I$(topsrcdir)/netwerk/sctp/datachannel \
 		$(NULL)
 endif
 
+# Are we targeting x86-32 or x86-64?  If so, we want to include SSE2 code for
+# nsTextFragment.cpp
+ifneq (,$(INTEL_ARCHITECTURE))
+CPPSRCS += nsTextFragmentSSE2.cpp
+endif
+
 GQI_SRCS = contentbase.gqi
 
 # we don't want the shared lib, but we want to force the creation of a
 # static lib.
 FORCE_STATIC_LIB = 1
 
 EXTRA_COMPONENTS = \
 		contentSecurityPolicy.manifest \

--- a/content/base/src/moz.build
+++ b/content/base/src/moz.build
@@ -31,122 +31,22 @@ EXPORTS += [
     'nsStubDocumentObserver.h',
     'nsStubMutationObserver.h',
     'nsStyledElement.h',
     'nsTextFragment.h',
 ]
 
 if CONFIG['MOZ_WEBRTC']:
     EXPORTS += ['nsDOMDataChannel.h']
-    CPP_SOURCES += [
-        'nsDOMDataChannel.cpp',
-    ]
-
-# Are we targeting x86-32 or x86-64?  If so, we want to include SSE2 code for
-# nsTextFragment.cpp
-if CONFIG['INTEL_ARCHITECTURE']:
-    CPP_SOURCES += [
-        'nsTextFragmentSSE2.cpp',
-    ]
 
 EXPORTS.mozilla.dom += [
     'Attr.h',
     'Comment.h',
     'DOMImplementation.h',
     'DocumentFragment.h',
     'DocumentType.h',
     'EventSource.h',
     'Link.h',
     'NodeIterator.h',
     'Text.h',
     'TreeWalker.h',
 ]
 
-CPP_SOURCES += [
-    'Attr.cpp',
-    'Comment.cpp',
-    'DOMImplementation.cpp',
-    'DirectionalityUtils.cpp',
-    'DocumentFragment.cpp',
-    'DocumentType.cpp',
-    'Element.cpp',
-    'EventSource.cpp',
-    'FileIOObject.cpp',
-    'FragmentOrElement.cpp',
-    'Link.cpp',
-    'NodeIterator.cpp',
-    'Text.cpp',
-    'ThirdPartyUtil.cpp',
-    'TreeWalker.cpp',
-    'WebSocket.cpp',
-    'nsAtomListUtils.cpp',
-    'nsAttrAndChildArray.cpp',
-    'nsAttrValue.cpp',
-    'nsAttrValueOrString.cpp',
-    'nsCCUncollectableMarker.cpp',
-    'nsCSPService.cpp',
-    'nsChannelPolicy.cpp',
-    'nsContentAreaDragDrop.cpp',
-    'nsContentIterator.cpp',
-    'nsContentList.cpp',
-    'nsContentPolicy.cpp',
-    'nsContentSink.cpp',
-    'nsContentUtils.cpp',
-    'nsCopySupport.cpp',
-    'nsCrossSiteListenerProxy.cpp',
-    'nsDOMAttributeMap.cpp',
-    'nsDOMBlobBuilder.cpp',
-    'nsDOMCaretPosition.cpp',
-    'nsDOMFile.cpp',
-    'nsDOMFileReader.cpp',
-    'nsDOMLists.cpp',
-    'nsDOMMutationObserver.cpp',
-    'nsDOMParser.cpp',
-    'nsDOMSerializer.cpp',
-    'nsDOMSettableTokenList.cpp',
-    'nsDOMTokenList.cpp',
-    'nsDataDocumentContentPolicy.cpp',
-    'nsDocument.cpp',
-    'nsDocumentEncoder.cpp',
-    'nsFormData.cpp',
-    'nsFrameLoader.cpp',
-    'nsFrameMessageManager.cpp',
-    'nsGenConImageContent.cpp',
-    'nsGenericDOMDataNode.cpp',
-    'nsGkAtoms.cpp',
-    'nsHTMLContentSerializer.cpp',
-    'nsHostObjectProtocolHandler.cpp',
-    'nsHostObjectURI.cpp',
-    'nsINode.cpp',
-    'nsImageLoadingContent.cpp',
-    'nsInProcessTabChildGlobal.cpp',
-    'nsLineBreaker.cpp',
-    'nsMappedAttributeElement.cpp',
-    'nsMappedAttributes.cpp',
-    'nsMixedContentBlocker.cpp',
-    'nsNameSpaceManager.cpp',
-    'nsNoDataProtocolContentPolicy.cpp',
-    'nsNodeInfo.cpp',
-    'nsNodeInfoManager.cpp',
-    'nsNodeUtils.cpp',
-    'nsObjectLoadingContent.cpp',
-    'nsPlainTextSerializer.cpp',
-    'nsPropertyTable.cpp',
-    'nsRange.cpp',
-    'nsReferencedElement.cpp',
-    'nsScriptElement.cpp',
-    'nsScriptLoader.cpp',
-    'nsStubDocumentObserver.cpp',
-    'nsStubMutationObserver.cpp',
-    'nsStyleLinkElement.cpp',
-    'nsStyledElement.cpp',
-    'nsSyncLoadService.cpp',
-    'nsTextFragment.cpp',
-    'nsTextNode.cpp',
-    'nsTraversal.cpp',
-    'nsTreeSanitizer.cpp',
-    'nsViewportInfo.cpp',
-    'nsXHTMLContentSerializer.cpp',
-    'nsXMLContentSerializer.cpp',
-    'nsXMLHttpRequest.cpp',
-    'nsXMLNameSpaceMap.cpp',
-]
-

--- a/content/canvas/src/Makefile.in
+++ b/content/canvas/src/Makefile.in
@@ -9,20 +9,65 @@ srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= gkconcvs_s
 LIBXUL_LIBRARY  = 1
 FAIL_ON_WARNINGS = 1
 
+CPPSRCS	= \
+	CanvasImageCache.cpp \
+	CanvasRenderingContext2D.cpp \
+	CanvasUtils.cpp \
+	DocumentRendererParent.cpp \
+	DocumentRendererChild.cpp \
+	ImageData.cpp \
+	$(NULL)
+
 ifdef MOZ_WEBGL
+
+CPPSRCS += \
+	WebGLActiveInfo.cpp \
+	WebGLBuffer.cpp \
+	WebGLContext.cpp \
+	WebGLContextGL.cpp \
+	WebGLContextUtils.cpp \
+	WebGLContextReporter.cpp \
+	WebGLContextValidate.cpp \
+	WebGLElementArrayCache.cpp \
+	WebGLExtensionBase.cpp \
+	WebGLExtensionCompressedTextureATC.cpp \
+	WebGLExtensionCompressedTexturePVRTC.cpp \
+	WebGLExtensionCompressedTextureS3TC.cpp \
+	WebGLExtensionDebugRendererInfo.cpp \
+	WebGLExtensionDepthTexture.cpp \
+	WebGLExtensionLoseContext.cpp \
+	WebGLExtensionStandardDerivatives.cpp \
+	WebGLExtensionTextureFilterAnisotropic.cpp \
+	WebGLExtensionTextureFloat.cpp \
+	WebGLFramebuffer.cpp \
+	WebGLObjectModel.cpp \
+	WebGLProgram.cpp \
+	WebGLRenderbuffer.cpp \
+	WebGLShader.cpp \
+	WebGLShaderPrecisionFormat.cpp \
+	WebGLTexelConversions.cpp \
+	WebGLTexture.cpp \
+	WebGLUniformLocation.cpp \
+	$(NULL)
+
 LOCAL_INCLUDES += \
 	-I$(topsrcdir)/js/xpconnect/wrappers \
 	$(NULL)
+
+else
+
+CPPSRCS += WebGLContextNotSupported.cpp
+
 endif
 
 # we don't want the shared lib, but we want to force the creation of a static lib.
 FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk

--- a/content/canvas/src/moz.build
+++ b/content/canvas/src/moz.build
@@ -10,51 +10,8 @@ EXPORTS.mozilla.dom += [
     'CanvasGradient.h',
     'CanvasPattern.h',
     'CanvasRenderingContext2D.h',
     'CanvasUtils.h',
     'ImageData.h',
     'TextMetrics.h',
 ]
 
-CPP_SOURCES += [
-    'CanvasImageCache.cpp',
-    'CanvasRenderingContext2D.cpp',
-    'CanvasUtils.cpp',
-    'DocumentRendererChild.cpp',
-    'DocumentRendererParent.cpp',
-    'ImageData.cpp',
-]
-
-if CONFIG['MOZ_WEBGL']:
-    CPP_SOURCES += [
-        'WebGLActiveInfo.cpp',
-        'WebGLBuffer.cpp',
-        'WebGLContext.cpp',
-        'WebGLContextGL.cpp',
-        'WebGLContextUtils.cpp',
-        'WebGLContextReporter.cpp',
-        'WebGLContextValidate.cpp',
-        'WebGLElementArrayCache.cpp',
-        'WebGLExtensionBase.cpp',
-        'WebGLExtensionCompressedTextureATC.cpp',
-        'WebGLExtensionCompressedTexturePVRTC.cpp',
-        'WebGLExtensionCompressedTextureS3TC.cpp',
-        'WebGLExtensionDebugRendererInfo.cpp',
-        'WebGLExtensionDepthTexture.cpp',
-        'WebGLExtensionLoseContext.cpp',
-        'WebGLExtensionStandardDerivatives.cpp',
-        'WebGLExtensionTextureFilterAnisotropic.cpp',
-        'WebGLExtensionTextureFloat.cpp',
-        'WebGLFramebuffer.cpp',
-        'WebGLObjectModel.cpp',
-        'WebGLProgram.cpp',
-        'WebGLRenderbuffer.cpp',
-        'WebGLShader.cpp',
-        'WebGLShaderPrecisionFormat.cpp',
-        'WebGLTexelConversions.cpp',
-        'WebGLTexture.cpp',
-        'WebGLUniformLocation.cpp',
-    ]
-else:
-    CPP_SOURCES += [
-        'WebGLContextNotSupported.cpp',
-    ]

--- a/content/events/src/Makefile.in
+++ b/content/events/src/Makefile.in
@@ -9,16 +9,63 @@ srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= gkconevents_s
 LIBXUL_LIBRARY  = 1
 FAIL_ON_WARNINGS = 1
 
+CPPSRCS		= \
+		EventTarget.cpp \
+		nsEventListenerManager.cpp \
+		nsEventStateManager.cpp \
+		nsDOMEvent.cpp \
+		nsDOMDataContainerEvent.cpp \
+		nsDOMUIEvent.cpp \
+		nsDOMKeyboardEvent.cpp \
+		nsDOMTextEvent.cpp \
+		nsDOMMouseEvent.cpp \
+		nsDOMMouseScrollEvent.cpp \
+		nsDOMDragEvent.cpp \
+		nsDOMMutationEvent.cpp \
+		nsDOMDeviceMotionEvent.cpp \
+		nsDOMBeforeUnloadEvent.cpp \
+		nsDOMXULCommandEvent.cpp \
+		nsDOMCommandEvent.cpp \
+		nsDOMMessageEvent.cpp \
+		nsPaintRequest.cpp \
+		nsPrivateTextRange.cpp \
+		nsAsyncDOMEvent.cpp \
+		nsEventDispatcher.cpp \
+		nsIMEStateManager.cpp \
+		nsContentEventHandler.cpp \
+		nsEventListenerService.cpp \
+		nsDOMDataTransfer.cpp \
+		nsDOMNotifyPaintEvent.cpp \
+		nsDOMNotifyAudioAvailableEvent.cpp \
+		nsDOMSimpleGestureEvent.cpp \
+		nsDOMEventTargetHelper.cpp \
+		nsDOMScrollAreaEvent.cpp \
+		nsDOMTransitionEvent.cpp \
+		nsDOMAnimationEvent.cpp \
+		nsDOMTouchEvent.cpp \
+		nsDOMCompositionEvent.cpp \
+		nsDOMClipboardEvent.cpp \
+		DOMWheelEvent.cpp \
+		TextComposition.cpp \
+		Touch.cpp \
+		$(NULL)
+
+ifdef MOZ_GAMEPAD
+CPPSRCS += \
+  nsDOMGamepad.cpp \
+  $(NULL)
+endif
+
 # we don't want the shared lib, but we want to force the creation of a static lib.
 FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES	+= \

--- a/content/events/src/moz.build
+++ b/content/events/src/moz.build
@@ -15,53 +15,8 @@ EXPORTS += [
     'nsEventListenerManager.h',
     'nsEventStateManager.h',
 ]
 
 EXPORTS.mozilla.dom += [
     'Touch.h',
 ]
 
-CPP_SOURCES += [
-    'DOMWheelEvent.cpp',
-    'EventTarget.cpp',
-    'TextComposition.cpp',
-    'Touch.cpp',
-    'nsAsyncDOMEvent.cpp',
-    'nsContentEventHandler.cpp',
-    'nsDOMAnimationEvent.cpp',
-    'nsDOMBeforeUnloadEvent.cpp',
-    'nsDOMClipboardEvent.cpp',
-    'nsDOMCommandEvent.cpp',
-    'nsDOMCompositionEvent.cpp',
-    'nsDOMDataContainerEvent.cpp',
-    'nsDOMDataTransfer.cpp',
-    'nsDOMDeviceMotionEvent.cpp',
-    'nsDOMDragEvent.cpp',
-    'nsDOMEvent.cpp',
-    'nsDOMEventTargetHelper.cpp',
-    'nsDOMKeyboardEvent.cpp',
-    'nsDOMMessageEvent.cpp',
-    'nsDOMMouseEvent.cpp',
-    'nsDOMMouseScrollEvent.cpp',
-    'nsDOMMutationEvent.cpp',
-    'nsDOMNotifyAudioAvailableEvent.cpp',
-    'nsDOMNotifyPaintEvent.cpp',
-    'nsDOMScrollAreaEvent.cpp',
-    'nsDOMSimpleGestureEvent.cpp',
-    'nsDOMTextEvent.cpp',
-    'nsDOMTouchEvent.cpp',
-    'nsDOMTransitionEvent.cpp',
-    'nsDOMUIEvent.cpp',
-    'nsDOMXULCommandEvent.cpp',
-    'nsEventDispatcher.cpp',
-    'nsEventListenerManager.cpp',
-    'nsEventListenerService.cpp',
-    'nsEventStateManager.cpp',
-    'nsIMEStateManager.cpp',
-    'nsPaintRequest.cpp',
-    'nsPrivateTextRange.cpp',
-]
-
-if CONFIG['MOZ_GAMEPAD']:
-    CPP_SOURCES += [
-        'nsDOMGamepad.cpp',
-    ]

--- a/content/html/content/src/Makefile.in
+++ b/content/html/content/src/Makefile.in
@@ -9,16 +9,93 @@ srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= gkconhtmlcon_s
 LIBXUL_LIBRARY	= 1
 FAIL_ON_WARNINGS = 1
 
+CPPSRCS		= \
+		HTMLPropertiesCollection.cpp \
+		nsClientRect.cpp \
+		nsHTMLDNSPrefetch.cpp \
+		nsGenericHTMLElement.cpp \
+		nsGenericHTMLFrameElement.cpp \
+		nsFormSubmission.cpp \
+		nsTextEditorState.cpp \
+		HTMLElement.cpp \
+		HTMLAnchorElement.cpp \
+		HTMLAreaElement.cpp \
+		HTMLAudioElement.cpp \
+		HTMLBRElement.cpp \
+		HTMLBodyElement.cpp \
+		HTMLButtonElement.cpp \
+		HTMLCanvasElement.cpp \
+		HTMLDataElement.cpp \
+		HTMLDataListElement.cpp \
+		HTMLDivElement.cpp \
+		HTMLFieldSetElement.cpp \
+		HTMLFontElement.cpp \
+		nsHTMLFormElement.cpp \
+		HTMLFrameElement.cpp \
+		HTMLFrameSetElement.cpp \
+		HTMLHRElement.cpp \
+		HTMLHeadingElement.cpp \
+		HTMLIFrameElement.cpp \
+		HTMLImageElement.cpp \
+		HTMLInputElement.cpp \
+		HTMLLIElement.cpp \
+		HTMLLabelElement.cpp \
+		HTMLLegendElement.cpp \
+		HTMLLinkElement.cpp \
+		HTMLMapElement.cpp \
+		HTMLMediaElement.cpp \
+		HTMLMenuElement.cpp \
+		HTMLMenuItemElement.cpp \
+		HTMLMetaElement.cpp \
+		HTMLMeterElement.cpp \
+		HTMLModElement.cpp \
+		HTMLObjectElement.cpp \
+		HTMLSharedObjectElement.cpp \
+		HTMLOptionElement.cpp \
+		HTMLOptionsCollection.cpp \
+		HTMLOptGroupElement.cpp \
+		HTMLOutputElement.cpp \
+		HTMLParagraphElement.cpp \
+		HTMLPreElement.cpp \
+		HTMLProgressElement.cpp \
+		HTMLScriptElement.cpp \
+		HTMLSelectElement.cpp \
+		HTMLSharedElement.cpp \
+		HTMLSharedListElement.cpp \
+		HTMLSourceElement.cpp \
+		HTMLSpanElement.cpp \
+		HTMLStyleElement.cpp \
+		HTMLTableElement.cpp \
+		HTMLTableCaptionElement.cpp \
+		HTMLTableCellElement.cpp \
+		HTMLTableColElement.cpp \
+		HTMLTableRowElement.cpp \
+		HTMLTableSectionElement.cpp \
+		HTMLTemplateElement.cpp \
+		HTMLTextAreaElement.cpp \
+		HTMLTimeElement.cpp \
+		HTMLTitleElement.cpp \
+		HTMLVideoElement.cpp \
+		HTMLUnknownElement.cpp \
+		MediaError.cpp \
+		TimeRanges.cpp \
+		ValidityState.cpp \
+		nsIConstraintValidation.cpp \
+		nsRadioVisitor.cpp \
+		nsDOMStringMap.cpp \
+		UndoManager.cpp \
+		$(NULL)
+
 # we don't want the shared lib, but we want to force the creation of a static lib.
 FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
 INCLUDES	+= \
 		-I$(srcdir)/../../document/src \

--- a/content/html/content/src/moz.build
+++ b/content/html/content/src/moz.build
@@ -69,85 +69,8 @@ EXPORTS.mozilla.dom += [
     'HTMLTitleElement.h',
     'HTMLUnknownElement.h',
     'MediaError.h',
     'TimeRanges.h',
     'UndoManager.h',
     'ValidityState.h',
 ]
 
-CPP_SOURCES += [
-    'HTMLAnchorElement.cpp',
-    'HTMLAreaElement.cpp',
-    'HTMLAudioElement.cpp',
-    'HTMLBRElement.cpp',
-    'HTMLBodyElement.cpp',
-    'HTMLButtonElement.cpp',
-    'HTMLCanvasElement.cpp',
-    'HTMLDataElement.cpp',
-    'HTMLDataListElement.cpp',
-    'HTMLDivElement.cpp',
-    'HTMLElement.cpp',
-    'HTMLFieldSetElement.cpp',
-    'HTMLFontElement.cpp',
-    'HTMLFrameElement.cpp',
-    'HTMLFrameSetElement.cpp',
-    'HTMLHRElement.cpp',
-    'HTMLHeadingElement.cpp',
-    'HTMLIFrameElement.cpp',
-    'HTMLImageElement.cpp',
-    'HTMLInputElement.cpp',
-    'HTMLLIElement.cpp',
-    'HTMLLabelElement.cpp',
-    'HTMLLegendElement.cpp',
-    'HTMLLinkElement.cpp',
-    'HTMLMapElement.cpp',
-    'HTMLMediaElement.cpp',
-    'HTMLMenuElement.cpp',
-    'HTMLMenuItemElement.cpp',
-    'HTMLMetaElement.cpp',
-    'HTMLMeterElement.cpp',
-    'HTMLModElement.cpp',
-    'HTMLObjectElement.cpp',
-    'HTMLOptGroupElement.cpp',
-    'HTMLOptionElement.cpp',
-    'HTMLOptionsCollection.cpp',
-    'HTMLOutputElement.cpp',
-    'HTMLParagraphElement.cpp',
-    'HTMLPreElement.cpp',
-    'HTMLProgressElement.cpp',
-    'HTMLPropertiesCollection.cpp',
-    'HTMLScriptElement.cpp',
-    'HTMLSelectElement.cpp',
-    'HTMLSharedElement.cpp',
-    'HTMLSharedListElement.cpp',
-    'HTMLSharedObjectElement.cpp',
-    'HTMLSourceElement.cpp',
-    'HTMLSpanElement.cpp',
-    'HTMLStyleElement.cpp',
-    'HTMLTableCaptionElement.cpp',
-    'HTMLTableCellElement.cpp',
-    'HTMLTableColElement.cpp',
-    'HTMLTableElement.cpp',
-    'HTMLTableRowElement.cpp',
-    'HTMLTableSectionElement.cpp',
-    'HTMLTemplateElement.cpp',
-    'HTMLTextAreaElement.cpp',
-    'HTMLTimeElement.cpp',
-    'HTMLTitleElement.cpp',
-    'HTMLUnknownElement.cpp',
-    'HTMLVideoElement.cpp',
-    'MediaError.cpp',
-    'TimeRanges.cpp',
-    'UndoManager.cpp',
-    'ValidityState.cpp',
-    'nsClientRect.cpp',
-    'nsDOMStringMap.cpp',
-    'nsFormSubmission.cpp',
-    'nsGenericHTMLElement.cpp',
-    'nsGenericHTMLFrameElement.cpp',
-    'nsHTMLDNSPrefetch.cpp',
-    'nsHTMLFormElement.cpp',
-    'nsIConstraintValidation.cpp',
-    'nsRadioVisitor.cpp',
-    'nsTextEditorState.cpp',
-]
-

--- a/content/html/document/src/Makefile.in
+++ b/content/html/document/src/Makefile.in
@@ -9,16 +9,25 @@ srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= gkconhtmldoc_s
 LIBXUL_LIBRARY	= 1
 FAIL_ON_WARNINGS = 1
 
+CPPSRCS		= \
+		nsHTMLContentSink.cpp \
+		nsHTMLDocument.cpp \
+		ImageDocument.cpp \
+		MediaDocument.cpp \
+		PluginDocument.cpp \
+		VideoDocument.cpp \
+		$(NULL)
+
 # we don't want the shared lib, but we want to force the creation of a static lib.
 FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES += \
 		-I$(srcdir)/../../../base/src \
 		-I$(srcdir)/../../../events/src \

--- a/content/html/document/src/moz.build
+++ b/content/html/document/src/moz.build
@@ -8,17 +8,8 @@ MODULE = 'content'
 
 EXPORTS += [
     'nsIHTMLDocument.h',
 ]
 
 EXPORTS.mozilla.dom += [
     'ImageDocument.h',
 ]
-
-CPP_SOURCES += [
-    'ImageDocument.cpp',
-    'MediaDocument.cpp',
-    'PluginDocument.cpp',
-    'VideoDocument.cpp',
-    'nsHTMLContentSink.cpp',
-    'nsHTMLDocument.cpp',
-]

--- a/content/mathml/content/src/Makefile.in
+++ b/content/mathml/content/src/Makefile.in
@@ -9,16 +9,21 @@ srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= gkcontentmathml_s
 LIBXUL_LIBRARY	= 1
 FAIL_ON_WARNINGS = 1
 
+CPPSRCS		= \
+		nsMathMLElement.cpp               \
+		nsMathMLElementFactory.cpp        \
+		$(NULL)
+
 include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
 # we don't want the shared lib, but we want to force the creation of a static 
 # lib.
 FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk

--- a/content/mathml/content/src/moz.build
+++ b/content/mathml/content/src/moz.build
@@ -1,13 +1,8 @@
 # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # 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 = 'content'
 
-CPP_SOURCES += [
-    'nsMathMLElement.cpp',
-    'nsMathMLElementFactory.cpp',
-]
-

--- a/content/media/Makefile.in
+++ b/content/media/Makefile.in
@@ -10,16 +10,41 @@ VPATH     = @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME = gkconmedia_s
 LIBXUL_LIBRARY = 1
 ifndef _MSC_VER
 FAIL_ON_WARNINGS := 1
 endif # !_MSC_VER
 
+CPPSRCS = \
+  AudioAvailableEventManager.cpp \
+  AudioChannelFormat.cpp \
+  AudioNodeEngine.cpp \
+  AudioNodeStream.cpp \
+  AudioSegment.cpp \
+  AudioStream.cpp \
+  AudioStreamTrack.cpp \
+  DecoderTraits.cpp \
+  DOMMediaStream.cpp \
+  FileBlockCache.cpp \
+  MediaCache.cpp \
+  MediaDecoder.cpp \
+  MediaDecoderStateMachine.cpp \
+  MediaDecoderReader.cpp \
+  MediaResource.cpp \
+  MediaStreamGraph.cpp \
+  MediaStreamTrack.cpp \
+  StreamBuffer.cpp \
+  VideoFrameContainer.cpp \
+  VideoSegment.cpp \
+  VideoStreamTrack.cpp \
+  VideoUtils.cpp \
+  $(NULL)
+
 FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 include $(topsrcdir)/config/rules.mk
 
 DEFINES  += -D_IMPL_NS_LAYOUT
 CFLAGS   += $(GSTREAMER_CFLAGS)

--- a/content/media/dash/Makefile.in
+++ b/content/media/dash/Makefile.in
@@ -13,16 +13,22 @@ topsrcdir  := @top_srcdir@
 srcdir     := @srcdir@
 VPATH      := @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME   := gkcondash_s
 LIBXUL_LIBRARY := 1
 
+CPPSRCS := \
+  DASHDecoder.cpp \
+  DASHRepDecoder.cpp \
+  DASHReader.cpp \
+  $(NULL)
+
 FORCE_STATIC_LIB := 1
 
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES := \
   -I$(topsrcdir)/netwerk/dash/mpd \
   -I$(srcdir)/../webm \
   -I$(srcdir)/../../base/src \

--- a/content/media/dash/moz.build
+++ b/content/media/dash/moz.build
@@ -8,14 +8,8 @@ MODULE = 'content'
 
 EXPORTS += [
     'DASHDecoder.h',
     'DASHReader.h',
     'DASHRepDecoder.h',
     'DASHRepReader.h',
 ]
 
-CPP_SOURCES += [
-    'DASHDecoder.cpp',
-    'DASHReader.cpp',
-    'DASHRepDecoder.cpp',
-]
-

--- a/content/media/gstreamer/Makefile.in
+++ b/content/media/gstreamer/Makefile.in
@@ -8,16 +8,24 @@ srcdir		= @srcdir@
 VPATH		= @srcdir@
 FAIL_ON_WARNINGS := 1
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= gkcongstreamer_s
 LIBXUL_LIBRARY 	= 1
 
+
+CPPSRCS		= \
+		GStreamerReader.cpp \
+		GStreamerDecoder.cpp \
+		GStreamerFormatHelper.cpp \
+		GStreamerMozVideoBuffer.cpp \
+		$(NULL)
+
 FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
 
 CFLAGS		+= $(GSTREAMER_CFLAGS)
 CXXFLAGS	+= $(GSTREAMER_CFLAGS)

--- a/content/media/gstreamer/moz.build
+++ b/content/media/gstreamer/moz.build
@@ -7,15 +7,8 @@
 MODULE = 'content'
 
 EXPORTS += [
     'GStreamerDecoder.h',
     'GStreamerFormatHelper.h',
     'GStreamerReader.h',
 ]
 
-CPP_SOURCES += [
-    'GStreamerDecoder.cpp',
-    'GStreamerFormatHelper.cpp',
-    'GStreamerReader.cpp',
-    'GStreamerMozVideoBuffer.cpp',
-]
-

--- a/content/media/moz.build
+++ b/content/media/moz.build
@@ -75,32 +75,8 @@ EXPORTS += [
 ]
 
 EXPORTS.mozilla.dom += [
     'AudioStreamTrack.h',
     'MediaStreamTrack.h',
     'VideoStreamTrack.h',
 ]
 
-CPP_SOURCES += [
-    'AudioAvailableEventManager.cpp',
-    'AudioChannelFormat.cpp',
-    'AudioNodeEngine.cpp',
-    'AudioNodeStream.cpp',
-    'AudioSegment.cpp',
-    'AudioStream.cpp',
-    'AudioStreamTrack.cpp',
-    'DecoderTraits.cpp',
-    'DOMMediaStream.cpp',
-    'FileBlockCache.cpp',
-    'MediaCache.cpp',
-    'MediaDecoder.cpp',
-    'MediaDecoderStateMachine.cpp',
-    'MediaDecoderReader.cpp',
-    'MediaResource.cpp',
-    'MediaStreamGraph.cpp',
-    'MediaStreamTrack.cpp',
-    'StreamBuffer.cpp',
-    'VideoFrameContainer.cpp',
-    'VideoSegment.cpp',
-    'VideoStreamTrack.cpp',
-    'VideoUtils.cpp',
-]

--- a/content/media/ogg/Makefile.in
+++ b/content/media/ogg/Makefile.in
@@ -9,11 +9,17 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= gkconogg_s
 LIBXUL_LIBRARY 	= 1
 FAIL_ON_WARNINGS := 1
 
 
+CPPSRCS		= \
+		OggDecoder.cpp \
+		OggCodecState.cpp \
+		OggReader.cpp \
+		$(NULL)
+
 FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk

--- a/content/media/ogg/moz.build
+++ b/content/media/ogg/moz.build
@@ -7,14 +7,8 @@
 MODULE = 'content'
 
 EXPORTS += [
     'OggCodecState.h',
     'OggDecoder.h',
     'OggReader.h',
 ]
 
-CPP_SOURCES += [
-    'OggCodecState.cpp',
-    'OggDecoder.cpp',
-    'OggReader.cpp',
-]
-

--- a/content/media/omx/Makefile.in
+++ b/content/media/omx/Makefile.in
@@ -7,16 +7,22 @@ topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= gkconomx_s
 LIBXUL_LIBRARY 	= 1
 
+CPPSRCS		= \
+		MediaOmxDecoder.cpp \
+		MediaOmxReader.cpp \
+		OmxDecoder.cpp \
+		$(NULL)
+
 FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
 INCLUDES	+= \
 		-I$(topsrcdir)/ipc/chromium/src \
 		-I$(srcdir)/../../base/src \

--- a/content/media/omx/moz.build
+++ b/content/media/omx/moz.build
@@ -6,14 +6,8 @@
 
 MODULE = 'content'
 
 EXPORTS += [
     'MediaOmxDecoder.h',
     'MediaOmxReader.h',
 ]
 
-CPP_SOURCES += [
-    'MediaOmxDecoder.cpp',
-    'MediaOmxReader.cpp',
-    'OmxDecoder.cpp',
-]
-

--- a/content/media/plugins/Makefile.in
+++ b/content/media/plugins/Makefile.in
@@ -7,16 +7,22 @@ topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= gkconmediaplugins_s
 LIBXUL_LIBRARY 	= 1
 
+CPPSRCS		= \
+		MediaPluginHost.cpp \
+		MediaPluginDecoder.cpp \
+		MediaPluginReader.cpp \
+		$(NULL)
+
 FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
 
 INCLUDES	+= \
 		-I$(srcdir)/../../base/src \
 		-I$(srcdir)/../../html/content/src \
 		$(NULL)

--- a/content/media/plugins/moz.build
+++ b/content/media/plugins/moz.build
@@ -8,14 +8,8 @@ MODULE = 'content'
 
 EXPORTS += [
     'MPAPI.h',
     'MediaPluginDecoder.h',
     'MediaPluginHost.h',
     'MediaPluginReader.h',
 ]
 
-CPP_SOURCES += [
-    'MediaPluginDecoder.cpp',
-    'MediaPluginHost.cpp',
-    'MediaPluginReader.cpp',
-]
-

--- a/content/media/raw/Makefile.in
+++ b/content/media/raw/Makefile.in
@@ -9,16 +9,21 @@ srcdir = @srcdir@
 VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME = gkconraw_s
 LIBXUL_LIBRARY = 1
 FAIL_ON_WARNINGS := 1
 
+CPPSRCS += \
+  RawDecoder.cpp \
+  RawReader.cpp \
+  $(NULL)
+
 FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
 
 INCLUDES	+= \
 		-I$(srcdir)/../../base/src \
 		-I$(srcdir)/../../html/content/src \
 		$(NULL)

--- a/content/media/raw/moz.build
+++ b/content/media/raw/moz.build
@@ -7,13 +7,8 @@
 MODULE = 'content'
 
 EXPORTS += [
     'RawDecoder.h',
     'RawReader.h',
     'RawStructs.h',
 ]
 
-CPP_SOURCES += [
-    'RawDecoder.cpp',
-    'RawReader.cpp',
-]
-

--- a/content/media/wave/Makefile.in
+++ b/content/media/wave/Makefile.in
@@ -9,11 +9,16 @@ VPATH		= @srcdir@
 FAIL_ON_WARNINGS := 1
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= gkconwave_s
 LIBXUL_LIBRARY 	= 1
 
 
+CPPSRCS		= \
+		WaveDecoder.cpp \
+		WaveReader.cpp \
+		$(NULL)
+
 FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk

--- a/content/media/wave/moz.build
+++ b/content/media/wave/moz.build
@@ -6,13 +6,8 @@
 
 MODULE = 'content'
 
 EXPORTS += [
     'WaveDecoder.h',
     'WaveReader.h',
 ]
 
-CPP_SOURCES += [
-    'WaveDecoder.cpp',
-    'WaveReader.cpp',
-]
-

--- a/content/media/webaudio/Makefile.in
+++ b/content/media/webaudio/Makefile.in
@@ -10,11 +10,35 @@ VPATH            := @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME   := gkconwebaudio_s
 LIBXUL_LIBRARY := 1
 ifndef _MSC_VER
 FAIL_ON_WARNINGS := 1
 endif # !_MSC_VER
 
+CPPSRCS := \
+  AnalyserNode.cpp \
+  AudioBuffer.cpp \
+  AudioBufferSourceNode.cpp \
+  AudioContext.cpp \
+  AudioDestinationNode.cpp \
+  AudioListener.cpp \
+  AudioNode.cpp \
+  AudioParam.cpp \
+  AudioProcessingEvent.cpp \
+  BiquadFilterNode.cpp \
+  ChannelMergerNode.cpp \
+  ChannelSplitterNode.cpp \
+  DelayNode.cpp \
+  DynamicsCompressorNode.cpp \
+  EnableWebAudioCheck.cpp \
+  GainNode.cpp \
+  MediaBufferDecoder.cpp \
+  PannerNode.cpp \
+  ScriptProcessorNode.cpp \
+  ThreeDPoint.cpp \
+  WebAudioUtils.cpp \
+  $(NULL)
+
 FORCE_STATIC_LIB := 1
 
 include $(topsrcdir)/config/rules.mk

--- a/content/media/webaudio/blink/Makefile.in
+++ b/content/media/webaudio/blink/Makefile.in
@@ -7,11 +7,18 @@ topsrcdir        := @top_srcdir@
 srcdir           := @srcdir@
 VPATH            := @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME   := gkconwebaudio_blink_s
 LIBXUL_LIBRARY := 1
 
+CPPSRCS := \
+  Biquad.cpp \
+  DynamicsCompressor.cpp \
+  DynamicsCompressorKernel.cpp \
+  ZeroPole.cpp \
+  $(NULL)
+
 FORCE_STATIC_LIB := 1
 
 include $(topsrcdir)/config/rules.mk

--- a/content/media/webaudio/blink/moz.build
+++ b/content/media/webaudio/blink/moz.build
@@ -1,15 +1,8 @@
 # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # 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 = 'content'
 
-CPP_SOURCES += [
-    'Biquad.cpp',
-    'DynamicsCompressor.cpp',
-    'DynamicsCompressorKernel.cpp',
-    'ZeroPole.cpp',
-]
-

--- a/content/media/webaudio/moz.build
+++ b/content/media/webaudio/moz.build
@@ -33,32 +33,8 @@ EXPORTS.mozilla.dom += [
     'DelayNode.h',
     'DynamicsCompressorNode.h',
     'EnableWebAudioCheck.h',
     'GainNode.h',
     'PannerNode.h',
     'ScriptProcessorNode.h',
 ]
 
-CPP_SOURCES += [
-    'AnalyserNode.cpp',
-    'AudioBuffer.cpp',
-    'AudioBufferSourceNode.cpp',
-    'AudioContext.cpp',
-    'AudioDestinationNode.cpp',
-    'AudioListener.cpp',
-    'AudioNode.cpp',
-    'AudioParam.cpp',
-    'AudioProcessingEvent.cpp',
-    'BiquadFilterNode.cpp',
-    'ChannelMergerNode.cpp',
-    'ChannelSplitterNode.cpp',
-    'DelayNode.cpp',
-    'DynamicsCompressorNode.cpp',
-    'EnableWebAudioCheck.cpp',
-    'GainNode.cpp',
-    'MediaBufferDecoder.cpp',
-    'PannerNode.cpp',
-    'ScriptProcessorNode.cpp',
-    'ThreeDPoint.cpp',
-    'WebAudioUtils.cpp',
-]
-

--- a/content/media/webm/Makefile.in
+++ b/content/media/webm/Makefile.in
@@ -9,16 +9,22 @@ VPATH		= @srcdir@
 FAIL_ON_WARNINGS := 1
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= gkconwebm_s
 LIBXUL_LIBRARY 	= 1
 
 
+CPPSRCS		= \
+		WebMBufferedParser.cpp \
+		WebMDecoder.cpp \
+		WebMReader.cpp \
+		$(NULL)
+
 FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES = \
 		$(MOZ_LIBVPX_CFLAGS) \
 		$(NULL)

--- a/content/media/webm/moz.build
+++ b/content/media/webm/moz.build
@@ -6,14 +6,8 @@
 
 MODULE = 'content'
 
 EXPORTS += [
     'WebMDecoder.h',
     'WebMReader.h',
 ]
 
-CPP_SOURCES += [
-    'WebMBufferedParser.cpp',
-    'WebMDecoder.cpp',
-    'WebMReader.cpp',
-]
-

--- a/content/media/webrtc/Makefile.in
+++ b/content/media/webrtc/Makefile.in
@@ -7,16 +7,28 @@ topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME = gkconwebrtc_s
 LIBXUL_LIBRARY = 1
 
+CPPSRCS	= \
+  MediaEngineDefault.cpp \
+  $(NULL)
+
+ifdef MOZ_WEBRTC
+CPPSRCS += \
+  MediaEngineWebRTC.cpp \
+  MediaEngineWebRTCVideo.cpp \
+  MediaEngineWebRTCAudio.cpp \
+  $(NULL)
+endif
+
 ifeq ($(OS_ARCH),WINNT)
 OS_CXXFLAGS += -DNOMINMAX
 endif
 
 FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk

--- a/content/media/webrtc/moz.build
+++ b/content/media/webrtc/moz.build
@@ -8,18 +8,8 @@ MODULE = 'content'
 
 EXPORTS += [
     'MediaEngine.h',
     'MediaEngineDefault.h',
 ]
 
 if CONFIG['MOZ_WEBRTC']:
     EXPORTS += ['MediaEngineWebRTC.h']
-    CPP_SOURCES += [
-        'MediaEngineWebRTC.cpp',
-        'MediaEngineWebRTCVideo.cpp',
-        'MediaEngineWebRTCAudio.cpp',
-    ]
-
-CPP_SOURCES += [
-    'MediaEngineDefault.cpp',
-]
-

--- a/content/media/webspeech/recognition/Makefile.in
+++ b/content/media/webspeech/recognition/Makefile.in
@@ -14,13 +14,28 @@ VPATH += \
   $(srcdir)/test \
   $(NULL)
 
 LIBRARY_NAME   := gkconwebspeechrecognition_s
 LIBXUL_LIBRARY := 1
 
 LOCAL_INCLUDES += $(VPATH:%=-I%)
 
+CPPSRCS := \
+  EnableWebSpeechRecognitionCheck.cpp \
+  SpeechGrammar.cpp \
+  SpeechGrammarList.cpp \
+  SpeechRecognitionAlternative.cpp \
+  SpeechRecognition.cpp \
+  SpeechRecognitionResult.cpp \
+  SpeechRecognitionResultList.cpp \
+  SpeechStreamListener.cpp \
+  endpointer.cc \
+  energy_endpointer.cc \
+  energy_endpointer_params.cc \
+  FakeSpeechRecognitionService.cpp \
+  $(NULL)
+
 FORCE_STATIC_LIB := 1
 
 include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 include $(topsrcdir)/config/rules.mk

--- a/content/media/webspeech/recognition/moz.build
+++ b/content/media/webspeech/recognition/moz.build
@@ -21,23 +21,8 @@ EXPORTS.mozilla.dom += [
     'SpeechGrammarList.h',
     'SpeechRecognition.h',
     'SpeechRecognitionAlternative.h',
     'SpeechRecognitionResult.h',
     'SpeechRecognitionResultList.h',
     'SpeechStreamListener.h',
 ]
 
-CPP_SOURCES += [
-    'EnableWebSpeechRecognitionCheck.cpp',
-    'FakeSpeechRecognitionService.cpp',
-    'SpeechGrammar.cpp',
-    'SpeechGrammarList.cpp',
-    'SpeechRecognition.cpp',
-    'SpeechRecognitionAlternative.cpp',
-    'SpeechRecognitionResult.cpp',
-    'SpeechRecognitionResultList.cpp',
-    'SpeechStreamListener.cpp',
-    'endpointer.cc',
-    'energy_endpointer.cc',
-    'energy_endpointer_params.cc',
-]
-

--- a/content/media/webspeech/recognition/test/Makefile.in
+++ b/content/media/webspeech/recognition/test/Makefile.in
@@ -5,16 +5,20 @@
 DEPTH          := @DEPTH@
 topsrcdir      := @top_srcdir@
 srcdir         := @srcdir@
 VPATH          := @srcdir@
 relativesrcdir := @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
+CPPSRCS := \
+  FakeSpeechRecognitionService.cpp \
+  $(NULL)
+
 MOCHITEST_FILES := \
   head.js \
   test_success_without_recognition_service.html \
   test_timeout.html \
   test_recognition_service_error.html \
   test_audio_capture_error.html \
   test_abort.html \
   test_call_start_from_end_handler.html \

--- a/content/media/webspeech/recognition/test/moz.build
+++ b/content/media/webspeech/recognition/test/moz.build
@@ -1,9 +1,4 @@
 # 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/.
-
-CPP_SOURCES += [
-    'FakeSpeechRecognitionService.cpp',
-]
-

--- a/content/media/webspeech/synth/Makefile.in
+++ b/content/media/webspeech/synth/Makefile.in
@@ -17,13 +17,24 @@ VPATH += \
   $(NULL)
 
 LIBRARY_NAME   := gkconwebspeechsynth_s
 EXPORT_LIBRARY  = 1
 LIBXUL_LIBRARY  = 1
 
 LOCAL_INCLUDES += $(VPATH:%=-I%)
 
+CPPSRCS := \
+  EnableSpeechSynthesisCheck.cpp \
+  SpeechSynthesisUtterance.cpp \
+  SpeechSynthesisVoice.cpp \
+  SpeechSynthesis.cpp \
+  SpeechSynthesisChild.cpp \
+  SpeechSynthesisParent.cpp \
+  nsSynthVoiceRegistry.cpp \
+  nsSpeechTask.cpp \
+  $(NULL)
+
 FORCE_STATIC_LIB := 1
 
 include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 include $(topsrcdir)/config/rules.mk

--- a/content/media/webspeech/synth/moz.build
+++ b/content/media/webspeech/synth/moz.build
@@ -21,19 +21,8 @@ EXPORTS.mozilla.dom += [
     'SpeechSynthesisChild.h',
     'SpeechSynthesisParent.h',
     'SpeechSynthesisUtterance.h',
     'SpeechSynthesisVoice.h',
     'nsSpeechTask.h',
     'nsSynthVoiceRegistry.h',
 ]
 
-CPP_SOURCES += [
-    'EnableSpeechSynthesisCheck.cpp',
-    'SpeechSynthesis.cpp',
-    'SpeechSynthesisChild.cpp',
-    'SpeechSynthesisParent.cpp',
-    'SpeechSynthesisUtterance.cpp',
-    'SpeechSynthesisVoice.cpp',
-    'nsSpeechTask.cpp',
-    'nsSynthVoiceRegistry.cpp',
-]
-

--- a/content/media/wmf/Makefile.in
+++ b/content/media/wmf/Makefile.in
@@ -8,15 +8,24 @@ srcdir		= @srcdir@
 VPATH		= @srcdir@
 FAIL_ON_WARNINGS := 1
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= gkconwmf_s
 LIBXUL_LIBRARY 	= 1
 
+CPPSRCS		= \
+		DXVA2Manager.cpp \
+		WMFByteStream.cpp \
+		WMFDecoder.cpp \
+		WMFReader.cpp \
+		WMFUtils.cpp \
+		WMFSourceReaderCallback.cpp \
+		$(NULL)
+
 ifeq ($(OS_ARCH),WINNT)
 OS_CXXFLAGS += -DNOMINMAX
 endif
 
 FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk

--- a/content/media/wmf/moz.build
+++ b/content/media/wmf/moz.build
@@ -7,17 +7,8 @@
 MODULE = 'content'
 
 EXPORTS += [
     'WMF.h',
     'WMFDecoder.h',
     'WMFReader.h',
 ]
 
-CPP_SOURCES += [
-    'DXVA2Manager.cpp',
-    'WMFByteStream.cpp',
-    'WMFDecoder.cpp',
-    'WMFReader.cpp',
-    'WMFSourceReaderCallback.cpp',
-    'WMFUtils.cpp',
-]
-

--- a/content/smil/Makefile.in
+++ b/content/smil/Makefile.in
@@ -9,16 +9,43 @@ srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= gkconsmil_s
 LIBXUL_LIBRARY	= 1
 FAIL_ON_WARNINGS = 1
 
+CPPSRCS	= \
+	nsDOMTimeEvent.cpp \
+	nsSMILAnimationController.cpp \
+	nsSMILAnimationFunction.cpp \
+	nsSMILCompositor.cpp \
+	nsSMILCSSProperty.cpp \
+	nsSMILCSSValueType.cpp \
+	nsSMILFloatType.cpp \
+	nsSMILInstanceTime.cpp \
+	nsSMILInterval.cpp \
+	nsSMILKeySpline.cpp \
+	nsSMILMappedAttribute.cpp \
+	nsSMILNullType.cpp \
+	nsSMILParserUtils.cpp \
+	nsSMILRepeatCount.cpp \
+	nsSMILSetAnimationFunction.cpp \
+	nsSMILTimeContainer.cpp \
+	nsSMILTimedElement.cpp \
+	nsSMILTimeValue.cpp \
+	nsSMILTimeValueSpec.cpp \
+	nsSMILValue.cpp \
+	SMILBoolType.cpp \
+	SMILEnumType.cpp \
+	SMILIntegerType.cpp \
+	SMILStringType.cpp \
+	$(NULL)
+
 include $(topsrcdir)/config/config.mk
 
 # we don't want the shared lib, but we want to force the creation of a static lib.
 FORCE_STATIC_LIB = 1
 
 INCLUDES += 	\
 		-I$(srcdir)/../base/src \
 		-I$(srcdir)/../../layout/style \

--- a/content/smil/moz.build
+++ b/content/smil/moz.build
@@ -28,35 +28,8 @@ EXPORTS += [
     'nsSMILTimeValue.h',
     'nsSMILTimeValueSpec.h',
     'nsSMILTimeValueSpecParams.h',
     'nsSMILTimedElement.h',
     'nsSMILTypes.h',
     'nsSMILValue.h',
 ]
 
-CPP_SOURCES += [
-    'SMILBoolType.cpp',
-    'SMILEnumType.cpp',
-    'SMILIntegerType.cpp',
-    'SMILStringType.cpp',
-    'nsDOMTimeEvent.cpp',
-    'nsSMILAnimationController.cpp',
-    'nsSMILAnimationFunction.cpp',
-    'nsSMILCSSProperty.cpp',
-    'nsSMILCSSValueType.cpp',
-    'nsSMILCompositor.cpp',
-    'nsSMILFloatType.cpp',
-    'nsSMILInstanceTime.cpp',
-    'nsSMILInterval.cpp',
-    'nsSMILKeySpline.cpp',
-    'nsSMILMappedAttribute.cpp',
-    'nsSMILNullType.cpp',
-    'nsSMILParserUtils.cpp',
-    'nsSMILRepeatCount.cpp',
-    'nsSMILSetAnimationFunction.cpp',
-    'nsSMILTimeContainer.cpp',
-    'nsSMILTimeValue.cpp',
-    'nsSMILTimeValueSpec.cpp',
-    'nsSMILTimedElement.cpp',
-    'nsSMILValue.cpp',
-]
-

--- a/content/svg/content/src/Makefile.in
+++ b/content/svg/content/src/Makefile.in
@@ -9,16 +9,158 @@ srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= gkcontentsvg_s
 LIBXUL_LIBRARY	= 1
 FAIL_ON_WARNINGS	= 1
 
+CPPSRCS		= \
+		DOMSVGAnimatedLengthList.cpp \
+		DOMSVGAnimatedNumberList.cpp \
+		DOMSVGLength.cpp \
+		DOMSVGLengthList.cpp \
+		DOMSVGNumber.cpp \
+		DOMSVGNumberList.cpp \
+		DOMSVGPathSeg.cpp \
+		DOMSVGPathSegList.cpp \
+		DOMSVGPoint.cpp \
+		DOMSVGPointList.cpp \
+		DOMSVGStringList.cpp \
+		DOMSVGTransformList.cpp \
+		nsISVGPoint.cpp \
+		nsSVGAngle.cpp \
+		nsSVGAnimatedTransformList.cpp \
+		nsSVGBoolean.cpp \
+		nsSVGClass.cpp \
+		nsSVGDataParser.cpp \
+		nsSVGElement.cpp \
+		nsSVGEnum.cpp \
+		nsSVGFeatures.cpp \
+		nsSVGFilters.cpp \
+		nsSVGInteger.cpp \
+		nsSVGIntegerPair.cpp \
+		nsSVGLength2.cpp \
+		nsSVGNumber2.cpp \
+		nsSVGNumberPair.cpp \
+		nsSVGPathDataParser.cpp \
+		nsSVGPathGeometryElement.cpp \
+		nsSVGPolyElement.cpp \
+		nsSVGString.cpp \
+		nsSVGTransform.cpp \
+		nsSVGViewBox.cpp \
+		SVGAElement.cpp \
+		SVGAltGlyphElement.cpp \
+		SVGAngle.cpp \
+		SVGAnimatedAngle.cpp \
+		SVGAnimatedBoolean.cpp \
+		SVGAnimatedLength.cpp \
+		SVGAnimatedLengthList.cpp \
+		SVGAnimatedNumberList.cpp \
+		SVGAnimatedPathSegList.cpp \
+		SVGAnimatedPointList.cpp \
+		SVGAnimatedPreserveAspectRatio.cpp \
+		SVGAnimatedRect.cpp \
+		SVGAnimatedTransformList.cpp \
+		SVGAnimateElement.cpp \
+		SVGAnimateTransformElement.cpp \
+		SVGAnimateMotionElement.cpp \
+		SVGAnimationElement.cpp \
+		SVGAttrValueWrapper.cpp \
+		SVGClipPathElement.cpp \
+		SVGCircleElement.cpp \
+		SVGContentUtils.cpp \
+		SVGDefsElement.cpp \
+		SVGDescElement.cpp \
+		SVGElementFactory.cpp \
+		SVGEllipseElement.cpp \
+		SVGFEBlendElement.cpp \
+		SVGFEColorMatrixElement.cpp \
+		SVGFEComponentTransferElement.cpp \
+		SVGFECompositeElement.cpp \
+		SVGFEConvolveMatrixElement.cpp \
+		SVGFEDiffuseLightingElement.cpp \
+		SVGFEDisplacementMapElement.cpp \
+		SVGFEDistantLightElement.cpp \
+		SVGFEFloodElement.cpp \
+		SVGFEGaussianBlurElement.cpp \
+		SVGFEImageElement.cpp \
+		SVGFEMergeElement.cpp \
+		SVGFEMergeNodeElement.cpp \
+		SVGFEMorphologyElement.cpp \
+		SVGFEOffsetElement.cpp \
+		SVGFEPointLightElement.cpp \
+		SVGFESpecularLightingElement.cpp \
+		SVGFESpotLightElement.cpp \
+		SVGFETileElement.cpp \
+		SVGFETurbulenceElement.cpp \
+		SVGFilterElement.cpp \
+		SVGForeignObjectElement.cpp \
+		SVGFragmentIdentifier.cpp \
+		SVGGElement.cpp \
+		SVGGradientElement.cpp \
+		SVGGraphicsElement.cpp \
+		SVGImageElement.cpp \
+		SVGIntegerPairSMILType.cpp \
+		SVGLength.cpp \
+		SVGLengthList.cpp \
+		SVGLengthListSMILType.cpp \
+		SVGLineElement.cpp \
+		SVGMarkerElement.cpp \
+		SVGMaskElement.cpp \
+		SVGMatrix.cpp \
+		SVGMetadataElement.cpp \
+		SVGMotionSMILType.cpp \
+		SVGMotionSMILAttr.cpp \
+		SVGMotionSMILAnimationFunction.cpp \
+		SVGMotionSMILPathUtils.cpp \
+		SVGMPathElement.cpp \
+		SVGNumberList.cpp \
+		SVGNumberListSMILType.cpp \
+		SVGNumberPairSMILType.cpp \
+		SVGOrientSMILType.cpp \
+		SVGPathData.cpp \
+		SVGPathElement.cpp \
+		SVGPathSegUtils.cpp \
+		SVGPathSegListSMILType.cpp \
+		SVGPatternElement.cpp \
+		SVGPointList.cpp \
+		SVGPointListSMILType.cpp \
+		SVGPolygonElement.cpp \
+		SVGPolylineElement.cpp \
+		SVGPreserveAspectRatio.cpp \
+		SVGRect.cpp \
+		SVGRectElement.cpp \
+		SVGScriptElement.cpp \
+		SVGSetElement.cpp \
+		SVGStopElement.cpp \
+		SVGStringList.cpp \
+		SVGStyleElement.cpp \
+		SVGSymbolElement.cpp \
+		SVGSVGElement.cpp \
+		SVGSwitchElement.cpp \
+		SVGTests.cpp \
+		SVGTextContentElement.cpp \
+		SVGTextElement.cpp \
+		SVGTextPathElement.cpp \
+		SVGTextPositioningElement.cpp \
+		SVGTitleElement.cpp \
+		SVGTransform.cpp \
+		SVGTransformableElement.cpp \
+		SVGTransformList.cpp \
+		SVGTransformListParser.cpp \
+		SVGTransformListSMILType.cpp \
+		SVGTSpanElement.cpp \
+		SVGUseElement.cpp \
+		SVGViewBoxSMILType.cpp \
+		SVGViewElement.cpp \
+		SVGZoomEvent.cpp \
+		$(NULL)
+
 include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
 # we don't want the shared lib, but we want to force the creation of a static lib.
 FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk

--- a/content/svg/content/src/moz.build
+++ b/content/svg/content/src/moz.build
@@ -89,150 +89,8 @@ EXPORTS.mozilla.dom += [
     'SVGTransform.h',
     'SVGTransformableElement.h',
     'SVGUseElement.h',
     'SVGViewElement.h',
     'SVGZoomEvent.h',
     'nsSVGAnimatedTransformList.h',
 ]
 
-CPP_SOURCES += [
-    'DOMSVGAnimatedLengthList.cpp',
-    'DOMSVGAnimatedNumberList.cpp',
-    'DOMSVGLength.cpp',
-    'DOMSVGLengthList.cpp',
-    'DOMSVGNumber.cpp',
-    'DOMSVGNumberList.cpp',
-    'DOMSVGPathSeg.cpp',
-    'DOMSVGPathSegList.cpp',
-    'DOMSVGPoint.cpp',
-    'DOMSVGPointList.cpp',
-    'DOMSVGStringList.cpp',
-    'DOMSVGTransformList.cpp',
-    'SVGAElement.cpp',
-    'SVGAltGlyphElement.cpp',
-    'SVGAngle.cpp',
-    'SVGAnimateElement.cpp',
-    'SVGAnimateMotionElement.cpp',
-    'SVGAnimateTransformElement.cpp',
-    'SVGAnimatedAngle.cpp',
-    'SVGAnimatedBoolean.cpp',
-    'SVGAnimatedLength.cpp',
-    'SVGAnimatedLengthList.cpp',
-    'SVGAnimatedNumberList.cpp',
-    'SVGAnimatedPathSegList.cpp',
-    'SVGAnimatedPointList.cpp',
-    'SVGAnimatedPreserveAspectRatio.cpp',
-    'SVGAnimatedRect.cpp',
-    'SVGAnimatedTransformList.cpp',
-    'SVGAnimationElement.cpp',
-    'SVGAttrValueWrapper.cpp',
-    'SVGCircleElement.cpp',
-    'SVGClipPathElement.cpp',
-    'SVGContentUtils.cpp',
-    'SVGDefsElement.cpp',
-    'SVGDescElement.cpp',
-    'SVGElementFactory.cpp',
-    'SVGEllipseElement.cpp',
-    'SVGFEBlendElement.cpp',
-    'SVGFEColorMatrixElement.cpp',
-    'SVGFEComponentTransferElement.cpp',
-    'SVGFECompositeElement.cpp',
-    'SVGFEConvolveMatrixElement.cpp',
-    'SVGFEDiffuseLightingElement.cpp',
-    'SVGFEDisplacementMapElement.cpp',
-    'SVGFEDistantLightElement.cpp',
-    'SVGFEFloodElement.cpp',
-    'SVGFEGaussianBlurElement.cpp',
-    'SVGFEImageElement.cpp',
-    'SVGFEMergeElement.cpp',
-    'SVGFEMergeNodeElement.cpp',
-    'SVGFEMorphologyElement.cpp',
-    'SVGFEOffsetElement.cpp',
-    'SVGFEPointLightElement.cpp',
-    'SVGFESpecularLightingElement.cpp',
-    'SVGFESpotLightElement.cpp',
-    'SVGFETileElement.cpp',
-    'SVGFETurbulenceElement.cpp',
-    'SVGFilterElement.cpp',
-    'SVGForeignObjectElement.cpp',
-    'SVGFragmentIdentifier.cpp',
-    'SVGGElement.cpp',
-    'SVGGradientElement.cpp',
-    'SVGGraphicsElement.cpp',
-    'SVGImageElement.cpp',
-    'SVGIntegerPairSMILType.cpp',
-    'SVGLength.cpp',
-    'SVGLengthList.cpp',
-    'SVGLengthListSMILType.cpp',
-    'SVGLineElement.cpp',
-    'SVGMPathElement.cpp',
-    'SVGMarkerElement.cpp',
-    'SVGMaskElement.cpp',
-    'SVGMatrix.cpp',
-    'SVGMetadataElement.cpp',
-    'SVGMotionSMILAnimationFunction.cpp',
-    'SVGMotionSMILAttr.cpp',
-    'SVGMotionSMILPathUtils.cpp',
-    'SVGMotionSMILType.cpp',
-    'SVGNumberList.cpp',
-    'SVGNumberListSMILType.cpp',
-    'SVGNumberPairSMILType.cpp',
-    'SVGOrientSMILType.cpp',
-    'SVGPathData.cpp',
-    'SVGPathElement.cpp',
-    'SVGPathSegListSMILType.cpp',
-    'SVGPathSegUtils.cpp',
-    'SVGPatternElement.cpp',
-    'SVGPointList.cpp',
-    'SVGPointListSMILType.cpp',
-    'SVGPolygonElement.cpp',
-    'SVGPolylineElement.cpp',
-    'SVGPreserveAspectRatio.cpp',
-    'SVGRect.cpp',
-    'SVGRectElement.cpp',
-    'SVGSVGElement.cpp',
-    'SVGScriptElement.cpp',
-    'SVGSetElement.cpp',
-    'SVGStopElement.cpp',
-    'SVGStringList.cpp',
-    'SVGStyleElement.cpp',
-    'SVGSwitchElement.cpp',
-    'SVGSymbolElement.cpp',
-    'SVGTSpanElement.cpp',
-    'SVGTests.cpp',
-    'SVGTextContentElement.cpp',
-    'SVGTextElement.cpp',
-    'SVGTextPathElement.cpp',
-    'SVGTextPositioningElement.cpp',
-    'SVGTitleElement.cpp',
-    'SVGTransform.cpp',
-    'SVGTransformList.cpp',
-    'SVGTransformListParser.cpp',
-    'SVGTransformListSMILType.cpp',
-    'SVGTransformableElement.cpp',
-    'SVGUseElement.cpp',
-    'SVGViewBoxSMILType.cpp',
-    'SVGViewElement.cpp',
-    'SVGZoomEvent.cpp',
-    'nsISVGPoint.cpp',
-    'nsSVGAngle.cpp',
-    'nsSVGAnimatedTransformList.cpp',
-    'nsSVGBoolean.cpp',
-    'nsSVGClass.cpp',
-    'nsSVGDataParser.cpp',
-    'nsSVGElement.cpp',
-    'nsSVGEnum.cpp',
-    'nsSVGFeatures.cpp',
-    'nsSVGFilters.cpp',
-    'nsSVGInteger.cpp',
-    'nsSVGIntegerPair.cpp',
-    'nsSVGLength2.cpp',
-    'nsSVGNumber2.cpp',
-    'nsSVGNumberPair.cpp',
-    'nsSVGPathDataParser.cpp',
-    'nsSVGPathGeometryElement.cpp',
-    'nsSVGPolyElement.cpp',
-    'nsSVGString.cpp',
-    'nsSVGTransform.cpp',
-    'nsSVGViewBox.cpp',
-]
-

--- a/content/svg/document/src/Makefile.in
+++ b/content/svg/document/src/Makefile.in
@@ -9,16 +9,20 @@ srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= gkconsvgdoc_s
 LIBXUL_LIBRARY	= 1
 FAIL_ON_WARNINGS = 1
 
+CPPSRCS		= \
+		SVGDocument.cpp \
+		$(NULL)
+
 # we don't want the shared lib, but we want to force the creation of a static lib.
 FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
 
 INCLUDES	+= \
 		-I$(srcdir) \
 		-I$(srcdir)/../../../xml/document/src \

--- a/content/svg/document/src/moz.build
+++ b/content/svg/document/src/moz.build
@@ -5,12 +5,8 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULE = 'content'
 
 EXPORTS.mozilla.dom += [
     'SVGDocument.h',
 ]
 
-CPP_SOURCES += [
-    'SVGDocument.cpp',
-]
-

--- a/content/xbl/src/Makefile.in
+++ b/content/xbl/src/Makefile.in
@@ -9,16 +9,36 @@ srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= gkconxbl_s
 LIBXUL_LIBRARY	= 1
 FAIL_ON_WARNINGS = 1
 
+CPPSRCS		= \
+    nsXBLBinding.cpp \
+    nsXBLPrototypeBinding.cpp \
+    nsXBLPrototypeResources.cpp \
+    nsXBLResourceLoader.cpp \
+    nsXBLDocumentInfo.cpp \
+    nsXBLContentSink.cpp \
+    nsXBLProtoImplProperty.cpp \
+    nsXBLProtoImplMethod.cpp \
+    nsXBLProtoImplField.cpp \
+    nsXBLProtoImpl.cpp \
+    nsXBLEventHandler.cpp \
+    nsXBLWindowKeyHandler.cpp \
+    nsXBLPrototypeHandler.cpp \
+    nsXBLService.cpp \
+    nsBindingManager.cpp \
+    nsXBLInsertionPoint.cpp \
+    nsXBLSerialize.cpp \
+		$(NULL)
+
 include $(topsrcdir)/config/config.mk
 
 # we don't want the shared lib, but we want to force the creation of a static lib.
 FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES	= \

--- a/content/xbl/src/moz.build
+++ b/content/xbl/src/moz.build
@@ -7,28 +7,8 @@
 MODULE = 'content'
 
 EXPORTS += [
     'nsBindingManager.h',
     'nsXBLBinding.h',
     'nsXBLService.h',
 ]
 
-CPP_SOURCES += [
-    'nsBindingManager.cpp',
-    'nsXBLBinding.cpp',
-    'nsXBLContentSink.cpp',
-    'nsXBLDocumentInfo.cpp',
-    'nsXBLEventHandler.cpp',
-    'nsXBLInsertionPoint.cpp',
-    'nsXBLProtoImpl.cpp',
-    'nsXBLProtoImplField.cpp',
-    'nsXBLProtoImplMethod.cpp',
-    'nsXBLProtoImplProperty.cpp',
-    'nsXBLPrototypeBinding.cpp',
-    'nsXBLPrototypeHandler.cpp',
-    'nsXBLPrototypeResources.cpp',
-    'nsXBLResourceLoader.cpp',
-    'nsXBLSerialize.cpp',
-    'nsXBLService.cpp',
-    'nsXBLWindowKeyHandler.cpp',
-]
-

--- a/content/xml/content/src/Makefile.in
+++ b/content/xml/content/src/Makefile.in
@@ -9,16 +9,23 @@ srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= gkconxmlcon_s
 LIBXUL_LIBRARY	= 1
 FAIL_ON_WARNINGS = 1
 
+CPPSRCS		= \
+		nsXMLElement.cpp \
+		CDATASection.cpp \
+		ProcessingInstruction.cpp \
+		XMLStylesheetProcessingInstruction.cpp \
+		$(NULL)
+
 # we don't want the shared lib, but we want to force the creation of a static lib.
 FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
 
 INCLUDES	+= \
 		-I$(srcdir)/../../../base/src \
 		$(NULL)

--- a/content/xml/content/src/moz.build
+++ b/content/xml/content/src/moz.build
@@ -7,15 +7,8 @@
 MODULE = 'content'
 
 EXPORTS.mozilla.dom += [
     'CDATASection.h',
     'ProcessingInstruction.h',
     'XMLStylesheetProcessingInstruction.h',
 ]
 
-CPP_SOURCES += [
-    'CDATASection.cpp',
-    'ProcessingInstruction.cpp',
-    'XMLStylesheetProcessingInstruction.cpp',
-    'nsXMLElement.cpp',
-]
-

--- a/content/xml/document/src/Makefile.in
+++ b/content/xml/document/src/Makefile.in
@@ -9,16 +9,23 @@ srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= gkconxmldoc_s
 LIBXUL_LIBRARY	= 1
 FAIL_ON_WARNINGS = 1
 
+CPPSRCS		= \
+		nsXMLContentSink.cpp \
+		nsXMLFragmentContentSink.cpp \
+		XMLDocument.cpp \
+		nsXMLPrettyPrinter.cpp \
+		$(NULL)
+
 # we don't want the shared lib, but we want to force the creation of a static lib.
 FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES	= \
 		-I$(srcdir) \
 		-I$(srcdir)/../../../html/document/src \

--- a/content/xml/document/src/moz.build
+++ b/content/xml/document/src/moz.build
@@ -5,15 +5,8 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULE = 'content'
 
 EXPORTS.mozilla.dom += [
     'XMLDocument.h',
 ]
 
-CPP_SOURCES += [
-    'XMLDocument.cpp',
-    'nsXMLContentSink.cpp',
-    'nsXMLFragmentContentSink.cpp',
-    'nsXMLPrettyPrinter.cpp',
-]
-

--- a/content/xslt/src/base/Makefile.in
+++ b/content/xslt/src/base/Makefile.in
@@ -8,16 +8,22 @@ srcdi

author	Ed Morley <emorley@mozilla.com>
	Mon, 13 May 2013 10:05:49 +0100
changeset 131750	0db9c45c8bde2a553cf4f8bcb62707ad359838c0
parent 131749	02d3d8a7021556b609968cbe55e00bce021a19b8
child 131751	25678a2f1f5ca6fa5563715cbf6c184aab22f19f
push id	24671
push user	ryanvm@gmail.com
push date	Mon, 13 May 2013 20:32:09 +0000
treeherder	mozilla-central@81dd97739fa1 [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
bugs	864774
milestone	23.0a1
backs out	496846474ed30201430d5c9b360c8a6956684d16
first release with	nightly linux32 81dd97739fa1 / 24.0a1 / 20130514031031 / files nightly linux64 81dd97739fa1 / 24.0a1 / 20130514031031 / files nightly mac 81dd97739fa1 / 24.0a1 / 20130514031031 / files nightly win32 81dd97739fa1 / 24.0a1 / 20130514031031 / files nightly win64 81dd97739fa1 / 24.0a1 / 20130514031031 / files
last release without	nightly linux32 d68224f5325b / 23.0a1 / 20130512030908 / files nightly linux64 d68224f5325b / 23.0a1 / 20130512030908 / files nightly mac d68224f5325b / 23.0a1 / 20130512030908 / files nightly win32 d68224f5325b / 23.0a1 / 20130512030908 / files nightly win64 d68224f5325b / 23.0a1 / 20130512030908 / files