mk: standardize DIRS-x assignments.

Most of the assignments followed the DIRS-($(CONFIG_X)) pattern, but
there were a couple of assignments using a different pattern.

Change-Id: I7c80fec2813c32cb7676912d72805565f77b2e3d
Signed-off-by: Seth Howell <seth.howell@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/466469
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Paul Luse <paul.e.luse@intel.com>
Reviewed-by: Broadcom SPDK FC-NVMe CI <spdk-ci.pdl@broadcom.com>
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
This commit is contained in:
Seth Howell 2019-08-27 13:07:56 -07:00 committed by Ben Walker
parent 43d2562dc6
commit 7463b0dea3
3 changed files with 7 additions and 21 deletions

View File

@ -42,9 +42,7 @@ ifeq ($(OS),Linux)
DIRS-y += nbd ftl
endif
ifeq ($(CONFIG_OCF), y)
DIRS-y += env_ocf
endif
DIRS-$(CONFIG_OCF) += env_ocf
DIRS-$(CONFIG_VHOST) += vhost
DIRS-$(CONFIG_VIRTIO) += virtio

View File

@ -36,21 +36,13 @@ include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
DIRS-y += delay error gpt lvol malloc null nvme passthru raid rpc split
ifeq ($(CONFIG_CRYPTO),y)
DIRS-y += crypto
endif
DIRS-$(CONFIG_CRYPTO) += crypto
ifeq ($(CONFIG_OCF), y)
DIRS-y += ocf
endif
DIRS-$(CONFIG_OCF) += ocf
ifeq ($(CONFIG_REDUCE),y)
DIRS-y += compress
endif
DIRS-$(CONFIG_REDUCE) += compress
ifeq ($(CONFIG_URING),y)
DIRS-y += uring
endif
DIRS-$(CONFIG_URING) += uring
ifeq ($(OS),Linux)
DIRS-y += aio

View File

@ -36,14 +36,10 @@ include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
DIRS-y = bdev.c part.c scsi_nvme.c gpt vbdev_lvol.c mt bdev_raid.c
ifeq ($(CONFIG_CRYPTO),y)
DIRS-y += crypto.c
endif
DIRS-$(CONFIG_CRYPTO) += crypto.c
ifeq ($(CONFIG_REDUCE),y)
# enable once new mocks are added for compressdev
DIRS-y += compress.c
endif
DIRS-$(CONFIG_REDUCE) += compress.c
DIRS-$(CONFIG_PMDK) += pmem