Bug 906412 - Cleanup some random parts of the build system; r=mshal
authorMs2ger <ms2ger@gmail.com>
Thu, 22 Aug 2013 08:55:59 +0200
changeset 156670 2a4e30e83513fe4dcc6b158ce6ec50fa1a360a80
parent 156669 9fa23b041b58a05ebe64c556983b0100b891b3cf
child 156671 142e45f9898980308593465e8f51fa8460e834dc
push id2961
push userlsblakk@mozilla.com
push dateMon, 28 Oct 2013 21:59:28 +0000
treeherdermozilla-beta@73ef4f13486f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmshal
bugs906412
milestone26.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 906412 - Cleanup some random parts of the build system; r=mshal
Makefile.in
b2g/installer/Makefile.in
browser/extensions/Makefile.in
browser/installer/Makefile.in
config/rules.mk
content/base/src/Makefile.in
dom/src/jsurl/Makefile.in
editor/composer/src/Makefile.in
editor/libeditor/base/Makefile.in
embedding/base/Makefile.in
embedding/components/printingui/src/mac/Makefile.in
gfx/angle/src/libEGL/Makefile.in
gfx/angle/src/libGLESv2/Makefile.in
gfx/cairo/cairo/src/Makefile.in
gfx/cairo/cairo/src/moz.build
gfx/gl/Makefile.in
gfx/gl/moz.build
js/src/Makefile.in
js/src/config/rules.mk
media/libpng/Makefile.in
mobile/android/app/Makefile.in
mobile/android/installer/Makefile.in
toolkit/components/feeds/Makefile.in
toolkit/components/maintenanceservice/Makefile.in
toolkit/mozapps/installer/packager.mk
toolkit/xre/Makefile.in
toolkit/xre/moz.build
widget/android/Makefile.in
widget/qt/Makefile.in
xpcom/tests/Makefile.in
--- a/Makefile.in
+++ b/Makefile.in
@@ -28,17 +28,17 @@ include $(topsrcdir)/$(MOZ_BUILD_APP)/bu
 endif
 
 
 include $(topsrcdir)/config/config.mk
 
 GARBAGE_DIRS += dist _javagen _profile _tests staticlib
 DIST_GARBAGE = config.cache config.log config.status* config-defs.h \
    config/autoconf.mk \
-   unallmakefiles mozilla-config.h \
+   mozilla-config.h \
    netwerk/necko-config.h xpcom/xpcom-config.h xpcom/xpcom-private.h \
    $(topsrcdir)/.mozconfig.mk $(topsrcdir)/.mozconfig.out
 
 ifndef MOZ_PROFILE_USE
 # One of the first things we do in the build is purge "unknown" files
 # from the object directory. This serves two purposes:
 #
 #   1) Remove files from a previous build no longer accounted for in
@@ -102,18 +102,17 @@ include $(topsrcdir)/config/rules.mk
 default all alldep::
 	$(call BUILDSTATUS,TIERS $(TIERS))
 	$(foreach tier,$(TIERS),$(call SUBMAKE,tier_$(tier)))
 
 include $(topsrcdir)/config/makefiles/tiers.mk
 $(foreach tier,$(TIERS),$(eval $(call CREATE_TIER_RULE,$(tier))))
 
 distclean::
-	cat unallmakefiles | $(XARGS) rm -f
-	$(RM) unallmakefiles $(DIST_GARBAGE)
+	$(RM) $(DIST_GARBAGE)
 
 ifeq ($(OS_ARCH),WINNT)
 # we want to copy PDB files on Windows
 MAKE_SYM_STORE_ARGS := -c --vcs-info
 ifdef PDBSTR_PATH
 MAKE_SYM_STORE_ARGS += -i
 endif
 DUMP_SYMS_BIN ?= $(topsrcdir)/toolkit/crashreporter/tools/win32/dump_syms_vc$(_MSC_VER).exe
