d/numam-spdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

build: remove $(ENV_CFLAGS) where not necessary

Browse Source 
Only Makefiles for libraries that directly depend on DPDK (rather than
the SPDK env abstraction) should add $(ENV_CFLAGS).

Change-Id: Ifdf44d3ef8c42bbf7f20edd524b330d00658235b
Signed-off-by: Daniel Verkamp <daniel.verkamp@intel.com>
Reviewed-on: https://review.gerrithub.io/392818
Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
This commit is contained in:
Daniel Verkamp 2017-12-11 15:38:24 -07:00 committed by Jim Harris
parent 61c1493785
commit 543cb17248
49 changed files with 11 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/iscsi_tgt/Makefile
View File

@ -38,8 +38,6 @@ include $(SPDK_ROOT_DIR)/mk/spdk.modules.mk
APP = iscsi_tgt
CFLAGS += $(ENV_CFLAGS)
# Add iSCSI library directory to include path
# TODO: remove this once iSCSI has a public API header
CFLAGS += -I$(SPDK_ROOT_DIR)/lib

2
app/nvmf_tgt/Makefile
View File

@ -38,8 +38,6 @@ include $(SPDK_ROOT_DIR)/mk/spdk.modules.mk
APP = nvmf_tgt
CFLAGS += $(ENV_CFLAGS)
C_SRCS := conf.c nvmf_main.c nvmf_tgt.c nvmf_rpc.c
SPDK_LIB_LIST = event_bdev event_copy

1
app/trace/Makefile
View File

@ -35,7 +35,6 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
include $(SPDK_ROOT_DIR)/mk/spdk.app.mk
CXXFLAGS += $(ENV_CFLAGS)
CXX_SRCS := trace.cpp
APP = spdk_trace

2
app/vhost/Makefile
View File

@ -38,8 +38,6 @@ include $(SPDK_ROOT_DIR)/mk/spdk.modules.mk
APP = vhost
CFLAGS += $(ENV_CFLAGS)
C_SRCS := vhost.c
SPDK_LIB_LIST = event_bdev event_copy event_net event_scsi event_vhost

2
examples/bdev/fio_plugin/Makefile
View File

@ -40,7 +40,7 @@ include $(SPDK_ROOT_DIR)/mk/spdk.modules.mk
APP := fio_plugin
C_SRCS = fio_plugin.c
CFLAGS += -I. $(ENV_CFLAGS) -I$(FIO_SOURCE_DIR)
CFLAGS += -I$(FIO_SOURCE_DIR)
LDFLAGS += -shared -rdynamic
SPDK_LIB_LIST += util bdev conf copy rpc jsonrpc json log

1
lib/bdev/Makefile
View File

@ -34,7 +34,6 @@
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
CFLAGS += $(ENV_CFLAGS) -I.
ifeq ($(CONFIG_VTUNE),y)
CFLAGS += -I$(VTUNE_SOURCE_DIR)/include -I$(VTUNE_SOURCE_DIR)/sdk/src/ittnotify
endif

2
lib/bdev/error/Makefile
View File

@ -34,7 +34,7 @@
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..)
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
CFLAGS += $(ENV_CFLAGS) -I$(SPDK_ROOT_DIR)/lib/bdev/
CFLAGS += -I$(SPDK_ROOT_DIR)/lib/bdev/
C_SRCS = vbdev_error.c vbdev_error_rpc.c
LIBNAME = vbdev_error

2
lib/bdev/gpt/Makefile
View File

@ -34,7 +34,7 @@
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..)
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
CFLAGS += $(ENV_CFLAGS) -I$(SPDK_ROOT_DIR)/lib/bdev/
CFLAGS += -I$(SPDK_ROOT_DIR)/lib/bdev/
C_SRCS = gpt.c vbdev_gpt.c
LIBNAME = vbdev_gpt

2
lib/bdev/malloc/Makefile
View File

@ -34,7 +34,7 @@
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..)
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
CFLAGS += $(ENV_CFLAGS) -I$(SPDK_ROOT_DIR)/lib/bdev/
CFLAGS += -I$(SPDK_ROOT_DIR)/lib/bdev/
C_SRCS = bdev_malloc.c bdev_malloc_rpc.c
LIBNAME = bdev_malloc

2
lib/bdev/null/Makefile
View File

@ -34,7 +34,7 @@
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..)
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
CFLAGS += $(ENV_CFLAGS) -I$(SPDK_ROOT_DIR)/lib/bdev/
CFLAGS += -I$(SPDK_ROOT_DIR)/lib/bdev/
C_SRCS = bdev_null.c bdev_null_rpc.c
LIBNAME = bdev_null

2
lib/bdev/nvme/Makefile
View File

@ -34,7 +34,7 @@
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..)
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
CFLAGS += $(ENV_CFLAGS) -I$(SPDK_ROOT_DIR)/lib/bdev/
CFLAGS += -I$(SPDK_ROOT_DIR)/lib/bdev/
C_SRCS = bdev_nvme.c bdev_nvme_rpc.c
LIBNAME = bdev_nvme

2
lib/bdev/pmem/Makefile
View File

@ -34,7 +34,7 @@
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..)
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
CFLAGS += $(ENV_CFLAGS) -I$(SPDK_ROOT_DIR)/lib/bdev/
CFLAGS += -I$(SPDK_ROOT_DIR)/lib/bdev/
C_SRCS = bdev_pmem.c bdev_pmem_rpc.c
LIBNAME = bdev_pmem

2
lib/bdev/split/Makefile
View File

@ -34,7 +34,7 @@
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..)
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
CFLAGS += $(ENV_CFLAGS) -I$(SPDK_ROOT_DIR)/lib/bdev/
CFLAGS += -I$(SPDK_ROOT_DIR)/lib/bdev/
C_SRCS = vbdev_split.c
LIBNAME = vbdev_split

1
lib/bdev/virtio/Makefile
View File

@ -34,7 +34,6 @@
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..)
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
CFLAGS += $(ENV_CFLAGS)
C_SRCS = bdev_virtio_scsi.c bdev_virtio_rpc.c
LIBNAME = bdev_virtio

1
lib/blob/Makefile
View File

@ -34,7 +34,6 @@
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
CFLAGS += $(ENV_CFLAGS)
C_SRCS = blobstore.c request.c
LIBNAME = blob

1
lib/copy/Makefile
View File

@ -34,7 +34,6 @@
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
CFLAGS += $(ENV_CFLAGS)
LIBNAME = copy
C_SRCS = copy_engine.c

1
lib/copy/ioat/Makefile
View File

@ -34,7 +34,6 @@
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..)
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
CFLAGS += $(ENV_CFLAGS)
LIBNAME = copy_ioat
C_SRCS = copy_engine_ioat.c

1
lib/event/Makefile
View File

@ -34,7 +34,6 @@
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
CFLAGS += $(ENV_CFLAGS)
LIBNAME = event
C_SRCS = app.c reactor.c rpc.c subsystem.c

1
lib/event/subsystems/bdev/Makefile
View File

@ -34,7 +34,6 @@
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../..)
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
CFLAGS += $(ENV_CFLAGS) -I.
C_SRCS = bdev.c
LIBNAME = event_bdev

1
lib/event/subsystems/copy/Makefile
View File

@ -34,7 +34,6 @@
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../..)
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
CFLAGS += $(ENV_CFLAGS) -I.
C_SRCS = copy.c
LIBNAME = event_copy

2
lib/event/subsystems/iscsi/Makefile
View File

@ -34,7 +34,7 @@
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../..)
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
CFLAGS += $(ENV_CFLAGS) -I. -I$(SPDK_ROOT_DIR)/lib
CFLAGS += -I$(SPDK_ROOT_DIR)/lib
C_SRCS = iscsi.c
LIBNAME = event_iscsi

1
lib/event/subsystems/nbd/Makefile
View File

@ -34,7 +34,6 @@
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../..)
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
CFLAGS += $(ENV_CFLAGS) -I.
C_SRCS = nbd.c
LIBNAME = event_nbd

1
lib/event/subsystems/net/Makefile
View File

@ -34,7 +34,6 @@
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../..)
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
CFLAGS += $(ENV_CFLAGS) -I.
C_SRCS = net.c
LIBNAME = event_net

1
lib/event/subsystems/scsi/Makefile
View File

@ -34,7 +34,6 @@
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../..)
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
CFLAGS += $(ENV_CFLAGS) -I.
C_SRCS = scsi.c
LIBNAME = event_scsi

1
lib/event/subsystems/vhost/Makefile
View File

@ -34,7 +34,6 @@
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../..)
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
CFLAGS += $(ENV_CFLAGS) -I.
C_SRCS = vhost.c
LIBNAME = event_vhost

1
lib/ioat/Makefile
View File

