Commit 2bab6202 authored by Mike Hommey's avatar Mike Hommey
Browse files

Bug 1043820 - Remove PARALLEL_DIRS. r=gps

parent 5f6ba110
......@@ -4,7 +4,7 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
PARALLEL_DIRS += [
DIRS += [
'content',
]
......
......@@ -4,7 +4,7 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
PARALLEL_DIRS += [
DIRS += [
'about',
'customizableui',
'dirprovider',
......
......@@ -4,7 +4,7 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
PARALLEL_DIRS += ['in-content']
DIRS += ['in-content']
BROWSER_CHROME_MANIFESTS += [
'in-content/tests/browser.ini',
......
......@@ -4,7 +4,7 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
PARALLEL_DIRS += [
DIRS += [
'content',
'components',
'themes',
......
......@@ -6,7 +6,7 @@
CONFIGURE_SUBST_FILES += ['installer/Makefile']
PARALLEL_DIRS += [
DIRS += [
'base',
'components',
'experiments',
......
......@@ -46,4 +46,4 @@ external_dirs += [
'media/libsoundtouch',
]
PARALLEL_DIRS += ['../../' + i for i in external_dirs]
DIRS += ['../../' + i for i in external_dirs]
......@@ -61,7 +61,6 @@ ifneq (,$(filter $(PROGRAM) $(HOST_PROGRAM) $(SIMPLE_PROGRAMS) $(HOST_LIBRARY) $
)
@echo --------------------------------------------------------------------------------
endif
$(LOOP_OVER_PARALLEL_DIRS)
$(LOOP_OVER_DIRS)
showbuild:
......
......@@ -181,19 +181,9 @@ libs export tools::
else
define CREATE_SUBTIER_TRAVERSAL_RULE
PARALLEL_DIRS_$(1) = $$(addsuffix _$(1),$$(PARALLEL_DIRS))
.PHONY: $(1) $$(PARALLEL_DIRS_$(1))
ifdef PARALLEL_DIRS
$$(PARALLEL_DIRS_$(1)): %_$(1): %/Makefile
+@$$(call SUBMAKE,$(1),$$*)
endif
.PHONY: $(1)
$(1):: $$(SUBMAKEFILES)
ifdef PARALLEL_DIRS
+@$(MAKE) $$(PARALLEL_DIRS_$(1))
endif
$$(LOOP_OVER_DIRS)
endef
......@@ -232,5 +222,4 @@ endif
recurse:
@$(RECURSED_COMMAND)
$(LOOP_OVER_PARALLEL_DIRS)
$(LOOP_OVER_DIRS)
......@@ -349,12 +349,6 @@ LOOP_OVER_DIRS = \
$(foreach dir,$(DIRS),$(call SUBMAKE,$@,$(dir)))
endif
# we only use this for the makefiles target and other stuff that doesn't matter
ifneq (,$(strip $(PARALLEL_DIRS)))
LOOP_OVER_PARALLEL_DIRS = \
$(foreach dir,$(PARALLEL_DIRS),$(call SUBMAKE,$@,$(dir)))
endif
#
# Now we can differentiate between objects used to build a library, and
# objects used to build an executable in the same directory.
......@@ -664,7 +658,7 @@ clean clobber realclean clobber_all distclean::
-$(call SUBMAKE,$@,$(dir)))
else
clean clobber realclean clobber_all distclean::
$(foreach dir,$(PARALLEL_DIRS) $(DIRS),-$(call SUBMAKE,$@,$(dir)))
$(foreach dir,$(DIRS),-$(call SUBMAKE,$@,$(dir)))
endif
distclean::
......@@ -1280,7 +1274,6 @@ endif # SDK_BINARY
chrome::
$(MAKE) realchrome
$(LOOP_OVER_PARALLEL_DIRS)
$(LOOP_OVER_DIRS)
$(FINAL_TARGET)/chrome: $(call mkdir_deps,$(FINAL_TARGET)/chrome)
......@@ -1621,7 +1614,6 @@ tags: TAGS
TAGS: $(CSRCS) $(CPPSRCS) $(wildcard *.h)
-etags $(CSRCS) $(CPPSRCS) $(wildcard *.h)
$(LOOP_OVER_PARALLEL_DIRS)
$(LOOP_OVER_DIRS)
ifndef INCLUDED_DEBUGMAKE_MK #{
......@@ -1637,7 +1629,6 @@ documentation:
ifdef ENABLE_TESTS
check::
$(LOOP_OVER_PARALLEL_DIRS)
$(LOOP_OVER_DIRS)
endif
......
......@@ -4,5 +4,5 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
PARALLEL_DIRS += ['public', 'src']
DIRS += ['public', 'src']
TEST_DIRS += ['test']
......@@ -4,5 +4,5 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
PARALLEL_DIRS += ['public', 'src']
DIRS += ['public', 'src']
TEST_DIRS += ['test']
......@@ -4,7 +4,7 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
PARALLEL_DIRS += ['public', 'src']
DIRS += ['public', 'src']
MOCHITEST_MANIFESTS += ['test/mochitest.ini']
BROWSER_CHROME_MANIFESTS += ['test/browser.ini']
......@@ -4,4 +4,4 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
PARALLEL_DIRS += ['content', 'document']
DIRS += ['content', 'document']
......@@ -5,7 +5,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
PARALLEL_DIRS += ['fmp4_muxer']
DIRS += ['fmp4_muxer']
EXPORTS += [
'ContainerWriter.h',
......
......@@ -21,7 +21,7 @@ SOURCES += [
]
if CONFIG['MOZ_WMF']:
PARALLEL_DIRS += [ 'wmf' ];
DIRS += [ 'wmf' ];
if CONFIG['MOZ_FFMPEG']:
EXPORTS += [
......@@ -31,7 +31,7 @@ if CONFIG['MOZ_FFMPEG']:
'ffmpeg/FFmpegLog.cpp',
'ffmpeg/FFmpegRuntimeLinker.cpp',
]
PARALLEL_DIRS += [
DIRS += [
'ffmpeg/libav53',
'ffmpeg/libav54',
'ffmpeg/libav55',
......
......@@ -3,7 +3,7 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
PARALLEL_DIRS += [
DIRS += [
'test'
]
......
......@@ -4,7 +4,7 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
PARALLEL_DIRS += [
DIRS += [
'encoder',
'gmp',
'mediasource',
......@@ -16,42 +16,42 @@ PARALLEL_DIRS += [
TEST_DIRS += ['compiledtest']
if CONFIG['MOZ_RAW']:
PARALLEL_DIRS += ['raw']
DIRS += ['raw']
if CONFIG['MOZ_WAVE']:
PARALLEL_DIRS += ['wave']
DIRS += ['wave']
if CONFIG['MOZ_WEBM']:
PARALLEL_DIRS += ['webm']
DIRS += ['webm']
if CONFIG['MOZ_GSTREAMER']:
PARALLEL_DIRS += ['gstreamer']
DIRS += ['gstreamer']
if CONFIG['MOZ_DIRECTSHOW']:
PARALLEL_DIRS += ['directshow']
DIRS += ['directshow']
if CONFIG['MOZ_ANDROID_OMX']:
PARALLEL_DIRS += ['android']
DIRS += ['android']
if CONFIG['MOZ_WMF']:
PARALLEL_DIRS += ['wmf']
DIRS += ['wmf']
if CONFIG['MOZ_FMP4']:
PARALLEL_DIRS += ['fmp4']
DIRS += ['fmp4']
if CONFIG['MOZ_APPLEMEDIA']:
PARALLEL_DIRS += ['apple']
DIRS += ['apple']
PARALLEL_DIRS += ['webrtc']
DIRS += ['webrtc']
if CONFIG['MOZ_OMX_DECODER']:
PARALLEL_DIRS += ['omx']
PARALLEL_DIRS += ['omx/mediaresourcemanager']
DIRS += ['omx']
DIRS += ['omx/mediaresourcemanager']
PARALLEL_DIRS += ['webspeech']
DIRS += ['webspeech']
if CONFIG['MOZ_EME']:
PARALLEL_DIRS += ['eme']
DIRS += ['eme']
TEST_DIRS += [
'test',
......
......@@ -4,7 +4,7 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
PARALLEL_DIRS += ['blink', 'test']
DIRS += ['blink', 'test']
TEST_DIRS += ['compiledtest']
......
......@@ -3,7 +3,7 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
PARALLEL_DIRS = ['synth']
DIRS = ['synth']
if CONFIG['MOZ_WEBSPEECH']:
PARALLEL_DIRS += ['recognition']
DIRS += ['recognition']
......@@ -35,7 +35,7 @@ if CONFIG['MOZ_WEBSPEECH']:
]
if CONFIG['MOZ_SYNTH_PICO']:
PARALLEL_DIRS = ['pico']
DIRS = ['pico']
IPDL_SOURCES += [
'ipc/PSpeechSynthesis.ipdl',
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment