bug 870407: cleanup bug. r=mshal

2025-01-31 19:10:36 +00:00 · 2013-07-08 11:53:00 -04:00 · 2013-07-08 11:53:00 -04:00 · 38ca368790
commit 38ca368790
parent 4228506a7b
21 changed files with 0 additions and 108 deletions
--- a/accessible/src/mac/Makefile.in
+++ b/accessible/src/mac/Makefile.in
@ -12,18 +12,6 @@ include $(DEPTH)/config/autoconf.mk
 EXPORT_LIBRARY = ..
 LIBXUL_LIBRARY = 1

-DISABLED_CMMSRCS = \
-          AccessibleWrap.mm \
-          DocAccessibleWrap.mm \
-          mozAccessible.mm \
-          mozDocAccessible.mm \
-          mozActionElements.mm \
-          mozTextAccessible.mm \
-          mozHTMLAccessible.mm \
-          MacUtils.mm \
-          Platform.mm \
-          RootAccessibleWrap.mm \
-          $(NULL)

 # we don't want the shared lib, but we want to force the creation of a static lib.
 FORCE_STATIC_LIB = 1
--- a/dom/plugins/ipc/Makefile.in
+++ b/dom/plugins/ipc/Makefile.in
@ -22,13 +22,6 @@ DEFINES += \
  $(NULL)
 endif

-ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
-DISABLED_CMMSRCS   += \
-    PluginUtilsOSX.mm \
-    PluginInterposeOSX.mm \
-    $(NULL)
-endif
-
 LOCAL_INCLUDES = \
  -I$(srcdir)/../base \
  -I$(topsrcdir)/xpcom/base/ \
--- a/dom/plugins/ipc/interpose/Makefile.in
+++ b/dom/plugins/ipc/interpose/Makefile.in
@ -12,7 +12,6 @@ include $(DEPTH)/config/autoconf.mk
 FORCE_SHARED_LIB = 1
 DIST_INSTALL     = 1

-DISABLED_CMMSRCS = $(LIBRARY_NAME).mm plugin_child_quirks.mm

 EXTRA_DSO_LDOPTS += \
  -framework Carbon \
--- a/embedding/components/printingui/src/mac/Makefile.in
+++ b/embedding/components/printingui/src/mac/Makefile.in
@ -15,7 +15,6 @@ LIBXUL_LIBRARY	= 1
 FAIL_ON_WARNINGS = 1


-DISABLED_CMMSRCS = nsPrintingPromptServiceX.mm

 LOCAL_INCLUDES	= \
 		$(NULL)
--- a/gfx/2d/Makefile.in
+++ b/gfx/2d/Makefile.in
@ -15,12 +15,6 @@ MSVC_ENABLE_PGO := 1
 LIBXUL_LIBRARY	= 1
 EXPORT_LIBRARY	= 1

-ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
-DISABLED_CMMSRCS = \
-	   QuartzSupport.mm \
-	   $(NULL)
-endif
-
 DEFINES += -DMOZ_GFX -DUSE_CAIRO -DGFX2D_INTERNAL

 ifeq ($(MOZ_WIDGET_TOOLKIT),$(findstring $(MOZ_WIDGET_TOOLKIT),android gtk2 gtk3 gonk qt))
--- a/gfx/gl/Makefile.in
+++ b/gfx/gl/Makefile.in
@ -68,11 +68,6 @@ ifdef MOZ_GL_PROVIDER
 GL_PROVIDER = $(MOZ_GL_PROVIDER)
 endif

-# Mac is a special snowflake
-ifeq ($(GL_PROVIDER),CGL)
-DISABLED_CMMSRCS += GLContextProvider$(GL_PROVIDER).mm
-endif
-
 ifdef MOZ_ANDROID_OMTC
 DEFINES += -DMOZ_ANDROID_OMTC
 endif
