ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build: move app rules to spdk.app.mk

Browse Source 
This removes a ton of duplicate from a lot of
Makefiles.  Note that spdk.unittest.mk still keeps
its own app rules, and now just includes
spdk.app_vars.mk instead.  Fixing Makefiles that
include this .mk file requires more work that is
deferred for now.  We do need to add the
"install: all" rule explicitly to this .mk files.

Note that Makefiles need to include spdk.app.mk
now at the end of the file, so that things like
APP and SPDK_LIB_LIST are defined before including
it.

Signed-off-by: Jim Harris <james.r.harris@intel.com>
Change-Id: If6823cda135180c37690ffc96c91660b7f0718e3

Reviewed-on: https://review.gerrithub.io/434283
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
This commit is contained in:
Jim Harris 2018-11-20 15:03:15 -07:00
parent 092eb22107
commit 5b16c18d17
26 changed files with 41 additions and 311 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/iscsi_tgt/Makefile
View File

@ -33,7 +33,6 @@
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
include $(SPDK_ROOT_DIR)/mk/spdk.app.mk
include $(SPDK_ROOT_DIR)/mk/spdk.modules.mk include $(SPDK_ROOT_DIR)/mk/spdk.modules.mk
APP = iscsi_tgt APP = iscsi_tgt
@ -53,15 +52,4 @@ ifeq ($(OS),Linux)
SPDK_LIB_LIST += event_nbd nbd SPDK_LIB_LIST += event_nbd nbd
endif endif
LIBS += $(SPDK_LIB_LINKER_ARGS) include $(SPDK_ROOT_DIR)/mk/spdk.app.mk
all : $(APP)
@:
$(APP) : $(OBJS) $(SPDK_LIB_FILES) $(ENV_LIBS)
$(LINK_C)
clean :
$(CLEAN_C) $(APP)
include $(SPDK_ROOT_DIR)/mk/spdk.deps.mk

14
app/nvmf_tgt/Makefile
View File

@ -33,7 +33,6 @@
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
include $(SPDK_ROOT_DIR)/mk/spdk.app.mk
include $(SPDK_ROOT_DIR)/mk/spdk.modules.mk include $(SPDK_ROOT_DIR)/mk/spdk.modules.mk
APP = nvmf_tgt APP = nvmf_tgt
@ -49,15 +48,4 @@ ifeq ($(OS),Linux)
SPDK_LIB_LIST += event_nbd nbd SPDK_LIB_LIST += event_nbd nbd
endif endif
LIBS += $(SPDK_LIB_LINKER_ARGS) include $(SPDK_ROOT_DIR)/mk/spdk.app.mk
all : $(APP)
@:
$(APP) : $(OBJS) $(SPDK_LIB_FILES) $(ENV_LIBS)
$(LINK_C)
clean :
$(CLEAN_C) $(APP)
include $(SPDK_ROOT_DIR)/mk/spdk.deps.mk

14
app/spdk_tgt/Makefile
View File

@ -33,7 +33,6 @@
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
include $(SPDK_ROOT_DIR)/mk/spdk.app.mk
include $(SPDK_ROOT_DIR)/mk/spdk.modules.mk include $(SPDK_ROOT_DIR)/mk/spdk.modules.mk
APP = spdk_tgt APP = spdk_tgt
@ -56,18 +55,7 @@ ifeq ($(OS),Linux)
SPDK_LIB_LIST += event_nbd nbd SPDK_LIB_LIST += event_nbd nbd
endif endif
LIBS += $(SPDK_LIB_LINKER_ARGS) include $(SPDK_ROOT_DIR)/mk/spdk.app.mk
all: $(APP)
@:
$(APP): $(OBJS) $(SPDK_LIB_FILES) $(ENV_LIBS)
$(LINK_C)
clean:
$(CLEAN_C) $(APP)
install: $(APP) install: $(APP)
$(INSTALL_APP) $(INSTALL_APP)
include $(SPDK_ROOT_DIR)/mk/spdk.deps.mk

