From a9b174e71ed44b412c7853e7d0714556465a613c Mon Sep 17 00:00:00 2001 From: Jim Harris Date: Tue, 21 May 2019 04:49:19 -0700 Subject: [PATCH] build: fix duplicate spdk.common.mk includes mk/nvme.libtest.mk includes mk/spdk.common.mk, but all of the Makefiles including mk/nvme.libtest.mk were also including mk/spdk.common.mk unnecessarily. So remove the spdk.common.mk include from all of the offending Makefiles. This was relatively harmless, although it would cause weird things like CFLAGS and LDFLAGS getting duplicated when building. Signed-off-by: Jim Harris Change-Id: Ie60637db3c19a2ead097562b2adf6573dbe27472 Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/455321 Tested-by: SPDK CI Jenkins Reviewed-by: Changpeng Liu Reviewed-by: Shuhei Matsumoto --- examples/nvme/arbitration/Makefile | 1 - examples/nvme/cmb_copy/Makefile | 1 - examples/nvme/fio_plugin/Makefile | 2 -- examples/nvme/hello_world/Makefile | 1 - examples/nvme/hotplug/Makefile | 1 - examples/nvme/identify/Makefile | 1 - examples/nvme/nvme_manage/Makefile | 1 - examples/nvme/perf/Makefile | 1 - examples/nvme/reserve/Makefile | 1 - test/env/env_dpdk_post_init/Makefile | 1 - test/nvme/aer/Makefile | 1 - test/nvme/deallocated_value/Makefile | 1 - test/nvme/e2edp/Makefile | 1 - test/nvme/err_injection/Makefile | 1 - test/nvme/overhead/Makefile | 1 - test/nvme/reset/Makefile | 1 - test/nvme/sgl/Makefile | 1 - 17 files changed, 18 deletions(-) diff --git a/examples/nvme/arbitration/Makefile b/examples/nvme/arbitration/Makefile index 3affeb800..7b17123de 100644 --- a/examples/nvme/arbitration/Makefile +++ b/examples/nvme/arbitration/Makefile @@ -32,7 +32,6 @@ # SPDK_ROOT_DIR := $(CURDIR)/../../.. -include $(SPDK_ROOT_DIR)/mk/spdk.common.mk APP = arbitration diff --git a/examples/nvme/cmb_copy/Makefile b/examples/nvme/cmb_copy/Makefile index 86c18143e..77a143abb 100644 --- a/examples/nvme/cmb_copy/Makefile +++ b/examples/nvme/cmb_copy/Makefile @@ -32,7 +32,6 @@ # SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) -include $(SPDK_ROOT_DIR)/mk/spdk.common.mk APP = cmb_copy diff --git a/examples/nvme/fio_plugin/Makefile b/examples/nvme/fio_plugin/Makefile index dfd7917db..5032efdc8 100644 --- a/examples/nvme/fio_plugin/Makefile +++ b/examples/nvme/fio_plugin/Makefile @@ -34,8 +34,6 @@ SPDK_ROOT_DIR := $(CURDIR)/../../.. -include $(SPDK_ROOT_DIR)/mk/spdk.common.mk - APP := fio_plugin CFLAGS += -I$(CONFIG_FIO_SOURCE_DIR) diff --git a/examples/nvme/hello_world/Makefile b/examples/nvme/hello_world/Makefile index 890d761a6..bbb3527cb 100644 --- a/examples/nvme/hello_world/Makefile +++ b/examples/nvme/hello_world/Makefile @@ -32,7 +32,6 @@ # SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) -include $(SPDK_ROOT_DIR)/mk/spdk.common.mk APP = hello_world diff --git a/examples/nvme/hotplug/Makefile b/examples/nvme/hotplug/Makefile index 0dcdda9af..c77c61227 100644 --- a/examples/nvme/hotplug/Makefile +++ b/examples/nvme/hotplug/Makefile @@ -32,7 +32,6 @@ # SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) -include $(SPDK_ROOT_DIR)/mk/spdk.common.mk APP = hotplug diff --git a/examples/nvme/identify/Makefile b/examples/nvme/identify/Makefile index e1dd574c5..6cff39a01 100644 --- a/examples/nvme/identify/Makefile +++ b/examples/nvme/identify/Makefile @@ -32,7 +32,6 @@ # SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) -include $(SPDK_ROOT_DIR)/mk/spdk.common.mk APP = identify diff --git a/examples/nvme/nvme_manage/Makefile b/examples/nvme/nvme_manage/Makefile index 4f49872e7..ed467b884 100644 --- a/examples/nvme/nvme_manage/Makefile +++ b/examples/nvme/nvme_manage/Makefile @@ -32,7 +32,6 @@ # SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) -include $(SPDK_ROOT_DIR)/mk/spdk.common.mk APP = nvme_manage diff --git a/examples/nvme/perf/Makefile b/examples/nvme/perf/Makefile index 4127b8356..ef1127655 100644 --- a/examples/nvme/perf/Makefile +++ b/examples/nvme/perf/Makefile @@ -32,7 +32,6 @@ # SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) -include $(SPDK_ROOT_DIR)/mk/spdk.common.mk APP = perf diff --git a/examples/nvme/reserve/Makefile b/examples/nvme/reserve/Makefile index 315faef08..a3e62138b 100644 --- a/examples/nvme/reserve/Makefile +++ b/examples/nvme/reserve/Makefile @@ -32,7 +32,6 @@ # SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) -include $(SPDK_ROOT_DIR)/mk/spdk.common.mk APP = reserve diff --git a/test/env/env_dpdk_post_init/Makefile b/test/env/env_dpdk_post_init/Makefile index f4b8804e8..ea0ff7bb7 100644 --- a/test/env/env_dpdk_post_init/Makefile +++ b/test/env/env_dpdk_post_init/Makefile @@ -32,7 +32,6 @@ # SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) -include $(SPDK_ROOT_DIR)/mk/spdk.common.mk CFLAGS += $(ENV_CFLAGS) APP = env_dpdk_post_init diff --git a/test/nvme/aer/Makefile b/test/nvme/aer/Makefile index 77acabd06..616800777 100644 --- a/test/nvme/aer/Makefile +++ b/test/nvme/aer/Makefile @@ -32,7 +32,6 @@ # SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) -include $(SPDK_ROOT_DIR)/mk/spdk.common.mk APP = aer diff --git a/test/nvme/deallocated_value/Makefile b/test/nvme/deallocated_value/Makefile index bff11cada..8277c32e0 100644 --- a/test/nvme/deallocated_value/Makefile +++ b/test/nvme/deallocated_value/Makefile @@ -32,7 +32,6 @@ # SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) -include $(SPDK_ROOT_DIR)/mk/spdk.common.mk APP = deallocated_value diff --git a/test/nvme/e2edp/Makefile b/test/nvme/e2edp/Makefile index 226a50e04..576262269 100644 --- a/test/nvme/e2edp/Makefile +++ b/test/nvme/e2edp/Makefile @@ -32,7 +32,6 @@ # SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) -include $(SPDK_ROOT_DIR)/mk/spdk.common.mk APP = nvme_dp diff --git a/test/nvme/err_injection/Makefile b/test/nvme/err_injection/Makefile index 4f5f18514..579fb5440 100644 --- a/test/nvme/err_injection/Makefile +++ b/test/nvme/err_injection/Makefile @@ -32,7 +32,6 @@ # SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) -include $(SPDK_ROOT_DIR)/mk/spdk.common.mk APP = err_injection diff --git a/test/nvme/overhead/Makefile b/test/nvme/overhead/Makefile index bcb7f38db..1d050d96d 100644 --- a/test/nvme/overhead/Makefile +++ b/test/nvme/overhead/Makefile @@ -32,7 +32,6 @@ # SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) -include $(SPDK_ROOT_DIR)/mk/spdk.common.mk APP = overhead diff --git a/test/nvme/reset/Makefile b/test/nvme/reset/Makefile index 440f385c3..dd1774bcd 100644 --- a/test/nvme/reset/Makefile +++ b/test/nvme/reset/Makefile @@ -32,7 +32,6 @@ # SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) -include $(SPDK_ROOT_DIR)/mk/spdk.common.mk APP = reset diff --git a/test/nvme/sgl/Makefile b/test/nvme/sgl/Makefile index f0e0fc508..fe57e6147 100644 --- a/test/nvme/sgl/Makefile +++ b/test/nvme/sgl/Makefile @@ -32,7 +32,6 @@ # SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) -include $(SPDK_ROOT_DIR)/mk/spdk.common.mk APP = sgl