Bug 1138063 - Remove boilerplate stuff from Makefile.ins; r=jcranmer

2015-04-11 23:44:36 +08:00 · 2015-04-11 23:44:36 +08:00 · ab1b394f11
--- a/calendar/libical/src/libical/Makefile.in
+++ b/calendar/libical/src/libical/Makefile.in
@ -35,14 +35,6 @@
 #
 # ***** END LICENSE BLOCK *****

-DEPTH= @DEPTH@
-
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 DEFINES += -DHAVE_CONFIG_H
 DEFINES += -DHAVE_SNPRINTF

--- a/calendar/lightning/Makefile.in
+++ b/calendar/lightning/Makefile.in
@ -84,7 +84,6 @@ endif

 DEFINES += -DTHUNDERBIRD_VERSION=$(THUNDERBIRD_VERSION) \
           -DTHUNDERBIRD_MAXVERSION=$(THUNDERBIRD_MAXVERSION) \
-           -DAB_CD=$(AB_CD) \
           -DSEAMONKEY_VERSION=$(SEAMONKEY_VERSION) \
           -DSEAMONKEY_MAXVERSION=$(SEAMONKEY_MAXVERSION) \
           -DLIGHTNING_VERSION=$(LIGHTNING_VERSION) \
--- a/calendar/lightning/locales/Makefile.in
+++ b/calendar/lightning/locales/Makefile.in
@ -9,7 +9,6 @@ relativesrcdir = calendar/locales
 USE_EXTENSION_MANIFEST = 1
 MOZ_CHROME_FILE_FORMAT=jar

-DEFINES += -DAB_CD=$(AB_CD) \
-           -DTHEME=$(THEME) \
+DEFINES += -DTHEME=$(THEME) \
           -DLOCALE_SRCDIR=$(LOCALE_SRCDIR) \
           $(NULL)
--- a/calendar/locales/Makefile.in
+++ b/calendar/locales/Makefile.in
@ -5,5 +5,3 @@

 MOZ_CHROME_FILE_FORMAT=jar
 USE_EXTENSION_MANIFEST = 1
-
-DEFINES += -DAB_CD=$(AB_CD)
--- a/calendar/providers/gdata/Makefile.in
+++ b/calendar/providers/gdata/Makefile.in
@ -17,8 +17,7 @@ SEAMONKEY_VERSION := $(shell cat $(topsrcdir)/suite/config/version.txt)
 LIGHTNING_VERSION := $(shell $(PYTHON) $(topsrcdir)/calendar/lightning/build/makeversion.py $(word 1,$(MOZ_PKG_VERSION) $(THUNDERBIRD_VERSION)))
 GDATA_VERSION = $(shell $(PYTHON) $(srcdir)/makeversion.py $(LIGHTNING_VERSION))

-DEFINES += -DAB_CD=$(AB_CD) \
-           -DLIGHTNING_VERSION=$(LIGHTNING_VERSION) \
+DEFINES += -DLIGHTNING_VERSION=$(LIGHTNING_VERSION) \
           -DSEAMONKEY_VERSION=$(SEAMONKEY_VERSION) \
           -DTHUNDERBIRD_VERSION=$(THUNDERBIRD_VERSION) \
           -DCOMM_BUILD=$(COMM_BUILD) \
--- a/calendar/providers/gdata/locales/Makefile.in
+++ b/calendar/providers/gdata/locales/Makefile.in
@ -2,21 +2,10 @@
 # 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@
-
 # Setting this to calendar/locales sets up LOCALE_SRCDIR to the correct locale
 # directory
 relativesrcdir = calendar/locales

 USE_EXTENSION_MANIFEST = 1

-include $(DEPTH)/config/autoconf.mk
-
-DEFINES += -DAB_CD=$(AB_CD) \
-           -DLOCALE_SRCDIR=$(LOCALE_SRCDIR) \
-           $(NULL)
-
-include $(topsrcdir)/config/rules.mk
+DEFINES += -DLOCALE_SRCDIR=$(LOCALE_SRCDIR)
--- a/calendar/resources/Makefile.in
+++ b/calendar/resources/Makefile.in
@ -2,13 +2,4 @@
 # 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
-
 USE_EXTENSION_MANIFEST = 1
-
-include $(topsrcdir)/config/rules.mk
--- a/calendar/test/mozmill/Makefile.in
+++ b/calendar/test/mozmill/Makefile.in
@ -2,13 +2,6 @@
 # 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
-
 MOZMILLDIR=$(DEPTH)/_tests/mozmill
 ifeq ($(OS_ARCH),WINNT)
 VIRTUALENV_BIN = $(MOZMILLDIR)/../mozmill-virtualenv/Scripts