--- a/b2g/installer/Makefile.in
+++ b/b2g/installer/Makefile.in
@@ -12,24 +12,16 @@ include $(DEPTH)/config/autoconf.mk
 STANDALONE_MAKEFILE := 1
 
 include $(topsrcdir)/config/rules.mk
 
 MOZ_PKG_REMOVALS = $(srcdir)/removed-files.in
 
 MOZ_PKG_MANIFEST_P = $(srcdir)/package-manifest.in
 
-MOZ_NONLOCALIZED_PKG_LIST = \
-	xpcom \
-	browser \
-	b2g \
-	$(NULL)
-
-MOZ_LOCALIZED_PKG_LIST = $(AB_CD) multilocale
-
 DEFINES += \
 	-DAB_CD=$(AB_CD) \
 	-DMOZ_APP_NAME=$(MOZ_APP_NAME) \
 	-DPREF_DIR=$(PREF_DIR) \
 	$(NULL)
 
 DEFINES += -DJAREXT=
 
--- a/browser/extensions/Makefile.in
+++ b/browser/extensions/Makefile.in
@@ -2,18 +2,16 @@
 # 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/.
 
 DEPTH      = @DEPTH@
 topsrcdir  = @top_srcdir@
 srcdir     = @srcdir@
 VPATH      = @srcdir@
 
-CHROMEDIR = $(call core_abspath,$(FINAL_TARGET))/chrome
-
 include $(DEPTH)/config/autoconf.mk
 
 ifdef MOZ_METRO
 GENERATED_DIRS = $(DIST)/bin/metro/chrome
 endif
 
 include $(topsrcdir)/config/rules.mk
 
--- a/browser/installer/Makefile.in
+++ b/browser/installer/Makefile.in
@@ -16,23 +16,16 @@ include $(topsrcdir)/config/rules.mk
 MOZ_PKG_REMOVALS = $(srcdir)/removed-files.in
 
 MOZ_PKG_MANIFEST_P = $(srcdir)/package-manifest.in
 # Some files have been already bundled with xulrunner
 ifndef SYSTEM_LIBXUL
 MOZ_PKG_FATAL_WARNINGS = 1
 endif
 
-MOZ_NONLOCALIZED_PKG_LIST = \
-	xpcom \
-	browser \
-	$(NULL)
-
-MOZ_LOCALIZED_PKG_LIST = $(AB_CD)
-
 DEFINES += -DAB_CD=$(AB_CD) -DMOZ_APP_NAME=$(MOZ_APP_NAME) -DPREF_DIR=$(PREF_DIR)
 
 ifdef LIBXUL_SDK
 DEFINES += -DLIBXUL_SDK=1
 endif
 
 ifdef MOZ_DEBUG
 DEFINES += -DMOZ_DEBUG=1
--- a/config/rules.mk
+++ b/config/rules.mk
@@ -394,17 +394,16 @@ ALL_TRASH = \
 	$(PROGRAM:$(BIN_SUFFIX)=.lib) $(SIMPLE_PROGRAMS:$(BIN_SUFFIX)=.lib) \
 	$(SIMPLE_PROGRAMS:$(BIN_SUFFIX)=.$(OBJ_SUFFIX)) \
 	$(wildcard gts_tmp_*) $(LIBRARY:%.a=.%.timestamp)
 ALL_TRASH_DIRS = \
 	$(GARBAGE_DIRS) /no-such-file
 
 ifdef QTDIR
 GARBAGE                 += $(MOCSRCS)
-GARBAGE                 += $(RCCSRCS)
 endif
 
 ifdef SIMPLE_PROGRAMS
 GARBAGE			+= $(SIMPLE_PROGRAMS:%=%.$(OBJ_SUFFIX))
 endif
 
 ifdef HOST_SIMPLE_PROGRAMS
 GARBAGE			+= $(HOST_SIMPLE_PROGRAMS:%=%.$(OBJ_SUFFIX))
--- a/content/base/src/Makefile.in
+++ b/content/base/src/Makefile.in
@@ -14,18 +14,16 @@ LIBRARY_NAME	= gkconbase_s
 MSVC_ENABLE_PGO := 1
 LIBXUL_LIBRARY	= 1
 ifdef MOZ_WEBRTC
 LOCAL_INCLUDES += \
 		-I$(topsrcdir)/netwerk/sctp/datachannel \
 		$(NULL)
 endif
 
