bug 462381 - sprinkle magic PARALLEL_DIRS fairy dust about the build system r=ted.mielczarek

browser/Makefile.in

@@ -42,7 +42,17 @@ VPATH		= @srcdir@
 
 include $(topsrcdir)/config/config.mk
 
-DIRS = base components locales themes fuel app
+PARALLEL_DIRS = \
+  base \
+  components \
+  fuel \
+  locales \
+  themes \
+  $(NULL)
+
+DIRS = \
+  app \
+  $(NULL)
 
 ifeq ($(OS_ARCH),WINNT)
 ifdef MOZ_INSTALLER

browser/components/Makefile.in

@@ -46,8 +46,8 @@ MODULE = browsercomps
 XPIDL_MODULE = browsercompsbase
 
 XPIDLSRCS = \
-	nsIBrowserHandler.idl \
   nsIBrowserGlue.idl \
+  nsIBrowserHandler.idl \
   $(NULL)
 
 EXTRA_PP_COMPONENTS = \
@@ -57,33 +57,33 @@ EXTRA_PP_COMPONENTS = \
 
 EXTRA_JS_MODULES = distribution.js
 
-DIRS = \
+PARALLEL_DIRS = \
   about \
   certerror \
   dirprovider \
+  feeds \
   microsummaries \
+  places \
   preferences \
+  privatebrowsing \
   search \
   sessionstore \
   shell \
   sidebar \
-	feeds \
-	places \
-	privatebrowsing \
   $(NULL)
 
 ifndef WINCE
-DIRS += migration
+PARALLEL_DIRS += migration
 endif
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),windows) 
 ifndef WINCE
-DIRS += wintaskbar
+PARALLEL_DIRS += wintaskbar
 endif
 endif
 
 ifdef MOZ_SAFE_BROWSING
-DIRS += safebrowsing
+PARALLEL_DIRS += safebrowsing
 endif
 
 DIRS += build

content/media/Makefile.in

@@ -45,7 +45,6 @@ MODULE		= content
 LIBRARY_NAME = gkconmedia_s
 LIBXUL_LIBRARY = 1
 
-
 EXPORTS = \
   nsMediaDecoder.h \
   nsMediaStream.h \
@@ -67,18 +66,16 @@ CPPSRCS		+= \
   $(NULL)
 endif
 
-DIRS =
-
 ifdef MOZ_OGG
-DIRS += ogg
+PARALLEL_DIRS += ogg
 endif
 
 ifdef MOZ_WAVE
-DIRS += wave
+PARALLEL_DIRS += wave
 endif
 
 ifdef ENABLE_TESTS
-DIRS += test
+PARALLEL_DIRS += test
 endif
 
 FORCE_STATIC_LIB = 1

db/Makefile.in

@@ -44,13 +44,12 @@ include $(DEPTH)/config/autoconf.mk
 
 ifndef NSS_DISABLE_DBM
 ifdef MOZ_MORK
-DIRS		= mdb mork
+PARALLEL_DIRS = mdb mork
 endif
 endif 
 
 ifdef MOZ_MORKREADER
-DIRS		+= morkreader
+PARALLEL_DIRS += morkreader
 endif
 
 include $(topsrcdir)/config/rules.mk
-

extensions/Makefile.in

@@ -42,6 +42,6 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DIRS		= $(MOZ_EXTENSIONS)
+PARALLEL_DIRS = $(MOZ_EXTENSIONS)
 
 include $(topsrcdir)/config/rules.mk

intl/Makefile.in

@@ -42,7 +42,14 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DIRS		= unicharutil uconv locale strres lwbrk build
+PARALLEL_DIRS = \
+  locale \
+  lwbrk \
+  strres \
+  uconv \
+  unicharutil \
+  $(NULL)
+
+DIRS = build
 
 include $(topsrcdir)/config/rules.mk
-

netwerk/protocol/Makefile.in

@@ -42,14 +42,15 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DIRS		= about \
+PARALLEL_DIRS = \
+  about \
   data \
-              res \
   file \
-              http \
-              viewsource \
   ftp \
   gopher \
+  http \
+  res \
+  viewsource \
   $(NULL)
 
 include $(topsrcdir)/config/rules.mk

toolkit/Makefile.in

@@ -43,38 +43,34 @@ VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DIRS	= \
+PARALLEL_DIRS = \
   content \
   locales \
+  mozapps \
   obsolete \
   profile \
-		themes \
   spatial-navigation \
+  themes \
   $(NULL)
 
