Bug 864774 - Part 2: Move CPPSRCS to moz.build as CPP_SOURCES; r=joey CLOSED TREE

From 9e0ba7f425143f545eb6c4b26a9a96b5ade4d8e9 Mon Sep 17 00:00:00 2001
2024-09-13 09:24:08 -07:00 · 2013-04-23 17:54:15 -04:00 · 2013-04-23 17:54:15 -04:00 · 994cfe0b6b
commit 994cfe0b6b
parent b91457697f
876 changed files with 6995 additions and 6595 deletions
--- a/accessible/src/atk/Makefile.in
+++ b/accessible/src/atk/Makefile.in
@ -13,29 +13,6 @@ 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

--- a/accessible/src/atk/moz.build
+++ b/accessible/src/atk/moz.build
@ -11,3 +11,25 @@ EXPORTS.mozilla.a11y += [
    '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
@ -12,40 +12,6 @@ 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

--- a/accessible/src/base/moz.build
+++ b/accessible/src/base/moz.build
@ -4,6 +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/.

+include('../shared.mozbuild')
+
 MODULE = 'accessibility'

 EXPORTS += [
@ -26,3 +28,35 @@ 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
@ -12,22 +12,6 @@ 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

--- a/accessible/src/generic/moz.build
+++ b/accessible/src/generic/moz.build
@ -12,3 +12,18 @@ EXPORTS.mozilla.a11y += [
    '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
@ -13,19 +13,6 @@ 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

--- a/accessible/src/html/moz.build
+++ b/accessible/src/html/moz.build
@ -6,3 +6,14 @@

 MODULE = 'accessibility'

+CPP_SOURCES += [
+    'HTMLCanvasAccessible.cpp',
+    'HTMLElementAccessibles.cpp',
+    'HTMLFormControlAccessible.cpp',
+    'HTMLImageMapAccessible.cpp',
+    'HTMLLinkAccessible.cpp',
+    'HTMLListAccessible.cpp',
+    'HTMLSelectAccessible.cpp',
+    'HTMLTableAccessible.cpp',
+]
+
--- a/accessible/src/jsat/moz.build
+++ b/accessible/src/jsat/moz.build
@ -6,3 +6,7 @@

 MODULE = 'alerts'

+CPP_SOURCES += [
+    'nsAccessibilityFactory.cpp',
+]
+
--- a/accessible/src/other/Makefile.in
+++ b/accessible/src/other/Makefile.in
@ -13,12 +13,6 @@ 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

--- a/accessible/src/other/moz.build
+++ b/accessible/src/other/moz.build
@ -11,3 +11,8 @@ EXPORTS.mozilla.a11y += [
    'HyperTextAccessibleWrap.h',
 ]

+CPP_SOURCES += [
+    'AccessibleWrap.cpp',
+    'Platform.cpp',
+]
+
--- a/accessible/src/shared.mozbuild
+++ b/accessible/src/shared.mozbuild
@ -0,0 +1,12 @@
+# -*- 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
@ -13,21 +13,6 @@ 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
--- a/accessible/src/windows/ia2/moz.build
+++ b/accessible/src/windows/ia2/moz.build
@ -16,3 +16,17 @@ EXPORTS += [
    '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
@ -13,34 +13,6 @@ 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

--- a/accessible/src/windows/msaa/moz.build
+++ b/accessible/src/windows/msaa/moz.build
@ -16,3 +16,28 @@ EXPORTS.mozilla.a11y += [
    '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
@ -16,11 +16,6 @@ LIBXUL_LIBRARY = 1
 # 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

--- a/accessible/src/windows/sdn/moz.build
+++ b/accessible/src/windows/sdn/moz.build
@ -6,3 +6,8 @@

 MODULE = 'accessibility'

+CPP_SOURCES += [
+    'sdnAccessible.cpp',
+    'sdnTextAccessible.cpp',
+]
+
--- a/accessible/src/windows/uia/Makefile.in
+++ b/accessible/src/windows/uia/Makefile.in
@ -16,11 +16,6 @@ LIBXUL_LIBRARY = 1
 # 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

--- a/accessible/src/windows/uia/moz.build
+++ b/accessible/src/windows/uia/moz.build
@ -6,3 +6,7 @@

 MODULE = 'accessibility'

+CPP_SOURCES += [
+    'uiaRawElmProvider.cpp',
+]
+
--- a/accessible/src/xpcom/Makefile.in
+++ b/accessible/src/xpcom/Makefile.in
@ -13,13 +13,6 @@ 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

--- a/accessible/src/xpcom/moz.build
+++ b/accessible/src/xpcom/moz.build
@ -10,3 +10,10 @@ 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
@ -13,23 +13,6 @@ 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

--- a/accessible/src/xul/moz.build
+++ b/accessible/src/xul/moz.build
@ -6,3 +6,18 @@

 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
@ -19,8 +19,6 @@ endif

 ifndef LIBXUL_SDK

-CPPSRCS = nsBrowserApp.cpp
-
 ifeq (gonk,$(MOZ_WIDGET_TOOLKIT))
 LIBS += \
  -lui \
--- a/b2g/app/moz.build
+++ b/b2g/app/moz.build
@ -9,3 +9,6 @@ if not CONFIG['LIBXUL_SDK']:
        PROGRAM = CONFIG['MOZ_APP_NAME'] + "-bin"
    else:
        PROGRAM = CONFIG['MOZ_APP_NAME']
+    CPP_SOURCES += [
+        'nsBrowserApp.cpp',
+    ]
--- a/b2g/gaia/Makefile.in
+++ b/b2g/gaia/Makefile.in
@ -12,7 +12,6 @@ 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))\" \
--- a/b2g/gaia/moz.build
+++ b/b2g/gaia/moz.build
@ -6,3 +6,7 @@

 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
@ -43,8 +43,6 @@ endif #} LIBXUL_SDK

 # Build a binary bootstrapping with XRE_main

-CPPSRCS = nsBrowserApp.cpp
-
 LOCAL_INCLUDES += \
  -I$(topsrcdir)/toolkit/xre \
  -I$(topsrcdir)/xpcom/base \
--- a/browser/app/moz.build
+++ b/browser/app/moz.build
@ -8,3 +8,6 @@ DIRS += ['profile/extensions']

 PROGRAM = CONFIG['MOZ_APP_NAME']

+CPP_SOURCES += [
+    'nsBrowserApp.cpp',
+]
--- a/browser/components/about/Makefile.in
+++ b/browser/components/about/Makefile.in
@ -14,8 +14,6 @@ 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
@ -10,3 +10,7 @@ EXPORTS.mozilla.browser += [
    'AboutRedirector.h',
 ]

+CPP_SOURCES += [
+    'AboutRedirector.cpp',
+]
+
--- a/browser/components/build/Makefile.in
+++ b/browser/components/build/Makefile.in
@ -17,9 +17,6 @@ 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
--- a/browser/components/build/moz.build
+++ b/browser/components/build/moz.build
@ -10,3 +10,7 @@ EXPORTS += [
    'nsBrowserCompsCID.h',
 ]

+CPP_SOURCES += [
+    'nsModule.cpp',
+]
+
--- a/browser/components/dirprovider/Makefile.in
+++ b/browser/components/dirprovider/Makefile.in
@ -14,8 +14,6 @@ LIBRARY_NAME = browserdir_s
 FORCE_STATIC_LIB = 1
 USE_STATIC_LIBS = 1

-CPPSRCS = DirectoryProvider.cpp
-
 LOCAL_INCLUDES = -I$(srcdir)/../build

 EXTRA_DSO_LDOPTS = \
--- a/browser/components/dirprovider/moz.build
+++ b/browser/components/dirprovider/moz.build
@ -12,3 +12,7 @@ EXPORTS.mozilla.browser += [
    'DirectoryProvider.h',
 ]

+CPP_SOURCES += [
+    'DirectoryProvider.cpp',
+]
+
--- a/browser/components/feeds/src/Makefile.in
+++ b/browser/components/feeds/src/Makefile.in
@ -30,8 +30,6 @@ EXTRA_PP_COMPONENTS = \
 	$(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
@ -6,3 +6,7 @@

 MODULE = 'browser_feeds'

+CPP_SOURCES += [
+    'nsFeedSniffer.cpp',
+]
+
--- a/browser/components/migration/src/Makefile.in
+++ b/browser/components/migration/src/Makefile.in
@ -24,8 +24,6 @@ EXTRA_PP_COMPONENTS = \
  $(NULL)

 ifeq ($(OS_ARCH),WINNT)
-CPPSRCS += nsIEHistoryEnumerator.cpp
-
 EXTRA_COMPONENTS += IEProfileMigrator.js \
                    $(NULL)

--- a/browser/components/migration/src/moz.build
+++ b/browser/components/migration/src/moz.build
@ -6,3 +6,7 @@

 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
@ -13,21 +13,24 @@ 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)
-CPPSRCS = nsWindowsShellService.cpp
+LIBRARY_NAME = shellservice_s
 else
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
-CPPSRCS = nsMacShellService.cpp
+LIBRARY_NAME = shellservice_s
 else
 ifeq ($(MOZ_WIDGET_TOOLKIT), gtk2)
-CPPSRCS = nsGNOMEShellService.cpp
-endif
-endif
-endif
-
-ifdef CPPSRCS
 LIBRARY_NAME = shellservice_s
 endif
+endif
+endif

 EXTRA_COMPONENTS = nsSetDefaultBrowser.js nsSetDefaultBrowser.manifest

--- a/browser/components/shell/src/moz.build
+++ b/browser/components/shell/src/moz.build
@ -6,3 +6,15 @@

 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
@ -22,11 +22,6 @@ DIST_PROGRAM = CommandExecuteHandler$(BIN_SUFFIX)
 MOZ_GLUE_LDFLAGS =
 MOZ_GLUE_PROGRAM_LDFLAGS =

-CPPSRCS	= \
-	CommandExecuteHandler.cpp \
-	CEHHelper.cpp \
-	$(NULL)
-
 OS_LIBS = \
 	kernel32.lib \
 	user32.lib \
--- a/browser/metro/shell/commandexecutehandler/moz.build
+++ b/browser/metro/shell/commandexecutehandler/moz.build
@ -5,3 +5,8 @@
 # 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
@ -15,8 +15,6 @@ include $(topsrcdir)/config/config.mk

 DIST_SUBDIR = metro/install

-CPPSRCS    = linktool.cpp
-
 OS_LIBS = \
 	kernel32.lib \
 	user32.lib \
--- a/browser/metro/shell/linktool/moz.build
+++ b/browser/metro/shell/linktool/moz.build
@ -6,3 +6,6 @@

 PROGRAM = 'linktool'

+CPP_SOURCES += [
+    'linktool.cpp',
+]
--- a/browser/metro/shell/testing/Makefile.in
+++ b/browser/metro/shell/testing/Makefile.in
@ -23,10 +23,6 @@ include $(topsrcdir)/config/config.mk
 # We want this exe in dist/bin
 DIST_SUBDIR =

-CPPSRCS	= \
-	metrotestharness.cpp \
-	$(NULL)
-
 OS_LIBS = \
 	kernel32.lib \
 	user32.lib \
--- a/browser/metro/shell/testing/moz.build
+++ b/browser/metro/shell/testing/moz.build
@ -6,3 +6,6 @@

 PROGRAM = 'metrotestharness'

+CPP_SOURCES += [
+    'metrotestharness.cpp',
+]
--- a/build/stlport/Makefile.in
+++ b/build/stlport/Makefile.in
@ -20,7 +20,6 @@ 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
--- a/build/stlport/moz.build
+++ b/build/stlport/moz.build
@ -6,3 +6,7 @@

 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
@ -16,8 +16,6 @@ STL_FLAGS =
 NO_EXPAND_LIBS = 1
 NO_PROFILE_GUIDED_OPTIMIZE = 1

-CPPSRCS = \
-  stdc++compat.cpp
  $(NULL)

 HOST_CPPSRCS = $(CPPSRCS)
--- a/build/unix/stdc++compat/moz.build
+++ b/build/unix/stdc++compat/moz.build
@ -6,3 +6,7 @@

 MODULE = 'build'

+CPP_SOURCES += [
+    'stdc++compat.cpp',
+]
+
--- a/build/win32/Makefile.in
+++ b/build/win32/Makefile.in
@ -14,7 +14,6 @@ NO_PROFILE_GUIDED_OPTIMIZE = 1
 ifdef ENABLE_TESTS

 USE_STATIC_LIBS = 1
-CPPSRCS = crashinject.cpp

 endif # ENABLE_TESTS

--- a/build/win32/crashinjectdll/Makefile.in
+++ b/build/win32/crashinjectdll/Makefile.in
@ -14,8 +14,6 @@ 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
@ -4,3 +4,7 @@
 # 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
@ -11,3 +11,6 @@ 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
@ -15,8 +15,6 @@ 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
@ -4,3 +4,7 @@
 # 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
@ -16,16 +16,6 @@ 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 \
--- a/caps/src/moz.build
+++ b/caps/src/moz.build
@ -6,3 +6,13 @@

 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
@ -15,13 +15,6 @@ MSVC_ENABLE_PGO := 1
 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
--- a/chrome/src/moz.build
+++ b/chrome/src/moz.build
@ -10,3 +10,10 @@ 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
@ -14,109 +14,12 @@ LIBRARY_NAME	= gkconbase_s
 MSVC_ENABLE_PGO := 1
 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
--- a/content/base/src/moz.build
+++ b/content/base/src/moz.build
@ -39,6 +39,16 @@ if CONFIG['MOZ_WEBRTC']:
        'nsDOMDataChannel.h',
        'nsDOMDataChannelDeclarations.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',
@ -53,3 +63,93 @@ EXPORTS.mozilla.dom += [
    '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
@ -15,56 +15,10 @@ MSVC_ENABLE_PGO := 1
 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 \
-	WebGLExtensionElementIndexUint.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.
--- a/content/canvas/src/moz.build
+++ b/content/canvas/src/moz.build
@ -15,3 +15,47 @@ EXPORTS.mozilla.dom += [
    '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',
+        'WebGLExtensionElementIndexUint.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
@ -15,53 +15,6 @@ MSVC_ENABLE_PGO := 1
 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

--- a/content/events/src/moz.build
+++ b/content/events/src/moz.build
@ -20,3 +20,48 @@ 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
@ -15,84 +15,6 @@ MSVC_ENABLE_PGO := 1
 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 \
-		HTMLTrackElement.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

--- a/content/html/content/src/moz.build
+++ b/content/html/content/src/moz.build
@ -75,3 +75,81 @@ EXPORTS.mozilla.dom += [
    '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',
+    'HTMLTrackElement.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
@ -15,15 +15,6 @@ MSVC_ENABLE_PGO := 1
 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

--- a/content/html/document/src/moz.build
+++ b/content/html/document/src/moz.build
@ -13,3 +13,12 @@ EXPORTS += [
 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
@ -14,11 +14,6 @@ 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

--- a/content/mathml/content/src/moz.build
+++ b/content/mathml/content/src/moz.build
@ -6,3 +6,8 @@

 MODULE = 'content'

+CPP_SOURCES += [
+    'nsMathMLElement.cpp',
+    'nsMathMLElementFactory.cpp',
+]
+
--- a/content/media/Makefile.in
+++ b/content/media/Makefile.in
@ -16,35 +16,6 @@ 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 \
-  TextTrack.cpp \
-  TextTrackList.cpp \
-  TextTrackCue.cpp \
-  TextTrackCueList.cpp \
-  VideoFrameContainer.cpp \
-  VideoSegment.cpp \
-  VideoStreamTrack.cpp \
-  VideoUtils.cpp \
-  $(NULL)
-
 FORCE_STATIC_LIB = 1

 include $(topsrcdir)/config/config.mk
--- a/content/media/dash/Makefile.in
+++ b/content/media/dash/Makefile.in
@ -18,12 +18,6 @@ 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
--- a/content/media/dash/moz.build
+++ b/content/media/dash/moz.build
@ -13,3 +13,9 @@ EXPORTS += [
    'DASHRepReader.h',
 ]

+CPP_SOURCES += [
+    'DASHDecoder.cpp',
+    'DASHReader.cpp',
+    'DASHRepDecoder.cpp',
+]
+
--- a/content/media/gstreamer/Makefile.in
+++ b/content/media/gstreamer/Makefile.in
@ -13,14 +13,6 @@ 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
--- a/content/media/gstreamer/moz.build
+++ b/content/media/gstreamer/moz.build
@ -12,3 +12,10 @@ EXPORTS += [
    'GStreamerReader.h',
 ]

+CPP_SOURCES += [
+    'GStreamerDecoder.cpp',
+    'GStreamerFormatHelper.cpp',
+    'GStreamerReader.cpp',
+    'GStreamerMozVideoBuffer.cpp',
+]
+
--- a/content/media/moz.build
+++ b/content/media/moz.build
@ -83,3 +83,32 @@ EXPORTS.mozilla.dom += [
    'TextTrackList.h',
    'VideoStreamTrack.h',
 ]
+
+CPP_SOURCES += [
+    'AudioAvailableEventManager.cpp',
+    'AudioChannelFormat.cpp',
+    'AudioNodeEngine.cpp',
+    'AudioNodeStream.cpp',
+    'AudioSegment.cpp',
+    'AudioStream.cpp',
+    'AudioStreamTrack.cpp',
+    'DOMMediaStream.cpp',
+    'DecoderTraits.cpp',
+    'FileBlockCache.cpp',
+    'MediaCache.cpp',
+    'MediaDecoder.cpp',
+    'MediaDecoderReader.cpp',
+    'MediaDecoderStateMachine.cpp',
+    'MediaResource.cpp',
+    'MediaStreamGraph.cpp',
+    'MediaStreamTrack.cpp',
+    'StreamBuffer.cpp',
+    'TextTrack.cpp',
+    'TextTrackCue.cpp',
+    'TextTrackCueList.cpp',
+    'TextTrackList.cpp',
+    'VideoFrameContainer.cpp',
+    'VideoSegment.cpp',
+    'VideoStreamTrack.cpp',
+    'VideoUtils.cpp',
+]
--- a/content/media/ogg/Makefile.in
+++ b/content/media/ogg/Makefile.in
@ -14,12 +14,6 @@ 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
@ -12,3 +12,9 @@ EXPORTS += [
    'OggReader.h',
 ]

+CPP_SOURCES += [
+    'OggCodecState.cpp',
+    'OggDecoder.cpp',
+    'OggReader.cpp',
+]
+
--- a/content/media/omx/Makefile.in
+++ b/content/media/omx/Makefile.in
@ -12,12 +12,6 @@ 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
--- a/content/media/omx/moz.build
+++ b/content/media/omx/moz.build
@ -11,3 +11,9 @@ EXPORTS += [
    'MediaOmxReader.h',
 ]

+CPP_SOURCES += [
+    'MediaOmxDecoder.cpp',
+    'MediaOmxReader.cpp',
+    'OmxDecoder.cpp',
+]
+
--- a/content/media/plugins/Makefile.in
+++ b/content/media/plugins/Makefile.in
@ -12,12 +12,6 @@ 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
--- a/content/media/plugins/moz.build
+++ b/content/media/plugins/moz.build
@ -13,3 +13,9 @@ EXPORTS += [
    'MediaPluginReader.h',
 ]

+CPP_SOURCES += [
+    'MediaPluginDecoder.cpp',
+    'MediaPluginHost.cpp',
+    'MediaPluginReader.cpp',
+]
+
--- a/content/media/raw/Makefile.in
+++ b/content/media/raw/Makefile.in
@ -14,11 +14,6 @@ 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
--- a/content/media/raw/moz.build
+++ b/content/media/raw/moz.build
@ -12,3 +12,8 @@ EXPORTS += [
    'RawStructs.h',
 ]

+CPP_SOURCES += [
+    'RawDecoder.cpp',
+    'RawReader.cpp',
+]
+
--- a/content/media/wave/Makefile.in
+++ b/content/media/wave/Makefile.in
@ -14,11 +14,6 @@ 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
@ -11,3 +11,8 @@ EXPORTS += [
    'WaveReader.h',
 ]

+CPP_SOURCES += [
+    'WaveDecoder.cpp',
+    'WaveReader.cpp',
+]
+
--- a/content/media/webaudio/Makefile.in
+++ b/content/media/webaudio/Makefile.in
@ -15,32 +15,6 @@ 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 \
-  OfflineAudioCompletionEvent.cpp \
-  PannerNode.cpp \
-  ScriptProcessorNode.cpp \
-  ThreeDPoint.cpp \
-  WaveShaperNode.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
@ -12,13 +12,6 @@ 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
@ -6,3 +6,10 @@

 MODULE = 'content'

+CPP_SOURCES += [
+    'Biquad.cpp',
+    'DynamicsCompressor.cpp',
+    'DynamicsCompressorKernel.cpp',
+    'ZeroPole.cpp',
+]
+
--- a/content/media/webaudio/moz.build
+++ b/content/media/webaudio/moz.build
@ -40,3 +40,29 @@ EXPORTS.mozilla.dom += [
    'WaveShaperNode.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',
+    'OfflineAudioCompletionEvent.cpp',
+    'PannerNode.cpp',
+    'ScriptProcessorNode.cpp',
+    'ThreeDPoint.cpp',
+    'WaveShaperNode.cpp',
+    'WebAudioUtils.cpp',
+]
+
--- a/content/media/webm/Makefile.in
+++ b/content/media/webm/Makefile.in
@ -14,12 +14,6 @@ LIBRARY_NAME	= gkconwebm_s
 LIBXUL_LIBRARY 	= 1


-CPPSRCS		= \
-		WebMBufferedParser.cpp \
-		WebMDecoder.cpp \
-		WebMReader.cpp \
-		$(NULL)
-
 FORCE_STATIC_LIB = 1

 include $(topsrcdir)/config/rules.mk
--- a/content/media/webm/moz.build
+++ b/content/media/webm/moz.build
@ -11,3 +11,9 @@ EXPORTS += [
    'WebMReader.h',
 ]

+CPP_SOURCES += [
+    'WebMBufferedParser.cpp',
+    'WebMDecoder.cpp',
+    'WebMReader.cpp',
+]
+
--- a/content/media/webrtc/Makefile.in
+++ b/content/media/webrtc/Makefile.in
@ -12,18 +12,6 @@ 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
--- a/content/media/webrtc/moz.build
+++ b/content/media/webrtc/moz.build
@ -13,3 +13,13 @@ EXPORTS += [

 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
@ -19,21 +19,6 @@ 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
--- a/content/media/webspeech/recognition/moz.build
+++ b/content/media/webspeech/recognition/moz.build
@ -26,3 +26,18 @@ EXPORTS.mozilla.dom += [
    '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/Show More
+++ b/Show More