14
app/vhost/Makefile
View File

@ -33,7 +33,6 @@
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
include $(SPDK_ROOT_DIR)/mk/spdk.app.mk
include $(SPDK_ROOT_DIR)/mk/spdk.modules.mk include $(SPDK_ROOT_DIR)/mk/spdk.modules.mk
APP = vhost APP = vhost
@ -47,15 +46,4 @@ SPDK_LIB_LIST += jsonrpc json rpc bdev_rpc bdev scsi copy trace conf
SPDK_LIB_LIST += thread util log log_rpc app_rpc SPDK_LIB_LIST += thread util log log_rpc app_rpc
SPDK_LIB_LIST += event_nbd nbd net sock SPDK_LIB_LIST += event_nbd nbd net sock
LIBS += $(SPDK_LIB_LINKER_ARGS) include $(SPDK_ROOT_DIR)/mk/spdk.app.mk
all : $(APP)
@:
$(APP) : $(OBJS) $(SPDK_LIB_FILES) $(ENV_LIBS)
$(LINK_C)
clean :
$(CLEAN_C) $(APP)
include $(SPDK_ROOT_DIR)/mk/spdk.deps.mk

14
examples/bdev/fio_plugin/Makefile
View File

@ -34,7 +34,6 @@
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..)
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
include $(SPDK_ROOT_DIR)/mk/spdk.app.mk
include $(SPDK_ROOT_DIR)/mk/spdk.modules.mk include $(SPDK_ROOT_DIR)/mk/spdk.modules.mk
APP := fio_plugin APP := fio_plugin
@ -46,15 +45,4 @@ LDFLAGS += -shared -rdynamic
SPDK_LIB_LIST = $(ALL_MODULES_LIST) SPDK_LIB_LIST = $(ALL_MODULES_LIST)
SPDK_LIB_LIST += thread util bdev conf copy rpc jsonrpc json log sock trace SPDK_LIB_LIST += thread util bdev conf copy rpc jsonrpc json log sock trace
LIBS += $(SPDK_LIB_LINKER_ARGS) include $(SPDK_ROOT_DIR)/mk/spdk.app.mk
all: $(APP)
@:
$(APP) : $(OBJS) $(SPDK_LIB_FILES) $(ENV_LIBS)
$(LINK_C)
clean:
$(CLEAN_C) $(APP)
include $(SPDK_ROOT_DIR)/mk/spdk.deps.mk

14
examples/bdev/hello_world/Makefile
View File

@ -31,7 +31,6 @@
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..)
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
include $(SPDK_ROOT_DIR)/mk/spdk.app.mk
include $(SPDK_ROOT_DIR)/mk/spdk.modules.mk include $(SPDK_ROOT_DIR)/mk/spdk.modules.mk
APP = hello_bdev APP = hello_bdev
@ -42,15 +41,4 @@ SPDK_LIB_LIST = $(ALL_MODULES_LIST)
SPDK_LIB_LIST += event_bdev event_copy SPDK_LIB_LIST += event_bdev event_copy
SPDK_LIB_LIST += bdev copy event thread util conf trace log jsonrpc json rpc sock SPDK_LIB_LIST += bdev copy event thread util conf trace log jsonrpc json rpc sock
LIBS += $(SPDK_LIB_LINKER_ARGS) include $(SPDK_ROOT_DIR)/mk/spdk.app.mk
all : $(APP)
@:
$(APP) : $(OBJS) $(SPDK_LIB_FILES) $(ENV_LIBS)
$(LINK_C)
clean :
$(CLEAN_C) $(APP)
include $(SPDK_ROOT_DIR)/mk/spdk.deps.mk

14
examples/blob/cli/Makefile
View File

