From c32e956c1c22f5ea20dfdd6e09a0e7e9ecba5bca Mon Sep 17 00:00:00 2001 From: Mike Hommey Date: Mon, 4 Mar 2013 19:34:02 +0100 Subject: [PATCH] Bug 847411 - Remove mkdir_deps dependency for PP_TARGETS rules. r=ted --- config/rules.mk | 4 ++-- js/src/config/rules.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/config/rules.mk b/config/rules.mk index 730fdbbfca6e..0e67d519013b 100644 --- a/config/rules.mk +++ b/config/rules.mk @@ -1712,9 +1712,9 @@ $(foreach category,$(INSTALL_TARGETS),\ # $(call preprocess_file_template, source_file, output_file, # makefile_target, extra_flags) define preprocess_file_template -$(2): $(1) $$(call mkdir_deps,$(dir $(2))) $$(GLOBAL_DEPS) +$(2): $(1) $$(GLOBAL_DEPS) $$(RM) "$$@" - $$(PYTHON) $$(topsrcdir)/config/Preprocessor.py $(4) $$(DEFINES) $$(ACDEFINES) $$(XULPPFLAGS) "$$<" > "$$@" + $$(PYTHON) $$(topsrcdir)/config/Preprocessor.py $(4) $$(DEFINES) $$(ACDEFINES) $$(XULPPFLAGS) "$$<" -o "$$@" $(3):: $(2) endef diff --git a/js/src/config/rules.mk b/js/src/config/rules.mk index 730fdbbfca6e..0e67d519013b 100644 --- a/js/src/config/rules.mk +++ b/js/src/config/rules.mk @@ -1712,9 +1712,9 @@ $(foreach category,$(INSTALL_TARGETS),\ # $(call preprocess_file_template, source_file, output_file, # makefile_target, extra_flags) define preprocess_file_template -$(2): $(1) $$(call mkdir_deps,$(dir $(2))) $$(GLOBAL_DEPS) +$(2): $(1) $$(GLOBAL_DEPS) $$(RM) "$$@" - $$(PYTHON) $$(topsrcdir)/config/Preprocessor.py $(4) $$(DEFINES) $$(ACDEFINES) $$(XULPPFLAGS) "$$<" > "$$@" + $$(PYTHON) $$(topsrcdir)/config/Preprocessor.py $(4) $$(DEFINES) $$(ACDEFINES) $$(XULPPFLAGS) "$$<" -o "$$@" $(3):: $(2) endef