--- a/calendar/timezones/Makefile.in
+++ b/calendar/timezones/Makefile.in
@ -11,8 +11,7 @@ SEAMONKEY_VERSION := $(shell cat $(topsrcdir)/suite/config/version.txt)
 CALENDAR_VERSION := $(shell $(PYTHON) $(topsrcdir)/calendar/lightning/build/makeversion.py $(word 1,$(MOZ_PKG_VERSION) $(THUNDERBIRD_VERSION)))
 TIMEZONES_VERSION := $(shell $(PYTHON) $(srcdir)/version.py)

-DEFINES += -DAB_CD=$(AB_CD) \
-           -DTHUNDERBIRD_VERSION=$(THUNDERBIRD_VERSION) \
+DEFINES += -DTHUNDERBIRD_VERSION=$(THUNDERBIRD_VERSION) \
           -DSEAMONKEY_VERSION=$(SEAMONKEY_VERSION) \
           -DCALENDAR_VERSION=$(CALENDAR_VERSION) \
           -DTIMEZONES_VERSION=$(TIMEZONES_VERSION) \
@ -21,4 +20,3 @@ DEFINES += -DAB_CD=$(AB_CD) \
 libs-%:
 	$(MAKE) -C locales libs AB_CD=$* XPI_NAME=calendar-timezones USE_EXTENSION_MANIFEST=1

-include $(topsrcdir)/config/rules.mk
--- a/calendar/timezones/locales/Makefile.in
+++ b/calendar/timezones/locales/Makefile.in
@ -2,21 +2,10 @@
 # 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@
-
 # Setting this to calendar/locales sets up LOCALE_SRCDIR to the correct locale
 # directory
 relativesrcdir = calendar/locales

 USE_EXTENSION_MANIFEST = 1

-include $(DEPTH)/config/autoconf.mk
-
-DEFINES += -DAB_CD=$(AB_CD) \
-           -DLOCALE_SRCDIR=$(LOCALE_SRCDIR) \
-           $(NULL)
-
-include $(topsrcdir)/config/rules.mk
+DEFINES += -DLOCALE_SRCDIR=$(LOCALE_SRCDIR)
--- a/chat/locales/Makefile.in
+++ b/chat/locales/Makefile.in
@ -1,15 +0,0 @@
-# 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@
-relativesrcdir	= @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-DEFINES += -DAB_CD=$(AB_CD)
-
-include $(topsrcdir)/config/rules.mk
--- a/editor/ui/locales/Makefile.in
+++ b/editor/ui/locales/Makefile.in
@ -1,15 +0,0 @@
-# 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@
-relativesrcdir = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-DEFINES += -DAB_CD=$(AB_CD)
-
-include $(topsrcdir)/config/rules.mk
--- a/im/Makefile.in
+++ b/im/Makefile.in
@ -3,13 +3,6 @@
 # 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 $(topsrcdir)/config/config.mk
-
 include $(topsrcdir)/config/rules.mk

 ifdef MAKENSISU
--- a/im/app/Makefile.in
+++ b/im/app/Makefile.in
@ -20,7 +20,6 @@ DEFINES += -DMOZ_SOURCE_REPO="$(SOURCE_REPO)"
 endif

 DEFINES += \
-  -DAB_CD=$(AB_CD) \
  -DINSTANTBIRD_ICO=\"$(DIST)/branding/instantbird.ico\" \
  -DGRE_MILESTONE=$(GRE_MILESTONE) \
  -DGRE_BUILDID=$(GRE_BUILDID) \
--- a/im/app/profile/extensions/Makefile.in
+++ b/im/app/profile/extensions/Makefile.in
@ -1,12 +0,0 @@
-# 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
-
-include $(topsrcdir)/config/rules.mk
--- a/im/branding/halloween/Makefile.in
+++ b/im/branding/halloween/Makefile.in
@ -4,13 +4,6 @@

 # Branding Makefile for nightlies/unofficial branding

-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/config/rules.mk

 export::
--- a/im/branding/halloween/locales/Makefile.in
+++ b/im/branding/halloween/locales/Makefile.in
@ -1,15 +0,0 @@
-# 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@
-relativesrcdir = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-DEFINES += -DAB_CD=$(AB_CD)
-
-include $(topsrcdir)/config/rules.mk
--- a/im/branding/nightly/Makefile.in
+++ b/im/branding/nightly/Makefile.in
@ -4,13 +4,6 @@

 # Branding Makefile for nightlies/unofficial branding

-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/config/rules.mk

 export::
