Mark targets as .PHONY at once

legionus · legionus · commit 6116104c2a65 · 2024-12-11T18:28:16.000+01:00
Changes in this patch: - Keep all targets that are to be marked .PHONY in a variable, PHONY. - Add .PHONY: $(PHONY) to mark them properly. Link: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/4f1933620f57145212cdbb1ac6ce099eeeb21c5a Signed-off-by: Alexey Gladkov <gladkov.alexey@gmail.com>
diff --git a/features/add-modules/rules.mk b/features/add-modules/rules.mk
@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
-.PHONY: put-modules
+PHONY += put-modules
 
 put-modules: create
 	@$(VMSG) "Putting modules ..."
diff --git a/features/add-udev-rules/rules.mk b/features/add-udev-rules/rules.mk
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 PUT_UDEV_RULES += $(SYSTEM_UDEV_RULES)
 
-.PHONY: put-udev-rules
+PHONY += put-udev-rules
 
 put-udev-rules: create
 	@$(VMSG) "Putting udev rules ..."
diff --git a/features/bootconfig/rules.mk b/features/bootconfig/rules.mk
@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
-.PHONY: bootconfig
+PHONY += bootconfig
 
 bootconfig: $(call if-feature,compress)
 	@$(VMSG) "Adding bootconfig ..."
diff --git a/features/cleanup/rules.mk b/features/cleanup/rules.mk
@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
-.PHONY: clean
+PHONY += clean
 
 clean: install
 	@$(VMSG) "Removing work directory ..."
diff --git a/features/compress/config.mk b/features/compress/config.mk
@@ -2,4 +2,3 @@
 COMPRESS_IMAGE	 = $(FEATURESDIR)/compress/bin/compress-image
 COMPRESS	?= gzip
 
-.PHONY: compress
diff --git a/features/compress/rules.mk b/features/compress/rules.mk
@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
-.PHONY: compress
+PHONY += compress
 
 compress: pack
 	@$(VMSG) "Compressing image ..."
diff --git a/features/depmod-image/rules.mk b/features/depmod-image/rules.mk
@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
-.PHONY: depmod-image
+PHONY += depmod-image
 
 depmod-image: create
 	@$(VMSG) "Generating module dependencies in image ..."
diff --git a/features/guestfs/rules.mk b/features/guestfs/rules.mk
@@ -10,7 +10,7 @@ PUT_FEATURE_PROGS += $(GUESTFS_PROGS)
 PUT_FEATURE_PROGS_WILDCARD += $(GUESTFS_PROGS_PATTERNS)
 
 # libugestfs doesn't work with busybox's swapon, so replace it
-.PHONY: guestfs
+PHONY += guestfs
 
 guestfs: create
 	@put-file -f "$(ROOTDIR)" /sbin/swapon
diff --git a/features/locales/rules.mk b/features/locales/rules.mk
@@ -10,7 +10,7 @@ LANG = $(call enforce_utf8,$(firstword $(LOCALES)))
 
 $(call set-sysconfig,init,LANG,$(LANG))
 
-.PHONY: locales
+PHONY += locales
 
 locales: create
 	@$(VMSG) "Adding locales and l10n..."
diff --git a/features/ucode/rules.mk b/features/ucode/rules.mk
@@ -1,6 +1,5 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
-
-.PHONY: ucode
+PHONY += ucode
 
 ucode: $(call if-feature,compress)
 	@$(VMSG) "Adding CPU microcode ..."
diff --git a/guess/bootconfig/rules.mk b/guess/bootconfig/rules.mk
@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
-.PHONY: guess-bootconfig
+PHONY += guess-bootconfig
 
 guess-bootconfig:
 	$V echo "Processing $@ ..."
diff --git a/guess/common/rules.mk b/guess/common/rules.mk
@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
-.PHONY: guess-common
+PHONY += guess-common
 
 GUESS_COMMON_SCRIPTS = $(call wildcard-features,guess/common)
 
diff --git a/guess/device/rules.mk b/guess/device/rules.mk
@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
-.PHONY: guess-device
+PHONY += guess-device
 
 guess-device:
 	$V echo "Processing $@ ..."
diff --git a/guess/keyboard/rules.mk b/guess/keyboard/rules.mk
@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
-.PHONY: guess-keyboard
+PHONY += guess-keyboard
 
 guess-keyboard:
 	$V echo "Processing $@ ..."
diff --git a/guess/lkrg/rules.mk b/guess/lkrg/rules.mk
@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
-.PHONY: guess-lkrg
+PHONY += guess-lkrg
 
 guess-lkrg:
 	$V echo "Processing $@ ..."
diff --git a/guess/net/rules.mk b/guess/net/rules.mk
@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
-.PHONY: guess-net
+PHONY += guess-net
 
 guess-net:
 	$V echo "Processing $@ ..."
diff --git a/guess/qemu/rules.mk b/guess/qemu/rules.mk
@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
-.PHONY: guess-qemu
+PHONY += guess-qemu
 
 guess-qemu:
 	$V echo "Processing $@ ..."
diff --git a/guess/rdshell/rules.mk b/guess/rdshell/rules.mk
@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
-.PHONY: guess-rdshell
+PHONY += guess-rdshell
 
 guess-rdshell:
 	$V echo "Processing $@ ..."
diff --git a/guess/resume/rules.mk b/guess/resume/rules.mk
@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
-.PHONY: guess-resume
+PHONY += guess-resume
 
 guess-resume:
 	$V echo "Processing $@ ..."
diff --git a/guess/root/rules.mk b/guess/root/rules.mk
@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
-.PHONY: guess-root
+PHONY += guess-root
 
 guess-root:
 	$V echo "Processing $@ ..."