@ -31,7 +31,6 @@
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..)
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
include $(SPDK_ROOT_DIR)/mk/spdk.app.mk
include $(SPDK_ROOT_DIR)/mk/spdk.modules.mk include $(SPDK_ROOT_DIR)/mk/spdk.modules.mk
APP = blobcli APP = blobcli
@ -44,15 +43,4 @@ SPDK_LIB_LIST += event_bdev event_copy
SPDK_LIB_LIST += bdev copy event thread util conf trace \ SPDK_LIB_LIST += bdev copy event thread util conf trace \
log jsonrpc json rpc sock log jsonrpc json rpc sock
LIBS += $(SPDK_LIB_LINKER_ARGS) include $(SPDK_ROOT_DIR)/mk/spdk.app.mk
all : $(APP)
@:
$(APP) : $(OBJS) $(SPDK_LIB_FILES) $(ENV_LIBS)
$(LINK_C)
clean :
$(CLEAN_C) $(APP)
include $(SPDK_ROOT_DIR)/mk/spdk.deps.mk

14
examples/blob/hello_world/Makefile
View File

@ -31,7 +31,6 @@
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..)
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
include $(SPDK_ROOT_DIR)/mk/spdk.app.mk
include $(SPDK_ROOT_DIR)/mk/spdk.modules.mk include $(SPDK_ROOT_DIR)/mk/spdk.modules.mk
APP = hello_blob APP = hello_blob
@ -43,15 +42,4 @@ SPDK_LIB_LIST += event_bdev event_copy
SPDK_LIB_LIST += bdev copy event thread util conf trace \ SPDK_LIB_LIST += bdev copy event thread util conf trace \
log jsonrpc json rpc sock log jsonrpc json rpc sock
LIBS += $(SPDK_LIB_LINKER_ARGS) include $(SPDK_ROOT_DIR)/mk/spdk.app.mk
all : $(APP)
@:
$(APP) : $(OBJS) $(SPDK_LIB_FILES) $(ENV_LIBS)
$(LINK_C)
clean :
$(CLEAN_C) $(APP)
include $(SPDK_ROOT_DIR)/mk/spdk.deps.mk

14
examples/ioat/perf/Makefile
View File

@ -33,7 +33,6 @@
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..)
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
include $(SPDK_ROOT_DIR)/mk/spdk.app.mk
APP = perf APP = perf
@ -41,15 +40,4 @@ C_SRCS := perf.c
SPDK_LIB_LIST = ioat thread util log SPDK_LIB_LIST = ioat thread util log
LIBS += $(SPDK_LIB_LINKER_ARGS) include $(SPDK_ROOT_DIR)/mk/spdk.app.mk
all: $(APP)
@:
$(APP): $(OBJS) $(SPDK_LIB_FILES) $(ENV_LIBS)
$(LINK_C)
clean:
$(CLEAN_C) $(APP)
include $(SPDK_ROOT_DIR)/mk/spdk.deps.mk

14
examples/ioat/verify/Makefile
View File

@ -33,7 +33,6 @@
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..)
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
include $(SPDK_ROOT_DIR)/mk/spdk.app.mk
APP = verify APP = verify
@ -41,15 +40,4 @@ C_SRCS := verify.c
SPDK_LIB_LIST = ioat thread util log SPDK_LIB_LIST = ioat thread util log
LIBS += $(SPDK_LIB_LINKER_ARGS) include $(SPDK_ROOT_DIR)/mk/spdk.app.mk
all: $(APP)
@:
$(APP): $(OBJS) $(SPDK_LIB_FILES) $(ENV_LIBS)
$(LINK_C)
clean:
$(CLEAN_C) $(APP)
include $(SPDK_ROOT_DIR)/mk/spdk.deps.mk

14
examples/sock/hello_world/Makefile
View File

