Bug 463385 Sprinkle magic PARALLEL_DIRS fairy dust about the build system r=gozer sr=bienvenu also hg removes for bug 462736 r=KaiRo
authorNeil Rashbrook <neil@parkwaycc.co.uk>
Mon, 10 Nov 2008 15:51:37 +0000
changeset 1056 cc3ffc99b4bf926735c3f781d8162ae3de7de5e6
parent 1055 5481635e0b6e254d4782b639e62a804bec635b00
child 1057 b12d733abd931b592b24b90009e14c8cd2b741cb
push idunknown
push userunknown
push dateunknown
reviewersgozer, bienvenu, KaiRo
bugs463385, 462736
Bug 463385 Sprinkle magic PARALLEL_DIRS fairy dust about the build system r=gozer sr=bienvenu also hg removes for bug 462736 r=KaiRo
mail/build.mk
mailnews/Makefile.in
mailnews/addrbook/Makefile.in
mailnews/base/Makefile.in
mailnews/base/search/Makefile.in
mailnews/compose/Makefile.in
mailnews/db/msgdb/Makefile.in
mailnews/extensions/Makefile.in
mailnews/extensions/bayesian-spam-filter/Makefile.in
mailnews/extensions/mailviews/Makefile.in
mailnews/extensions/mailviews/resources/Makefile.in
mailnews/extensions/smime/Makefile.in
mailnews/extensions/smime/resources/Makefile.in
mailnews/extensions/smime/resources/content/Makefile.in
mailnews/imap/Makefile.in
mailnews/import/Makefile.in
mailnews/import/applemail/Makefile.in
mailnews/import/comm4x/Makefile.in
mailnews/import/eudora/Makefile.in
mailnews/import/outlook/Makefile.in
mailnews/import/text/Makefile.in
mailnews/local/Makefile.in
mailnews/makefiles.sh
mailnews/mapi/Makefile.in
mailnews/mime/Makefile.in
mailnews/mime/cthandlers/Makefile.in
mailnews/news/Makefile.in
suite/build.mk
suite/makefiles.sh
suite/profile/migration/Makefile.in
suite/shell/Makefile.in
suite/themes/Makefile.in
--- a/mail/build.mk
+++ b/mail/build.mk
@@ -62,16 +62,17 @@ endif
 
 ifdef MOZ_BRANDING_DIRECTORY
 tier_app_dirs += $(MOZ_BRANDING_DIRECTORY)
 else
 tier_app_dirs += mail/branding/nightly
 endif
 
 tier_app_dirs += \
+	mailnews/base \
 	mailnews \
 	$(NULL)
 
 ifdef MOZ_CALENDAR
 tier_app_dirs += calendar/lightning
 endif
 
 tier_app_dirs += \
--- a/mailnews/Makefile.in
+++ b/mailnews/Makefile.in
@@ -39,34 +39,36 @@ DEPTH		= ..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE       = mailnews
 
-DIRS		= base db/msgdb db/gloda news local mime compose imap addrbook import extensions
+PARALLEL_DIRS	= base/search/src db/msgdb db/gloda news local mime compose imap addrbook import extensions
 
 ifeq ($(OS_ARCH),WINNT)
 ifndef GNU_CC
-DIRS		+= mapi
+PARALLEL_DIRS	+= mapi/mapiDLL mapi/mapihook
 endif
 endif
 
 ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
  EXTRA_DSO_LDOPTS += \
    $(TK_LIBS) \
                        -framework Cocoa \
   $(NULL)
 endif 
 
 
 ifdef MOZ_STATIC_MAIL_BUILD
-DIRS += build
+DIRS = build
+else
+DIRS = base/build
 endif
 
 PREF_JS_EXPORTS = $(srcdir)/mailnews.js
 
 DEFINES += -DOS_ARCH=$(OS_ARCH) \
            -DMOZ_WIDGET_TOOLKIT=$(MOZ_WIDGET_TOOLKIT) \
            $(NULL)
 
--- a/mailnews/addrbook/Makefile.in
+++ b/mailnews/addrbook/Makefile.in
@@ -38,20 +38,20 @@
 
 DEPTH		= ../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DIRS		= public src
+PARALLEL_DIRS	= public src
+
+ifdef ENABLE_TESTS
+PARALLEL_DIRS += test
+endif
 
 ifndef MOZ_STATIC_MAIL_BUILD
