From ad78c6fabe20cfcfe0d9f749f4b40c285e330b3f Mon Sep 17 00:00:00 2001 From: "James O. D. Hunt" Date: Mon, 17 Aug 2020 16:49:21 +0100 Subject: [PATCH] build: Fold long clean line Folded the overly long clean rule across multiple lines. Signed-off-by: James O. D. Hunt --- Makefile | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 089556b789..71c07ecd4a 100644 --- a/Makefile +++ b/Makefile @@ -559,14 +559,16 @@ define MAKE_KERNEL_VIRTIOFS_NAME $(if $(findstring uncompressed,$1),vmlinux-virtiofs.container,vmlinuz-virtiofs.container) endef +GENERATED_CONFIG = $(abspath $(CLI_DIR)/config-generated.go) -GENERATED_FILES += $(CLI_DIR)/config-generated.go +GENERATED_FILES += $(GENERATED_CONFIG) GENERATED_FILES += pkg/katautils/config-settings.go $(TARGET_OUTPUT): $(SOURCES) $(GENERATED_FILES) $(MAKEFILE_LIST) | show-summary $(QUIET_BUILD)(cd $(CLI_DIR) && go build $(KATA_LDFLAGS) $(BUILDFLAGS) -o $@ .) $(SHIMV2_OUTPUT): $(SOURCES) $(GENERATED_FILES) $(MAKEFILE_LIST) + $(QUIET_BUILD)(cd $(SHIMV2_DIR)/ && ln -fs $(GENERATED_CONFIG)) $(QUIET_BUILD)(cd $(SHIMV2_DIR)/ && go build $(KATA_LDFLAGS) $(BUILDTAGS) -i -o $@ .) .PHONY: \ @@ -711,7 +713,13 @@ install-completions: $(QUIET_INST)install --mode 0644 -D $(BASH_COMPLETIONS) $(DESTDIR)/$(BASH_COMPLETIONSDIR)/$(notdir $(BASH_COMPLETIONS)); clean: - $(QUIET_CLEAN)rm -f $(TARGET) $(SHIMV2) $(NETMON_TARGET) $(CONFIGS) $(GENERATED_FILES) .git-commit .git-commit.tmp + $(QUIET_CLEAN)rm -f \ + $(CONFIGS) \ + $(GENERATED_FILES) \ + $(NETMON_TARGET) \ + $(SHIMV2) \ + $(TARGET) \ + .git-commit .git-commit.tmp show-usage: show-header @printf "• Overview:\n"