Bug 689884 - Skip Makefiles that are no-op or else only |DIRS = a_single_subdir|; r=khuey

This commit is contained in:
Ed Morley 2011-10-06 17:15:07 +01:00
parent 2dcd7a85fe
commit 918444551f
22 changed files with 27 additions and 30 deletions

View File

@ -69,7 +69,7 @@ PARALLEL_DIRS = \
search \
sessionstore \
shell \
sidebar \
sidebar/src \
migration \
$(NULL)
@ -82,7 +82,7 @@ PARALLEL_DIRS += safebrowsing
endif
ifdef ENABLE_TESTS
DIRS += test
DIRS += test/browser
endif
DIRS += build

View File

@ -43,8 +43,6 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
DIRS = src
ifdef ENABLE_TESTS
DIRS += content/test
endif

View File

@ -51,7 +51,7 @@ XPIDLSRCS = \
DIRS = src
ifdef ENABLE_TESTS
DIRS += test
DIRS += test/browser
endif
include $(topsrcdir)/config/rules.mk

View File

@ -49,14 +49,13 @@ include $(topsrcdir)/config/config.mk
DIRS = \
highlighter \
webconsole \
scratchpad \
sourceeditor \
styleinspector \
shared \
$(NULL)
ifdef ENABLE_TESTS
# DIRS += test # no tests yet
DIRS += scratchpad/test
endif
include $(topsrcdir)/config/rules.mk

View File

@ -45,11 +45,11 @@ include $(DEPTH)/config/autoconf.mk
ifdef ENABLE_TESTS
ifneq (mobile,$(MOZ_BUILD_APP))
DIRS += test
DIRS += test/browser
endif
endif
include $(topsrcdir)/config/rules.mk
libs::
$(NSINSTALL) $(srcdir)/*.jsm $(FINAL_TARGET)/modules/devtools
$(NSINSTALL) $(srcdir)/*.jsm $(FINAL_TARGET)/modules/devtools

View File

@ -57,7 +57,7 @@ EXTRA_PP_JS_MODULES = \
ifdef ENABLE_TESTS
ifneq (mobile,$(MOZ_BUILD_APP))
DIRS += test
DIRS += test/browser
endif
endif

View File

@ -46,7 +46,7 @@ MODULE = caps
DIRS = idl include src
ifdef ENABLE_TESTS
DIRS += tests
DIRS += tests/mochitest
endif
include $(topsrcdir)/config/rules.mk

View File

@ -43,7 +43,7 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
MODULE = content
PARALLEL_DIRS = base canvas events html mathml smil svg xml xul xbl xslt
PARALLEL_DIRS = base canvas events html mathml/content/src smil svg xml xul xbl xslt
ifdef MOZ_MEDIA
PARALLEL_DIRS += media

View File

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

View File

@ -42,7 +42,7 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
PARALLEL_DIRS = content document
PARALLEL_DIRS = content/src document
include $(topsrcdir)/config/rules.mk

View File

@ -46,7 +46,7 @@ MODULE = xultmpl
PARALLEL_DIRS = public src
ifdef ENABLE_TESTS
TOOL_DIRS += tests
TOOL_DIRS += tests/chrome
endif
include $(topsrcdir)/config/rules.mk

View File

@ -48,7 +48,7 @@ DIRS = \
base \
shistory \
build \
resources \
resources/content \
$(NULL)
ifdef ENABLE_TESTS

View File

@ -46,7 +46,7 @@ include $(DEPTH)/config/autoconf.mk
DIRS = \
lib \
src \
test \
test/unit \
$(NULL)
include $(topsrcdir)/config/rules.mk

View File

@ -45,11 +45,11 @@ include $(DEPTH)/config/autoconf.mk
# You'd think we could skip building ui if XUL is disabled,
# but we need to export interface headers from those directories.
DIRS = windowwatcher appstartup find webbrowserpersist commandhandler
DIRS = windowwatcher appstartup/src find webbrowserpersist commandhandler
ifdef MOZ_XUL
ifdef NS_PRINTING
DIRS += printingui
DIRS += printingui/src
endif
endif

View File

@ -45,7 +45,7 @@ MODULE = spellchecker
DIRS = idl locales hunspell src
ifdef ENABLE_TESTS
DIRS += tests
DIRS += tests/chrome
endif
include $(topsrcdir)/config/rules.mk

View File

@ -43,7 +43,7 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
DIRS = chrome locales components modules themes app
DIRS = chrome locales components modules themes/core app
ifndef LIBXUL_SDK
PARALLEL_DIRS += $(DEPTH)/xulrunner/tools/redit

View File

@ -44,7 +44,7 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
ifdef ENABLE_TESTS
DIRS += tests
DIRS += tests/chrome
endif
include $(topsrcdir)/config/rules.mk

View File

@ -65,8 +65,6 @@ EXTRA_COMPONENTS = \
storage-mozStorage.js \
$(NULL)
DIRS = content
ifdef ENABLE_TESTS
DIRS += test
endif

View File

@ -69,7 +69,9 @@ endif
EXTRA_COMPONENTS = nsTryToClose.js nsTryToClose.manifest
ifdef ENABLE_TESTS
DIRS += tests
ifneq (mobile,$(MOZ_BUILD_APP))
DIRS += tests/browser
endif
endif
include $(topsrcdir)/config/rules.mk

View File

@ -62,10 +62,10 @@ ifneq (,$(filter gtk2 qt,$(MOZ_WIDGET_TOOLKIT)))
DIRS += gnomestripe
endif
ifneq (,$(filter os2,$(MOZ_WIDGET_TOOLKIT)))
DIRS += pmstripe
DIRS += pmstripe/global
endif
ifdef MOZ_THEME_FASTSTRIPE
DIRS += faststripe
DIRS += faststripe/global
endif
endif

View File

@ -223,7 +223,7 @@ tier_platform_dirs += services/crypto/component
tier_platform_dirs += startupcache
tier_platform_dirs += js/ductwork
tier_platform_dirs += js/ductwork/debugger
ifdef APP_LIBXUL_STATICDIRS
# Applications can cheat and ask for code to be

View File

@ -43,10 +43,10 @@ ifdef MOZ_EXTENSIONS
tier_app_dirs += extensions
endif
# winembed, mfcembed
# winEmbed
ifeq ($(OS_ARCH),WINNT)
ifneq (,$(ENABLE_TESTS)$(MOZILLA_OFFICIAL))
tier_app_dirs += embedding/tests
tier_app_dirs += embedding/tests/winEmbed
endif
endif