-DIRS += build
-endif
-
-ifdef ENABLE_TESTS
-DIRS += test
+DIRS = build
 endif
 
 include $(topsrcdir)/config/rules.mk
 
--- a/mailnews/base/Makefile.in
+++ b/mailnews/base/Makefile.in
@@ -38,20 +38,19 @@
 DEPTH		= ../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= msgbase
-DIRS		= public src util search ispdata
+
+PARALLEL_DIRS	= public src util ispdata
 
-ifndef MOZ_STATIC_MAIL_BUILD
-DIRS += build
+ifdef ENABLE_TESTS
+PARALLEL_DIRS += test
 endif
 
-ifdef ENABLE_TESTS
-DIRS += test
-endif
+DIRS		= search/public
 
 include $(topsrcdir)/config/rules.mk
 
deleted file mode 100644
--- a/mailnews/base/search/Makefile.in
+++ /dev/null
@@ -1,48 +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 mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either of 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		= ../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-DIRS		= public src
-
-include $(topsrcdir)/config/rules.mk
-
--- a/mailnews/compose/Makefile.in
+++ b/mailnews/compose/Makefile.in
@@ -39,20 +39,20 @@ DEPTH		= ../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= msgcompose
 
-DIRS		= public src
+PARALLEL_DIRS	= public src
+
+ifdef ENABLE_TESTS
+PARALLEL_DIRS += test
+endif
 
 ifndef MOZ_STATIC_MAIL_BUILD
-DIRS += build
-endif
-
-ifdef ENABLE_TESTS
-DIRS += test
+DIRS = build
 endif
 
 include $(topsrcdir)/config/rules.mk
 
--- a/mailnews/db/msgdb/Makefile.in
+++ b/mailnews/db/msgdb/Makefile.in
@@ -38,19 +38,20 @@
 DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= msgdb
-DIRS		= public src
+
+PARALLEL_DIRS	= public src
+
+ifdef ENABLE_TESTS
+PARALLEL_DIRS += test
+endif
 
 ifndef MOZ_STATIC_MAIL_BUILD
-DIRS += build
-endif
-
-ifdef ENABLE_TESTS
-DIRS += test
+DIRS = build
 endif
 
 include $(topsrcdir)/config/rules.mk
--- a/mailnews/extensions/Makefile.in
+++ b/mailnews/extensions/Makefile.in
@@ -38,24 +38,24 @@
 DEPTH		= ../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 # these extensions are not optional
-DIRS	= mdn mailviews bayesian-spam-filter offline-startup newsblog
+PARALLEL_DIRS	= mdn mailviews bayesian-spam-filter offline-startup newsblog
 
 ifdef MOZ_PSM
 BUILD_SMIME=1
 endif
 
 ifdef BUILD_SMIME
-DIRS		+= smime
+PARALLEL_DIRS	+= smime
 endif
 
 ifdef BUILD_PALMSYNC
-DIRS		+= palmsync
+PARALLEL_DIRS	+= palmsync
 endif
 
 include $(topsrcdir)/config/rules.mk
 
--- a/mailnews/extensions/bayesian-spam-filter/Makefile.in
+++ b/mailnews/extensions/bayesian-spam-filter/Makefile.in
@@ -40,19 +40,19 @@ topsrcdir	= @top_srcdir@
 
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= bayesflt
 
-DIRS=src
+PARALLEL_DIRS	= src
+
+ifdef ENABLE_TESTS
+PARALLEL_DIRS += test
+endif
 
 ifndef MOZ_STATIC_MAIL_BUILD
-DIRS += build
-endif
-
-ifdef ENABLE_TESTS
-DIRS += test
+DIRS = build
 endif
 
 include $(topsrcdir)/config/rules.mk
--- a/mailnews/extensions/mailviews/Makefile.in
+++ b/mailnews/extensions/mailviews/Makefile.in
@@ -39,15 +39,15 @@ DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= mailview
 
-DIRS		= public src resources
+PARALLEL_DIRS	= public src resources/content
 
 ifndef MOZ_STATIC_MAIL_BUILD
-DIRS += build
+DIRS = build
 endif
 
 include $(topsrcdir)/config/rules.mk
