From 8ccdba4aa0a87f8d37a43b202ece53f0e033398f Mon Sep 17 00:00:00 2001
From: Ms2ger <ms2ger@gmail.com>
Date: Thu, 22 Aug 2013 08:55:59 +0200
Subject: [PATCH] Bug 906412 - Cleanup some random parts of the build system;
 r=mshal

---
 Makefile.in                                   |  5 +--
 b2g/installer/Makefile.in                     |  8 ----
 browser/extensions/Makefile.in                |  2 -
 browser/installer/Makefile.in                 |  7 ----
 config/rules.mk                               |  1 -
 content/base/src/Makefile.in                  |  2 -
 dom/src/jsurl/Makefile.in                     |  5 +--
 editor/composer/src/Makefile.in               |  3 --
 editor/libeditor/base/Makefile.in             |  9 ++--
 embedding/base/Makefile.in                    | 18 --------
 .../components/printingui/src/mac/Makefile.in |  2 -
 gfx/angle/src/libEGL/Makefile.in              |  4 --
 gfx/angle/src/libGLESv2/Makefile.in           |  4 --
 gfx/cairo/cairo/src/Makefile.in               |  4 --
 gfx/cairo/cairo/src/moz.build                 |  5 ---
 gfx/gl/Makefile.in                            | 41 -------------------
 gfx/gl/moz.build                              |  6 +--
 js/src/Makefile.in                            |  7 +---
 js/src/config/rules.mk                        |  1 -
 media/libpng/Makefile.in                      | 15 ++-----
 mobile/android/app/Makefile.in                |  2 -
 mobile/android/installer/Makefile.in          |  8 ----
 toolkit/components/feeds/Makefile.in          |  2 -
 .../components/maintenanceservice/Makefile.in |  1 -
 toolkit/mozapps/installer/packager.mk         |  4 +-
 toolkit/xre/Makefile.in                       | 14 +------
 toolkit/xre/moz.build                         |  6 +++
 widget/android/Makefile.in                    | 12 ------
 widget/qt/Makefile.in                         |  5 ---
 xpcom/tests/Makefile.in                       |  5 ---
 30 files changed, 22 insertions(+), 186 deletions(-)
 delete mode 100644 embedding/base/Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 21632cfa4a5..7bfb6f3cb44 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -33,7 +33,7 @@ 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
 
@@ -107,8 +107,7 @@ 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
diff --git a/b2g/installer/Makefile.in b/b2g/installer/Makefile.in
index 9c00d1f2324..ff49d58d670 100644
--- a/b2g/installer/Makefile.in
+++ b/b2g/installer/Makefile.in
@@ -17,14 +17,6 @@ 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) \
diff --git a/browser/extensions/Makefile.in b/browser/extensions/Makefile.in
index ff96dc1b60d..5dae4397a6d 100644
--- a/browser/extensions/Makefile.in
+++ b/browser/extensions/Makefile.in
@@ -7,8 +7,6 @@ topsrcdir  = @top_srcdir@
 srcdir     = @srcdir@
 VPATH      = @srcdir@
 
-CHROMEDIR = $(call core_abspath,$(FINAL_TARGET))/chrome
-
 include $(DEPTH)/config/autoconf.mk
 
 ifdef MOZ_METRO
diff --git a/browser/installer/Makefile.in b/browser/installer/Makefile.in
index 4e3ab6fad4b..2f9c4554d51 100644
--- a/browser/installer/Makefile.in
+++ b/browser/installer/Makefile.in
@@ -21,13 +21,6 @@ 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
diff --git a/config/rules.mk b/config/rules.mk
index ce6a361e9bb..a05a7a71460 100644
--- a/config/rules.mk
+++ b/config/rules.mk
@@ -399,7 +399,6 @@ ALL_TRASH_DIRS = \
 
 ifdef QTDIR
 GARBAGE                 += $(MOCSRCS)
-GARBAGE                 += $(RCCSRCS)
 endif
 
 ifdef SIMPLE_PROGRAMS
diff --git a/content/base/src/Makefile.in b/content/base/src/Makefile.in
index 417b48dbc57..9242219de58 100644
--- a/content/base/src/Makefile.in
+++ b/content/base/src/Makefile.in
@@ -19,8 +19,6 @@ LOCAL_INCLUDES += \
 		$(NULL)
 endif
 
-GQI_SRCS = contentbase.gqi
-
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 
diff --git a/dom/src/jsurl/Makefile.in b/dom/src/jsurl/Makefile.in
index f5998d025a7..35dab285373 100644
--- a/dom/src/jsurl/Makefile.in
+++ b/dom/src/jsurl/Makefile.in
@@ -15,10 +15,7 @@ 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
 
