Commit a9b174e7 authored May 21, 2019 by Jim Harris

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

parent 9018dd60

examples/nvme/arbitration/Makefile

+0 −1

Original line number	Diff line number	Diff line
		@@ -32,7 +32,6 @@
		#

		SPDK_ROOT_DIR := $(CURDIR)/../../..
		include $(SPDK_ROOT_DIR)/mk/spdk.common.mk

		APP = arbitration

examples/nvme/cmb_copy/Makefile

+0 −1

Original line number	Diff line number	Diff line
		@@ -32,7 +32,6 @@
		#

		SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..)
		include $(SPDK_ROOT_DIR)/mk/spdk.common.mk

		APP = cmb_copy

examples/nvme/fio_plugin/Makefile

+0 −2

Original line number	Diff line number	Diff line
		@@ -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)

examples/nvme/hello_world/Makefile

+0 −1

Original line number	Diff line number	Diff line
		@@ -32,7 +32,6 @@
		#

		SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..)
		include $(SPDK_ROOT_DIR)/mk/spdk.common.mk

		APP = hello_world

examples/nvme/hotplug/Makefile

+0 −1

Original line number	Diff line number	Diff line
		@@ -32,7 +32,6 @@
		#

		SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..)
		include $(SPDK_ROOT_DIR)/mk/spdk.common.mk

		APP = hotplug