@ -34,7 +34,6 @@
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
CFLAGS += $(ENV_CFLAGS)
C_SRCS = ioat.c
LIBNAME = ioat

2
lib/iscsi/Makefile
View File

@ -34,7 +34,7 @@
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
CFLAGS += $(ENV_CFLAGS) -I$(SPDK_ROOT_DIR)/lib
CFLAGS += -I$(SPDK_ROOT_DIR)/lib
C_SRCS = acceptor.c conn.c \
init_grp.c iscsi.c md5.c param.c portal_grp.c \
tgt_node.c iscsi_subsystem.c \

1
lib/lvol/Makefile
View File

@ -34,7 +34,6 @@
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
CFLAGS += $(ENV_CFLAGS)
C_SRCS = lvol.c
LIBNAME = lvol

1
lib/nvme/Makefile
View File

@ -34,7 +34,6 @@
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
CFLAGS += $(ENV_CFLAGS)
C_SRCS = nvme_ctrlr_cmd.c nvme_ctrlr.c nvme_ns_cmd.c nvme_ns.c nvme_pcie.c nvme_qpair.c nvme.c nvme_quirks.c nvme_transport.c nvme_uevent.c
C_SRCS-$(CONFIG_RDMA) += nvme_rdma.c
LIBNAME = nvme

1
lib/nvmf/Makefile
View File

@ -34,7 +34,6 @@
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
CFLAGS += $(ENV_CFLAGS)
LIBNAME = nvmf
C_SRCS = ctrlr.c ctrlr_discovery.c ctrlr_bdev.c \

1
lib/rpc/Makefile
View File

@ -34,7 +34,6 @@
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
CFLAGS += $(ENV_CFLAGS)
C_SRCS = rpc.c
LIBNAME = rpc

1
lib/scsi/Makefile
View File

@ -34,7 +34,6 @@
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
CFLAGS += $(ENV_CFLAGS)
C_SRCS = dev.c lun.c lun_db.c port.c scsi.c scsi_bdev.c scsi_rpc.c task.c
LIBNAME = scsi

1
lib/util/Makefile
View File

@ -34,7 +34,6 @@
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
CFLAGS += $(ENV_CFLAGS)
C_SRCS = bit_array.c crc16.c crc32.c crc32c.c crc32_ieee.c fd.c io_channel.c string.c
LIBNAME = util

2
mk/nvme.libtest.mk
View File

@ -38,8 +38,6 @@ include $(SPDK_ROOT_DIR)/mk/spdk.app.mk
C_SRCS = $(APP:%=%.c)
CFLAGS += -I. $(ENV_CFLAGS)
SPDK_LIB_LIST = nvme util log
LIBS += $(SPDK_LIB_LINKER_ARGS) $(ENV_LINKER_ARGS)

2
test/app/bdev_svc/Makefile
View File

@ -38,8 +38,6 @@ include $(SPDK_ROOT_DIR)/mk/spdk.modules.mk
APP = bdev_svc
CFLAGS += $(ENV_CFLAGS)
C_SRCS := bdev_svc.c
SPDK_LIB_LIST = event_bdev event_copy

2
test/app/stub/Makefile
View File

@ -37,8 +37,6 @@ include $(SPDK_ROOT_DIR)/mk/spdk.app.mk
APP = stub
CFLAGS += $(ENV_CFLAGS)
C_SRCS := stub.c
SPDK_LIB_LIST = event conf nvme util log trace rpc jsonrpc json

2
test/lib/bdev/bdevio/Makefile
View File

@ -40,8 +40,6 @@ APP = bdevio
C_SRCS := bdevio.c
CFLAGS += -I. $(ENV_CFLAGS)
SPDK_LIB_LIST = event_bdev event_copy
SPDK_LIB_LIST += bdev copy event trace log conf util rpc jsonrpc json

2
test/lib/bdev/bdevperf/Makefile
View File

@ -40,8 +40,6 @@ APP = bdevperf
C_SRCS := bdevperf.c
CFLAGS += -I. $(ENV_CFLAGS)
SPDK_LIB_LIST = event_bdev event_copy
SPDK_LIB_LIST += bdev copy event trace log conf util rpc jsonrpc json

2
test/lib/bdev/nbd/Makefile
View File

@ -40,8 +40,6 @@ APP = nbd
C_SRCS := nbd.c
CFLAGS += -I. $(ENV_CFLAGS)
SPDK_LIB_LIST = event_bdev event_copy event_nbd
SPDK_LIB_LIST += bdev bdev_rpc copy event trace log log_rpc conf util rpc jsonrpc json nbd