@ -31,7 +31,6 @@
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..)
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
include $(SPDK_ROOT_DIR)/mk/spdk.app.mk
include $(SPDK_ROOT_DIR)/mk/spdk.modules.mk include $(SPDK_ROOT_DIR)/mk/spdk.modules.mk
APP = hello_sock APP = hello_sock
@ -41,15 +40,4 @@ C_SRCS := hello_sock.c
SPDK_LIB_LIST = $(SOCK_MODULES_LIST) SPDK_LIB_LIST = $(SOCK_MODULES_LIST)
SPDK_LIB_LIST += event thread util conf trace log jsonrpc json rpc sock SPDK_LIB_LIST += event thread util conf trace log jsonrpc json rpc sock
LIBS += $(SPDK_LIB_LINKER_ARGS) include $(SPDK_ROOT_DIR)/mk/spdk.app.mk
all : $(APP)
@:
$(APP) : $(OBJS) $(SPDK_LIB_FILES) $(ENV_LIBS)
$(LINK_C)
clean :
$(CLEAN_C) $(APP)
include $(SPDK_ROOT_DIR)/mk/spdk.deps.mk

14
mk/nvme.libtest.mk
View File

@ -34,7 +34,6 @@
NVME_DIR := $(SPDK_ROOT_DIR)/lib/nvme NVME_DIR := $(SPDK_ROOT_DIR)/lib/nvme
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
include $(SPDK_ROOT_DIR)/mk/spdk.app.mk
include $(SPDK_ROOT_DIR)/mk/spdk.modules.mk include $(SPDK_ROOT_DIR)/mk/spdk.modules.mk
C_SRCS = $(APP:%=%.c) C_SRCS = $(APP:%=%.c)
@ -42,19 +41,8 @@ C_SRCS = $(APP:%=%.c)
SPDK_LIB_LIST = $(SOCK_MODULES_LIST) SPDK_LIB_LIST = $(SOCK_MODULES_LIST)
SPDK_LIB_LIST += nvme thread util log sock SPDK_LIB_LIST += nvme thread util log sock
LIBS += $(SPDK_LIB_LINKER_ARGS)
ifeq ($(CONFIG_RDMA),y) ifeq ($(CONFIG_RDMA),y)
SYS_LIBS += -libverbs -lrdmacm SYS_LIBS += -libverbs -lrdmacm
endif endif
all: $(APP) include $(SPDK_ROOT_DIR)/mk/spdk.app.mk
@:
$(APP) : $(OBJS) $(SPDK_LIB_FILES) $(ENV_LIBS)
$(LINK_C)
clean:
$(CLEAN_C) $(APP)
include $(SPDK_ROOT_DIR)/mk/spdk.deps.mk

13
mk/spdk.app.mk
View File

@ -33,4 +33,17 @@
include $(SPDK_ROOT_DIR)/mk/spdk.app_vars.mk include $(SPDK_ROOT_DIR)/mk/spdk.app_vars.mk
LIBS += $(SPDK_LIB_LINKER_ARGS)
all : $(APP)
@:
install: all install: all
$(APP) : $(OBJS) $(SPDK_LIB_FILES) $(ENV_LIBS)
$(LINK_C)
clean :
$(CLEAN_C) $(APP)
include $(SPDK_ROOT_DIR)/mk/spdk.deps.mk

4
mk/spdk.unittest.mk
View File

@ -32,7 +32,7 @@
# #
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
include $(SPDK_ROOT_DIR)/mk/spdk.app.mk include $(SPDK_ROOT_DIR)/mk/spdk.app_vars.mk
include $(SPDK_ROOT_DIR)/mk/spdk.mock.unittest.mk include $(SPDK_ROOT_DIR)/mk/spdk.mock.unittest.mk
C_SRCS = $(TEST_FILE) C_SRCS = $(TEST_FILE)
@ -50,6 +50,8 @@ ifneq ($(UNIT_TEST_LINK_ENV),1)
ENV_LINKER_ARGS = ENV_LINKER_ARGS =
endif endif
install: all
all: $(APP) all: $(APP)
@: @:

14
test/app/bdev_svc/Makefile
View File