deleted file mode 100644
--- a/mailnews/extensions/mailviews/resources/Makefile.in
+++ /dev/null
@@ -1,48 +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 mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 2002
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either of 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		= ../../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-DIRS	= content
-
-include $(topsrcdir)/config/rules.mk
-
--- a/mailnews/extensions/smime/Makefile.in
+++ b/mailnews/extensions/smime/Makefile.in
@@ -38,17 +38,20 @@
 DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= msgsmime
-DIRS		= public src build
+
+PARALLEL_DIRS	= public src
+
+DIRS		= build
 
 include $(topsrcdir)/config/rules.mk
 
 libs::
 	$(INSTALL) $(srcdir)/resources/content/smime.js $(DIST)/bin/defaults/pref
 
 install::
 	$(SYSINSTALL) $(IFLAGS1) $(srcdir)/resources/content/smime.js $(DESTDIR)$(mozappdir)/defaults/pref
deleted file mode 100644
--- a/mailnews/extensions/smime/resources/Makefile.in
+++ /dev/null
@@ -1,48 +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 mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either of 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		= ../../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-DIRS		= content
-
-include $(topsrcdir)/config/rules.mk
-
deleted file mode 100644
--- a/mailnews/extensions/smime/resources/content/Makefile.in
+++ /dev/null
@@ -1,51 +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 mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either of 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		= ../../../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-libs::
-	$(INSTALL) $(srcdir)/smime.js $(DIST)/bin/defaults/pref
-
-install::
-	$(SYSINSTALL) $(IFLAGS1) $(srcdir)/smime.js $(DESTDIR)$(mozappdir)/defaults/pref
-
-include $(topsrcdir)/config/rules.mk
--- a/mailnews/imap/Makefile.in
+++ b/mailnews/imap/Makefile.in
@@ -38,20 +38,21 @@
 DEPTH		= ../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= msgimap
-DIRS		= public src
+
+PARALLEL_DIRS	= public src
 
 ifndef MOZ_STATIC_MAIL_BUILD
-DIRS += build
+DIRS = build
 endif
 
 ifdef ENABLE_TESTS
 DIRS += test
 endif
 
 include $(topsrcdir)/config/rules.mk
 
--- a/mailnews/import/Makefile.in
+++ b/mailnews/import/Makefile.in
@@ -39,28 +39,28 @@ DEPTH		= ../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= import
 
-DIRS		= public src text comm4x
+PARALLEL_DIRS	= public src text/src comm4x/public comm4x/src
 
 ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
-DIRS		+= eudora applemail
+PARALLEL_DIRS	+= eudora/src applemail/src
 endif
 
 ifeq ($(OS_ARCH),WINNT)
-DIRS		+= eudora
+PARALLEL_DIRS	+= eudora/src
 ifndef GNU_CC
-DIRS		+= oexpress outlook
+PARALLEL_DIRS	+= oexpress outlook/src
 endif
 endif
 
-DIRS += build
-
 ifdef ENABLE_TESTS
-DIRS		+= test
+PARALLEL_DIRS	+= test
 endif
 
+DIRS = build
+
 include $(topsrcdir)/config/rules.mk
deleted file mode 100644
--- a/mailnews/import/applemail/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 Mailnews import code.
-#
-# The Initial Developer of the Original Code is
-# HÃ¥kan Waara <hwaara@gmail.com>.
-# Portions created by the Initial Developer are Copyright (C) 2008
-# 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 = ../../..
-topsrcdir		= @top_srcdir@
-VPATH				= @srcdir@
-srcdir			= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE	= applemail
-DIRS		= src
-
-include $(topsrcdir)/config/rules.mk
deleted file mode 100644
--- a/mailnews/import/comm4x/Makefile.in
+++ /dev/null
@@ -1,49 +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 mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 2002
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Srilatha Moturi <srilatha@netscape.com>
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either of 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 = ../../..
-topsrcdir   = @top_srcdir@
-VPATH       = @srcdir@
-srcdir      = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE	= impComm4xMail
-DIRS =public src
-
-include $(topsrcdir)/config/rules.mk
-
deleted file mode 100644
--- a/mailnews/import/eudora/Makefile.in
+++ /dev/null
@@ -1,48 +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 mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 2001
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either of 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		= ../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-DIRS		= src
-
-include $(topsrcdir)/config/rules.mk
-
deleted file mode 100644
--- a/mailnews/import/outlook/Makefile.in
+++ /dev/null
@@ -1,48 +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 mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 2001
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either of 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		= ../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-DIRS		= src
-
-include $(topsrcdir)/config/rules.mk
-
deleted file mode 100644
--- a/mailnews/import/text/Makefile.in
+++ /dev/null
@@ -1,48 +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 mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either of 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		= ../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-DIRS		= src
-
-include $(topsrcdir)/config/rules.mk
-
--- a/mailnews/local/Makefile.in
+++ b/mailnews/local/Makefile.in
@@ -38,20 +38,21 @@
 DEPTH		= ../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= msglocal