-GQI_SRCS = contentbase.gqi
-
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
 LOCAL_INCLUDES += \
   -I$(topsrcdir)/caps/include \
   -I$(topsrcdir)/content/events/src \
   -I$(topsrcdir)/content/html/content/src \
   -I$(topsrcdir)/content/html/document/src \
--- a/dom/src/jsurl/Makefile.in
+++ b/dom/src/jsurl/Makefile.in
@@ -10,15 +10,12 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 LIBXUL_LIBRARY	= 1
 
 LOCAL_INCLUDES += \
 		-I$(srcdir) \
 		-I$(topsrcdir)/dom/base \
 		-I$(topsrcdir)/netwerk/base/src \
-
-ifdef BUILD_DEBUG_GC
-DEFINES		+= -DDEBUG_GC
-endif
+		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
--- a/editor/composer/src/Makefile.in
+++ b/editor/composer/src/Makefile.in
@@ -9,19 +9,16 @@ srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 EXPORT_LIBRARY = 1
 LIBXUL_LIBRARY	= 1
 include $(topsrcdir)/config/rules.mk
 
-INCLUDES        += \
-	$(NULL)
-
 _FILES = \
 	$(srcdir)/res/EditorOverride.css \
 	$(srcdir)/res/grabber.gif \
 	$(srcdir)/res/table-add-column-after-active.gif \
 	$(srcdir)/res/table-add-column-after-hover.gif \
 	$(srcdir)/res/table-add-column-after.gif \
 	$(srcdir)/res/table-add-column-before-active.gif \
 	$(srcdir)/res/table-add-column-before-hover.gif \
--- a/editor/libeditor/base/Makefile.in
+++ b/editor/libeditor/base/Makefile.in
@@ -7,21 +7,18 @@ DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBXUL_LIBRARY	= 1
 
-# Internal header files, needed by other editor sublibs:
-INTERNAL_HDR_DIR = ../internal
-
-include $(topsrcdir)/config/rules.mk
-
-INCLUDES	+= \
+LOCAL_INCLUDES += \
 		-I$(topsrcdir)/editor/libeditor/text \
 		-I$(topsrcdir)/editor/txmgr/src \
 		-I$(topsrcdir)/content/base/src \
 		-I$(topsrcdir)/content/events/src \
 		-I$(topsrcdir)/layout/style \
 		-I$(topsrcdir)/extensions/spellcheck/src \
 		$(NULL)
+
+include $(topsrcdir)/config/rules.mk
deleted file mode 100644
--- a/embedding/base/Makefile.in
+++ /dev/null
@@ -1,18 +0,0 @@
-# vim:set ts=8 sw=8 sts=8 noet:
-# 
-# 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/.
-
-DEPTH           = @DEPTH@
-topsrcdir       = @top_srcdir@
-srcdir          = @srcdir@
-VPATH           = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-DISABLED_SDK_HEADERS         = \
-                nsEmbedCID.h \
-                $(NULL)
-
-include $(topsrcdir)/config/rules.mk
--- a/embedding/components/printingui/src/mac/Makefile.in
+++ b/embedding/components/printingui/src/mac/Makefile.in
@@ -7,13 +7,11 @@ DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 EXPORT_LIBRARY	= ..
 LIBXUL_LIBRARY	= 1
-LOCAL_INCLUDES	= \
-		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
--- a/gfx/angle/src/libEGL/Makefile.in
+++ b/gfx/angle/src/libEGL/Makefile.in
@@ -10,20 +10,16 @@ VPATH     = @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 # On Windows, we don't automatically get "lib" prepended, but we need it.
 FORCE_SHARED_LIB = 1
 
 # ANGLE uses the STL, so we can't use our derpy STL wrappers.
 STL_FLAGS =
 
-# ANGLE uses exceptions internally, so we need to have exception handling
-# support
-ENABLE_CXX_EXCEPTIONS = 1
-
 ifndef GNU_CC
 # Enable unwind semantics for exception handlers in response to warning C4530.
 OS_CPPFLAGS += -EHsc
 endif
 
 # Since we're building off in our own world, we don't want to have
 # mozilla-config.h and -DMOZILLA_CLIENT automatically included and defined, so
 # we just overwrite OS_COMPILE_C(XX)FLAGS.