@ -33,7 +33,6 @@
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..)
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
include $(SPDK_ROOT_DIR)/mk/spdk.app.mk
include $(SPDK_ROOT_DIR)/mk/spdk.modules.mk include $(SPDK_ROOT_DIR)/mk/spdk.modules.mk
APP = bdev_svc APP = bdev_svc
@ -49,15 +48,4 @@ ifeq ($(OS),Linux)
SPDK_LIB_LIST += event_nbd nbd SPDK_LIB_LIST += event_nbd nbd
endif endif
LIBS += $(SPDK_LIB_LINKER_ARGS) include $(SPDK_ROOT_DIR)/mk/spdk.app.mk
all : $(APP)
@:
$(APP) : $(OBJS) $(SPDK_LIB_FILES) $(ENV_LIBS)
$(LINK_C)
clean :
$(CLEAN_C) $(APP)
include $(SPDK_ROOT_DIR)/mk/spdk.deps.mk

14
test/app/histogram_perf/Makefile
View File

@ -33,7 +33,6 @@
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..)
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
include $(SPDK_ROOT_DIR)/mk/spdk.app.mk
APP = histogram_perf APP = histogram_perf
@ -41,15 +40,4 @@ C_SRCS = histogram_perf.c
SPDK_LIB_LIST = thread util log SPDK_LIB_LIST = thread util log
LIBS += $(SPDK_LIB_LINKER_ARGS) include $(SPDK_ROOT_DIR)/mk/spdk.app.mk
all: $(APP)
@:
$(APP): $(OBJS) $(SPDK_LIB_FILES)
$(LINK_C)
clean:
$(CLEAN_C) $(APP)
include $(SPDK_ROOT_DIR)/mk/spdk.deps.mk

14
test/app/jsoncat/Makefile
View File

@ -33,7 +33,6 @@
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..)
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
include $(SPDK_ROOT_DIR)/mk/spdk.app.mk
APP = jsoncat APP = jsoncat
@ -41,15 +40,4 @@ C_SRCS = jsoncat.c
SPDK_LIB_LIST = json thread util log SPDK_LIB_LIST = json thread util log
LIBS += $(SPDK_LIB_LINKER_ARGS) include $(SPDK_ROOT_DIR)/mk/spdk.app.mk
all: $(APP)
@:
$(APP): $(OBJS) $(SPDK_LIB_FILES)
$(LINK_C)
clean:
$(CLEAN_C) $(APP)
include $(SPDK_ROOT_DIR)/mk/spdk.deps.mk

14
test/app/stub/Makefile
View File

@ -33,7 +33,6 @@
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..)
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
include $(SPDK_ROOT_DIR)/mk/spdk.app.mk
include $(SPDK_ROOT_DIR)/mk/spdk.modules.mk include $(SPDK_ROOT_DIR)/mk/spdk.modules.mk
APP = stub APP = stub
@ -43,15 +42,4 @@ C_SRCS := stub.c
SPDK_LIB_LIST = $(SOCK_MODULES_LIST) SPDK_LIB_LIST = $(SOCK_MODULES_LIST)
SPDK_LIB_LIST += event conf nvme log trace rpc jsonrpc json thread util sock SPDK_LIB_LIST += event conf nvme log trace rpc jsonrpc json thread util sock
LIBS += $(SPDK_LIB_LINKER_ARGS) include $(SPDK_ROOT_DIR)/mk/spdk.app.mk
all : $(APP)
@:
$(APP) : $(OBJS) $(SPDK_LIB_FILES) $(ENV_LIBS)
$(LINK_C)
clean :
$(CLEAN_C) $(APP)
include $(SPDK_ROOT_DIR)/mk/spdk.deps.mk

14
test/bdev/bdevio/Makefile
View File