--- a/im/branding/nightly/locales/Makefile.in
+++ b/im/branding/nightly/locales/Makefile.in
@ -1,15 +0,0 @@
-# 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@
-relativesrcdir = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-DEFINES += -DAB_CD=$(AB_CD)
-
-include $(topsrcdir)/config/rules.mk
--- a/im/installer/Makefile.in
+++ b/im/installer/Makefile.in
@ -2,13 +2,6 @@
 # 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
-
 STANDALONE_MAKEFILE := 1

 include $(topsrcdir)/config/rules.mk
@ -28,7 +21,7 @@ MOZ_NONLOCALIZED_PKG_LIST = \

 MOZ_LOCALIZED_PKG_LIST = $(AB_CD)

-DEFINES += -DAB_CD=$(AB_CD) -DMOZ_APP_NAME=$(MOZ_APP_NAME) -DPREF_DIR=$(PREF_DIR)
+DEFINES += -DMOZ_APP_NAME=$(MOZ_APP_NAME) -DPREF_DIR=$(PREF_DIR)

 ifdef MOZ_DEBUG
 DEFINES += -DMOZ_DEBUG=1
--- a/im/installer/windows/Makefile.in
+++ b/im/installer/windows/Makefile.in
@ -2,13 +2,6 @@
 # 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
-
 include $(MOZILLA_SRCDIR)/toolkit/mozapps/installer/package-name.mk

 PKG_INST_PATH =
@ -37,7 +30,6 @@ BRANDING_FILES = \
 	$(NULL)

 DEFINES += \
-	-DAB_CD=$(AB_CD) \
 	-DMOZ_APP_NAME=$(MOZ_APP_NAME) \
 	-DMOZ_APP_DISPLAYNAME=${MOZ_APP_DISPLAYNAME} \
 	-DMOZILLA_VERSION=${MOZILLA_VERSION} \
--- a/im/locales/Makefile.in
+++ b/im/locales/Makefile.in
@ -2,14 +2,6 @@
 # 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@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/config/config.mk

 vpath %.xml @srcdir@/en-US/searchplugins
