Commit 44e60dc4 authored by Daniel Verkamp's avatar Daniel Verkamp
Browse files

build: consolidate library outputs in build/lib 



Make it easier to use SPDK libraries by putting them all in a single
directory that can be added with -L rather than scattered around the
source tree.

Change-Id: I5c0f5dd6e7058b5f92fa9bc41548190ffc064761
Signed-off-by: default avatarDaniel Verkamp <daniel.verkamp@intel.com>
parent cbc83c85

app/iscsi_tgt/Makefile

+16 −16
Original line number Diff line number Diff line
@@ -46,22 +46,22 @@ CFLAGS += -I$(SPDK_ROOT_DIR)/lib 
C_SRCS := iscsi_tgt.c



SPDK_LIBS = \

	$(SPDK_ROOT_DIR)/lib/json/libspdk_json.a \

	$(SPDK_ROOT_DIR)/lib/jsonrpc/libspdk_jsonrpc.a \

	$(SPDK_ROOT_DIR)/lib/rpc/libspdk_rpc.a \

	$(SPDK_ROOT_DIR)/lib/bdev/rpc/libspdk_bdev_rpc.a \

	$(SPDK_ROOT_DIR)/lib/bdev/libspdk_bdev.a \

	$(SPDK_ROOT_DIR)/lib/iscsi/libspdk_iscsi.a \

	$(SPDK_ROOT_DIR)/lib/scsi/libspdk_scsi.a \

	$(SPDK_ROOT_DIR)/lib/net/libspdk_net.a \

	$(SPDK_ROOT_DIR)/lib/copy/libspdk_copy.a \

	$(SPDK_ROOT_DIR)/lib/trace/libspdk_trace.a \

	$(SPDK_ROOT_DIR)/lib/conf/libspdk_conf.a \

	$(SPDK_ROOT_DIR)/lib/util/libspdk_util.a \

	$(SPDK_ROOT_DIR)/lib/log/libspdk_log.a \

	$(SPDK_ROOT_DIR)/lib/log/rpc/libspdk_log_rpc.a \

	$(SPDK_ROOT_DIR)/lib/event/libspdk_event.a \

	$(SPDK_ROOT_DIR)/lib/event/rpc/libspdk_app_rpc.a \

	$(SPDK_ROOT_DIR)/build/lib/libspdk_json.a \

	$(SPDK_ROOT_DIR)/build/lib/libspdk_jsonrpc.a \

	$(SPDK_ROOT_DIR)/build/lib/libspdk_rpc.a \

	$(SPDK_ROOT_DIR)/build/lib/libspdk_bdev_rpc.a \

	$(SPDK_ROOT_DIR)/build/lib/libspdk_bdev.a \

	$(SPDK_ROOT_DIR)/build/lib/libspdk_iscsi.a \

	$(SPDK_ROOT_DIR)/build/lib/libspdk_scsi.a \

	$(SPDK_ROOT_DIR)/build/lib/libspdk_net.a \

	$(SPDK_ROOT_DIR)/build/lib/libspdk_copy.a \

	$(SPDK_ROOT_DIR)/build/lib/libspdk_trace.a \

	$(SPDK_ROOT_DIR)/build/lib/libspdk_conf.a \

	$(SPDK_ROOT_DIR)/build/lib/libspdk_util.a \

	$(SPDK_ROOT_DIR)/build/lib/libspdk_log.a \

	$(SPDK_ROOT_DIR)/build/lib/libspdk_log_rpc.a \

	$(SPDK_ROOT_DIR)/build/lib/libspdk_event.a \

	$(SPDK_ROOT_DIR)/build/lib/libspdk_app_rpc.a \



LIBS += -Wl,--whole-archive $(SPDK_LIBS) -Wl,--no-whole-archive

LIBS += -lcrypto $(ENV_LINKER_ARGS)

app/nvmf_tgt/Makefile

+15 −15
Original line number Diff line number Diff line
@@ -42,25 +42,25 @@ CFLAGS += $(ENV_CFLAGS) 
C_SRCS := conf.c nvmf_tgt.c nvmf_rpc.c