-ifneq (,$(filter gtk2,$(MOZ_WIDGET_TOOLKIT)))
-DIRS += system/unixproxy
+ifneq (,$(filter gtk2 qt,$(MOZ_WIDGET_TOOLKIT)))
+PARALLEL_DIRS += system/unixproxy
 endif
 
 ifneq (,$(filter cocoa,$(MOZ_WIDGET_TOOLKIT)))
-DIRS += system/osxproxy
-endif
-
-ifneq (,$(filter qt,$(MOZ_WIDGET_TOOLKIT)))
-DIRS += system/unixproxy
+PARALLEL_DIRS += system/osxproxy
 endif
 
 ifneq (,$(filter windows,$(MOZ_WIDGET_TOOLKIT)))
-DIRS += system/windowsproxy
+PARALLEL_DIRS += system/windowsproxy
 endif
 
 ifdef MOZ_CRASHREPORTER
-DIRS += crashreporter
+PARALLEL_DIRS += crashreporter
 endif
 
 DIRS += \
   xre \
-	mozapps \
   $(NULL)
 
 include $(topsrcdir)/config/rules.mk

toolkit/components/Makefile.in

@@ -46,49 +46,52 @@ include $(topsrcdir)/config/config.mk
 # These component dirs are built for all apps (including suite)
 
 ifdef MOZ_ENABLE_XREMOTE
-DIRS += remote
+PARALLEL_DIRS += remote
 endif
-DIRS += \
-        urlformatter \
-        contentprefs \
-        microformats \
-        places \
+
+PARALLEL_DIRS += \
+  aboutmemory \
   apppicker \
-	filepicker \
+  commandlines \
   console \
+  contentprefs \
   cookie \
   exthelper \
-	viewconfig \
-	typeaheadfind \
+  filepicker \
+  microformats \
   parentalcontrols \
   passwordmgr \
-	aboutmemory \
+  places \
+  startup \
+  typeaheadfind \
+  urlformatter \
+  viewconfig \
   $(NULL)
 
 ifneq (,$(filter cocoa, $(MOZ_WIDGET_TOOLKIT)))
 TOOL_DIRS += alerts
 else
-DIRS += alerts
+PARALLEL_DIRS += alerts
 endif
 
 ifdef MOZ_FEEDS
-DIRS += feeds
+PARALLEL_DIRS += feeds
 endif
 
 ifdef MOZ_HELP_VIEWER
-DIRS += help
+PARALLEL_DIRS += help
 endif
 
 ifdef NS_PRINTING
-DIRS +=	printing
+PARALLEL_DIRS += printing
 endif
 
 ifdef MOZ_VIEW_SOURCE
-DIRS +=	viewsource
+PARALLEL_DIRS += viewsource
 endif
 
 ifdef MOZ_XUL
-DIRS += \
+PARALLEL_DIRS += \
   autocomplete \
   satchel \
   $(NULL)
@@ -97,26 +100,24 @@ endif
 ifndef MOZ_THUNDERBIRD
 
 ifndef MOZ_SUITE
-DIRS +=	search
+PARALLEL_DIRS += search
 endif
 
 endif # MOZ_THUNDERBIRD
 
 ifdef MOZ_RDF
-DIRS +=	downloads
+PARALLEL_DIRS += downloads
 endif
 
 ifdef MOZ_URL_CLASSIFIER
-DIRS += url-classifier
+PARALLEL_DIRS += url-classifier
 endif
 
 ifdef MOZ_FASTSTART
-DIRS += faststart
+PARALLEL_DIRS += faststart
 endif
 
 DIRS += \
-	commandlines \
-	startup \
   build \
   $(NULL)
 

toolkit/mozapps/Makefile.in

@@ -43,7 +43,15 @@ VPATH   = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DIRS = downloads extensions update xpinstall plugins handling shared
+PARALLEL_DIRS = \
+  downloads \
+  extensions \
+  handling \
+  plugins \
+  shared \
+  update \
+  xpinstall \
+  $(NULL)
  
 ifeq ($(OS_ARCH),WINCE)
 ifdef WINCE_WINDOWS_MOBILE

uriloader/Makefile.in

@@ -48,11 +48,10 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DIRS		= \
+PARALLEL_DIRS = \
   base \
   exthandler \
   prefetch \
   $(NULL)
 
 include $(topsrcdir)/config/rules.mk
-

xulrunner/Makefile.in

@@ -43,10 +43,10 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DIRS = \
+PARALLEL_DIRS = \
+  app \
   setup \
   stub \
-	app \
   examples \
   $(NULL)
 
@@ -57,7 +57,7 @@ endif
 endif
 
 ifneq (,$(filter WINNT WINCE,$(OS_ARCH)))
-DIRS += tools/redit
+PARALLEL_DIRS += tools/redit
 endif
 
 include $(topsrcdir)/config/rules.mk