-DIRS		= public src
+
+PARALLEL_DIRS	= public src
+
+ifdef ENABLE_TESTS
+PARALLEL_DIRS += test
+endif
 
 ifndef MOZ_STATIC_MAIL_BUILD
-DIRS += build
-endif
-
-ifdef ENABLE_TESTS
-DIRS += test
+DIRS = build
 endif
 
 include $(topsrcdir)/config/rules.mk
 
--- a/mailnews/makefiles.sh
+++ b/mailnews/makefiles.sh
@@ -43,17 +43,16 @@ mailnews/addrbook/build/Makefile
 mailnews/addrbook/public/Makefile
 mailnews/addrbook/src/Makefile
 mailnews/base/Makefile
 mailnews/base/build/Makefile
 mailnews/base/ispdata/Makefile
 mailnews/base/public/Makefile
 mailnews/base/src/Makefile
 mailnews/base/util/Makefile
-mailnews/base/search/Makefile
 mailnews/base/search/public/Makefile
 mailnews/base/search/src/Makefile
 mailnews/build/Makefile
 mailnews/db/Makefile
 mailnews/db/gloda/Makefile
 mailnews/db/msgdb/Makefile
 mailnews/db/msgdb/public/Makefile
 mailnews/db/msgdb/src/Makefile
@@ -85,39 +84,34 @@ mailnews/mime/build/Makefile
 mailnews/compose/Makefile
 mailnews/compose/public/Makefile
 mailnews/compose/src/Makefile
 mailnews/compose/build/Makefile
 mailnews/import/Makefile
 mailnews/import/build/Makefile
 mailnews/import/public/Makefile
 mailnews/import/src/Makefile
-mailnews/import/text/Makefile
 mailnews/import/text/src/Makefile
-mailnews/import/eudora/Makefile
 mailnews/import/eudora/src/Makefile
 mailnews/import/oexpress/Makefile
-mailnews/import/outlook/Makefile
 mailnews/import/outlook/src/Makefile
-mailnews/import/comm4x/Makefile
 mailnews/import/comm4x/public/Makefile
 mailnews/import/comm4x/src/Makefile
+mailnews/import/applemail/src/Makefile.in
 mailnews/extensions/Makefile
 mailnews/extensions/smime/Makefile
 mailnews/extensions/smime/build/Makefile
 mailnews/extensions/smime/src/Makefile
 mailnews/extensions/smime/public/Makefile
 mailnews/extensions/mdn/Makefile
 mailnews/extensions/mdn/src/Makefile
 mailnews/extensions/mdn/build/Makefile
 mailnews/extensions/bayesian-spam-filter/Makefile
 mailnews/extensions/bayesian-spam-filter/src/Makefile
 mailnews/extensions/bayesian-spam-filter/build/Makefile
 mailnews/extensions/mailviews/Makefile
 mailnews/extensions/mailviews/public/Makefile
 mailnews/extensions/mailviews/src/Makefile
 mailnews/extensions/mailviews/build/Makefile
-mailnews/extensions/mailviews/resources/Makefile
 mailnews/extensions/mailviews/resources/content/Makefile
 mailnews/extensions/newsblog/Makefile
 mailnews/extensions/offline-startup/Makefile
-mailnews/mapi/Makefile
 "
deleted file mode 100644
--- a/mailnews/mapi/Makefile.in
+++ /dev/null
@@ -1,49 +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 mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 2001
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either of 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		= ../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE = msgMapi
-
-DIRS	= mapiDll mapihook
-
-include $(topsrcdir)/config/rules.mk
--- a/mailnews/mime/Makefile.in
+++ b/mailnews/mime/Makefile.in
@@ -39,20 +39,20 @@ DEPTH		= ../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= mime
 