--- a/gfx/thebes/Makefile.in
+++ b/gfx/thebes/Makefile.in
@ -52,15 +52,6 @@ ifeq ($(MOZ_WIDGET_TOOLKIT),android)
 DEFINES +=	-DMOZ_USING_ANDROID_JAVA_WIDGETS
 endif

-ifeq ($(MOZ_WIDGET_TOOLKIT),qt)
-endif
-
-ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
-DISABLED_CMMSRCS = \
-	gfxMacPlatformFontList.mm \
-	$(NULL)
-endif
-
 DEFINES += \
 	-DIMPL_THEBES \
 	-DHB_DONT_DEFINE_STDINT \
--- a/hal/Makefile.in
+++ b/hal/Makefile.in
@ -31,13 +31,6 @@ MOCHITEST_BROWSER_FILES += \
 	tests/browser_alarms.js \
 	$(NULL)

-ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
-DISABLED_CMMSRCS += \
-  CocoaSensor.mm \
-  smslib.mm \
-  $(NULL)
-endif
-
 ifdef MOZ_GAMEPAD
 LOCAL_INCLUDES = -I$(topsrcdir)/dom/base
 endif
--- a/image/decoders/icon/mac/Makefile.in
+++ b/image/decoders/icon/mac/Makefile.in
@ -13,7 +13,6 @@ LIBXUL_LIBRARY = 1
 FAIL_ON_WARNINGS = 1


-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
--- a/ipc/chromium/Makefile.in
+++ b/ipc/chromium/Makefile.in
@ -47,27 +47,6 @@ DEFINES += -DANDROID -D_POSIX_MONOTONIC_CLOCK=0
 endif # Android
 endif # } OS_POSIX

-ifdef OS_MACOSX # {
-
-DISABLED_CMMSRCS += \
-  base_paths_mac.mm \
-  file_util_mac.mm \
-  file_version_info_mac.mm \
-  mac_util.mm \
-  message_pump_mac.mm \
-  platform_thread_mac.mm \
-  process_util_mac.mm \
-  scoped_nsautorelease_pool.mm \
-  sys_string_conversions_mac.mm \
-  worker_pool_mac.mm \
-  chrome_paths_mac.mm \
-  mach_ipc_mac.mm \
-  platform_util_mac.mm \
-  chrome_application_mac.mm \
-  $(NULL)
-
-endif # } OS_MACOSX
-
 # libevent

 ifndef MOZ_NATIVE_LIBEVENT # {
--- a/js/xpconnect/shell/Makefile.in
+++ b/js/xpconnect/shell/Makefile.in
@ -17,10 +17,6 @@ LOCAL_INCLUDES += \
  -I$(topsrcdir)/toolkit/xre \
  $(NULL)

-ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
-DISABLED_CMMSRCS += xpcshellMacUtils.mm
-endif
-
 ifeq (windows,$(MOZ_WIDGET_TOOLKIT))
  ifdef MOZ_APP_PROFILE
    DEFINES += -DMOZ_APP_PROFILE='"$(MOZ_APP_PROFILE)"'
--- a/layout/generic/Makefile.in
+++ b/layout/generic/Makefile.in
@ -16,12 +16,6 @@ ifndef _MSC_VER
 FAIL_ON_WARNINGS = 1
 endif # !_MSC_VER

-ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
-DISABLED_CMMSRCS		+= \
-		nsPluginUtilsOSX.mm \
-		$(NULL)
-endif
-
 RESOURCES_HTML = \
 		$(srcdir)/folder.png \
 		$(NULL)
--- a/netwerk/system/mac/Makefile.in
+++ b/netwerk/system/mac/Makefile.in
@ -15,7 +15,6 @@ LIBXUL_LIBRARY = 1

 FORCE_STATIC_LIB = 1

-DISABLED_CMMSRCS += nsNetworkLinkService.mm

 include $(topsrcdir)/config/rules.mk