2
test/lib/env/pci/Makefile vendored
View File

@ -39,8 +39,6 @@ APP = pci_ut
C_SRCS = pci_ut.c
CFLAGS += $(ENV_CFLAGS)
LIBS += $(ENV_LINKER_ARGS) -lcunit
all: $(APP)

2
test/lib/env/vtophys/Makefile vendored
View File

@ -39,8 +39,6 @@ APP = vtophys
C_SRCS = vtophys.c
CFLAGS += $(ENV_CFLAGS)
LIBS += $(SPDK_LIBS) $(ENV_LINKER_ARGS)
all: $(APP)

1
test/lib/event/reactor/Makefile
View File

@ -35,7 +35,6 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../..)
include $(SPDK_ROOT_DIR)/mk/spdk.app.mk
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
CFLAGS += $(ENV_CFLAGS)
APP = reactor
C_SRCS := reactor.c

1
test/lib/event/reactor_perf/Makefile
View File

@ -35,7 +35,6 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../..)
include $(SPDK_ROOT_DIR)/mk/spdk.app.mk
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
CFLAGS += $(ENV_CFLAGS)
APP = reactor_perf
C_SRCS := reactor_perf.c

1
test/unit/lib/iscsi/init_grp.c/Makefile
View File

@ -37,7 +37,6 @@ include $(SPDK_ROOT_DIR)/mk/spdk.app.mk
SPDK_LIB_LIST = log conf util cunit
CFLAGS += $(ENV_CFLAGS)
CFLAGS += -I$(SPDK_ROOT_DIR)/test
CFLAGS += -I$(SPDK_ROOT_DIR)/lib
LIBS += $(SPDK_LIB_LINKER_ARGS)

1
test/unit/lib/iscsi/iscsi.c/Makefile
View File

@ -37,7 +37,6 @@ include $(SPDK_ROOT_DIR)/mk/spdk.app.mk
SPDK_LIB_LIST = log util cunit trace conf
CFLAGS += $(ENV_CFLAGS)
CFLAGS += -I$(SPDK_ROOT_DIR)/test
CFLAGS += -I$(SPDK_ROOT_DIR)/lib
LIBS += $(SPDK_LIB_LINKER_ARGS) $(ENV_LINKER_ARGS)

1
test/unit/lib/iscsi/param.c/Makefile
View File

@ -37,7 +37,6 @@ include $(SPDK_ROOT_DIR)/mk/spdk.app.mk
SPDK_LIB_LIST = log util cunit
CFLAGS += $(ENV_CFLAGS)
CFLAGS += -I$(SPDK_ROOT_DIR)/test
CFLAGS += -I$(SPDK_ROOT_DIR)/lib
LIBS += $(SPDK_LIB_LINKER_ARGS)

1
test/unit/lib/iscsi/tgt_node.c/Makefile
View File

@ -37,7 +37,6 @@ include $(SPDK_ROOT_DIR)/mk/spdk.app.mk
SPDK_LIB_LIST = log conf util cunit
CFLAGS += $(ENV_CFLAGS)
CFLAGS += -I$(SPDK_ROOT_DIR)/test
CFLAGS += -I$(SPDK_ROOT_DIR)/lib
LIBS += $(SPDK_LIB_LINKER_ARGS)

2
test/unit/lib/scsi/scsi.c/Makefile
View File

@ -37,7 +37,7 @@ include $(SPDK_ROOT_DIR)/mk/spdk.app.mk
SPDK_LIB_LIST = log conf trace util
CFLAGS += -I$(SPDK_ROOT_DIR)/lib/scsi $(ENV_CFLAGS)
CFLAGS += -I$(SPDK_ROOT_DIR)/lib/scsi
CFLAGS += -I$(SPDK_ROOT_DIR)/test
LIBS += $(SPDK_LIB_LINKER_ARGS) $(ENV_LINKER_ARGS)
LIBS += -lcunit

1
test/unit/lib/util/io_channel.c/Makefile
View File

@ -38,7 +38,6 @@ include $(SPDK_ROOT_DIR)/mk/spdk.mock.unittest.mk
SPDK_LIB_LIST = log cunit spdk_mock
CFLAGS += $(ENV_CFLAGS)
CFLAGS += -I$(SPDK_ROOT_DIR)/test
CFLAGS += -I$(SPDK_ROOT_DIR)/lib
LIBS += $(SPDK_LIB_LINKER_ARGS)