--- a/gfx/angle/src/libGLESv2/Makefile.in
+++ b/gfx/angle/src/libGLESv2/Makefile.in
@@ -11,20 +11,16 @@ VPATH     = @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 # On Windows, we don't automatically get "lib" prepended, but we need it.
 FORCE_SHARED_LIB = 1
 
 # ANGLE uses the STL, so we can't use our derpy STL wrappers.
 STL_FLAGS =
 
-# ANGLE uses exceptions internally, so we need to have exception handling
-# support
-ENABLE_CXX_EXCEPTIONS = 1
-
 ifndef GNU_CC
 # Enable unwind semantics for exception handlers in response to warning C4530.
 OS_CPPFLAGS += -EHsc
 endif
 
 # Since we're building off in our own world, we don't want to have
 #
 # we just overwrite OS_COMPILE_C(XX)FLAGS.
--- a/gfx/cairo/cairo/src/Makefile.in
+++ b/gfx/cairo/cairo/src/Makefile.in
@@ -149,20 +149,16 @@ ifneq (,$(filter android gonk,$(MOZ_WIDG
 CSRCS   += $(PSPDF_BASE_CSRCS) $(PDF_CSRCS)
 endif
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),qt)
 CSRCS   += $(PSPDF_BASE_CSRCS) $(PDF_CSRCS) 
 OS_INCLUDES += $(MOZ_QT_CFLAGS)
 endif
 
-ifdef BUILD_CAIRO_SVG
-CSRCS	+= cairo-svg-surface.c
-endif
-
 ifdef MOZ_X11
 CSRCS   += cairo-xlib-surface.c \
 	   cairo-xlib-screen.c \
 	   cairo-xlib-visual.c \
 	   cairo-xlib-display.c
 OS_INCLUDES += $(XCFLAGS)
 endif
 
--- a/gfx/cairo/cairo/src/moz.build
+++ b/gfx/cairo/cairo/src/moz.build
@@ -62,21 +62,16 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'qt
     EXPORTS.cairo += [
         'cairo-pdf.h',
         'cairo-qt.h',
     ]
     CPP_SOURCES += [
         'cairo-qt-surface.cpp',
     ]
 
-if CONFIG['BUILD_CAIRO_SVG']:
-    EXPORTS.cairo += [
-        'cairo-svg.h'
-    ]
-
 if CONFIG['MOZ_X11']:
     EXPORTS.cairo += [
         'cairo-xlib-xrender.h',
         'cairo-xlib.h',
     ]
 
 if CONFIG['MOZ_ENABLE_CAIRO_FT']:
     EXPORTS.cairo += [
--- a/gfx/gl/Makefile.in
+++ b/gfx/gl/Makefile.in
@@ -14,61 +14,20 @@ MSVC_ENABLE_PGO := 1
 LIBXUL_LIBRARY   = 1
 EXPORT_LIBRARY   = 1
 ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
 ifdef MOZ_WEBGL
 DEFINES += -DMOZ_D3DCOMPILER_DLL=$(MOZ_D3DCOMPILER_DLL)
 endif
 endif
 
-# NOTE: Please keep GL_PROVIDER in sync with moz.build until all variables
-# are moved over.
-GL_PROVIDER = Null
-
-ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
-GL_PROVIDER = WGL
-endif
-
-ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
-GL_PROVIDER = CGL
-endif
-
-ifdef MOZ_WIDGET_GTK
-ifdef MOZ_PLATFORM_MAEMO
-GL_PROVIDER = EGL
-else
-ifdef MOZ_EGL_XRENDER_COMPOSITE
-GL_PROVIDER = EGL
-else
-GL_PROVIDER = GLX
-endif
-endif
-endif
-
-ifeq ($(MOZ_WIDGET_TOOLKIT),qt)
-ifdef MOZ_PLATFORM_MAEMO
-GL_PROVIDER = EGL
-else
-GL_PROVIDER = GLX
-endif
-endif
-
-ifeq ($(MOZ_WIDGET_TOOLKIT),android)
-GL_PROVIDER = EGL
-endif
-
 ifeq ($(MOZ_WIDGET_TOOLKIT),gonk)
-GL_PROVIDER = EGL
 LOCAL_INCLUDES = -I$(topsrcdir)/widget/gonk
 endif
 
-ifdef MOZ_GL_PROVIDER
-GL_PROVIDER = $(MOZ_GL_PROVIDER)
-endif
-
 ifdef MOZ_ANDROID_OMTC
 DEFINES += -DMOZ_ANDROID_OMTC
 endif
 
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
 DEFINES := $(filter-out -DUNICODE,$(DEFINES))
--- a/gfx/gl/moz.build
+++ b/gfx/gl/moz.build
@@ -1,34 +1,32 @@
 # -*- 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/.
 
 MODULE = 'gl'
 
-# NOTE: Please keep gl_provider in sync with Makefile.in until all variables
-# are moved over.
 gl_provider = 'Null'
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
     gl_provider = 'WGL'
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
     gl_provider = 'CGL'
 elif CONFIG['MOZ_WIDGET_GTK']:
-    if CONFIG['fdef MOZ_PLATFORM_MAEMO']:
+    if CONFIG['MOZ_PLATFORM_MAEMO']:
         gl_provider = 'EGL'
     else:
         if CONFIG['MOZ_EGL_XRENDER_COMPOSITE']:
             gl_provider = 'EGL'
         else:
             gl_provider = 'GLX'
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'qt':
-    if CONFIG['fdef MOZ_PLATFORM_MAEMO']:
+    if CONFIG['MOZ_PLATFORM_MAEMO']:
         gl_provider = 'EGL'
     else:
         gl_provider = 'GLX'
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android':
     gl_provider = 'EGL'
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
     gl_provider = 'EGL'
 
--- a/js/src/Makefile.in
+++ b/js/src/Makefile.in
@@ -153,20 +153,16 @@ ifeq (,$(MOZ_GLUE_PROGRAM_LDFLAGS))
 # When building standalone, we need to include mfbt sources, and to declare
 # "exported" mfbt symbols on its behalf when we use its headers.
 include $(MFBT_ROOT)/sources.mk
 DEFINES += -DIMPL_MFBT
 endif
 
 EXTRA_DSO_LDOPTS += $(NSPR_LIBS)
 
-ifndef BUILD_OPT
-MOCHAFILE	= 1
-endif
-
 # Define keyword generator before rules.mk, see bug 323979 comment 50
 
 HOST_CPPSRCS += jskwgen.cpp
 HOST_SIMPLE_PROGRAMS += host_jskwgen$(HOST_BIN_SUFFIX)
 GARBAGE += jsautokw.h host_jskwgen$(HOST_BIN_SUFFIX)
 
 HOST_CPPSRCS += jsoplengen.cpp
 HOST_SIMPLE_PROGRAMS += host_jsoplengen$(HOST_BIN_SUFFIX)
@@ -338,20 +334,19 @@ check-jstests:
 ifneq ($(OS_ARCH),WINNT)
 ifndef HAVE_DTRACE
 #check:: check-jstests
 endif
 endif
 
 DIST_GARBAGE = config.cache config.log config.status* \
    config/autoconf.mk \
-   unallmakefiles $(JS_CONFIG_NAME) js-config.h js-confdefs.h
+   $(JS_CONFIG_NAME) js-config.h js-confdefs.h
 
 distclean::
-	cat unallmakefiles | $(XARGS) rm -f
 	$(RM) $(DIST_GARBAGE)
 
 DEFINES		+= -DEXPORT_JS_API
 
 INCLUDES	+= -I$(srcdir)
 
 ifdef JS_THREADSAFE
 DEFINES		+= -DJS_THREADSAFE
--- a/js/src/config/rules.mk
+++ b/js/src/config/rules.mk
@@ -394,17 +394,16 @@ ALL_TRASH = \
 	$(PROGRAM:$(BIN_SUFFIX)=.lib) $(SIMPLE_PROGRAMS:$(BIN_SUFFIX)=.lib) \
 	$(SIMPLE_PROGRAMS:$(BIN_SUFFIX)=.$(OBJ_SUFFIX)) \
 	$(wildcard gts_tmp_*) $(LIBRARY:%.a=.%.timestamp)
 ALL_TRASH_DIRS = \
 	$(GARBAGE_DIRS) /no-such-file
 
 ifdef QTDIR
 GARBAGE                 += $(MOCSRCS)
-GARBAGE                 += $(RCCSRCS)
 endif
 
 ifdef SIMPLE_PROGRAMS
 GARBAGE			+= $(SIMPLE_PROGRAMS:%=%.$(OBJ_SUFFIX))
 endif
 
 ifdef HOST_SIMPLE_PROGRAMS
 GARBAGE			+= $(HOST_SIMPLE_PROGRAMS:%=%.$(OBJ_SUFFIX))
--- a/media/libpng/Makefile.in
+++ b/media/libpng/Makefile.in
@@ -11,23 +11,16 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 MSVC_ENABLE_PGO := 1
 FORCE_STATIC_LIB= 1
 ifeq ($(OS_ARCH),WINNT)
 VISIBILITY_FLAGS=
 endif
 
-
-DEFINES		+= -DMOZ_PNG_READ \
-		-DMOZ_PNG_WRITE
-
-LOCAL_INCLUDES	= -I$(srcdir)
+DEFINES += \
+  -DMOZ_PNG_READ \
+  -DMOZ_PNG_WRITE \
+  $(NULL)
 
 FORCE_STATIC_LIB = 1
 
 include $(topsrcdir)/config/rules.mk
-
-ifeq ($(OS_ARCH),WINNT)
-ifdef BUILD_DEBUG_GC
-DEFINES		+= -DDEBUG_GC
-endif
-endif
--- a/mobile/android/app/Makefile.in
+++ b/mobile/android/app/Makefile.in
@@ -32,18 +32,16 @@ LIBS += \
 endif
 endif #LIBXUL_SDK
 
 # Make sure the standalone glue doesn't try to get libxpcom.so from mobile/app.
 NSDISTMODE = copy
 
 include $(topsrcdir)/config/rules.mk
 
-APP_ICON = mobile
-
 DEFINES += \
   -DAPP_NAME=$(MOZ_APP_NAME) \
   -DAPP_VERSION=$(MOZ_APP_VERSION) \
   -DMOZ_UPDATER=$(MOZ_UPDATER) \
   -DMOZ_APP_UA_NAME=$(MOZ_APP_UA_NAME) \
   $(NULL)
 
 ifdef MOZ_PKG_SPECIAL
--- a/mobile/android/installer/Makefile.in
+++ b/mobile/android/installer/Makefile.in
@@ -17,24 +17,16 @@ PREF_JS_EXPORTS = $(srcdir)/mobile-l10n.
 endif
 
 include $(topsrcdir)/config/rules.mk
 
 MOZ_PKG_REMOVALS = $(srcdir)/removed-files.in
 
 MOZ_PKG_MANIFEST_P = $(srcdir)/package-manifest.in
 
-MOZ_NONLOCALIZED_PKG_LIST = \
-	xpcom \
-	browser \
-	mobile \
-	$(NULL)
-
-MOZ_LOCALIZED_PKG_LIST = $(AB_CD) multilocale
-
 DEFINES += \
 	-DAB_CD=$(AB_CD) \
 	-DMOZ_APP_NAME=$(MOZ_APP_NAME) \
 	-DPREF_DIR=$(PREF_DIR) \
 	$(NULL)
 
 DEFINES += -DJAREXT=
 DEFINES += -DMOZ_CHILD_PROCESS_NAME=$(MOZ_CHILD_PROCESS_NAME)
--- a/toolkit/components/feeds/Makefile.in
+++ b/toolkit/components/feeds/Makefile.in
@@ -14,18 +14,16 @@ MOZILLA_INTERNAL_API = 1
 LIBXUL_LIBRARY = 1
 
 
 include $(topsrcdir)/config/rules.mk
 
 ABS_SRCDIR := $(call core_abspath,$(srcdir))
 ifeq ($(OS_ARCH),WINNT)
 
-ABS_DEPTH := $(call core_abspath,$(DEPTH))
-
 check::
 	cd $(srcdir)/test; $(LIBXUL_DIST)/bin/xpcshell$(BIN_SUFFIX) shell.js 
 
 else
 
 check::
 	$(RUN_TEST_PROGRAM) $(LIBXUL_DIST)/bin/xpcshell$(BIN_SUFFIX) $(srcdir)/test/shell.js $(ABS_SRCDIR)/test
 
--- a/toolkit/components/maintenanceservice/Makefile.in
+++ b/toolkit/components/maintenanceservice/Makefile.in
@@ -20,17 +20,16 @@ MOZ_GLUE_LDFLAGS =
 MOZ_GLUE_PROGRAM_LDFLAGS =
 STL_FLAGS=
 
 LIBS += \
   ../../mozapps/update/common/$(LIB_PREFIX)updatecommon.$(LIB_SUFFIX) \
   $(NULL)
 
 USE_STATIC_LIBS = 1
-HAVE_PROGRESSUI = 1
 RCINCLUDE = maintenanceservice.rc
 
 OS_LIBS += $(call EXPAND_LIBNAME,comctl32 ws2_32 shell32)
 DEFINES += -DUNICODE -D_UNICODE
 ifndef GNU_CC
 RCFLAGS += -I$(srcdir)
 else
 RCFLAGS += --include-dir $(srcdir)
--- a/toolkit/mozapps/installer/packager.mk
+++ b/toolkit/mozapps/installer/packager.mk
@@ -550,19 +550,17 @@ DEFINES += -DDLL_PREFIX=$(DLL_PREFIX) -D
 ifdef MOZ_FOLD_LIBS
 DEFINES += -DMOZ_FOLD_LIBS=1
 endif
 
 GARBAGE		+= $(DIST)/$(PACKAGE) $(PACKAGE)
 
 # The following target stages files into two directories: one directory for
 # core files, and one for optional extensions based on the information in
-# the MOZ_PKG_MANIFEST file and the following vars:
-# MOZ_NONLOCALIZED_PKG_LIST
-# MOZ_LOCALIZED_PKG_LIST
+# the MOZ_PKG_MANIFEST file.
 
 PKG_ARG = , "$(pkg)"
 
 installer-stage: prepare-package
 ifndef MOZ_PKG_MANIFEST
 	$(error MOZ_PKG_MANIFEST unspecified!)
 endif
 	@rm -rf $(DEPTH)/installer-stage $(DIST)/xpt
--- a/toolkit/xre/Makefile.in
+++ b/toolkit/xre/Makefile.in
@@ -22,37 +22,27 @@ MSVC_ENABLE_PGO := 1
 LIBXUL_LIBRARY = 1
 
 ifeq ($(MOZ_GL_DEFAULT_PROVIDER),GLX)
 DEFINES += -DUSE_GLX_TEST
 endif
 
 DEFINES += \
   -DMOZ_APP_NAME='"$(MOZ_APP_NAME)"' \
-  -DMOZ_APP_VERSION='"$(MOZ_APP_VERSION)"'
+  -DMOZ_APP_VERSION='"$(MOZ_APP_VERSION)"' \
+  $(NULL)
 
 ifdef MOZ_UPDATER
 ifneq (android,$(MOZ_WIDGET_TOOLKIT))
 DEFINES += -DMOZ_UPDATER
 endif
 endif
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
 DEFINES += -DWIN32_LEAN_AND_MEAN -DUNICODE -D_UNICODE
-else
-ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
-CMMSRCS = nsNativeAppSupportCocoa.mm
-endif
-endif
-
-ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
-CMMSRCS += MacLaunchHelper.mm
-CMMSRCS += MacApplicationDelegate.mm
-CMMSRCS += MacAutoreleasePool.mm
-ENABLE_CXX_EXCEPTIONS = 1
 endif
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),android)
 DEFINES += -DANDROID_PACKAGE_NAME='"$(ANDROID_PACKAGE_NAME)"'
 endif
 
 SHARED_LIBRARY_LIBS += \
   ../profile/$(LIB_PREFIX)profile_s.$(LIB_SUFFIX) \
