ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build: fix duplicate spdk.common.mk includes

Browse Source 
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 <james.r.harris@intel.com>
Change-Id: Ie60637db3c19a2ead097562b2adf6573dbe27472

Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/455321
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
This commit is contained in:
Jim Harris 2019-05-21 04:49:19 -07:00
parent 9018dd60c6
commit a9b174e71e
17 changed files with 0 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
examples/nvme/arbitration/Makefile
View File

@ -32,7 +32,6 @@
#
SPDK_ROOT_DIR := $(CURDIR)/../../..
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
APP = arbitration

1
examples/nvme/cmb_copy/Makefile
View File

@ -32,7 +32,6 @@
#
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..)
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
APP = cmb_copy

2
examples/nvme/fio_plugin/Makefile
View File

@ -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)

1
examples/nvme/hello_world/Makefile
View File

@ -32,7 +32,6 @@
#
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..)
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
APP = hello_world

1
examples/nvme/hotplug/Makefile
View File

@ -32,7 +32,6 @@
#
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..)
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
APP = hotplug

1
examples/nvme/identify/Makefile
View File

@ -32,7 +32,6 @@
#
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..)
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
APP = identify

1
examples/nvme/nvme_manage/Makefile
View File

@ -32,7 +32,6 @@
#
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..)
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
APP = nvme_manage

1
examples/nvme/perf/Makefile
View File

@ -32,7 +32,6 @@
#
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..)
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
APP = perf

1
examples/nvme/reserve/Makefile
View File

@ -32,7 +32,6 @@
#
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..)
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
APP = reserve

1
test/env/env_dpdk_post_init/Makefile vendored
View File

@ -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

1
test/nvme/aer/Makefile
View File

@ -32,7 +32,6 @@
#
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..)
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
APP = aer

1
test/nvme/deallocated_value/Makefile
View File

@ -32,7 +32,6 @@
#
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..)
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
APP = deallocated_value

1
test/nvme/e2edp/Makefile
View File

@ -32,7 +32,6 @@
#
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..)
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
APP = nvme_dp

1
test/nvme/err_injection/Makefile
View File

@ -32,7 +32,6 @@
#
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..)
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
APP = err_injection

1
test/nvme/overhead/Makefile
View File

@ -32,7 +32,6 @@
#
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..)
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
APP = overhead

1
test/nvme/reset/Makefile
View File

@ -32,7 +32,6 @@
#
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..)
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
APP = reset

1
test/nvme/sgl/Makefile
View File

@ -32,7 +32,6 @@
#
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..)
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
APP = sgl