@ -33,7 +33,6 @@
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..)
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
include $(SPDK_ROOT_DIR)/mk/spdk.app.mk
include $(SPDK_ROOT_DIR)/mk/spdk.modules.mk include $(SPDK_ROOT_DIR)/mk/spdk.modules.mk
APP = bdevio APP = bdevio
@ -44,15 +43,6 @@ SPDK_LIB_LIST = $(ALL_MODULES_LIST)
SPDK_LIB_LIST += event_bdev event_copy SPDK_LIB_LIST += event_bdev event_copy
SPDK_LIB_LIST += bdev copy event trace log conf thread util rpc jsonrpc json sock SPDK_LIB_LIST += bdev copy event trace log conf thread util rpc jsonrpc json sock
LIBS += $(SPDK_LIB_LINKER_ARGS) -lcunit LIBS += -lcunit
all : $(APP) include $(SPDK_ROOT_DIR)/mk/spdk.app.mk
@:
$(APP) : $(OBJS) $(SPDK_LIB_FILES) $(ENV_LIBS)
$(LINK_C)
clean :
$(CLEAN_C) $(APP)
include $(SPDK_ROOT_DIR)/mk/spdk.deps.mk

14
test/bdev/bdevperf/Makefile
View File

@ -33,7 +33,6 @@
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..)
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
include $(SPDK_ROOT_DIR)/mk/spdk.app.mk
include $(SPDK_ROOT_DIR)/mk/spdk.modules.mk include $(SPDK_ROOT_DIR)/mk/spdk.modules.mk
APP = bdevperf APP = bdevperf
@ -44,15 +43,4 @@ SPDK_LIB_LIST = $(ALL_MODULES_LIST)
SPDK_LIB_LIST += event_bdev event_copy SPDK_LIB_LIST += event_bdev event_copy
SPDK_LIB_LIST += bdev copy event trace log conf thread util rpc jsonrpc json sock SPDK_LIB_LIST += bdev copy event trace log conf thread util rpc jsonrpc json sock
LIBS += $(SPDK_LIB_LINKER_ARGS) include $(SPDK_ROOT_DIR)/mk/spdk.app.mk
all : $(APP)
@:
$(APP) : $(OBJS) $(SPDK_LIB_FILES) $(ENV_LIBS)
$(LINK_C)
clean :
$(CLEAN_C) $(APP)
include $(SPDK_ROOT_DIR)/mk/spdk.deps.mk

13
test/blobfs/fuse/Makefile
View File

@ -33,7 +33,6 @@
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..)
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
include $(SPDK_ROOT_DIR)/mk/spdk.app.mk
include $(SPDK_ROOT_DIR)/mk/spdk.modules.mk include $(SPDK_ROOT_DIR)/mk/spdk.modules.mk
APP = fuse APP = fuse
@ -45,16 +44,6 @@ SPDK_LIB_LIST += event_bdev event_copy
SPDK_LIB_LIST += bdev copy event thread util conf trace \ SPDK_LIB_LIST += bdev copy event thread util conf trace \
log jsonrpc json rpc sock log jsonrpc json rpc sock
LIBS += $(SPDK_LIB_LINKER_ARGS)
LIBS+= -L/usr/local/lib -lfuse3 LIBS+= -L/usr/local/lib -lfuse3
all : $(APP) include $(SPDK_ROOT_DIR)/mk/spdk.app.mk
@:
$(APP) : $(OBJS) $(SPDK_LIB_FILES) $(ENV_LIBS)
$(LINK_C)
clean :
$(CLEAN_C) $(APP)
include $(SPDK_ROOT_DIR)/mk/spdk.deps.mk

14
test/blobfs/mkfs/Makefile
View File

@ -33,7 +33,6 @@
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..)
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
include $(SPDK_ROOT_DIR)/mk/spdk.app.mk
include $(SPDK_ROOT_DIR)/mk/spdk.modules.mk include $(SPDK_ROOT_DIR)/mk/spdk.modules.mk
APP = mkfs APP = mkfs
@ -45,15 +44,4 @@ SPDK_LIB_LIST += event_bdev event_copy
SPDK_LIB_LIST += bdev copy event thread util conf trace \ SPDK_LIB_LIST += bdev copy event thread util conf trace \
log jsonrpc json rpc sock log jsonrpc json rpc sock
LIBS += $(SPDK_LIB_LINKER_ARGS) include $(SPDK_ROOT_DIR)/mk/spdk.app.mk
all : $(APP)
@:
$(APP) : $(OBJS) $(SPDK_LIB_FILES) $(ENV_LIBS)
$(LINK_C)
clean :
$(CLEAN_C) $(APP)
include $(SPDK_ROOT_DIR)/mk/spdk.deps.mk

