Bug 959508 - Remove EXTERNALLY_MANAGED_MAKE_FILE traversal. r=gps
authorMike Hommey <mh+mozilla@glandium.org>
Mon, 20 Jan 2014 09:10:33 +0900
changeset 180273 b528de4b776fb6b87dbeaebca1fa1a7de45512a7
parent 180272 b5b02d097d15114ee23db5edc7ed2e5ba1344699
child 180274 17c463691232faa0b4c1c55dc38662b42c70ab09
push idunknown
push userunknown
push dateunknown
reviewersgps
bugs959508
milestone29.0a1
Bug 959508 - Remove EXTERNALLY_MANAGED_MAKE_FILE traversal. r=gps
config/recurse.mk
--- a/config/recurse.mk
+++ b/config/recurse.mk
@@ -139,19 +139,18 @@ endif
 endif
 
 DIST_GARBAGE += binaries-deps.mk binaries-deps
 
 endif
 
 else
 
-# Don't recurse if MAKELEVEL is NO_RECURSE_MAKELEVEL as defined above, but
-# still recurse for externally managed make files (gyp-generated ones).
-ifeq ($(EXTERNALLY_MANAGED_MAKE_FILE)_$(NO_RECURSE_MAKELEVEL),_$(MAKELEVEL))
+# Don't recurse if MAKELEVEL is NO_RECURSE_MAKELEVEL as defined above
+ifeq ($(NO_RECURSE_MAKELEVEL),$(MAKELEVEL))
 
 compile binaries libs export tools::
 
 else
 #########################
 # Tier traversal handling
 #########################
 
@@ -188,34 +187,29 @@ endef
 
 $(foreach subtier,export compile binaries libs tools,$(eval $(call CREATE_SUBTIER_TRAVERSAL_RULE,$(subtier))))
 
 tools export:: $(SUBMAKEFILES)
 	$(LOOP_OVER_TOOL_DIRS)
 
 endif # ifdef TIERS
 
-endif # ifeq ($(EXTERNALLY_MANAGED_MAKE_FILE)_$(NO_RECURSE_MAKELEVEL),_$(MAKELEVEL))
+endif # ifeq ($(NO_RECURSE_MAKELEVEL),$(MAKELEVEL))
 
 endif # ifeq (1_.,$(MOZ_PSEUDO_DERECURSE)_$(DEPTH))
 
 ifdef MOZ_PSEUDO_DERECURSE
-ifdef EXTERNALLY_MANAGED_MAKE_FILE
-# gyp-managed directories
-recurse_targets := $(addsuffix /binaries,$(DIRS) $(PARALLEL_DIRS))
-else
 ifeq (.,$(DEPTH))
 # top-level directories
 recurse_targets := $(addsuffix /binaries,$(binaries_dirs))
 ifdef recurse_targets
 # only js/src has binaries_dirs, and we want to adjust paths for it.
 want_abspaths = 1
 endif
 endif
-endif
 
 ifdef COMPILE_ENVIRONMENT
 
 # Aggregate all dependency files relevant to a binaries build except in
 # the mozilla top-level directory.
 ifneq (_.,$(recurse_targets)_$(DEPTH))
 ALL_DEP_FILES := \
   $(BINARIES_PP) \