From 71cbbf51cba789f95acb3c6e854135f4b10add2c Mon Sep 17 00:00:00 2001
From: Mike Hommey <mh+mozilla@glandium.org>
Date: Wed, 30 Oct 2013 07:51:27 +0900
Subject: [PATCH] Bug 901561 - Move CMSRCS to moz.build. r=gps

---
 config/config.mk                                           | 1 +
 js/src/config/config.mk                                    | 1 +
 python/mozbuild/mozbuild/frontend/emitter.py               | 1 +
 .../google-breakpad/src/common/mac/Makefile.in             | 7 -------
 .../crashreporter/google-breakpad/src/common/mac/moz.build | 4 ++++
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/config/config.mk b/config/config.mk
index 6860a79db9e..67da9929e8f 100644
--- a/config/config.mk
+++ b/config/config.mk
@@ -36,6 +36,7 @@ endif
 _MOZBUILD_EXTERNAL_VARIABLES := \
   ANDROID_GENERATED_RESFILES \
   ANDROID_RESFILES \
+  CMSRCS \
   CMMSRCS \
   CPP_UNIT_TESTS \
   DIRS \
diff --git a/js/src/config/config.mk b/js/src/config/config.mk
index 6860a79db9e..67da9929e8f 100644
--- a/js/src/config/config.mk
+++ b/js/src/config/config.mk
@@ -36,6 +36,7 @@ endif
 _MOZBUILD_EXTERNAL_VARIABLES := \
   ANDROID_GENERATED_RESFILES \
   ANDROID_RESFILES \
+  CMSRCS \
   CMMSRCS \
   CPP_UNIT_TESTS \
   DIRS \
diff --git a/python/mozbuild/mozbuild/frontend/emitter.py b/python/mozbuild/mozbuild/frontend/emitter.py
index 074b7e6416c..7d24e86cf66 100644
--- a/python/mozbuild/mozbuild/frontend/emitter.py
+++ b/python/mozbuild/mozbuild/frontend/emitter.py
@@ -179,6 +179,7 @@ class TreeMetadataEmitter(LoggingMixin):
                 '.s': 'ASFILES',
                 '.asm': 'ASFILES',
                 '.c': 'CSRCS',
+                '.m': 'CMSRCS',
                 '.mm': 'CMMSRCS',
                 '.cc': 'CPPSRCS',
                 '.cpp': 'CPPSRCS',
diff --git a/toolkit/crashreporter/google-breakpad/src/common/mac/Makefile.in b/toolkit/crashreporter/google-breakpad/src/common/mac/Makefile.in
index 28195338616..c02efdc408a 100644
--- a/toolkit/crashreporter/google-breakpad/src/common/mac/Makefile.in
+++ b/toolkit/crashreporter/google-breakpad/src/common/mac/Makefile.in
@@ -4,13 +4,6 @@
 
 LOCAL_INCLUDES 	= -I$(srcdir)/../..
 
-# This is a little weird, but we're building a host and a target lib here.
-# The host lib is used for dump_syms, and the target lib for the
-# crash reporter client.  Therefore, we don't need all the srcs in both.
-CMSRCS = \
-  HTTPMultipartUpload.m \
-  $(NULL)
-
 HOST_CMMSRCS = \
   dump_syms.mm \
   $(NULL)
diff --git a/toolkit/crashreporter/google-breakpad/src/common/mac/moz.build b/toolkit/crashreporter/google-breakpad/src/common/mac/moz.build
index 12012bd2217..a26f33c25c7 100644
--- a/toolkit/crashreporter/google-breakpad/src/common/mac/moz.build
+++ b/toolkit/crashreporter/google-breakpad/src/common/mac/moz.build
@@ -17,10 +17,14 @@ SOURCES += [
     'string_utilities.cc',
 ]
 
+# This is a little weird, but we're building a host and a target lib here.
+# The host lib is used for dump_syms, and the target lib for the
+# crash reporter client.  Therefore, we don't need all the srcs in both.
 HOST_SOURCES += SOURCES
 
 HOST_LIBRARY_NAME = 'host_breakpad_mac_common_s'
 SOURCES += [
+    'HTTPMultipartUpload.m',
     'MachIPC.mm',
 ]