Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-25 05:41:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1230355 - Remove include_deps. r=mshal

Browse Source 
We used to use include_deps to trigger a fast-path in pymake, but we don't
use pymake anymore, so we can use normal includes now.
This commit is contained in:
Mike Hommey 2015-12-04 08:20:58 +09:00
parent ac6c0718c7
commit 158e08c29b
4 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/baseconfig.mk
View File

@ -41,8 +41,6 @@ endif
endif
endif # WINNT
include_deps = $(eval $(if $(2),,-)include $(1))
ifndef INCLUDED_AUTOCONF_MK
default::
else

6
config/rules.mk
View File

@ -1296,7 +1296,7 @@ ifneq (,$(filter-out all chrome default export realchrome clean clobber clobber_
MDDEPEND_FILES := $(strip $(wildcard $(addprefix $(MDDEPDIR)/,$(addsuffix .pp,$(notdir $(sort $(OBJS) $(PROGOBJS) $(HOST_OBJS) $(HOST_PROGOBJS)))))))
ifneq (,$(MDDEPEND_FILES))
$(call include_deps,$(MDDEPEND_FILES))
-include $(MDDEPEND_FILES)
endif
endif
@ -1304,7 +1304,7 @@ endif
MDDEPEND_FILES := $(strip $(wildcard $(addprefix $(MDDEPDIR)/,$(EXTRA_MDDEPEND_FILES))))
ifneq (,$(MDDEPEND_FILES))
$(call include_deps,$(MDDEPEND_FILES))
-include $(MDDEPEND_FILES)
endif
#############################################################################
@ -1483,7 +1483,7 @@ $(foreach file,$(PP_TARGETS_ALL_RESULTS), \
MDDEPEND_FILES := $(strip $(wildcard $(addprefix $(MDDEPDIR)/,$(addsuffix .pp,$(notdir $(PP_TARGETS_ALL_RESULTS))))))
ifneq (,$(MDDEPEND_FILES))
$(call include_deps,$(MDDEPEND_FILES))
-include $(MDDEPEND_FILES)
endif
endif

3
dom/bindings/Makefile.in
View File

@ -45,8 +45,7 @@ codegen_dependencies := \
$(GLOBAL_DEPS) \
$(NULL)
# The 1 is to make codegen.pp not optional.
$(call include_deps,codegen.pp,1)
include codegen.pp
codegen.pp: $(codegen_dependencies)
$(call py_action,webidl,$(srcdir))

2
python/mozbuild/mozbuild/backend/recursivemake.py
View File

@ -710,7 +710,7 @@ class RecursiveMakeBackend(CommonBackend):
root_mk.add_statement('compile_targets := %s' % ' '.join(sorted(
set(self._compile_graph.keys()) | all_compile_deps)))
root_mk.add_statement('$(call include_deps,root-deps.mk)')
root_mk.add_statement('include root-deps.mk')
with self._write_file(
mozpath.join(self.environment.topobjdir, 'root.mk')) as root: