*.mk: Use empty recipes for .PHONY targets

The @: dummy recipe was there to avoid having rules without recipes.
Rules without recipes can be confusing, as the reader can't know if a
recipe is being defined somewhere else.  Also, implicit rules might
apply (in general, but we disable all implicit stuff).

However, @: is also problematic, since make really needs to run that
command, which is unnecessary overhead.  But okay, :(1) (really called
true(1), but wouldn't it be a nice man page name?) that's not meaningful
overhead.

And the bigger problem: having a recipe hides the usual:

	make: Nothing to be done for 'all'.

We already disable it by using .SILENCE:, but the message can be seen
when using V=1 (after this patch; prior to this patch, it was impossible
to find that message).  It is good to be able to know that make(1)
says there's nothing to be done, as a confirmation.

Signed-off-by: Alejandro Colomar <alx@kernel.org>

diff --git a/Makefile b/Makefile
index 8b6bc937026a027dd17cda560acf9f3b07893243..411aa5ad2157c245053e516960ef17819cd2e7de 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -38,8 +38,7 @@ MAKEFILEDIR := $(DATAROOTDIR)/mk
 
 
 .PHONY: all
-all: build
-       @:
+all: build;
 
 .PHONY: help
 help:

diff --git a/share/mk/build/_.mk b/share/mk/build/_.mk
index c68290c1e9e26dbd62b34a975bb5c156c7f0ad94..a02301ff10ec91b88f78f016e30c1686f1857308 100644 (file)
--- a/share/mk/build/_.mk
+++ b/share/mk/build/_.mk
@@ -39,8 +39,7 @@ $(builddir)/%/:
 
 
 .PHONY: build
-build: build-catman build-html build-pdf build-ps build-src
-       @:
+build: build-catman build-html build-pdf build-ps build-src;
 
 .PHONY: clean
 clean:

diff --git a/share/mk/build/catman.mk b/share/mk/build/catman.mk
index 39d8bc90f0e0b885ee54d727256aa320aae3d0ff..16b9f26b78c7324ae91dbfdb4d2e5d782d280efe 100644 (file)
--- a/share/mk/build/catman.mk
+++ b/share/mk/build/catman.mk
@@ -60,28 +60,22 @@ $(_CATMAN): %.cat: %.cat.set | $$(@D)/
 
 
 .PHONY: build-catman-eqn
-build-catman-eqn: $(_CATMAN_troff)
-       @:
+build-catman-eqn: $(_CATMAN_troff);
 
 .PHONY: build-catman-troff-man
-build-catman-troff-man: $(_CATMAN_MAN_set)
-       @:
+build-catman-troff-man: $(_CATMAN_MAN_set);
 
 .PHONY: build-catman-troff-mdoc
-build-catman-troff-mdoc: $(_CATMAN_MDOC_set)
-       @:
+build-catman-troff-mdoc: $(_CATMAN_MDOC_set);
 
 .PHONY: build-catman-troff
-build-catman-troff: build-catman-troff-man build-catman-troff-mdoc
-       @:
+build-catman-troff: build-catman-troff-man build-catman-troff-mdoc;
 
 .PHONY: build-catman-grotty
-build-catman-grotty: $(_CATMAN)
-       @:
+build-catman-grotty: $(_CATMAN);
 
 .PHONY: build-catman
-build-catman: build-catman-grotty
-       @:
+build-catman: build-catman-grotty;
 
 
 endif  # include guard

diff --git a/share/mk/build/html.mk b/share/mk/build/html.mk
index b68f972134089d715fbb550d60575da16deb4645..084654df7dbf81856508f5bcdd99ec2cdb32d390 100644 (file)
--- a/share/mk/build/html.mk
+++ b/share/mk/build/html.mk
@@ -36,8 +36,7 @@ $(_HTMLPAGES): $(_HTMLDIR)/%$(htmlext): $(MANDIR)/% | $$(@D)/
 
 
 .PHONY: build-html html
-build-html html: $(_HTMLPAGES)
-       @:
+build-html html: $(_HTMLPAGES);
 
 
 endif  # include guard

diff --git a/share/mk/build/pdf.mk b/share/mk/build/pdf.mk
index c2547bf0bd2ae6fade42181bc9be7ed24c9a0036..0f7a61042b20d911d1296c4b570116d8ea957689 100644 (file)
--- a/share/mk/build/pdf.mk
+++ b/share/mk/build/pdf.mk
@@ -47,28 +47,22 @@ $(_PDFMAN): %.pdf: %.pdf.set | $$(@D)/
 
 
 .PHONY: build-pdf-eqn
-build-pdf-eqn: $(_PDFMAN_troff)
-       @:
+build-pdf-eqn: $(_PDFMAN_troff);
 
 .PHONY: build-pdf-troff-man
-build-pdf-troff-man: $(_PDFMAN_MAN_set)
-       @:
+build-pdf-troff-man: $(_PDFMAN_MAN_set);
 
 .PHONY: build-pdf-troff-mdoc
-build-pdf-troff-mdoc: $(_PDFMAN_MDOC_set)
-       @:
+build-pdf-troff-mdoc: $(_PDFMAN_MDOC_set);
 
 .PHONY: build-pdf-troff
-build-pdf-troff: build-pdf-troff-man build-pdf-troff-mdoc
-       @:
+build-pdf-troff: build-pdf-troff-man build-pdf-troff-mdoc;
 
 .PHONY: build-pdf-gropdf
-build-pdf-gropdf: $(_PDFMAN)
-       @:
+build-pdf-gropdf: $(_PDFMAN);
 
 .PHONY: build-pdf
-build-pdf: build-pdf-gropdf
-       @:
+build-pdf: build-pdf-gropdf;
 
 
 endif  # include guard

diff --git a/share/mk/build/pre.mk b/share/mk/build/pre.mk
index cfa01f66362f0e8f2085d7dac6f0b284650e7f46..4c458fa4e7d4ab520bd8c7a931502d1647f3a485 100644 (file)
--- a/share/mk/build/pre.mk
+++ b/share/mk/build/pre.mk
@@ -35,16 +35,13 @@ $(_MAN_eqn): %.eqn: %.tbl | $$(@D)/
 
 
 .PHONY: build-pre-preconv
-build-pre-preconv: $(_MAN_tbl)
-       @:
+build-pre-preconv: $(_MAN_tbl);
 
 .PHONY: build-pre-tbl
-build-pre-tbl: $(_MAN_eqn)
-       @:
+build-pre-tbl: $(_MAN_eqn);
 
 .PHONY: build-pre
-build-pre: build-pre-tbl
-       @:
+build-pre: build-pre-tbl;
 
 
 endif  # include guard

diff --git a/share/mk/build/ps.mk b/share/mk/build/ps.mk
index 0ce828c86c7c06c812222e27a7fecf9efbf91da6..899d1475655f16774dafba811f0167322d58e068 100644 (file)
--- a/share/mk/build/ps.mk
+++ b/share/mk/build/ps.mk
@@ -47,28 +47,22 @@ $(_PSMAN): %.ps: %.ps.set | $$(@D)/
 
 
 .PHONY: build-ps-eqn
-build-ps-eqn: $(_PSMAN_troff)
-       @:
+build-ps-eqn: $(_PSMAN_troff);
 
 .PHONY: build-ps-troff-man
-build-ps-troff-man: $(_PSMAN_MAN_set)
-       @:
+build-ps-troff-man: $(_PSMAN_MAN_set);
 
 .PHONY: build-ps-troff-mdoc
-build-ps-troff-mdoc: $(_PSMAN_MDOC_set)
-       @:
+build-ps-troff-mdoc: $(_PSMAN_MDOC_set);
 
 .PHONY: build-ps-troff
-build-ps-troff: build-ps-troff-man build-ps-troff-mdoc
-       @:
+build-ps-troff: build-ps-troff-man build-ps-troff-mdoc;
 
 .PHONY: build-ps-grops
-build-ps-grops: $(_PSMAN)
-       @:
+build-ps-grops: $(_PSMAN);
 
 .PHONY: build-ps
-build-ps: build-ps-grops
-       @:
+build-ps: build-ps-grops;
 
 
 endif  # include guard

diff --git a/share/mk/build/src.mk b/share/mk/build/src.mk
index e273fbf4ee3a56d6221b1dfc9ee476d9160cb945..fcee7fa4355a520b0b1c76bde1ad0f5e97c8a4fb 100644 (file)
--- a/share/mk/build/src.mk
+++ b/share/mk/build/src.mk
@@ -98,16 +98,13 @@ $(_UNITS_src_bin): %: %.o
 
 
 .PHONY: build-src-c
-build-src-c:   $(_UNITS_src_c)
-       @:
+build-src-c:   $(_UNITS_src_c);
 
 .PHONY: build-src-cc
-build-src-cc:  $(_UNITS_src_o)
-       @:
+build-src-cc:  $(_UNITS_src_o);
 
 .PHONY: build-src-ld
-build-src-ld:  $(_UNITS_src_bin)
-       @:
+build-src-ld:  $(_UNITS_src_bin);
 
 .PHONY: build-src
 build-src: build-src-ld

diff --git a/share/mk/check/_.mk b/share/mk/check/_.mk
index 1ee40294c94f975181500a784cb1b12f86a64cb7..6326d1f89ec23a456608b5488e208f6798292dff 100644 (file)
--- a/share/mk/check/_.mk
+++ b/share/mk/check/_.mk
@@ -12,8 +12,7 @@ check := check-catman
 
 
 .PHONY: check
-check: $(check)
-       @:
+check: $(check);
 
 
 endif  # include guard

diff --git a/share/mk/check/catman.mk b/share/mk/check/catman.mk
index d99919e2d0de646157b288145d8681bbf535e23d..8268e85d31308db5eaf67047699648b037f30ac8 100644 (file)
--- a/share/mk/check/catman.mk
+++ b/share/mk/check/catman.mk
@@ -38,16 +38,13 @@ $(_CHECK_catman): %.check-catman.touch: %.cat.grep | $$(@D)/
 
 
 .PHONY: check-catman-col
-check-catman-col: $(_CHECK_catman_grep)
-       @:
+check-catman-col: $(_CHECK_catman_grep);
 
 .PHONY: check-catman-grep
-check-catman-grep: $(_CHECK_catman)
-       @:
+check-catman-grep: $(_CHECK_catman);
 
 .PHONY: check-catman
-check-catman: check-catman-grep
-       @:
+check-catman: check-catman-grep;
 
 
 endif  # include guard

diff --git a/share/mk/dist.mk b/share/mk/dist.mk
index e10294f1eaa5b8e43d41b1ebbf088df3e20d1d29..da76e7bf30af8b92ee193ba305d00cc7f960c94b 100644 (file)
--- a/share/mk/dist.mk
+++ b/share/mk/dist.mk
@@ -81,16 +81,13 @@ $(DISTFILE).xz: %.xz: % | $$(@D)/
 
 
 .PHONY: dist-tar
-dist-tar: $(DISTFILE)
-       @:
+dist-tar: $(DISTFILE);
 
 .PHONY: $(dist)
-$(dist): dist-%: $(DISTFILE).%
-       @:
+$(dist): dist-%: $(DISTFILE).%;
 
 .PHONY: dist
-dist: $(dist)
-       @:
+dist: $(dist);
 
 
 endif  # include guard

diff --git a/share/mk/install/_.mk b/share/mk/install/_.mk
index 0a0861e47389b27d11613c4f58bacba82da918d8..98f6f888feaf28622825692ad474982a14e03cd3 100644 (file)
--- a/share/mk/install/_.mk
+++ b/share/mk/install/_.mk
@@ -32,12 +32,10 @@ $(DESTDIR)%/:
 
 
 .PHONY: install
-install: install-man
-       @:
+install: install-man;
 
 .PHONY: uninstall
-uninstall: uninstall-man
-       @:
+uninstall: uninstall-man;
 
 
 endif  # include guard

diff --git a/share/mk/install/html.mk b/share/mk/install/html.mk
index 4b6dfa26203cff5ca6e2a12635485ad631b6a3e4..ae518d2c2cc7cd667921d592649267f12995cf0d 100644 (file)
--- a/share/mk/install/html.mk
+++ b/share/mk/install/html.mk
@@ -30,12 +30,10 @@ $(_htmlpages): $(_htmldir)/%: $(_HTMLDIR)/% | $$(@D)/
 
 
 .PHONY: install-html
-install-html: $(_htmlpages)
-       @:
+install-html: $(_htmlpages);
 
 .PHONY: uninstall-html
-uninstall-html: $(_htmldir_rmdir) $(_htmldirs_rmdir) $(_htmlpages_rm)
-       @:
+uninstall-html: $(_htmldir_rmdir) $(_htmldirs_rmdir) $(_htmlpages_rm);
 
 
 endif  # include guard

diff --git a/share/mk/install/man.mk b/share/mk/install/man.mk
index 128f20833305067da98d581566fbf89b568e02eb..f1043a9d629bc934f0f5c81e78241a5ea41effe8 100644 (file)
--- a/share/mk/install/man.mk
+++ b/share/mk/install/man.mk
@@ -192,20 +192,16 @@ $(_mandir_rmdir): $(uninstall_manX) FORCE
 
 
 .PHONY: $(install_manX)
-$(install_manX): install-man%: $$(_man%pages)
-       @:
+$(install_manX): install-man%: $$(_man%pages);
 
 .PHONY: install-man
-install-man: $(install_manX)
-       @:
+install-man: $(install_manX);
 
 .PHONY: $(uninstall_manX)
-$(uninstall_manX): uninstall-man%: $$(_man%pages_rm) $$(_man%dir_rmdir)
-       @:
+$(uninstall_manX): uninstall-man%: $$(_man%pages_rm) $$(_man%dir_rmdir);
 
 .PHONY: uninstall-man
-uninstall-man: $(_mandir_rmdir) $(uninstall_manX)
-       @:
+uninstall-man: $(_mandir_rmdir) $(uninstall_manX);
 
 
 endif  # include guard

diff --git a/share/mk/lint/_.mk b/share/mk/lint/_.mk
index 3b679bc7ea389dc87bd9b8f544f5a48a41616164..9d93bd3809d94adad3e39ff9b3c74517c4511eb8 100644 (file)
--- a/share/mk/lint/_.mk
+++ b/share/mk/lint/_.mk
@@ -12,8 +12,7 @@ lint := lint-c lint-man lint-mdoc
 
 
 .PHONY: lint
-lint: $(lint)
-       @:
+lint: $(lint);
 
 
 endif  # include guard

diff --git a/share/mk/lint/c.mk b/share/mk/lint/c.mk
index 70422aa8a9cf31d7e37e902e574ab5af1613d81d..94cee5f9bd2402ca4fa7b5a7be52d1a6b184b376 100644 (file)
--- a/share/mk/lint/c.mk
+++ b/share/mk/lint/c.mk
@@ -90,12 +90,10 @@ $(_LINT_c_iwyu): %.lint-c.iwyu.touch: %.c
 
 
 .PHONY: $(lint_c)
-$(lint_c): lint-c-%: $$(_LINT_c_%)
-       @:
+$(lint_c): lint-c-%: $$(_LINT_c_%);
 
 .PHONY: lint-c
-lint-c: $(lint_c)
-       @:
+lint-c: $(lint_c);
 
 
 endif  # include guard

diff --git a/share/mk/lint/man/man.mk b/share/mk/lint/man/man.mk
index 1c74d7e53e9fb32cf833ce19c501cce14fe5c680..4b3d1db8b8c1551216a5abe3bc1a695f12f633ba 100644 (file)
--- a/share/mk/lint/man/man.mk
+++ b/share/mk/lint/man/man.mk
@@ -61,12 +61,10 @@ $(_LINT_man_tbl): $(_MANDIR)/%.lint-man.tbl.touch: $(MANDIR)/% | $$(@D)/
 
 
 .PHONY: $(lint_man)
-$(lint_man): lint-man-%: $$(_LINT_man_%)
-       @:
+$(lint_man): lint-man-%: $$(_LINT_man_%);
 
 .PHONY: lint-man
-lint-man: $(lint_man)
-       @:
+lint-man: $(lint_man);
 
 
 endif  # include guard

diff --git a/share/mk/lint/man/mdoc.mk b/share/mk/lint/man/mdoc.mk
index 5c7344114fdc051d6aba4e3b3b866bbbd8634778..eaf186ee37623b6fc904a0252411115512c079ab 100644 (file)
--- a/share/mk/lint/man/mdoc.mk
+++ b/share/mk/lint/man/mdoc.mk
@@ -34,12 +34,10 @@ $(_LINT_mdoc_mandoc): $(_MANDIR)/%.lint-mdoc.mandoc.touch: $(MANDIR)/% | $$(@D)/
 
 
 .PHONY: $(lint_mdoc)
-$(lint_mdoc): lint-mdoc-%: $$(_LINT_mdoc_%)
-       @:
+$(lint_mdoc): lint-mdoc-%: $$(_LINT_mdoc_%);
 
 .PHONY: lint-mdoc
-lint-mdoc: $(lint_mdoc)
-       @:
+lint-mdoc: $(lint_mdoc);
 
 
 endif  # include guard