diff --git a/editor/composer/src/Makefile.in b/editor/composer/src/Makefile.in
index f41d5d9878b..abc5f9c9abe 100644
--- a/editor/composer/src/Makefile.in
+++ b/editor/composer/src/Makefile.in
@@ -14,9 +14,6 @@ EXPORT_LIBRARY = 1
 LIBXUL_LIBRARY	= 1
 include $(topsrcdir)/config/rules.mk
 
-INCLUDES        += \
-	$(NULL)
-
 _FILES = \
 	$(srcdir)/res/EditorOverride.css \
 	$(srcdir)/res/grabber.gif \
diff --git a/editor/libeditor/base/Makefile.in b/editor/libeditor/base/Makefile.in
index 282f769c07f..fb878d02469 100644
--- a/editor/libeditor/base/Makefile.in
+++ b/editor/libeditor/base/Makefile.in
@@ -12,12 +12,7 @@ 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 \
@@ -25,3 +20,5 @@ INCLUDES	+= \
 		-I$(topsrcdir)/layout/style \
 		-I$(topsrcdir)/extensions/spellcheck/src \
 		$(NULL)
+
+include $(topsrcdir)/config/rules.mk
diff --git a/embedding/base/Makefile.in b/embedding/base/Makefile.in
deleted file mode 100644
index b29a36f34a6..00000000000
--- 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
diff --git a/embedding/components/printingui/src/mac/Makefile.in b/embedding/components/printingui/src/mac/Makefile.in
index d4ecaf565a0..d04671e0e07 100644
--- a/embedding/components/printingui/src/mac/Makefile.in
+++ b/embedding/components/printingui/src/mac/Makefile.in
@@ -12,8 +12,6 @@ include $(DEPTH)/config/autoconf.mk
 
 EXPORT_LIBRARY	= ..
 LIBXUL_LIBRARY	= 1
-LOCAL_INCLUDES	= \
-		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
diff --git a/gfx/angle/src/libEGL/Makefile.in b/gfx/angle/src/libEGL/Makefile.in
index af93672fdc4..00d9dcb4056 100644
--- a/gfx/angle/src/libEGL/Makefile.in
+++ b/gfx/angle/src/libEGL/Makefile.in
@@ -15,10 +15,6 @@ 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
diff --git a/gfx/angle/src/libGLESv2/Makefile.in b/gfx/angle/src/libGLESv2/Makefile.in
index a7c63f27921..249a3cea479 100644
--- a/gfx/angle/src/libGLESv2/Makefile.in
+++ b/gfx/angle/src/libGLESv2/Makefile.in
@@ -16,10 +16,6 @@ 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
diff --git a/gfx/cairo/cairo/src/Makefile.in b/gfx/cairo/cairo/src/Makefile.in
index 6b133786636..2950ba2306e 100644
--- a/gfx/cairo/cairo/src/Makefile.in
+++ b/gfx/cairo/cairo/src/Makefile.in
@@ -154,10 +154,6 @@ 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 \
diff --git a/gfx/cairo/cairo/src/moz.build b/gfx/cairo/cairo/src/moz.build
index dd0f1943e5b..c7528a50bcd 100644
--- a/gfx/cairo/cairo/src/moz.build
+++ b/gfx/cairo/cairo/src/moz.build
@@ -67,11 +67,6 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'qt':
         'cairo-qt-surface.cpp',
     ]
 
