diff --git a/lib/conf/Makefile b/lib/conf/Makefile index 5f4f9d039e..c31ca0d454 100644 --- a/lib/conf/Makefile +++ b/lib/conf/Makefile @@ -32,18 +32,8 @@ # SPDK_ROOT_DIR := $(CURDIR)/../.. -include $(SPDK_ROOT_DIR)/mk/spdk.common.mk C_SRCS = conf.c +LIBNAME = conf -LIB = libspdk_conf.a - -all : $(LIB) - -clean : - $(CLEAN_C) - -$(LIB) : $(OBJS) - $(LIB_C) - -include $(SPDK_ROOT_DIR)/mk/spdk.deps.mk +include $(SPDK_ROOT_DIR)/mk/spdk.lib.mk diff --git a/lib/ioat/Makefile b/lib/ioat/Makefile index d4905d9049..2fce04cb6f 100644 --- a/lib/ioat/Makefile +++ b/lib/ioat/Makefile @@ -32,20 +32,9 @@ # SPDK_ROOT_DIR := $(CURDIR)/../.. -include $(SPDK_ROOT_DIR)/mk/spdk.common.mk CFLAGS += $(DPDK_INC) -include $(CONFIG_IOAT_IMPL) - C_SRCS = ioat.c +LIBNAME = ioat -LIB = libspdk_ioat.a - -all: $(LIB) - -clean: - $(CLEAN_C) - -$(LIB): $(OBJS) - $(LIB_C) - -include $(SPDK_ROOT_DIR)/mk/spdk.deps.mk +include $(SPDK_ROOT_DIR)/mk/spdk.lib.mk diff --git a/lib/memory/Makefile b/lib/memory/Makefile index 5711111927..3f98699186 100644 --- a/lib/memory/Makefile +++ b/lib/memory/Makefile @@ -32,20 +32,9 @@ # SPDK_ROOT_DIR := $(CURDIR)/../.. -include $(SPDK_ROOT_DIR)/mk/spdk.common.mk CFLAGS += $(DPDK_INC) - C_SRCS = vtophys.c +LIBNAME = memory -LIB = libspdk_memory.a - -all : $(LIB) - -clean : - $(CLEAN_C) - -$(LIB) : $(OBJS) - $(LIB_C) - -include $(SPDK_ROOT_DIR)/mk/spdk.deps.mk +include $(SPDK_ROOT_DIR)/mk/spdk.lib.mk diff --git a/lib/nvme/Makefile b/lib/nvme/Makefile index 7924b6d537..fbdecd1463 100644 --- a/lib/nvme/Makefile +++ b/lib/nvme/Makefile @@ -32,20 +32,9 @@ # SPDK_ROOT_DIR := $(CURDIR)/../.. -include $(SPDK_ROOT_DIR)/mk/spdk.common.mk CFLAGS += $(DPDK_INC) -include $(CONFIG_NVME_IMPL) - C_SRCS = nvme_ctrlr_cmd.c nvme_ctrlr.c nvme_ns_cmd.c nvme_ns.c nvme_qpair.c nvme.c nvme_intel.c +LIBNAME = nvme -LIB = libspdk_nvme.a - -all : $(LIB) - -clean : - $(CLEAN_C) - -$(LIB) : $(OBJS) - $(LIB_C) - -include $(SPDK_ROOT_DIR)/mk/spdk.deps.mk +include $(SPDK_ROOT_DIR)/mk/spdk.lib.mk diff --git a/lib/util/Makefile b/lib/util/Makefile index 19eca32735..b62f86d90c 100644 --- a/lib/util/Makefile +++ b/lib/util/Makefile @@ -32,20 +32,9 @@ # SPDK_ROOT_DIR := $(CURDIR)/../.. -include $(SPDK_ROOT_DIR)/mk/spdk.common.mk CFLAGS += $(DPDK_INC) - C_SRCS = file.c string.c pci.c +LIBNAME = util -LIB = libspdk_util.a - -all : $(LIB) - -clean : - $(CLEAN_C) - -$(LIB) : $(OBJS) - $(LIB_C) - -include $(SPDK_ROOT_DIR)/mk/spdk.deps.mk +include $(SPDK_ROOT_DIR)/mk/spdk.lib.mk diff --git a/mk/spdk.lib.mk b/mk/spdk.lib.mk new file mode 100644 index 0000000000..7d5b135c15 --- /dev/null +++ b/mk/spdk.lib.mk @@ -0,0 +1,46 @@ +# +# 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. +# + +include $(SPDK_ROOT_DIR)/mk/spdk.common.mk + +LIB := libspdk_$(LIBNAME).a + +all: $(LIB) + +clean: + $(CLEAN_C) + +$(LIB): $(OBJS) + $(LIB_C) + +include $(SPDK_ROOT_DIR)/mk/spdk.deps.mk