Skip to content
This repository was archived by the owner on May 12, 2021. It is now read-only.

Commit ad78c6f

Browse files
author
James O. D. Hunt
committed
build: Fold long clean line
Folded the overly long clean rule across multiple lines. Signed-off-by: James O. D. Hunt <[email protected]>
1 parent 7827155 commit ad78c6f

File tree

1 file changed

+10
-2
lines changed

1 file changed

+10
-2
lines changed

Makefile

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -559,14 +559,16 @@ define MAKE_KERNEL_VIRTIOFS_NAME
559559
$(if $(findstring uncompressed,$1),vmlinux-virtiofs.container,vmlinuz-virtiofs.container)
560560
endef
561561

562+
GENERATED_CONFIG = $(abspath $(CLI_DIR)/config-generated.go)
562563

563-
GENERATED_FILES += $(CLI_DIR)/config-generated.go
564+
GENERATED_FILES += $(GENERATED_CONFIG)
564565
GENERATED_FILES += pkg/katautils/config-settings.go
565566

566567
$(TARGET_OUTPUT): $(SOURCES) $(GENERATED_FILES) $(MAKEFILE_LIST) | show-summary
567568
$(QUIET_BUILD)(cd $(CLI_DIR) && go build $(KATA_LDFLAGS) $(BUILDFLAGS) -o $@ .)
568569

569570
$(SHIMV2_OUTPUT): $(SOURCES) $(GENERATED_FILES) $(MAKEFILE_LIST)
571+
$(QUIET_BUILD)(cd $(SHIMV2_DIR)/ && ln -fs $(GENERATED_CONFIG))
570572
$(QUIET_BUILD)(cd $(SHIMV2_DIR)/ && go build $(KATA_LDFLAGS) $(BUILDTAGS) -i -o $@ .)
571573

572574
.PHONY: \
@@ -711,7 +713,13 @@ install-completions:
711713
$(QUIET_INST)install --mode 0644 -D $(BASH_COMPLETIONS) $(DESTDIR)/$(BASH_COMPLETIONSDIR)/$(notdir $(BASH_COMPLETIONS));
712714

713715
clean:
714-
$(QUIET_CLEAN)rm -f $(TARGET) $(SHIMV2) $(NETMON_TARGET) $(CONFIGS) $(GENERATED_FILES) .git-commit .git-commit.tmp
716+
$(QUIET_CLEAN)rm -f \
717+
$(CONFIGS) \
718+
$(GENERATED_FILES) \
719+
$(NETMON_TARGET) \
720+
$(SHIMV2) \
721+
$(TARGET) \
722+
.git-commit .git-commit.tmp
715723

716724
show-usage: show-header
717725
@printf "• Overview:\n"

0 commit comments

Comments
 (0)