aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/arc/boot/dts/Makefile2
-rw-r--r--arch/arm/crypto/Makefile2
-rw-r--r--arch/arm64/crypto/Makefile2
-rw-r--r--arch/sparc/vdso/Makefile4
-rw-r--r--arch/x86/entry/vdso/Makefile4
-rw-r--r--drivers/of/unittest-data/Makefile4
-rw-r--r--scripts/Makefile.build10
-rw-r--r--scripts/Makefile.lib3
8 files changed, 11 insertions, 20 deletions
diff --git a/arch/arc/boot/dts/Makefile b/arch/arc/boot/dts/Makefile
index 22a4c5d4702f..a83c4f5e928b 100644
--- a/arch/arc/boot/dts/Makefile
+++ b/arch/arc/boot/dts/Makefile
@@ -9,8 +9,6 @@ endif
9obj-y += $(builtindtb-y).dtb.o 9obj-y += $(builtindtb-y).dtb.o
10dtb-y := $(builtindtb-y).dtb 10dtb-y := $(builtindtb-y).dtb
11 11
12.SECONDARY: $(obj)/$(builtindtb-y).dtb.S
13
14# for CONFIG_OF_ALL_DTBS test 12# for CONFIG_OF_ALL_DTBS test
15dtstree := $(srctree)/$(src) 13dtstree := $(srctree)/$(src)
16dtb- := $(patsubst $(dtstree)/%.dts,%.dtb, $(wildcard $(dtstree)/*.dts)) 14dtb- := $(patsubst $(dtstree)/%.dts,%.dtb, $(wildcard $(dtstree)/*.dts))
diff --git a/arch/arm/crypto/Makefile b/arch/arm/crypto/Makefile
index 3304e671918d..8de542c48ade 100644
--- a/arch/arm/crypto/Makefile
+++ b/arch/arm/crypto/Makefile
@@ -67,4 +67,4 @@ $(src)/sha512-core.S_shipped: $(src)/sha512-armv4.pl
67 $(call cmd,perl) 67 $(call cmd,perl)
68endif 68endif
69 69
70.PRECIOUS: $(obj)/sha256-core.S $(obj)/sha512-core.S 70targets += sha256-core.S sha512-core.S
diff --git a/arch/arm64/crypto/Makefile b/arch/arm64/crypto/Makefile
index 8df9f326f449..f35ac684b1c0 100644
--- a/arch/arm64/crypto/Makefile
+++ b/arch/arm64/crypto/Makefile
@@ -78,4 +78,4 @@ $(src)/sha512-core.S_shipped: $(src)/sha512-armv8.pl
78 $(call cmd,perlasm) 78 $(call cmd,perlasm)
79endif 79endif
80 80
81.PRECIOUS: $(obj)/sha256-core.S $(obj)/sha512-core.S 81targets += sha256-core.S sha512-core.S
diff --git a/arch/sparc/vdso/Makefile b/arch/sparc/vdso/Makefile
index a6615d8864f7..dd0b5a92ffd0 100644
--- a/arch/sparc/vdso/Makefile
+++ b/arch/sparc/vdso/Makefile
@@ -29,9 +29,7 @@ vdso_img_cfiles := $(vdso_img-y:%=vdso-image-%.c)
29vdso_img_sodbg := $(vdso_img-y:%=vdso%.so.dbg) 29vdso_img_sodbg := $(vdso_img-y:%=vdso%.so.dbg)
30obj-y += $(vdso_img_objs) 30obj-y += $(vdso_img_objs)
31targets += $(vdso_img_cfiles) 31targets += $(vdso_img_cfiles)
32targets += $(vdso_img_sodbg) 32targets += $(vdso_img_sodbg) $(vdso_img-y:%=vdso%.so)
33.SECONDARY: $(vdso_img-y:%=$(obj)/vdso-image-%.c) \
34 $(vdso_img-y:%=$(obj)/vdso%.so)
35 33
36export CPPFLAGS_vdso.lds += -P -C 34export CPPFLAGS_vdso.lds += -P -C
37 35
diff --git a/arch/x86/entry/vdso/Makefile b/arch/x86/entry/vdso/Makefile
index 1943aebadede..d998a487c9b1 100644
--- a/arch/x86/entry/vdso/Makefile
+++ b/arch/x86/entry/vdso/Makefile
@@ -42,9 +42,7 @@ vdso_img_cfiles := $(vdso_img-y:%=vdso-image-%.c)
42vdso_img_sodbg := $(vdso_img-y:%=vdso%.so.dbg) 42vdso_img_sodbg := $(vdso_img-y:%=vdso%.so.dbg)
43obj-y += $(vdso_img_objs) 43obj-y += $(vdso_img_objs)
44targets += $(vdso_img_cfiles) 44targets += $(vdso_img_cfiles)
45targets += $(vdso_img_sodbg) 45targets += $(vdso_img_sodbg) $(vdso_img-y:%=vdso%.so)
46.SECONDARY: $(vdso_img-y:%=$(obj)/vdso-image-%.c) \
47 $(vdso_img-y:%=$(obj)/vdso%.so)
48 46
49export CPPFLAGS_vdso.lds += -P -C 47export CPPFLAGS_vdso.lds += -P -C
50 48
diff --git a/drivers/of/unittest-data/Makefile b/drivers/of/unittest-data/Makefile
index 87a65ca38583..013d85e694c6 100644
--- a/drivers/of/unittest-data/Makefile
+++ b/drivers/of/unittest-data/Makefile
@@ -30,7 +30,3 @@ DTC_FLAGS_testcases += -@
30 30
31# suppress warnings about intentional errors 31# suppress warnings about intentional errors
32DTC_FLAGS_testcases += -Wno-interrupts_property 32DTC_FLAGS_testcases += -Wno-interrupts_property
33
34.PRECIOUS: \
35 $(obj)/%.dtb.S \
36 $(obj)/%.dtb
diff --git a/scripts/Makefile.build b/scripts/Makefile.build
index 8c3ca611b978..8bdb1dc4072c 100644
--- a/scripts/Makefile.build
+++ b/scripts/Makefile.build
@@ -430,8 +430,6 @@ quiet_cmd_asn1_compiler = ASN.1 $@
430 cmd_asn1_compiler = $(objtree)/scripts/asn1_compiler $< \ 430 cmd_asn1_compiler = $(objtree)/scripts/asn1_compiler $< \
431 $(subst .h,.c,$@) $(subst .c,.h,$@) 431 $(subst .h,.c,$@) $(subst .c,.h,$@)
432 432
433.PRECIOUS: $(objtree)/$(obj)/%.asn1.c $(objtree)/$(obj)/%.asn1.h
434
435$(obj)/%.asn1.c $(obj)/%.asn1.h: $(src)/%.asn1 $(objtree)/scripts/asn1_compiler 433$(obj)/%.asn1.c $(obj)/%.asn1.h: $(src)/%.asn1 $(objtree)/scripts/asn1_compiler
436 $(call cmd,asn1_compiler) 434 $(call cmd,asn1_compiler)
437 435
@@ -544,10 +542,12 @@ targets := $(filter-out $(PHONY), $(targets))
544intermediate_targets = $(foreach sfx, $(2), \ 542intermediate_targets = $(foreach sfx, $(2), \
545 $(patsubst %$(strip $(1)),%$(sfx), \ 543 $(patsubst %$(strip $(1)),%$(sfx), \
546 $(filter %$(strip $(1)), $(targets)))) 544 $(filter %$(strip $(1)), $(targets))))
545# %.asn1.o <- %.asn1.[ch] <- %.asn1
547# %.dtb.o <- %.dtb.S <- %.dtb <- %.dts 546# %.dtb.o <- %.dtb.S <- %.dtb <- %.dts
548# %.lex.o <- %.lex.c <- %.l 547# %.lex.o <- %.lex.c <- %.l
549# %.tab.o <- %.tab.[ch] <- %.y 548# %.tab.o <- %.tab.[ch] <- %.y
550targets += $(call intermediate_targets, .dtb.o, .dtb.S .dtb) \ 549targets += $(call intermediate_targets, .asn1.o, .asn1.c .asn1.h) \
550 $(call intermediate_targets, .dtb.o, .dtb.S .dtb) \
551 $(call intermediate_targets, .lex.o, .lex.c) \ 551 $(call intermediate_targets, .lex.o, .lex.c) \
552 $(call intermediate_targets, .tab.o, .tab.c .tab.h) 552 $(call intermediate_targets, .tab.o, .tab.c .tab.h)
553 553
@@ -587,6 +587,10 @@ $(shell mkdir -p $(obj-dirs))
587endif 587endif
588endif 588endif
589 589
590# Some files contained in $(targets) are intermediate artifacts.
591# We never want them to be removed automatically.
592.SECONDARY: $(targets)
593
590# Declare the contents of the .PHONY variable as phony. We keep that 594# Declare the contents of the .PHONY variable as phony. We keep that
591# information in a variable se we can use it in if_changed and friends. 595# information in a variable se we can use it in if_changed and friends.
592 596
diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
index 7f5bca0c3b7b..07d07409f16f 100644
--- a/scripts/Makefile.lib
+++ b/scripts/Makefile.lib
@@ -184,7 +184,6 @@ endef
184quiet_cmd_flex = LEX $@ 184quiet_cmd_flex = LEX $@
185 cmd_flex = $(LEX) -o$@ -L $< 185 cmd_flex = $(LEX) -o$@ -L $<
186 186
187.PRECIOUS: $(obj)/%.lex.c
188$(obj)/%.lex.c: $(src)/%.l FORCE 187$(obj)/%.lex.c: $(src)/%.l FORCE
189 $(call if_changed,flex) 188 $(call if_changed,flex)
190 189
@@ -193,14 +192,12 @@ $(obj)/%.lex.c: $(src)/%.l FORCE
193quiet_cmd_bison = YACC $@ 192quiet_cmd_bison = YACC $@
194 cmd_bison = $(YACC) -o$@ -t -l $< 193 cmd_bison = $(YACC) -o$@ -t -l $<
195 194
196.PRECIOUS: $(obj)/%.tab.c
197$(obj)/%.tab.c: $(src)/%.y FORCE 195$(obj)/%.tab.c: $(src)/%.y FORCE
198 $(call if_changed,bison) 196 $(call if_changed,bison)
199 197
200quiet_cmd_bison_h = YACC $@ 198quiet_cmd_bison_h = YACC $@
201 cmd_bison_h = bison -o/dev/null --defines=$@ -t -l $< 199 cmd_bison_h = bison -o/dev/null --defines=$@ -t -l $<
202 200
203.PRECIOUS: $(obj)/%.tab.h
204$(obj)/%.tab.h: $(src)/%.y FORCE 201$(obj)/%.tab.h: $(src)/%.y FORCE
205 $(call if_changed,bison_h) 202 $(call if_changed,bison_h)
206 203