--- a/toolkit/xre/moz.build
+++ b/toolkit/xre/moz.build
@@ -26,16 +26,22 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'wind
         'nsNativeAppSupportWin.cpp',
         'nsWindowsDllBlocklist.cpp',
     ]
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
     EXPORTS += ['MacQuirks.h']
     CPP_SOURCES += [
         'nsCommandLineServiceMac.cpp',
     ]
+    CMMSRCS += [
+        'MacApplicationDelegate.mm',
+        'MacAutoreleasePool.mm',
+        'MacLaunchHelper.mm',
+        'nsNativeAppSupportCocoa.mm',
+    ]
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'qt':
     EXPORTS += ['nsQAppInstance.h']
     CPP_SOURCES += [
         'moc_nsNativeAppSupportQt.cpp',
         'nsNativeAppSupportQt.cpp',
         'nsQAppInstance.cpp',
     ]
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'os2':
--- a/widget/android/Makefile.in
+++ b/widget/android/Makefile.in
@@ -7,28 +7,16 @@ topsrcdir       = @top_srcdir@
 srcdir          = @srcdir@
 VPATH           = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME    = widget_android
 EXPORT_LIBRARY  = 1
 LIBXUL_LIBRARY  = 1
-ifdef MOZ_WEBSMS_BACKEND
-DEFINES += -DMOZ_WEBSMS_BACKEND
-endif
-
-NOT_THERE_YET_CPPSRCS = \
-	nsQtKeyUtils.cpp \
-	nsBidiKeyboard.cpp \
-	nsDragService.cpp \
-	nsNativeThemeQt.cpp \
-	mozqwidget.cpp \
-	nsSound.cpp \
-	$(NULL)
 
 SHARED_LIBRARY_LIBS = ../xpwidgets/libxpwidgets_s.a
 
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
 #DEFINES += -DDEBUG_WIDGETS
 