--- a/netwerk/wifi/Makefile.in
+++ b/netwerk/wifi/Makefile.in
@ -18,10 +18,6 @@ ifneq ($(OS_ARCH),Darwin)
 FAIL_ON_WARNINGS := 1
 endif

-ifeq ($(OS_ARCH),Darwin)
-DISABLED_CMMSRCS = osx_corewlan.mm
-endif
-
 ifeq ($(OS_ARCH),SunOS)
 OS_INCLUDES += $(GLIB_CFLAGS)
 endif
--- a/toolkit/crashreporter/Makefile.in
+++ b/toolkit/crashreporter/Makefile.in
@ -13,10 +13,6 @@ LIBXUL_LIBRARY = 1
 LIBRARY_NAME = exception_handler_s
 MSVC_ENABLE_PGO := 1

-ifeq ($(OS_ARCH),Darwin)
-DISABLED_CMMSRCS = mac_utils.mm
-endif
-
 ifeq ($(OS_ARCH),Linux)
 # There's no define for XP_LINUX normally.
 # MOZ_APP_NAME is needed on Android, where we
--- a/toolkit/crashreporter/client/Makefile.in
+++ b/toolkit/crashreporter/client/Makefile.in
@ -39,7 +39,6 @@ MOZ_WINCONSOLE = 0
 endif

 ifeq ($(OS_ARCH),Darwin)
-DISABLED_CMMSRCS += crashreporter_osx.mm
 OS_LIBS += -framework Cocoa
 LIBS += \
  $(DEPTH)/toolkit/crashreporter/google-breakpad/src/common/$(LIB_PREFIX)breakpad_common_s.$(LIB_SUFFIX) \
--- a/toolkit/crashreporter/google-breakpad/src/common/Makefile.in
+++ b/toolkit/crashreporter/google-breakpad/src/common/Makefile.in
@ -38,11 +38,6 @@ HOST_CPPSRCS = \
 endif
 endif

-ifeq ($(OS_ARCH),Darwin)
-DISABLED_CMMSRCS += \
-  mac/dump_syms.mm
-endif
-
 DISABLED_CSRCS = \
  convert_UTF.c \
  $(NULL)
--- a/toolkit/crashreporter/google-breakpad/src/common/mac/Makefile.in
+++ b/toolkit/crashreporter/google-breakpad/src/common/mac/Makefile.in
@ -19,9 +19,6 @@ CMSRCS = \
  HTTPMultipartUpload.m \
  $(NULL)

-DISABLED_CMMSRCS = \
-  MachIPC.mm \
-  $(NULL)

 HOST_CPPSRCS = $(CPPSRCS)

--- a/toolkit/mozapps/update/updater/Makefile.in
+++ b/toolkit/mozapps/update/updater/Makefile.in
@ -44,7 +44,6 @@ OS_LIBS += $(TK_LIBS)
 endif

 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
-DISABLED_CMMSRCS += progressui_osx.mm launchchild_osx.mm
 OS_LIBS += -framework Cocoa
 endif

--- a/toolkit/system/osxproxy/Makefile.in
+++ b/toolkit/system/osxproxy/Makefile.in
@ -14,8 +14,5 @@ IS_COMPONENT    = 1
 MODULE_NAME     = nsOSXProxyModule
 LIBXUL_LIBRARY  = 1

-DISABLED_CMMSRCS = \
-        nsOSXSystemProxySettings.mm \
-        $(NULL)

 include $(topsrcdir)/config/rules.mk
--- a/xpcom/io/Makefile.in
+++ b/xpcom/io/Makefile.in
@ -22,12 +22,6 @@ MODULE_OPTIMIZE_FLAGS = $(MOZ_OPTIMIZE_FLAGS) -fno-strict-aliasing
 endif
 endif

-ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
-DISABLED_CMMSRCS		+= \
-		CocoaFileUtils.mm \
-		$(NULL)
-endif
-
 DISABLED_SDK_HEADERS =  \
 		nsDirectoryServiceDefs.h \
 		nsDirectoryServiceUtils.h \