diff --git a/guess/smart-card/rules.mk b/guess/smart-card/rules.mk
@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
-.PHONY: guess-smart-card
+PHONY += guess-smart-card
 
 guess-smart-card:
 	$V echo "Processing $@ ..."
diff --git a/guess/touchscreen/rules.mk b/guess/touchscreen/rules.mk
@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
-.PHONY: guess-touchscreen
+PHONY += guess-touchscreen
 
 guess-touchscreen:
 	$V echo "Processing $@ ..."
diff --git a/guess/ucode/rules.mk b/guess/ucode/rules.mk
@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
-.PHONY: guess-ucode
+PHONY += guess-ucode
 
 guess-ucode:
 	$V echo "Processing $@ ..."
diff --git a/mk/genimage.mk.in b/mk/genimage.mk.in
@@ -5,7 +5,7 @@
 # The previous call to 'guess' has already done this.
 IGNORE_DEPMOD := 1
 
-.PHONY: create pack install genimage
+PHONY += create pack install genimage
 
 create: depmod-host
 	@$(VMSG) "Creating initrd image ..."
diff --git a/mk/guess.mk.in b/mk/guess.mk.in
@@ -31,6 +31,8 @@ $(info GUESS_MODULES        = $(notdir $(GUESS_MODULES)))
 $(info PASSED_GUESS_MODULES = $(notdir $(PASSED_GUESS_MODULES)))
 endif
 
+PHONY += guess
+
 ifneq "$(GUESS_MODULES)" ''
 
 GUESS_DEVICE_SCRIPTS = $(call wildcard-features,guess/device)
@@ -42,7 +44,7 @@ include \
 		$(foreach exl,$(DISABLE_GUESS),$(realpath $(exl:%=$(DETECTDIR)/%/rules.mk))), \
 		$(foreach mod,$(GUESS_MODULES),$(realpath $(DETECTDIR)/$(mod)/rules.mk))))
 
-.PHONY: pre-guess
+PHONY += pre-guess test-guess-actions
 
 pre-guess: check-for-root
 	@mkdir -m 755 -p -- $(GUESSDIR)
@@ -54,8 +56,6 @@ test-guess-actions: pre-guess
 	@[ -n "$(TEST_GUESS_ACTIONS)" ] || { printf "TEST_GUESS_ACTIONS not specified\n" >&2; exit 1; }
 	@for exe in $(TEST_GUESS_ACTIONS); do echo "RUN: $$exe"; "$$exe"; done
 
-.PHONY: guess
-
 guess: pre-guess
 	$V printf '============================================================\n\n' >&2
 	@$(TOOLSDIR)/guess-config > $(GUESSDIR)/guessed.mk
@@ -74,8 +74,6 @@ ifneq "$(unknown_features)" ''
 $(info WARNING: Unknown features are specified in the config: $(unknown_features))
 endif
 
-.PHONY: guess
-
 guess: depmod-host
 	@$(VMSG) "Guessing is complete"
 
diff --git a/mk/main.mk.in b/mk/main.mk.in
@@ -4,6 +4,7 @@
 .EXPORT_ALL_VARIABLES:
 .DEFAULT_GOAL := all
 
+PHONY =
 TESTING_PUBLIC_GOALS =
 
 ifneq "$(MAKE_INITRD_TESTING)" ""
@@ -19,9 +20,10 @@ $(error You MUST NOT call private goals directly: $(private-goals))
 endif
 endif # MAKELEVEL = 0
 
-include @projectdir@/mk/config.mk
+PHONY += all guess-config guess-modules feature-info bug-report
+PHONY += check-for-root depmod-host process-config test-guess
 
-.PHONY: check-for-root depmod-host
+include @projectdir@/mk/config.mk
 
 check-for-root:
 	@if [ -z "$$IGNORE_PRIV_CHECKS" ] && [ "$$(id -u)" != 0 ]; then \
@@ -50,8 +52,6 @@ STARTUP_TIME   = $(shell date +'%s')
 WORKDIR_SUFFIX = $(basename $(notdir $(INITRD_CONFIG)))
 endif
 
-.PHONY: all process-config guess-config guess-modules feature-info bug-report
-
 all: check-for-root
 	@rc=0; \
 	for c in $(INITRD_CONFIG_LIST); do \
@@ -92,8 +92,6 @@ test-guess:
 	$Qrm -rf -- "$(GUESSDIR)"
 	$Qrm -rf -- "$(WORKDIR)"
 
-.PHONY: feature-info
-
 feature-info:
 	@$(MAKE) $(MFLAGS) -f @projectdir@/mk/main.mk show-feature-info
 
@@ -106,3 +104,6 @@ bug-report: check-for-root
 	@$(TOOLSDIR)/bug-report >&4
 	$Qrm -rf -- "$(REPORTDIR)"
 	$Qrmdir -- "$(WORKDIR)"
+
+# Declare the contents of the .PHONY variable as phony.
+.PHONY: $(PHONY)
diff --git a/mk/show-feature-info.mk.in b/mk/show-feature-info.mk.in
@@ -2,12 +2,10 @@
 
 INITRD_CONFIG = /dev/null
 
-.PHONY: $(INITRD_CONFIG)
+PHONY += show-eature-info $(INITRD_CONFIG)
 
 include @projectdir@/mk/config.mk
 $(call show-feature-dependency,$(FEATURE_NAMES))
 
-.PHONY: show-eature-info
-
 show-feature-info:
 	@:

Original file line number	Diff line number	Diff line change
`@@ -2,4 +2,3 @@`
`2`	`2`	`COMPRESS_IMAGE = $(FEATURESDIR)/compress/bin/compress-image`
`3`	`3`	`COMPRESS ?= gzip`
`4`	`4`
`5`		`-.PHONY: compress`