bug 870407: move CMMSRCS to mozbuild (file batch #3). r=mshal

image/decoders/icon/mac/Makefile.in

@@ -13,7 +13,7 @@ LIBXUL_LIBRARY = 1
 FAIL_ON_WARNINGS = 1
 
 
-CMMSRCS		= nsIconChannelCocoa.mm
+DISABLED_CMMSRCS = nsIconChannelCocoa.mm
 
 # we don't want the shared lib, but we want to force the creation of a static lib.
 FORCE_STATIC_LIB = 1

image/decoders/icon/mac/moz.build

@@ -8,3 +8,6 @@ MODULE = 'imgicon'
 
 LIBRARY_NAME = 'imgiconmac_s'
 
+CMMSRCS += [
+    'nsIconChannelCocoa.mm',
+]

ipc/chromium/Makefile.in

@@ -49,7 +49,7 @@ endif # } OS_POSIX
 
 ifdef OS_MACOSX # {
 
-CMMSRCS += \
+DISABLED_CMMSRCS += \
   base_paths_mac.mm \
   file_util_mac.mm \
   file_version_info_mac.mm \

ipc/chromium/moz.build

@@ -166,6 +166,22 @@ if os_macosx:
         'mach_message_source_mac.cc',
         'transport_dib_mac.cc',
     ]
+    CMMSRCS += [
+        'base_paths_mac.mm',
+        'chrome_application_mac.mm',
+        'chrome_paths_mac.mm',
+        'file_util_mac.mm',
+        'file_version_info_mac.mm',
+        'mac_util.mm',
+        'mach_ipc_mac.mm',
+        'message_pump_mac.mm',
+        'platform_thread_mac.mm',
+        'platform_util_mac.mm',
+        'process_util_mac.mm',
+        'scoped_nsautorelease_pool.mm',
+        'sys_string_conversions_mac.mm',
+        'worker_pool_mac.mm',
+    ]
 
 if os_linux:
     CPP_SOURCES += [

js/xpconnect/shell/Makefile.in

@@ -18,7 +18,7 @@ LOCAL_INCLUDES += \
   $(NULL)
 
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
-CMMSRCS += xpcshellMacUtils.mm
+DISABLED_CMMSRCS += xpcshellMacUtils.mm
 endif
 
 ifeq (windows,$(MOZ_WIDGET_TOOLKIT))

js/xpconnect/shell/moz.build

@@ -11,3 +11,8 @@ PROGRAM = 'xpcshell'
 CPP_SOURCES += [
     'xpcshell.cpp',
 ]
+
+if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
+    CMMSRCS += [
+        'xpcshellMacUtils.mm',
+    ]

layout/generic/Makefile.in

@@ -17,7 +17,7 @@ FAIL_ON_WARNINGS = 1
 endif # !_MSC_VER
 
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
-CMMSRCS		+= \
+DISABLED_CMMSRCS		+= \
 		nsPluginUtilsOSX.mm \
 		$(NULL)
 endif

layout/generic/moz.build

@@ -87,3 +87,8 @@ CPP_SOURCES += [
     'nsVideoFrame.cpp',
     'nsViewportFrame.cpp',
 ]
+
+if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
+    CMMSRCS += [
+        'nsPluginUtilsOSX.mm',
+    ]

netwerk/system/mac/Makefile.in

@@ -15,7 +15,7 @@ LIBXUL_LIBRARY = 1
 
 FORCE_STATIC_LIB = 1
 
-CMMSRCS += nsNetworkLinkService.mm
+DISABLED_CMMSRCS += nsNetworkLinkService.mm
 
 include $(topsrcdir)/config/rules.mk
 

netwerk/system/mac/moz.build

@@ -8,3 +8,6 @@ MODULE = 'necko'
 
 LIBRARY_NAME = 'neckosystem_s'
 
+CMMSRCS += [
+    'nsNetworkLinkService.mm',
+]

netwerk/wifi/Makefile.in

@@ -19,7 +19,7 @@ FAIL_ON_WARNINGS := 1
 endif
 
 ifeq ($(OS_ARCH),Darwin)
-CMMSRCS = osx_corewlan.mm
+DISABLED_CMMSRCS = osx_corewlan.mm
 endif
 
 ifeq ($(OS_ARCH),SunOS)

netwerk/wifi/moz.build

@@ -31,6 +31,9 @@ if CONFIG['OS_ARCH'] == 'Darwin':
     CPP_SOURCES += [
         'nsWifiScannerMac.cpp',
     ]
+    CMMSRCS += [
+        'osx_corewlan.mm',
+    ]
 elif CONFIG['OS_ARCH'] == 'WINNT':
     CPP_SOURCES += [
         'nsWifiScannerWin.cpp',
@@ -46,4 +49,3 @@ if CONFIG['MOZ_ENABLE_DBUS']:
     ]
 
 LIBRARY_NAME = 'neckowifi_s'
-