Commit 7463b0de authored by Seth Howell's avatar Seth Howell Committed by Ben Walker
Browse files

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: default avatarSeth Howell <seth.howell@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/466469


Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarPaul Luse <paul.e.luse@intel.com>
Reviewed-by: default avatarBroadcom SPDK FC-NVMe CI <spdk-ci.pdl@broadcom.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
parent 43d2562d

lib/Makefile

+1 −3
Original line number Diff line number Diff line
@@ -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

module/bdev/Makefile

+4 −12
Original line number Diff line number Diff line
@@ -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

test/unit/lib/bdev/Makefile

+2 −6
Original line number Diff line number Diff line
@@ -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