diff --git a/lib/blob/Makefile b/lib/blob/Makefile index 996155bfb3..c0864a8cf5 100644 --- a/lib/blob/Makefile +++ b/lib/blob/Makefile @@ -37,6 +37,4 @@ include $(SPDK_ROOT_DIR)/mk/spdk.common.mk C_SRCS = blobstore.c request.c zeroes.c blob_bs_dev.c LIBNAME = blob -DIRS-y += bdev - include $(SPDK_ROOT_DIR)/mk/spdk.lib.mk diff --git a/module/Makefile b/module/Makefile index 1ee05de678..a028175a3d 100644 --- a/module/Makefile +++ b/module/Makefile @@ -34,7 +34,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -DIRS-y = bdev event sock +DIRS-y = bdev blob event sock .PHONY: all clean $(DIRS-y) diff --git a/module/blob/Makefile b/module/blob/Makefile new file mode 100644 index 0000000000..744a0a4a4e --- /dev/null +++ b/module/blob/Makefile @@ -0,0 +1,44 @@ +# +# BSD LICENSE +# +# Copyright (c) Intel Corporation. +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# * Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# * Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in +# the documentation and/or other materials provided with the +# distribution. +# * Neither the name of Intel Corporation nor the names of its +# contributors may be used to endorse or promote products derived +# from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + +SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) +include $(SPDK_ROOT_DIR)/mk/spdk.common.mk + +DIRS-y = bdev + +.PHONY: all clean $(DIRS-y) + +all: $(DIRS-y) +clean: $(DIRS-y) + +include $(SPDK_ROOT_DIR)/mk/spdk.subdirs.mk diff --git a/lib/blob/bdev/Makefile b/module/blob/bdev/Makefile similarity index 100% rename from lib/blob/bdev/Makefile rename to module/blob/bdev/Makefile diff --git a/lib/blob/bdev/blob_bdev.c b/module/blob/bdev/blob_bdev.c similarity index 100% rename from lib/blob/bdev/blob_bdev.c rename to module/blob/bdev/blob_bdev.c