From 15a757f6be76511b2816fb461f3ff060561af6f9 Mon Sep 17 00:00:00 2001 From: Kir Kolyshkin Date: Wed, 22 Feb 2017 15:15:48 -0800 Subject: [PATCH] Makefiles: remove @true Apparently @true was used as a rule for any target which should have a non-empty rule doing nothing. For this, there's a ": ;" syntax, let's use this and eliminate an unnecessary fork/exec :) Signed-off-by: Kir Kolyshkin Signed-off-by: Andrei Vagin --- Makefile | 3 +-- Makefile.install | 3 +-- criu/Makefile | 3 +-- scripts/nmk/Makefile | 3 +-- scripts/nmk/scripts/build.mk | 3 +-- 5 files changed, 5 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index a47ac405f..4a6bbd4a1 100644 --- a/Makefile +++ b/Makefile @@ -311,8 +311,7 @@ endif tar-name := $(shell echo $(head-name) | sed -e 's/^v//g') criu-$(tar-name).tar.bz2: git archive --format tar --prefix 'criu-$(tar-name)/' $(head-name) | bzip2 > $@ -dist tar: criu-$(tar-name).tar.bz2 - @true +dist tar: criu-$(tar-name).tar.bz2 ; .PHONY: dist tar tags: diff --git a/Makefile.install b/Makefile.install index 9e78367a3..f1e541500 100644 --- a/Makefile.install +++ b/Makefile.install @@ -41,8 +41,7 @@ install-compel: $(compel-install-targets) $(Q) $(MAKE) $(build)=compel/plugins install .PHONY: install-compel -install: install-man install-lib install-criu install-compel - @true +install: install-man install-lib install-criu install-compel ; .PHONY: install uninstall: diff --git a/criu/Makefile b/criu/Makefile index 48688d8c1..ada75af3a 100644 --- a/criu/Makefile +++ b/criu/Makefile @@ -57,8 +57,7 @@ pie: criu/pie/pie.lib.a $(Q) $(MAKE) $(build)=criu/pie all .PHONY: pie -criu/pie/%: pie - @true +criu/pie/%: pie ; # # CRIU executable diff --git a/scripts/nmk/Makefile b/scripts/nmk/Makefile index d9885c23a..f05e5c5c8 100644 --- a/scripts/nmk/Makefile +++ b/scripts/nmk/Makefile @@ -29,8 +29,7 @@ install: @cp scripts/tools.mk $(dir) @cp scripts/utils.mk $(dir) -all: - @true +all: ; clean: $(call msg-clean, "nmk") diff --git a/scripts/nmk/scripts/build.mk b/scripts/nmk/scripts/build.mk index 46d15fab9..907967cd7 100644 --- a/scripts/nmk/scripts/build.mk +++ b/scripts/nmk/scripts/build.mk @@ -281,8 +281,7 @@ endif # # Main phony rule. -all: $(all-y) - @true +all: $(all-y) ; .PHONY: all #