-if CONFIG['BUILD_CAIRO_SVG']:
-    EXPORTS.cairo += [
-        'cairo-svg.h'
-    ]
-
 if CONFIG['MOZ_X11']:
     EXPORTS.cairo += [
         'cairo-xlib-xrender.h',
diff --git a/gfx/gl/Makefile.in b/gfx/gl/Makefile.in
index c3ad1f792bc..21c2f646931 100644
--- a/gfx/gl/Makefile.in
+++ b/gfx/gl/Makefile.in
@@ -19,51 +19,10 @@ 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
diff --git a/gfx/gl/moz.build b/gfx/gl/moz.build
index e98a6cb6b6f..0a97149ab67 100644
--- a/gfx/gl/moz.build
+++ b/gfx/gl/moz.build
@@ -6,8 +6,6 @@
 
 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':
@@ -15,7 +13,7 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
 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']:
@@ -23,7 +21,7 @@ elif CONFIG['MOZ_WIDGET_GTK']:
         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'
diff --git a/js/src/Makefile.in b/js/src/Makefile.in
index 5a736a6109a..9cd7e390fc2 100644
--- a/js/src/Makefile.in
+++ b/js/src/Makefile.in
@@ -158,10 +158,6 @@ 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
@@ -343,10 +339,9 @@ 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
diff --git a/js/src/config/rules.mk b/js/src/config/rules.mk
index ce6a361e9bb..a05a7a71460 100644
--- a/js/src/config/rules.mk
+++ b/js/src/config/rules.mk
@@ -399,7 +399,6 @@ ALL_TRASH_DIRS = \
 
 ifdef QTDIR
 GARBAGE                 += $(MOCSRCS)
-GARBAGE                 += $(RCCSRCS)
 endif
 
 ifdef SIMPLE_PROGRAMS
diff --git a/media/libpng/Makefile.in b/media/libpng/Makefile.in
index 4434411508b..2ec10ee9682 100644
--- a/media/libpng/Makefile.in
+++ b/media/libpng/Makefile.in
@@ -16,18 +16,11 @@ 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
diff --git a/mobile/android/app/Makefile.in b/mobile/android/app/Makefile.in
index 27931839f37..fea286acced 100644
--- a/mobile/android/app/Makefile.in
+++ b/mobile/android/app/Makefile.in
@@ -37,8 +37,6 @@ NSDISTMODE = copy
 
 include $(topsrcdir)/config/rules.mk
 
-APP_ICON = mobile
-
 DEFINES += \
   -DAPP_NAME=$(MOZ_APP_NAME) \
   -DAPP_VERSION=$(MOZ_APP_VERSION) \
diff --git a/mobile/android/installer/Makefile.in b/mobile/android/installer/Makefile.in
index 39e2c013767..53d02bd9acc 100644
--- a/mobile/android/installer/Makefile.in
+++ b/mobile/android/installer/Makefile.in
@@ -22,14 +22,6 @@ 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) \
diff --git a/toolkit/components/feeds/Makefile.in b/toolkit/components/feeds/Makefile.in
index 84fd69aa96c..e57faa8c180 100644
--- a/toolkit/components/feeds/Makefile.in
+++ b/toolkit/components/feeds/Makefile.in
@@ -19,8 +19,6 @@ 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 
 
diff --git a/toolkit/components/maintenanceservice/Makefile.in b/toolkit/components/maintenanceservice/Makefile.in
index 0cdcb1e09cb..45085c3ef7f 100644
--- a/toolkit/components/maintenanceservice/Makefile.in
+++ b/toolkit/components/maintenanceservice/Makefile.in
@@ -25,7 +25,6 @@ LIBS += \
   $(NULL)
 
 USE_STATIC_LIBS = 1
-HAVE_PROGRESSUI = 1
 RCINCLUDE = maintenanceservice.rc
 
 OS_LIBS += $(call EXPAND_LIBNAME,comctl32 ws2_32 shell32)
diff --git a/toolkit/mozapps/installer/packager.mk b/toolkit/mozapps/installer/packager.mk
index 101292d9eca..c5073757b84 100644
--- a/toolkit/mozapps/installer/packager.mk
+++ b/toolkit/mozapps/installer/packager.mk
@@ -555,9 +555,7 @@ 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)"
 
diff --git a/toolkit/xre/Makefile.in b/toolkit/xre/Makefile.in
index 894ac9d1f87..ec693cac011 100644
--- a/toolkit/xre/Makefile.in
+++ b/toolkit/xre/Makefile.in
@@ -27,7 +27,8 @@ 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))
@@ -37,17 +38,6 @@ 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)
diff --git a/toolkit/xre/moz.build b/toolkit/xre/moz.build
index 01df06809dc..f16b6cfcc08 100644
--- a/toolkit/xre/moz.build
+++ b/toolkit/xre/moz.build
@@ -31,6 +31,12 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
     CPP_SOURCES += [
         'nsCommandLineServiceMac.cpp',
     ]
+    CMMSRCS += [
+        'MacApplicationDelegate.mm',
+        'MacAutoreleasePool.mm',
+        'MacLaunchHelper.mm',
+        'nsNativeAppSupportCocoa.mm',
+    ]
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'qt':
     EXPORTS += ['nsQAppInstance.h']
     CPP_SOURCES += [
diff --git a/widget/android/Makefile.in b/widget/android/Makefile.in
index d2f76c6bb2a..a0aa81a50db 100644
--- a/widget/android/Makefile.in
+++ b/widget/android/Makefile.in
@@ -12,18 +12,6 @@ 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
 
diff --git a/widget/qt/Makefile.in b/widget/qt/Makefile.in
index 23c6fa06d9c..499ba901b0c 100644
--- a/widget/qt/Makefile.in
+++ b/widget/qt/Makefile.in
@@ -16,11 +16,6 @@ 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
 
diff --git a/xpcom/tests/Makefile.in b/xpcom/tests/Makefile.in
index 3194a057891..d1e23c724b5 100644
--- a/xpcom/tests/Makefile.in
+++ b/xpcom/tests/Makefile.in
@@ -49,13 +49,8 @@ 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