From 40e461cbb7e355111f3671fcf753e41e53b9d84c Mon Sep 17 00:00:00 2001 From: Jim Harris Date: Wed, 13 Feb 2019 08:28:03 -0700 Subject: [PATCH] build: fix duplicated clean target in shared_lib/Makefile Add a CLEAN_FILES macro that shared_lib/Makefile can use to add to the list of files to be cleaned. Fixes #663. Signed-off-by: Jim Harris Change-Id: I12982e0989e02a69aaea4e470777301280090096 Reviewed-on: https://review.gerrithub.io/c/444427 (master) Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/447583 Reviewed-by: Darek Stojaczyk Reviewed-by: Ben Walker Tested-by: SPDK CI Jenkins --- mk/spdk.app.mk | 4 +++- shared_lib/Makefile | 3 +-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/mk/spdk.app.mk b/mk/spdk.app.mk index beba2f563..faee7143a 100644 --- a/mk/spdk.app.mk +++ b/mk/spdk.app.mk @@ -35,6 +35,8 @@ include $(SPDK_ROOT_DIR)/mk/spdk.app_vars.mk LIBS += $(SPDK_LIB_LINKER_ARGS) +CLEAN_FILES = $(APP) + all : $(APP) @: @@ -44,6 +46,6 @@ $(APP) : $(OBJS) $(SPDK_LIB_FILES) $(ENV_LIBS) $(LINK_C) clean : - $(CLEAN_C) $(APP) + $(CLEAN_C) $(CLEAN_FILES) include $(SPDK_ROOT_DIR)/mk/spdk.deps.mk diff --git a/shared_lib/Makefile b/shared_lib/Makefile index d7ee5e1f7..9a2773657 100644 --- a/shared_lib/Makefile +++ b/shared_lib/Makefile @@ -56,8 +56,7 @@ $(SHARED_LINKED_LIB) : $(SHARED_REALNAME_LIB) all: $(SHARED_LINKED_LIB) -clean: - $(CLEAN_C) $(SHARED_REALNAME_LIB) $(SHARED_LINKED_LIB) +CLEAN_FILES += $(SHARED_REALNAME_LIB) $(SHARED_LINKED_LIB) install: $(INSTALL_SHARED_LIB)