14
test/event/event_perf/Makefile
View File

@ -32,7 +32,6 @@
# #
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..)
include $(SPDK_ROOT_DIR)/mk/spdk.app.mk
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
APP = event_perf APP = event_perf
@ -40,15 +39,4 @@ C_SRCS := event_perf.c
SPDK_LIB_LIST = event trace conf thread util log rpc jsonrpc json sock SPDK_LIB_LIST = event trace conf thread util log rpc jsonrpc json sock
LIBS += $(SPDK_LIB_LINKER_ARGS) include $(SPDK_ROOT_DIR)/mk/spdk.app.mk
all : $(APP)
@:
$(APP) : $(OBJS) $(SPDK_LIB_FILES) $(ENV_LIBS)
$(LINK_C)
clean :
$(CLEAN_C) $(APP)
include $(SPDK_ROOT_DIR)/mk/spdk.deps.mk

14
test/event/reactor/Makefile
View File

@ -32,7 +32,6 @@
# #
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..)
include $(SPDK_ROOT_DIR)/mk/spdk.app.mk
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
APP = reactor APP = reactor
@ -40,15 +39,4 @@ C_SRCS := reactor.c
SPDK_LIB_LIST = event trace conf thread util log rpc jsonrpc json sock SPDK_LIB_LIST = event trace conf thread util log rpc jsonrpc json sock
LIBS += $(SPDK_LIB_LINKER_ARGS) include $(SPDK_ROOT_DIR)/mk/spdk.app.mk
all : $(APP)
@:
$(APP) : $(OBJS) $(SPDK_LIB_FILES) $(ENV_LIBS)
$(LINK_C)
clean :
$(CLEAN_C) $(APP)
include $(SPDK_ROOT_DIR)/mk/spdk.deps.mk

14
test/event/reactor_perf/Makefile
View File

@ -32,7 +32,6 @@
# #
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..)
include $(SPDK_ROOT_DIR)/mk/spdk.app.mk
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
APP = reactor_perf APP = reactor_perf
@ -40,15 +39,4 @@ C_SRCS := reactor_perf.c
SPDK_LIB_LIST = event trace conf thread util log rpc jsonrpc json sock SPDK_LIB_LIST = event trace conf thread util log rpc jsonrpc json sock
LIBS += $(SPDK_LIB_LINKER_ARGS) include $(SPDK_ROOT_DIR)/mk/spdk.app.mk
all : $(APP)
@:
$(APP) : $(OBJS) $(SPDK_LIB_FILES) $(ENV_LIBS)
$(LINK_C)
clean :
$(CLEAN_C) $(APP)
include $(SPDK_ROOT_DIR)/mk/spdk.deps.mk

14
test/rpc_client/Makefile
View File

@ -33,7 +33,6 @@
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
include $(SPDK_ROOT_DIR)/mk/spdk.app.mk
include $(SPDK_ROOT_DIR)/mk/spdk.modules.mk include $(SPDK_ROOT_DIR)/mk/spdk.modules.mk
APP = rpc_client_test APP = rpc_client_test
@ -42,15 +41,4 @@ C_SRCS := rpc_client_test.c
SPDK_LIB_LIST = jsonrpc json rpc log util SPDK_LIB_LIST = jsonrpc json rpc log util
LIBS += $(SPDK_LIB_LINKER_ARGS) include $(SPDK_ROOT_DIR)/mk/spdk.app.mk
all : $(APP)
@:
$(APP) : $(OBJS) $(SPDK_LIB_FILES)
$(LINK_C)
clean :
$(CLEAN_C) $(APP)
include $(SPDK_ROOT_DIR)/mk/spdk.deps.mk