SPDK_LIBS = \

	$(SPDK_ROOT_DIR)/lib/nvmf/libspdk_nvmf.a \

	$(SPDK_ROOT_DIR)/lib/nvme/libspdk_nvme.a \

	$(SPDK_ROOT_DIR)/lib/event/libspdk_event.a \

	$(SPDK_ROOT_DIR)/lib/log/libspdk_log.a \

	$(SPDK_ROOT_DIR)/lib/trace/libspdk_trace.a \

	$(SPDK_ROOT_DIR)/lib/conf/libspdk_conf.a \

	$(SPDK_ROOT_DIR)/lib/util/libspdk_util.a \

	$(SPDK_ROOT_DIR)/lib/bdev/libspdk_bdev.a \

	$(SPDK_ROOT_DIR)/lib/copy/libspdk_copy.a \

	$(SPDK_ROOT_DIR)/lib/rpc/libspdk_rpc.a \

	$(SPDK_ROOT_DIR)/lib/jsonrpc/libspdk_jsonrpc.a \

	$(SPDK_ROOT_DIR)/lib/json/libspdk_json.a \

	$(SPDK_ROOT_DIR)/build/lib/libspdk_nvmf.a \

	$(SPDK_ROOT_DIR)/build/lib/libspdk_nvme.a \

	$(SPDK_ROOT_DIR)/build/lib/libspdk_event.a \

	$(SPDK_ROOT_DIR)/build/lib/libspdk_log.a \

	$(SPDK_ROOT_DIR)/build/lib/libspdk_trace.a \

	$(SPDK_ROOT_DIR)/build/lib/libspdk_conf.a \

	$(SPDK_ROOT_DIR)/build/lib/libspdk_util.a \

	$(SPDK_ROOT_DIR)/build/lib/libspdk_bdev.a \

	$(SPDK_ROOT_DIR)/build/lib/libspdk_copy.a \

	$(SPDK_ROOT_DIR)/build/lib/libspdk_rpc.a \

	$(SPDK_ROOT_DIR)/build/lib/libspdk_jsonrpc.a \

	$(SPDK_ROOT_DIR)/build/lib/libspdk_json.a \



# These libraries do not expose any external API, only constructors,

# so they must be linked specially to ensure they are not removed.

SPDK_WHOLE_LIBS = \

	$(SPDK_ROOT_DIR)/lib/event/rpc/libspdk_app_rpc.a \

	$(SPDK_ROOT_DIR)/lib/log/rpc/libspdk_log_rpc.a \

	$(SPDK_ROOT_DIR)/lib/bdev/rpc/libspdk_bdev_rpc.a \

	$(SPDK_ROOT_DIR)/build/lib/libspdk_app_rpc.a \

	$(SPDK_ROOT_DIR)/build/lib/libspdk_log_rpc.a \

	$(SPDK_ROOT_DIR)/build/lib/libspdk_bdev_rpc.a \



LIBS += $(BLOCKDEV_MODULES_LINKER_ARGS) \

        $(COPY_MODULES_LINKER_ARGS)

build/lib/.gitignore

0 → 100644
+1 −0
Original line number Diff line number Diff line 
# Placeholder

examples/ioat/perf/Makefile

+3 −3
Original line number Diff line number Diff line
@@ -40,9 +40,9 @@ C_SRCS := perf.c 


CFLAGS += -I. $(ENV_CFLAGS)



SPDK_LIBS += $(SPDK_ROOT_DIR)/lib/ioat/libspdk_ioat.a \

	     $(SPDK_ROOT_DIR)/lib/util/libspdk_util.a \

	     $(SPDK_ROOT_DIR)/lib/log/libspdk_log.a \

SPDK_LIBS += $(SPDK_ROOT_DIR)/build/lib/libspdk_ioat.a \

	     $(SPDK_ROOT_DIR)/build/lib/libspdk_util.a \

	     $(SPDK_ROOT_DIR)/build/lib/libspdk_log.a \



LIBS += $(SPDK_LIBS) $(ENV_LINKER_ARGS)

examples/ioat/verify/Makefile

+3 −3
Original line number Diff line number Diff line
@@ -40,9 +40,9 @@ C_SRCS := verify.c 


CFLAGS += -I. $(ENV_CFLAGS)



SPDK_LIBS += $(SPDK_ROOT_DIR)/lib/ioat/libspdk_ioat.a \

	     $(SPDK_ROOT_DIR)/lib/util/libspdk_util.a \

	     $(SPDK_ROOT_DIR)/lib/log/libspdk_log.a \

SPDK_LIBS += $(SPDK_ROOT_DIR)/build/lib/libspdk_ioat.a \

	     $(SPDK_ROOT_DIR)/build/lib/libspdk_util.a \

	     $(SPDK_ROOT_DIR)/build/lib/libspdk_log.a \



LIBS += $(SPDK_LIBS) $(ENV_LINKER_ARGS)