--- a/browser/Makefile.in
+++ b/browser/Makefile.in
@@ -30,32 +30,24 @@
# 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@
+DEPTH = ..
+topsrcdir = @top_srcdir@
+srcdir = @srcdir@
+VPATH = @srcdir@
include $(topsrcdir)/config/config.mk
-PARALLEL_DIRS = \
- base \
- components \
- fuel \
- locales \
- themes \
- $(NULL)
-
-DIRS = app
+DIRS = base components locales themes fuel app
ifeq ($(OS_ARCH),WINNT)
ifdef MOZ_INSTALLER
DIRS += installer/windows
endif
endif
include $(topsrcdir)/config/rules.mk
--- a/db/Makefile.in
+++ b/db/Makefile.in
@@ -39,17 +39,18 @@ DEPTH = ..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
ifndef NSS_DISABLE_DBM
ifdef MOZ_MORK
-PARALLEL_DIRS = mdb mork
+DIRS = mdb mork
endif
endif
ifdef MOZ_MORKREADER
-PARALLEL_DIRS += morkreader
+DIRS += morkreader
endif
include $(topsrcdir)/config/rules.mk
+
--- a/extensions/Makefile.in
+++ b/extensions/Makefile.in
@@ -37,11 +37,11 @@
DEPTH = ..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
-PARALLEL_DIRS = $(MOZ_EXTENSIONS)
+DIRS = $(MOZ_EXTENSIONS)
include $(topsrcdir)/config/rules.mk
--- a/intl/Makefile.in
+++ b/intl/Makefile.in
@@ -37,19 +37,12 @@
DEPTH = ..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
-PARALLEL_DIRS = \
- locale \
- lwbrk \
- strres \
- uconv \
- unicharutil \
- $(NULL)
-
-DIRS = build
+DIRS = unicharutil uconv locale strres lwbrk build
include $(topsrcdir)/config/rules.mk
+
--- a/netwerk/Makefile.in
+++ b/netwerk/Makefile.in
@@ -30,47 +30,47 @@
# 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@
+DEPTH = ..
+topsrcdir = @top_srcdir@
+srcdir = @srcdir@
+VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
-MODULE = necko
+MODULE = necko
-DIRS = \
- base \
- cookie \
- dns \
- socket \
- mime \
- streamconv \
- cache \
- protocol \
- system \
- $(NULL)
+DIRS = \
+ base \
+ cookie \
+ dns \
+ socket \
+ mime \
+ streamconv \
+ cache \
+ protocol \
+ system \
+ $(NULL)
ifdef NECKO_WIFI
-DIRS += wifi
+DIRS += wifi
endif
-DIRS += \
- build \
- locales \
- $(NULL)
+DIRS += \
+ build \
+ locales \
+ $(NULL)
ifdef ENABLE_TESTS
-TOOL_DIRS += test
+TOOL_DIRS += test
endif
-EXPORTS = necko-config.h
+EXPORTS = necko-config.h
include $(topsrcdir)/config/rules.mk
DEFINES += -DIMPL_NS_NET
--- a/netwerk/protocol/Makefile.in
+++ b/netwerk/protocol/Makefile.in
@@ -30,29 +30,28 @@
# 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@
+DEPTH = ../..
+topsrcdir = @top_srcdir@
+srcdir = @srcdir@
+VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
-PARALLEL_DIRS = \
- about \
- data \
- file \
- ftp \
- gopher \
- http \
- res \
- viewsource \
- $(NULL)
+DIRS = about \
+ data \
+ res \
+ file \
+ http \
+ viewsource \
+ ftp \
+ gopher \
+ $(NULL)
include $(topsrcdir)/config/rules.mk
DEFINES += -DIMPL_NS_NET
--- a/toolkit/Makefile.in
+++ b/toolkit/Makefile.in
@@ -38,42 +38,46 @@
DEPTH = ..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
-PARALLEL_DIRS = \
- content \
- locales \
- mozapps \
- obsolete \
- profile \
- spatial-navigation \
- themes \
- $(NULL)
+DIRS = \
+ content \
+ locales \
+ obsolete \
+ profile \
+ themes \
+ spatial-navigation \
+ $(NULL)
-ifneq (,$(filter gtk2 qt,$(MOZ_WIDGET_TOOLKIT)))
-PARALLEL_DIRS += system/unixproxy
+ifneq (,$(filter gtk2,$(MOZ_WIDGET_TOOLKIT)))
+DIRS += system/unixproxy
endif
ifneq (,$(filter cocoa,$(MOZ_WIDGET_TOOLKIT)))
-PARALLEL_DIRS += system/osxproxy
+DIRS += system/osxproxy
+endif
+
+ifneq (,$(filter qt,$(MOZ_WIDGET_TOOLKIT)))
+DIRS += system/unixproxy
endif
ifneq (,$(filter windows,$(MOZ_WIDGET_TOOLKIT)))
-PARALLEL_DIRS += system/windowsproxy
+DIRS += system/windowsproxy
endif
ifdef MOZ_CRASHREPORTER
-PARALLEL_DIRS += crashreporter
+DIRS += crashreporter
endif
DIRS += \
- xre
- $(NULL)
+ xre \
+ mozapps \
+ $(NULL)
include $(topsrcdir)/config/rules.mk
export::
@$(MAKE) -C xre export
--- a/toolkit/components/Makefile.in
+++ b/toolkit/components/Makefile.in
@@ -31,100 +31,99 @@
# 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@
+VPATH = @srcdir@
include $(topsrcdir)/config/config.mk
# These component dirs are built for all apps (including suite)
ifdef MOZ_ENABLE_XREMOTE
-PARALLEL_DIRS += remote
+DIRS += remote
endif
-
-PARALLEL_DIRS += \
- aboutmemory \
- apppicker \
- commandlines \
- console \
- contentprefs \
- cookie \
- exthelper \
- filepicker \
- microformats \
- parentalcontrols \
- passwordmgr \
- places \
- startup \
- typeaheadfind \
- urlformatter \
- viewconfig \
- $(NULL)
+DIRS += \
+ urlformatter \
+ contentprefs \
+ microformats \
+ places \
+ apppicker \
+ filepicker \
+ console \
+ cookie \
+ exthelper \
+ viewconfig \
+ typeaheadfind \
+ parentalcontrols \
+ passwordmgr \
+ aboutmemory \
+ $(NULL)
ifneq (,$(filter cocoa, $(MOZ_WIDGET_TOOLKIT)))
TOOL_DIRS += alerts
else
-PARALLEL_DIRS += alerts
+DIRS += alerts
endif
ifdef MOZ_FEEDS
-PARALLEL_DIRS += feeds
+DIRS += feeds
endif
ifdef MOZ_HELP_VIEWER
-PARALLEL_DIRS += help
+DIRS += help
endif
ifdef NS_PRINTING
-PARALLEL_DIRS += printing
+DIRS += printing
endif
ifdef MOZ_VIEW_SOURCE
-PARALLEL_DIRS += viewsource
+DIRS += viewsource
endif
ifdef MOZ_XUL
-PARALLEL_DIRS += \
+DIRS += \
autocomplete \
satchel \
$(NULL)
endif
ifndef MOZ_THUNDERBIRD
ifndef MOZ_SUITE
-PARALLEL_DIRS += search
+DIRS += search
endif
endif # MOZ_THUNDERBIRD
ifdef MOZ_RDF
-PARALLEL_DIRS += downloads
+DIRS += downloads
endif
ifdef MOZ_URL_CLASSIFIER
-PARALLEL_DIRS += url-classifier
+DIRS += url-classifier
endif
ifdef MOZ_FASTSTART
-PARALLEL_DIRS += faststart
+DIRS += faststart
endif
DIRS += \
- build \
- $(NULL)
+ commandlines \
+ startup \
+ build \
+ $(NULL)
EXTRA_PP_COMPONENTS = nsDefaultCLH.js
ifeq ($(MOZ_BUILD_APP),camino)
DIRS += autocomplete/public
DIRS += downloads/public
endif
--- a/toolkit/mozapps/Makefile.in
+++ b/toolkit/mozapps/Makefile.in
@@ -31,25 +31,18 @@
# 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@
+VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
-PARALLEL_DIRS = \
- downloads \
- extensions \
- handling \
- plugins \
- update \
- xpinstall \
- $(NULL)
+DIRS = downloads extensions update xpinstall plugins handling
include $(topsrcdir)/config/rules.mk
--- a/uriloader/Makefile.in
+++ b/uriloader/Makefile.in
@@ -36,22 +36,23 @@
# ***** END LICENSE BLOCK *****
#
# uriloader is linked into the docshell module.
#
# Build in docshell/build to relink.
#
-DEPTH = ..
-topsrcdir = @top_srcdir@
-srcdir = @srcdir@
-VPATH = @srcdir@
+DEPTH = ..
+topsrcdir = @top_srcdir@
+srcdir = @srcdir@
+VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
-PARALLEL_DIRS = \
- base \
- exthandler \
- prefetch \
- $(NULL)
+DIRS = \
+ base \
+ exthandler \
+ prefetch \
+ $(NULL)
include $(topsrcdir)/config/rules.mk
+
