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

This commit is contained in:
Mitchell Field 2009-11-13 14:40:00 -05:00
parent 67105dfe67
commit 92a2deeef1
12 changed files with 191 additions and 173 deletions

View File

@ -35,14 +35,24 @@
#
# ***** END LICENSE BLOCK *****
DEPTH = ..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
DEPTH = ..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
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

View File

@ -35,10 +35,10 @@
#
# ***** END LICENSE BLOCK *****
DEPTH = ../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
DEPTH = ../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
@ -46,44 +46,44 @@ MODULE = browsercomps
XPIDL_MODULE = browsercompsbase
XPIDLSRCS = \
nsIBrowserHandler.idl \
nsIBrowserGlue.idl \
$(NULL)
nsIBrowserGlue.idl \
nsIBrowserHandler.idl \
$(NULL)
EXTRA_PP_COMPONENTS = \
nsBrowserContentHandler.js \
nsBrowserGlue.js \
$(NULL)
nsBrowserContentHandler.js \
nsBrowserGlue.js \
$(NULL)
EXTRA_JS_MODULES = distribution.js
DIRS = \
about \
certerror \
dirprovider \
microsummaries \
preferences \
search \
sessionstore \
shell \
sidebar \
feeds \
places \
privatebrowsing \
$(NULL)
PARALLEL_DIRS = \
about \
certerror \
dirprovider \
feeds \
microsummaries \
places \
preferences \
privatebrowsing \
search \
sessionstore \
shell \
sidebar \
$(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

View File

@ -34,58 +34,55 @@
#
# ***** 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 = content
LIBRARY_NAME = gkconmedia_s
LIBXUL_LIBRARY = 1
MODULE = content
LIBRARY_NAME = gkconmedia_s
LIBXUL_LIBRARY = 1
EXPORTS = \
nsMediaDecoder.h \
nsMediaStream.h \
nsMediaCache.h \
$(NULL)
EXPORTS = \
nsMediaDecoder.h \
nsMediaStream.h \
nsMediaCache.h \
$(NULL)
CPPSRCS = \
nsMediaDecoder.cpp \
nsMediaCache.cpp \
nsMediaStream.cpp \
$(NULL)
CPPSRCS = \
nsMediaDecoder.cpp \
nsMediaCache.cpp \
nsMediaStream.cpp \
$(NULL)
ifdef MOZ_SYDNEYAUDIO
EXPORTS += \
nsAudioStream.h \
$(NULL)
CPPSRCS += \
nsAudioStream.cpp \
$(NULL)
EXPORTS += \
nsAudioStream.h \
$(NULL)
CPPSRCS += \
nsAudioStream.cpp \
$(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
include $(topsrcdir)/config/rules.mk
INCLUDES += \
-I$(srcdir)/../base/src \
-I$(srcdir)/../html/content/src \
$(NULL)
INCLUDES += \
-I$(srcdir)/../base/src \
-I$(srcdir)/../html/content/src \
$(NULL)

View File

@ -35,22 +35,21 @@
#
# ***** END LICENSE BLOCK *****
DEPTH = ..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
DEPTH = ..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
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

View File

@ -35,13 +35,13 @@
#
# ***** END LICENSE BLOCK *****
DEPTH = ..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
DEPTH = ..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
DIRS = $(MOZ_EXTENSIONS)
PARALLEL_DIRS = $(MOZ_EXTENSIONS)
include $(topsrcdir)/config/rules.mk

View File

@ -35,14 +35,21 @@
#
# ***** END LICENSE BLOCK *****
DEPTH = ..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
DEPTH = ..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
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

View File

@ -35,22 +35,23 @@
#
# ***** END LICENSE BLOCK *****
DEPTH = ../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
DEPTH = ../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
DIRS = about \
data \
res \
file \
http \
viewsource \
ftp \
gopher \
$(NULL)
PARALLEL_DIRS = \
about \
data \
file \
ftp \
gopher \
http \
res \
viewsource \
$(NULL)
include $(topsrcdir)/config/rules.mk

View File

@ -43,39 +43,35 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
DIRS = \
content \
locales \
obsolete \
profile \
themes \
spatial-navigation \
$(NULL)
PARALLEL_DIRS = \
content \
locales \
mozapps \
obsolete \
profile \
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)
xre \
$(NULL)
include $(topsrcdir)/config/rules.mk

View File

@ -36,59 +36,62 @@
#
# ***** 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
DIRS += remote
PARALLEL_DIRS += remote
endif
DIRS += \
urlformatter \
contentprefs \
microformats \
places \
apppicker \
filepicker \
console \
cookie \
exthelper \
viewconfig \
typeaheadfind \
parentalcontrols \
passwordmgr \
aboutmemory \
$(NULL)
PARALLEL_DIRS += \
aboutmemory \
apppicker \
commandlines \
console \
contentprefs \
cookie \
exthelper \
filepicker \
microformats \
parentalcontrols \
passwordmgr \
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,28 +100,26 @@ 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)
build \
$(NULL)
EXTRA_PP_COMPONENTS = nsDefaultCLH.js

View File

@ -36,14 +36,22 @@
#
# ***** END LICENSE BLOCK *****
DEPTH = ../..
DEPTH = ../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
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

View File

@ -41,18 +41,17 @@
# 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
DIRS = \
base \
exthandler \
prefetch \
$(NULL)
PARALLEL_DIRS = \
base \
exthandler \
prefetch \
$(NULL)
include $(topsrcdir)/config/rules.mk

View File

@ -36,19 +36,19 @@
#
# ***** END LICENSE BLOCK *****
DEPTH = ..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
DEPTH = ..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
DIRS = \
setup \
stub \
app \
examples \
$(NULL)
PARALLEL_DIRS = \
app \
setup \
stub \
examples \
$(NULL)
ifeq ($(OS_ARCH),WINNT)
ifdef MOZ_INSTALLER
@ -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