--- a/ldap/xpcom/src/Makefile.in
+++ b/ldap/xpcom/src/Makefile.in
@ -1,20 +0,0 @@
-# 
-# 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
-
-ifdef MOZ_PREF_EXTENSIONS
-DEFINES += -DMOZ_PREF_EXTENSIONS
-endif
-
-include $(topsrcdir)/config/rules.mk
-
-LOCAL_INCLUDES	= $(LDAP_CFLAGS)
-
--- a/ldap/xpcom/src/moz.build
+++ b/ldap/xpcom/src/moz.build
@ -20,6 +20,7 @@ SOURCES += [

 if CONFIG['MOZ_PREF_EXTENSIONS']:
    SOURCES += ['nsLDAPSyncQuery.cpp']
+    DEFINES['MOZ_PREF_EXTENSIONS'] = True

 EXTRA_COMPONENTS += [
    'ldapComponents.manifest',
@ -46,3 +47,4 @@ else:
    Library('mozldap')
    FINAL_LIBRARY = 'xul'

+CXXFLAGS += [CONFIG['LDAP_CFLAGS']]
--- a/mail/Makefile.in
+++ b/mail/Makefile.in
@ -3,11 +3,6 @@
 # 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 $(topsrcdir)/config/config.mk

 ifdef ENABLE_TESTS
--- a/mail/app/Makefile.in
+++ b/mail/app/Makefile.in
@ -18,7 +18,6 @@ DEFINES += -DMOZ_SOURCE_REPO="$(SOURCE_REPO)"
 endif

 DEFINES += \
-  -DAB_CD=$(AB_CD) \
  -DTHUNDERBIRD_ICO='"$(DIST)/branding/thunderbird.ico"' \
  -DGRE_MILESTONE=$(GRE_MILESTONE) \
  -DGRE_BUILDID=$(GRE_BUILDID) \
--- a/mail/app/profile/extensions/Makefile.in
+++ b/mail/app/profile/extensions/Makefile.in
@ -3,15 +3,8 @@
 # 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@
-
 DISTROEXT = $(abspath $(DIST))/bin/distribution/extensions

-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/config/rules.mk

 # If adding extra extensions here, check that EXTRA_ARGS defined below won't
--- a/mail/branding/aurora/locales/Makefile.in
+++ b/mail/branding/aurora/locales/Makefile.in
@ -1,15 +0,0 @@
-# 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@
-relativesrcdir = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-DEFINES += -DAB_CD=$(AB_CD)
-
-include $(topsrcdir)/config/rules.mk
--- a/mail/branding/nightly/locales/Makefile.in
+++ b/mail/branding/nightly/locales/Makefile.in
@ -1,15 +0,0 @@
-# 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@
-relativesrcdir = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-DEFINES += -DAB_CD=$(AB_CD)
-
-include $(topsrcdir)/config/rules.mk
--- a/mail/components/devtools/extension/Makefile.in
+++ b/mail/components/devtools/extension/Makefile.in
@ -7,10 +7,4 @@ XPI_PKGNAME = dbgserver-$(MOZILLA_VERSION).$(AB_CD)
 DIST_FILES = install.rdf bootstrap.js
 relativesrcdir = mail/locales

-include $(DEPTH)/config/autoconf.mk
-
-DEFINES += -DAB_CD=$(AB_CD) \
-           -DLOCALE_SRCDIR=$(LOCALE_SRCDIR) \
-           $(NULL)
-
-include $(topsrcdir)/config/rules.mk
+DEFINES += -DLOCALE_SRCDIR=$(LOCALE_SRCDIR)
--- a/mail/installer/Makefile.in
+++ b/mail/installer/Makefile.in
@ -2,13 +2,6 @@
 # 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
-
 STANDALONE_MAKEFILE := 1

 include $(topsrcdir)/config/rules.mk
@ -30,7 +23,7 @@ MOZ_NONLOCALIZED_PKG_LIST = \

 MOZ_LOCALIZED_PKG_LIST = $(AB_CD)

-DEFINES += -DAB_CD=$(AB_CD) -DMOZ_APP_NAME=$(MOZ_APP_NAME) -DPREF_DIR=$(PREF_DIR)
+DEFINES += -DMOZ_APP_NAME=$(MOZ_APP_NAME) -DPREF_DIR=$(PREF_DIR)

 ifdef MOZ_DEBUG
 DEFINES += -DMOZ_DEBUG=1
--- a/mail/installer/windows/Makefile.in
+++ b/mail/installer/windows/Makefile.in
@ -2,13 +2,6 @@
 # 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
-
 include $(MOZILLA_SRCDIR)/toolkit/mozapps/installer/package-name.mk

 CONFIG_DIR = instgen
@ -44,7 +37,6 @@ BRANDING_FILES = \
 	$(NULL)

 DEFINES += \
-	-DAB_CD=$(AB_CD) \
 	-DMOZ_APP_NAME=$(MOZ_APP_NAME) \
 	-DMOZ_APP_DISPLAYNAME='${MOZ_APP_DISPLAYNAME}' \
 	-DMOZILLA_VERSION=${MOZILLA_VERSION} \
--- a/mail/locales/Makefile.in
+++ b/mail/locales/Makefile.in
@ -2,14 +2,6 @@
 # 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@
-relativesrcdir  = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/config/config.mk

 vpath %.xml @srcdir@/en-US/searchplugins
--- a/mail/test/mozmill/Makefile.in
+++ b/mail/test/mozmill/Makefile.in
@ -3,14 +3,6 @@
 # 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@
-relativesrcdir = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/config/rules.mk

 # We're installing to _tests/mozmill
--- a/mail/themes/Makefile.in
+++ b/mail/themes/Makefile.in
@ -2,13 +2,4 @@
 # 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 $(topsrcdir)/config/config.mk
-
 DIST_FILES = install.rdf
-
-include $(topsrcdir)/config/rules.mk
--- a/mailnews/mapi/mapiDll/Makefile.in
+++ b/mailnews/mapi/mapiDll/Makefile.in
@ -3,13 +3,4 @@
 # 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
-
 EMBED_MANIFEST_AT = 2
-
-include $(topsrcdir)/config/rules.mk
--- a/mailnews/mapi/mapihook/build/Makefile.in
+++ b/mailnews/mapi/mapihook/build/Makefile.in
@ -3,13 +3,6 @@
 # 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
-
 MIDL_GENERATED_FILES = msgMapi.h msgMapi_p.c msgMapi_i.c dlldata.c

 INSTALL_TARGETS += msgmapi
--- a/mailnews/mapi/mapihook/src/Makefile.in
+++ b/mailnews/mapi/mapihook/src/Makefile.in
@ -3,13 +3,4 @@
 # 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
-
 CSRCS += ../build/msgMapi_i.c
-
-include $(topsrcdir)/config/rules.mk
--- a/other-licenses/branding/instantbird/Makefile.in
+++ b/other-licenses/branding/instantbird/Makefile.in
@ -4,13 +4,6 @@

 # Branding Makefile for nightlies/unofficial branding

-DEPTH = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
 include $(topsrcdir)/config/rules.mk

 export::
--- a/other-licenses/branding/instantbird/locales/Makefile.in
+++ b/other-licenses/branding/instantbird/locales/Makefile.in
@ -1,15 +0,0 @@
-# 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@
-relativesrcdir = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-DEFINES += -DAB_CD=$(AB_CD)
-
-include $(topsrcdir)/config/rules.mk
--- a/other-licenses/branding/thunderbird/locales/Makefile.in
+++ b/other-licenses/branding/thunderbird/locales/Makefile.in
@ -1,47 +0,0 @@
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is the Mozilla Browser code.
-#
-# The Initial Developer of the Original Code is
-# Benjamin Smedberg <benjamin@smedbergs.us>
-# Portions created by the Initial Developer are Copyright (C) 2004
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-DEPTH          = @DEPTH@
-topsrcdir      = @top_srcdir@
-srcdir         = @srcdir@
-VPATH          = @srcdir@
-relativesrcdir = @relativesrcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-DEFINES += -DAB_CD=$(AB_CD)
-
-include $(topsrcdir)/config/rules.mk
--- a/suite/Makefile.in
+++ b/suite/Makefile.in
@ -3,13 +3,6 @@
 # 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
-
 include $(topsrcdir)/config/rules.mk

 ifdef MAKENSISU
--- a/suite/app/Makefile.in
+++ b/suite/app/Makefile.in
@ -2,13 +2,6 @@
 # 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
-
 AB_CD = $(MOZ_UI_LOCALE) 

 DEFINES += \
--- a/suite/build/Makefile.in
+++ b/suite/build/Makefile.in
@ -2,14 +2,5 @@
 # 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
-
-include $(topsrcdir)/config/rules.mk
-
 # Ensure that we don't embed a manifest referencing the CRT.
 EMBED_MANIFEST_AT =
--- a/suite/debugQA/Makefile.in
+++ b/suite/debugQA/Makefile.in
@ -3,14 +3,6 @@
 # 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
-
 USE_EXTENSION_MANIFEST = 1
 INSTALL_EXTENSION_ID   = debugQA@mozilla.org
 XPI_PKGNAME            = debugQA-$(MOZ_APP_VERSION)
@ -21,5 +13,3 @@ XULAPP_DEFINES = \
    -DMOZ_APP_VERSION=$(MOZ_APP_VERSION) \
    -DMOZ_APP_MAXVERSION=$(MOZ_APP_MAXVERSION) \
    $(NULL)
-
-include $(topsrcdir)/config/rules.mk
--- a/suite/debugQA/locales/Makefile.in
+++ b/suite/debugQA/locales/Makefile.in
@ -3,13 +3,6 @@
 # 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@
-relativesrcdir=@relativesrcdir@
-
 USE_EXTENSION_MANIFEST = 1

 # include config.mk before we override the AB_CD var it sets
@ -18,5 +11,3 @@ include $(topsrcdir)/config/config.mk
 # override UI locale with en-US so that we don't need to provide L10n for this
 AB_CD = en-US
 DEFINES += -DAB_CD=$(AB_CD)
-
-include $(topsrcdir)/config/rules.mk
--- a/suite/installer/Makefile.in
+++ b/suite/installer/Makefile.in
@ -2,13 +2,6 @@
 # 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
-
 STANDALONE_MAKEFILE := 1

 include $(topsrcdir)/config/rules.mk
@ -31,7 +24,7 @@ MOZ_LOCALIZED_PKG_LIST = \
 	$(AB_CD) \
 	$(NULL)

-DEFINES += -DAB_CD=$(AB_CD) -DMOZ_APP_NAME=$(MOZ_APP_NAME) -DPREF_DIR=$(PREF_DIR)
+DEFINES += -DMOZ_APP_NAME=$(MOZ_APP_NAME) -DPREF_DIR=$(PREF_DIR)

 DEFINES += -DJAREXT=

--- a/suite/installer/windows/Makefile.in
+++ b/suite/installer/windows/Makefile.in
@ -2,13 +2,6 @@
 # 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
-
 include $(MOZILLA_SRCDIR)/toolkit/mozapps/installer/package-name.mk

 CONFIG_DIR = instgen
@ -30,7 +23,6 @@ BRANDING_FILES = \
 	$(NULL)

 DEFINES += \
-	-DAB_CD=$(AB_CD) \
 	-DPKG_BASENAME="$(PKG_BASENAME)" \
 	-DPKG_INST_BASENAME="$(PKG_INST_BASENAME)" \
 	-DMOZ_APP_VERSION=$(MOZ_APP_VERSION) \