-DIRS		= public src emitters cthandlers
+PARALLEL_DIRS	= public src emitters cthandlers
+
+ifdef ENABLE_TESTS
+PARALLEL_DIRS += test
+endif
 
 ifndef MOZ_STATIC_MAIL_BUILD
-DIRS += build
-endif
-
-ifdef ENABLE_TESTS
-DIRS += test
+DIRS = build
 endif
 
 include $(topsrcdir)/config/rules.mk
 
--- a/mailnews/mime/cthandlers/Makefile.in
+++ b/mailnews/mime/cthandlers/Makefile.in
@@ -41,16 +41,16 @@ srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 ifdef MOZ_PSM
 BUILD_SMIME=1
 endif
 
-DIRS = glue vcard
+PARALLEL_DIRS = glue vcard
 
 ifndef BUILD_SMIME
-DIRS += smimestub
+PARALLEL_DIRS += smimestub
 endif
 
 include $(topsrcdir)/config/rules.mk
 
--- a/mailnews/news/Makefile.in
+++ b/mailnews/news/Makefile.in
@@ -38,20 +38,20 @@
 
 DEPTH		= ../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DIRS		= public src
+PARALLEL_DIRS	= public src
+
+ifdef ENABLE_TESTS
+PARALLEL_DIRS += test
+endif
 
 ifndef MOZ_STATIC_MAIL_BUILD
-DIRS += build
-endif
-
-ifdef ENABLE_TESTS
-DIRS += test
+DIRS = build
 endif
 
 include $(topsrcdir)/config/rules.mk
 
--- a/suite/build.mk
+++ b/suite/build.mk
@@ -60,17 +60,17 @@ ifdef MOZ_COMPOSER
 tier_app_dirs += editor/ui
 endif
 
 ifdef MOZ_BRANDING_DIRECTORY
 tier_app_dirs += $(MOZ_BRANDING_DIRECTORY)
 endif
 
 ifdef MOZ_MAIL_NEWS
-tier_app_dirs += mailnews
+tier_app_dirs += mailnews/base mailnews
 endif
 
 ifdef MOZ_CALENDAR
 tier_app_dirs += calendar/lightning
 endif
 
 tier_app_dirs += \
 	suite \
--- a/suite/makefiles.sh
+++ b/suite/makefiles.sh
@@ -51,19 +51,16 @@ add_makefiles "
   suite/common/src/Makefile
   suite/common/tests/Makefile
   suite/installer/Makefile
   suite/installer/windows/Makefile
   suite/locales/Makefile
   suite/modules/Makefile
   suite/modules/test/Makefile
   suite/profile/Makefile
-  suite/profile/migration/Makefile
   suite/profile/migration/public/Makefile
   suite/profile/migration/src/Makefile
-  suite/shell/Makefile
   suite/shell/public/Makefile
   suite/shell/src/Makefile
-  suite/themes/Makefile
   suite/themes/modern/Makefile
   suite/themes/classic/Makefile
 "
 fi
deleted file mode 100644
--- a/suite/profile/migration/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 mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# the mozilla.org SeaMonkey project.
-# Portions created by the Initial Developer are Copyright (C) 2006
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#  Mark Banner <bugzilla@standard8.demon.co.uk>
-#
-# 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		= ../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-DIRS		= public src
-
-include $(topsrcdir)/config/rules.mk
deleted file mode 100644
--- a/suite/shell/Makefile.in
+++ /dev/null
@@ -1,51 +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
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 2002
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#  Brian Ryner <bryner@brianryner.com>
-#
-# 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           = ../..
-topsrcdir       = @top_srcdir@
-srcdir          = @srcdir@
-VPATH           = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-DIRS = public
-
-ifeq ($(OS_ARCH),WINNT)
-DIRS += src
-endif
-
-include $(topsrcdir)/config/rules.mk
deleted file mode 100644
--- a/suite/themes/Makefile.in
+++ /dev/null
@@ -1,45 +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 mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# the mozilla.org SeaMonkey project.
-# Portions created by the Initial Developer are Copyright (C) 2007
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either of 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		= ../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-DIRS		= classic modern
-
-include $(topsrcdir)/config/rules.mk