--- a/widget/qt/Makefile.in
+++ b/widget/qt/Makefile.in
@@ -11,21 +11,16 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 LIBRARY_NAME	= widget_qt
 EXPORT_LIBRARY = 1
 LIBXUL_LIBRARY	= 1
 
 SHARED_LIBRARY_LIBS = ../xpwidgets/libxpwidgets_s.a
 
-# If not primary toolkit, install in secondary path
-ifneq (qt,$(MOZ_WIDGET_TOOLKIT))
-INACTIVE_COMPONENT = 1
-endif
-
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
 CXXFLAGS	+= $(MOZ_QT_CFLAGS) $(GLIB_CFLAGS) $(MOZ_CAIRO_CFLAGS) \
 		$(MOZ_PIXMAN_CFLAGS) $(MOZ_PLATFORM_MAEMO_CFLAGS)
 CFLAGS		+= $(MOZ_QT_CFLAGS) $(GLIB_CFLAGS) $(MOZ_CAIRO_CFLAGS) \
 		$(MOZ_PIXMAN_CFLAGS) $(MOZ_PLATFORM_MAEMO_CFLAGS)
 
--- a/xpcom/tests/Makefile.in
+++ b/xpcom/tests/Makefile.in
@@ -44,18 +44,13 @@ install::
 ifeq (,$(filter-out WINNT os2-emx, $(HOST_OS_ARCH)))
 getnativepath = $(call normalizepath,$(1))
 else
 getnativepath = $(1)
 endif
 
 abs_srcdir = $(call core_abspath,$(srcdir))
 
-DIST_PATH = $(DIST)/bin/
-RM_DIST = rm -f
 regOrderDir="$(call getnativepath,$(abs_srcdir)/regorder)";
-DOCOPY=
 
 check::
 	XPCOM_DEBUG_BREAK=stack-and-abort $(RUN_TEST_PROGRAM) \
 	  $(DIST)/bin/TestRegistrationOrder$(BIN_SUFFIX) $(regOrderDir)
-
-GARBAGE += TestScriptable.h