From 9dd3f13a92313f5bdb10f7c0a1e2372c0f158ea3 Mon Sep 17 00:00:00 2001 From: Julio Montes Date: Fri, 29 Nov 2019 15:39:43 +0000 Subject: [PATCH] Makefile: Move the .git-commit: rule block to below the all: rule the first rule defined becomes the default and the default rule should be all. Signed-off-by: Julio Montes --- Makefile | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index 556246981..b1f13fdc9 100644 --- a/Makefile +++ b/Makefile @@ -200,16 +200,6 @@ SHIMV2_DIR = $(CLI_DIR)/$(SHIMV2) SOURCES := $(shell find . 2>&1 | grep -E '.*\.(c|h|go)$$') VERSION := ${shell cat ./VERSION} -# Targets that depend on .git-commit can use $(shell cat .git-commit) to get a -# git revision string. They will only be rebuilt if the revision string -# actually changes. -.PHONY: .git-commit.tmp -.git-commit: .git-commit.tmp - @cmp $< $@ >/dev/null 2>&1 || cp $< $@ -.git-commit.tmp: - @echo -n "$$(git rev-parse HEAD 2>/dev/null)" >$@ - @test -n "$$(git status --porcelain --untracked-files=no)" && echo -n "-dirty" >>$@ || true - # List of configuration files to build and install CONFIGS = CONFIG_PATHS = @@ -483,6 +473,16 @@ endef all: runtime containerd-shim-v2 netmon +# Targets that depend on .git-commit can use $(shell cat .git-commit) to get a +# git revision string. They will only be rebuilt if the revision string +# actually changes. +.PHONY: .git-commit.tmp +.git-commit: .git-commit.tmp + @cmp $< $@ >/dev/null 2>&1 || cp $< $@ +.git-commit.tmp: + @echo -n "$$(git rev-parse HEAD 2>/dev/null)" >$@ + @test -n "$$(git status --porcelain --untracked-files=no)" && echo -n "-dirty" >>$@ || true + containerd-shim-v2: $(SHIMV2_OUTPUT) netmon: $(NETMON_TARGET_OUTPUT)