diff options
| -rw-r--r-- | Makefile | 12 | ||||
| -rw-r--r-- | shared.mak | 4 |
2 files changed, 8 insertions, 8 deletions
@@ -3231,14 +3231,14 @@ endif define cocci-rule ## Rule for .build/$(1).patch/$(2); Params: -# $(1) = e.g. "free.cocci" +# $(1) = e.g. ".build/contrib/coccinelle/free.cocci" # $(2) = e.g. "grep.c" # $(3) = e.g. "grep.o" -COCCI_$(1:.build/contrib/coccinelle/%.cocci=%) += .build/$(1).patch/$(2) -.build/$(1).patch/$(2): GIT-SPATCH-DEFINES -.build/$(1).patch/$(2): $(if $(and $(SPATCH_USE_O_DEPENDENCIES),$(wildcard $(3))),$(3),.build/contrib/coccinelle/FOUND_H_SOURCES) -.build/$(1).patch/$(2): $(1) -.build/$(1).patch/$(2): .build/$(1).patch/% : % +COCCI_$(1:.build/contrib/coccinelle/%.cocci=%) += $(1).d/$(2).patch +$(1).d/$(2).patch: GIT-SPATCH-DEFINES +$(1).d/$(2).patch: $(if $(and $(SPATCH_USE_O_DEPENDENCIES),$(wildcard $(3))),$(3),.build/contrib/coccinelle/FOUND_H_SOURCES) +$(1).d/$(2).patch: $(1) +$(1).d/$(2).patch: $(1).d/%.patch : % $$(call mkdir_p_parent_template) $$(QUIET_SPATCH)if ! $$(SPATCH) $$(SPATCH_FLAGS) \ $$(SPATCH_INCLUDE_FLAGS) \ diff --git a/shared.mak b/shared.mak index a34b66c926..be1f30ff20 100644 --- a/shared.mak +++ b/shared.mak @@ -72,9 +72,9 @@ ifndef V QUIET_RC = @echo ' ' RC $@; ## Used in "Makefile": SPATCH - QUIET_SPATCH = @echo ' ' SPATCH $@; + QUIET_SPATCH = @echo ' ' SPATCH $< \>$@; QUIET_SPATCH_TEST = @echo ' ' SPATCH TEST $(@:.build/%=%); - QUIET_SPATCH_CAT = @echo ' ' SPATCH CAT $$^ \>$@; + QUIET_SPATCH_CAT = @echo ' ' SPATCH CAT $(@:%.patch=%.d/)\*\*.patch \>$@; ## Used in "Documentation/Makefile" QUIET_ASCIIDOC = @echo ' ' ASCIIDOC $@; |