mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-02-07 23:43:37 +00:00
bug 870407: cleanup bug. r=mshal
This commit is contained in:
parent
4228506a7b
commit
38ca368790
@ -12,18 +12,6 @@ include $(DEPTH)/config/autoconf.mk
|
|||||||
EXPORT_LIBRARY = ..
|
EXPORT_LIBRARY = ..
|
||||||
LIBXUL_LIBRARY = 1
|
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.
|
# we don't want the shared lib, but we want to force the creation of a static lib.
|
||||||
FORCE_STATIC_LIB = 1
|
FORCE_STATIC_LIB = 1
|
||||||
|
@ -22,13 +22,6 @@ DEFINES += \
|
|||||||
$(NULL)
|
$(NULL)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
|
|
||||||
DISABLED_CMMSRCS += \
|
|
||||||
PluginUtilsOSX.mm \
|
|
||||||
PluginInterposeOSX.mm \
|
|
||||||
$(NULL)
|
|
||||||
endif
|
|
||||||
|
|
||||||
LOCAL_INCLUDES = \
|
LOCAL_INCLUDES = \
|
||||||
-I$(srcdir)/../base \
|
-I$(srcdir)/../base \
|
||||||
-I$(topsrcdir)/xpcom/base/ \
|
-I$(topsrcdir)/xpcom/base/ \
|
||||||
|
@ -12,7 +12,6 @@ include $(DEPTH)/config/autoconf.mk
|
|||||||
FORCE_SHARED_LIB = 1
|
FORCE_SHARED_LIB = 1
|
||||||
DIST_INSTALL = 1
|
DIST_INSTALL = 1
|
||||||
|
|
||||||
DISABLED_CMMSRCS = $(LIBRARY_NAME).mm plugin_child_quirks.mm
|
|
||||||
|
|
||||||
EXTRA_DSO_LDOPTS += \
|
EXTRA_DSO_LDOPTS += \
|
||||||
-framework Carbon \
|
-framework Carbon \
|
||||||
|
@ -15,7 +15,6 @@ LIBXUL_LIBRARY = 1
|
|||||||
FAIL_ON_WARNINGS = 1
|
FAIL_ON_WARNINGS = 1
|
||||||
|
|
||||||
|
|
||||||
DISABLED_CMMSRCS = nsPrintingPromptServiceX.mm
|
|
||||||
|
|
||||||
LOCAL_INCLUDES = \
|
LOCAL_INCLUDES = \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
|
@ -15,12 +15,6 @@ MSVC_ENABLE_PGO := 1
|
|||||||
LIBXUL_LIBRARY = 1
|
LIBXUL_LIBRARY = 1
|
||||||
EXPORT_LIBRARY = 1
|
EXPORT_LIBRARY = 1
|
||||||
|
|
||||||
ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
|
|
||||||
DISABLED_CMMSRCS = \
|
|
||||||
QuartzSupport.mm \
|
|
||||||
$(NULL)
|
|
||||||
endif
|
|
||||||
|
|
||||||
DEFINES += -DMOZ_GFX -DUSE_CAIRO -DGFX2D_INTERNAL
|
DEFINES += -DMOZ_GFX -DUSE_CAIRO -DGFX2D_INTERNAL
|
||||||
|
|
||||||
ifeq ($(MOZ_WIDGET_TOOLKIT),$(findstring $(MOZ_WIDGET_TOOLKIT),android gtk2 gtk3 gonk qt))
|
ifeq ($(MOZ_WIDGET_TOOLKIT),$(findstring $(MOZ_WIDGET_TOOLKIT),android gtk2 gtk3 gonk qt))
|
||||||
|
@ -68,11 +68,6 @@ ifdef MOZ_GL_PROVIDER
|
|||||||
GL_PROVIDER = $(MOZ_GL_PROVIDER)
|
GL_PROVIDER = $(MOZ_GL_PROVIDER)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# Mac is a special snowflake
|
|
||||||
ifeq ($(GL_PROVIDER),CGL)
|
|
||||||
DISABLED_CMMSRCS += GLContextProvider$(GL_PROVIDER).mm
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifdef MOZ_ANDROID_OMTC
|
ifdef MOZ_ANDROID_OMTC
|
||||||
DEFINES += -DMOZ_ANDROID_OMTC
|
DEFINES += -DMOZ_ANDROID_OMTC
|
||||||
endif
|
endif
|
||||||
|
@ -52,15 +52,6 @@ ifeq ($(MOZ_WIDGET_TOOLKIT),android)
|
|||||||
DEFINES += -DMOZ_USING_ANDROID_JAVA_WIDGETS
|
DEFINES += -DMOZ_USING_ANDROID_JAVA_WIDGETS
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(MOZ_WIDGET_TOOLKIT),qt)
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
|
|
||||||
DISABLED_CMMSRCS = \
|
|
||||||
gfxMacPlatformFontList.mm \
|
|
||||||
$(NULL)
|
|
||||||
endif
|
|
||||||
|
|
||||||
DEFINES += \
|
DEFINES += \
|
||||||
-DIMPL_THEBES \
|
-DIMPL_THEBES \
|
||||||
-DHB_DONT_DEFINE_STDINT \
|
-DHB_DONT_DEFINE_STDINT \
|
||||||
|
@ -31,13 +31,6 @@ MOCHITEST_BROWSER_FILES += \
|
|||||||
tests/browser_alarms.js \
|
tests/browser_alarms.js \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
|
|
||||||
ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
|
|
||||||
DISABLED_CMMSRCS += \
|
|
||||||
CocoaSensor.mm \
|
|
||||||
smslib.mm \
|
|
||||||
$(NULL)
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifdef MOZ_GAMEPAD
|
ifdef MOZ_GAMEPAD
|
||||||
LOCAL_INCLUDES = -I$(topsrcdir)/dom/base
|
LOCAL_INCLUDES = -I$(topsrcdir)/dom/base
|
||||||
endif
|
endif
|
||||||
|
@ -13,7 +13,6 @@ LIBXUL_LIBRARY = 1
|
|||||||
FAIL_ON_WARNINGS = 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.
|
# we don't want the shared lib, but we want to force the creation of a static lib.
|
||||||
FORCE_STATIC_LIB = 1
|
FORCE_STATIC_LIB = 1
|
||||||
|
@ -47,27 +47,6 @@ DEFINES += -DANDROID -D_POSIX_MONOTONIC_CLOCK=0
|
|||||||
endif # Android
|
endif # Android
|
||||||
endif # } OS_POSIX
|
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
|
# libevent
|
||||||
|
|
||||||
ifndef MOZ_NATIVE_LIBEVENT # {
|
ifndef MOZ_NATIVE_LIBEVENT # {
|
||||||
|
@ -17,10 +17,6 @@ LOCAL_INCLUDES += \
|
|||||||
-I$(topsrcdir)/toolkit/xre \
|
-I$(topsrcdir)/toolkit/xre \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
|
|
||||||
ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
|
|
||||||
DISABLED_CMMSRCS += xpcshellMacUtils.mm
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifeq (windows,$(MOZ_WIDGET_TOOLKIT))
|
ifeq (windows,$(MOZ_WIDGET_TOOLKIT))
|
||||||
ifdef MOZ_APP_PROFILE
|
ifdef MOZ_APP_PROFILE
|
||||||
DEFINES += -DMOZ_APP_PROFILE='"$(MOZ_APP_PROFILE)"'
|
DEFINES += -DMOZ_APP_PROFILE='"$(MOZ_APP_PROFILE)"'
|
||||||
|
@ -16,12 +16,6 @@ ifndef _MSC_VER
|
|||||||
FAIL_ON_WARNINGS = 1
|
FAIL_ON_WARNINGS = 1
|
||||||
endif # !_MSC_VER
|
endif # !_MSC_VER
|
||||||
|
|
||||||
ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
|
|
||||||
DISABLED_CMMSRCS += \
|
|
||||||
nsPluginUtilsOSX.mm \
|
|
||||||
$(NULL)
|
|
||||||
endif
|
|
||||||
|
|
||||||
RESOURCES_HTML = \
|
RESOURCES_HTML = \
|
||||||
$(srcdir)/folder.png \
|
$(srcdir)/folder.png \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
|
@ -15,7 +15,6 @@ LIBXUL_LIBRARY = 1
|
|||||||
|
|
||||||
FORCE_STATIC_LIB = 1
|
FORCE_STATIC_LIB = 1
|
||||||
|
|
||||||
DISABLED_CMMSRCS += nsNetworkLinkService.mm
|
|
||||||
|
|
||||||
include $(topsrcdir)/config/rules.mk
|
include $(topsrcdir)/config/rules.mk
|
||||||
|
|
||||||
|
@ -18,10 +18,6 @@ ifneq ($(OS_ARCH),Darwin)
|
|||||||
FAIL_ON_WARNINGS := 1
|
FAIL_ON_WARNINGS := 1
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(OS_ARCH),Darwin)
|
|
||||||
DISABLED_CMMSRCS = osx_corewlan.mm
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifeq ($(OS_ARCH),SunOS)
|
ifeq ($(OS_ARCH),SunOS)
|
||||||
OS_INCLUDES += $(GLIB_CFLAGS)
|
OS_INCLUDES += $(GLIB_CFLAGS)
|
||||||
endif
|
endif
|
||||||
|
@ -13,10 +13,6 @@ LIBXUL_LIBRARY = 1
|
|||||||
LIBRARY_NAME = exception_handler_s
|
LIBRARY_NAME = exception_handler_s
|
||||||
MSVC_ENABLE_PGO := 1
|
MSVC_ENABLE_PGO := 1
|
||||||
|
|
||||||
ifeq ($(OS_ARCH),Darwin)
|
|
||||||
DISABLED_CMMSRCS = mac_utils.mm
|
|
||||||
endif
|
|
||||||
|
|
||||||
ifeq ($(OS_ARCH),Linux)
|
ifeq ($(OS_ARCH),Linux)
|
||||||
# There's no define for XP_LINUX normally.
|
# There's no define for XP_LINUX normally.
|
||||||
# MOZ_APP_NAME is needed on Android, where we
|
# MOZ_APP_NAME is needed on Android, where we
|
||||||
|
@ -39,7 +39,6 @@ MOZ_WINCONSOLE = 0
|
|||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(OS_ARCH),Darwin)
|
ifeq ($(OS_ARCH),Darwin)
|
||||||
DISABLED_CMMSRCS += crashreporter_osx.mm
|
|
||||||
OS_LIBS += -framework Cocoa
|
OS_LIBS += -framework Cocoa
|
||||||
LIBS += \
|
LIBS += \
|
||||||
$(DEPTH)/toolkit/crashreporter/google-breakpad/src/common/$(LIB_PREFIX)breakpad_common_s.$(LIB_SUFFIX) \
|
$(DEPTH)/toolkit/crashreporter/google-breakpad/src/common/$(LIB_PREFIX)breakpad_common_s.$(LIB_SUFFIX) \
|
||||||
|
@ -38,11 +38,6 @@ HOST_CPPSRCS = \
|
|||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(OS_ARCH),Darwin)
|
|
||||||
DISABLED_CMMSRCS += \
|
|
||||||
mac/dump_syms.mm
|
|
||||||
endif
|
|
||||||
|
|
||||||
DISABLED_CSRCS = \
|
DISABLED_CSRCS = \
|
||||||
convert_UTF.c \
|
convert_UTF.c \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
|
@ -19,9 +19,6 @@ CMSRCS = \
|
|||||||
HTTPMultipartUpload.m \
|
HTTPMultipartUpload.m \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
|
|
||||||
DISABLED_CMMSRCS = \
|
|
||||||
MachIPC.mm \
|
|
||||||
$(NULL)
|
|
||||||
|
|
||||||
HOST_CPPSRCS = $(CPPSRCS)
|
HOST_CPPSRCS = $(CPPSRCS)
|
||||||
|
|
||||||
|
@ -44,7 +44,6 @@ OS_LIBS += $(TK_LIBS)
|
|||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
|
ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
|
||||||
DISABLED_CMMSRCS += progressui_osx.mm launchchild_osx.mm
|
|
||||||
OS_LIBS += -framework Cocoa
|
OS_LIBS += -framework Cocoa
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
@ -14,8 +14,5 @@ IS_COMPONENT = 1
|
|||||||
MODULE_NAME = nsOSXProxyModule
|
MODULE_NAME = nsOSXProxyModule
|
||||||
LIBXUL_LIBRARY = 1
|
LIBXUL_LIBRARY = 1
|
||||||
|
|
||||||
DISABLED_CMMSRCS = \
|
|
||||||
nsOSXSystemProxySettings.mm \
|
|
||||||
$(NULL)
|
|
||||||
|
|
||||||
include $(topsrcdir)/config/rules.mk
|
include $(topsrcdir)/config/rules.mk
|
||||||
|
@ -22,12 +22,6 @@ MODULE_OPTIMIZE_FLAGS = $(MOZ_OPTIMIZE_FLAGS) -fno-strict-aliasing
|
|||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
|
|
||||||
DISABLED_CMMSRCS += \
|
|
||||||
CocoaFileUtils.mm \
|
|
||||||
$(NULL)
|
|
||||||
endif
|
|
||||||
|
|
||||||
DISABLED_SDK_HEADERS = \
|
DISABLED_SDK_HEADERS = \
|
||||||
nsDirectoryServiceDefs.h \
|
nsDirectoryServiceDefs.h \
|
||||||
nsDirectoryServiceUtils.h \
|
nsDirectoryServiceUtils.h \
|
||||||
|
Loading…
x
Reference in New Issue
Block a user