From ab1b394f11b662f06d713e0c4be15a275f3a7457 Mon Sep 17 00:00:00 2001 From: Brian O'Keefe Date: Sat, 11 Apr 2015 23:44:36 +0800 Subject: [PATCH] Bug 1138063 - Remove boilerplate stuff from Makefile.ins; r=jcranmer --- calendar/libical/src/libical/Makefile.in | 8 ---- calendar/lightning/Makefile.in | 1 - calendar/lightning/locales/Makefile.in | 3 +- calendar/locales/Makefile.in | 2 - calendar/providers/gdata/Makefile.in | 3 +- calendar/providers/gdata/locales/Makefile.in | 13 +---- calendar/resources/Makefile.in | 9 ---- calendar/test/mozmill/Makefile.in | 7 --- calendar/timezones/Makefile.in | 4 +- calendar/timezones/locales/Makefile.in | 13 +---- chat/locales/Makefile.in | 15 ------ editor/ui/locales/Makefile.in | 15 ------ im/Makefile.in | 7 --- im/app/Makefile.in | 1 - im/app/profile/extensions/Makefile.in | 12 ----- im/branding/halloween/Makefile.in | 7 --- im/branding/halloween/locales/Makefile.in | 15 ------ im/branding/nightly/Makefile.in | 7 --- im/branding/nightly/locales/Makefile.in | 15 ------ im/installer/Makefile.in | 9 +--- im/installer/windows/Makefile.in | 8 ---- im/locales/Makefile.in | 8 ---- ldap/xpcom/src/Makefile.in | 20 -------- ldap/xpcom/src/moz.build | 2 + mail/Makefile.in | 5 -- mail/app/Makefile.in | 1 - mail/app/profile/extensions/Makefile.in | 7 --- mail/branding/aurora/locales/Makefile.in | 15 ------ mail/branding/nightly/locales/Makefile.in | 15 ------ .../components/devtools/extension/Makefile.in | 8 +--- mail/installer/Makefile.in | 9 +--- mail/installer/windows/Makefile.in | 8 ---- mail/locales/Makefile.in | 8 ---- mail/test/mozmill/Makefile.in | 8 ---- mail/themes/Makefile.in | 9 ---- mailnews/mapi/mapiDll/Makefile.in | 9 ---- mailnews/mapi/mapihook/build/Makefile.in | 7 --- mailnews/mapi/mapihook/src/Makefile.in | 9 ---- .../branding/instantbird/Makefile.in | 7 --- .../branding/instantbird/locales/Makefile.in | 15 ------ .../branding/thunderbird/locales/Makefile.in | 47 ------------------- suite/Makefile.in | 7 --- suite/app/Makefile.in | 7 --- suite/build/Makefile.in | 9 ---- suite/debugQA/Makefile.in | 10 ---- suite/debugQA/locales/Makefile.in | 9 ---- suite/installer/Makefile.in | 9 +--- suite/installer/windows/Makefile.in | 8 ---- 48 files changed, 11 insertions(+), 439 deletions(-) delete mode 100644 chat/locales/Makefile.in delete mode 100644 editor/ui/locales/Makefile.in delete mode 100644 im/app/profile/extensions/Makefile.in delete mode 100755 im/branding/halloween/locales/Makefile.in delete mode 100755 im/branding/nightly/locales/Makefile.in delete mode 100644 ldap/xpcom/src/Makefile.in delete mode 100755 mail/branding/aurora/locales/Makefile.in delete mode 100755 mail/branding/nightly/locales/Makefile.in delete mode 100755 other-licenses/branding/instantbird/locales/Makefile.in delete mode 100755 other-licenses/branding/thunderbird/locales/Makefile.in diff --git a/calendar/libical/src/libical/Makefile.in b/calendar/libical/src/libical/Makefile.in index 653de8346f..089f4dbe8f 100644 --- 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 diff --git a/calendar/lightning/Makefile.in b/calendar/lightning/Makefile.in index e09f5c0bfc..5edcb631ea 100644 --- 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) \ diff --git a/calendar/lightning/locales/Makefile.in b/calendar/lightning/locales/Makefile.in index 53df471c87..0d7bf359f6 100644 --- 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) diff --git a/calendar/locales/Makefile.in b/calendar/locales/Makefile.in index def9d29fca..686e24b8de 100644 --- 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) diff --git a/calendar/providers/gdata/Makefile.in b/calendar/providers/gdata/Makefile.in index 708ac6e194..001a0bd691 100644 --- 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) \ diff --git a/calendar/providers/gdata/locales/Makefile.in b/calendar/providers/gdata/locales/Makefile.in index 643d9a4b9a..c204dc8292 100644 --- 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) diff --git a/calendar/resources/Makefile.in b/calendar/resources/Makefile.in index 62307165bc..8efd7be91e 100644 --- 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 diff --git a/calendar/test/mozmill/Makefile.in b/calendar/test/mozmill/Makefile.in index 234ae2ee14..9858e62384 100644 --- 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 diff --git a/calendar/timezones/Makefile.in b/calendar/timezones/Makefile.in index acd9c16fd5..45b4967289 100644 --- 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 diff --git a/calendar/timezones/locales/Makefile.in b/calendar/timezones/locales/Makefile.in index 643d9a4b9a..c204dc8292 100644 --- 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) diff --git a/chat/locales/Makefile.in b/chat/locales/Makefile.in deleted file mode 100644 index 1ac1385ef6..0000000000 --- a/chat/locales/Makefile.in +++ /dev/null @@ -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 diff --git a/editor/ui/locales/Makefile.in b/editor/ui/locales/Makefile.in deleted file mode 100644 index 2839d474fe..0000000000 --- a/editor/ui/locales/Makefile.in +++ /dev/null @@ -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 diff --git a/im/Makefile.in b/im/Makefile.in index 71d1a3409c..f1f230efdf 100644 --- 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 diff --git a/im/app/Makefile.in b/im/app/Makefile.in index 7c0febb3bf..6f52c9ae78 100644 --- 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) \ diff --git a/im/app/profile/extensions/Makefile.in b/im/app/profile/extensions/Makefile.in deleted file mode 100644 index ef40c1e3e8..0000000000 --- a/im/app/profile/extensions/Makefile.in +++ /dev/null @@ -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 diff --git a/im/branding/halloween/Makefile.in b/im/branding/halloween/Makefile.in index f6e6acdfb5..7b97c5e8d8 100644 --- 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:: diff --git a/im/branding/halloween/locales/Makefile.in b/im/branding/halloween/locales/Makefile.in deleted file mode 100755 index 2839d474fe..0000000000 --- a/im/branding/halloween/locales/Makefile.in +++ /dev/null @@ -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 diff --git a/im/branding/nightly/Makefile.in b/im/branding/nightly/Makefile.in index 17a0554c04..d05d8d00f1 100644 --- 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:: diff --git a/im/branding/nightly/locales/Makefile.in b/im/branding/nightly/locales/Makefile.in deleted file mode 100755 index 2839d474fe..0000000000 --- a/im/branding/nightly/locales/Makefile.in +++ /dev/null @@ -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 diff --git a/im/installer/Makefile.in b/im/installer/Makefile.in index 0234b21be9..bc0b2e68fa 100644 --- 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 diff --git a/im/installer/windows/Makefile.in b/im/installer/windows/Makefile.in index cb4810632f..043e1eafc5 100644 --- 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} \ diff --git a/im/locales/Makefile.in b/im/locales/Makefile.in index 342f0947e4..4895b6c8b4 100644 --- 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 diff --git a/ldap/xpcom/src/Makefile.in b/ldap/xpcom/src/Makefile.in deleted file mode 100644 index f8b261f060..0000000000 --- a/ldap/xpcom/src/Makefile.in +++ /dev/null @@ -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) - diff --git a/ldap/xpcom/src/moz.build b/ldap/xpcom/src/moz.build index ac1fcb180d..0f6be73924 100644 --- 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']] diff --git a/mail/Makefile.in b/mail/Makefile.in index 7701ba2bb2..98cb3e6378 100644 --- 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 diff --git a/mail/app/Makefile.in b/mail/app/Makefile.in index c490ad8d98..8195509374 100644 --- 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) \ diff --git a/mail/app/profile/extensions/Makefile.in b/mail/app/profile/extensions/Makefile.in index ea0c7b5e7b..a096625757 100644 --- 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 diff --git a/mail/branding/aurora/locales/Makefile.in b/mail/branding/aurora/locales/Makefile.in deleted file mode 100755 index 2839d474fe..0000000000 --- a/mail/branding/aurora/locales/Makefile.in +++ /dev/null @@ -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 diff --git a/mail/branding/nightly/locales/Makefile.in b/mail/branding/nightly/locales/Makefile.in deleted file mode 100755 index 2839d474fe..0000000000 --- a/mail/branding/nightly/locales/Makefile.in +++ /dev/null @@ -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 diff --git a/mail/components/devtools/extension/Makefile.in b/mail/components/devtools/extension/Makefile.in index 314d52c650..7ec1a4ce60 100644 --- 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) diff --git a/mail/installer/Makefile.in b/mail/installer/Makefile.in index cc25b1d3ee..a519bfeb23 100644 --- 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 diff --git a/mail/installer/windows/Makefile.in b/mail/installer/windows/Makefile.in index e7d020968e..f6559137b4 100644 --- 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} \ diff --git a/mail/locales/Makefile.in b/mail/locales/Makefile.in index 254c60d40d..f51e802259 100644 --- 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 diff --git a/mail/test/mozmill/Makefile.in b/mail/test/mozmill/Makefile.in index ac562eb05c..d3ac540c7f 100644 --- 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 diff --git a/mail/themes/Makefile.in b/mail/themes/Makefile.in index cad1f04b79..85ee75edfa 100644 --- 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 diff --git a/mailnews/mapi/mapiDll/Makefile.in b/mailnews/mapi/mapiDll/Makefile.in index 298e999006..b6769e3144 100644 --- 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 diff --git a/mailnews/mapi/mapihook/build/Makefile.in b/mailnews/mapi/mapihook/build/Makefile.in index a05efcc844..0614220e9c 100644 --- 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 diff --git a/mailnews/mapi/mapihook/src/Makefile.in b/mailnews/mapi/mapihook/src/Makefile.in index 463a5dfa11..10e6172bf1 100644 --- 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 diff --git a/other-licenses/branding/instantbird/Makefile.in b/other-licenses/branding/instantbird/Makefile.in index e149bae6cd..bb02eb3895 100644 --- 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:: diff --git a/other-licenses/branding/instantbird/locales/Makefile.in b/other-licenses/branding/instantbird/locales/Makefile.in deleted file mode 100755 index 2839d474fe..0000000000 --- a/other-licenses/branding/instantbird/locales/Makefile.in +++ /dev/null @@ -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 diff --git a/other-licenses/branding/thunderbird/locales/Makefile.in b/other-licenses/branding/thunderbird/locales/Makefile.in deleted file mode 100755 index 1d96b61915..0000000000 --- a/other-licenses/branding/thunderbird/locales/Makefile.in +++ /dev/null @@ -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 -# 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 diff --git a/suite/Makefile.in b/suite/Makefile.in index 303dba7f69..f1f230efdf 100644 --- 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 diff --git a/suite/app/Makefile.in b/suite/app/Makefile.in index d63596d738..1814fffe33 100644 --- 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 += \ diff --git a/suite/build/Makefile.in b/suite/build/Makefile.in index d4c11517c9..2f8aa85742 100644 --- 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 = diff --git a/suite/debugQA/Makefile.in b/suite/debugQA/Makefile.in index 821726dbb5..a91707e7cd 100644 --- 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 diff --git a/suite/debugQA/locales/Makefile.in b/suite/debugQA/locales/Makefile.in index cb725d5067..dd03763da7 100644 --- 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 diff --git a/suite/installer/Makefile.in b/suite/installer/Makefile.in index 5c89c9dca1..ded383e1e6 100644 --- 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= diff --git a/suite/installer/windows/Makefile.in b/suite/installer/windows/Makefile.in index da4e6ef3ca..6109ad3408 100644 --- 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) \