diff --git a/app/iscsi_tgt/Makefile b/app/iscsi_tgt/Makefile index 97711393b..308672aab 100644 --- a/app/iscsi_tgt/Makefile +++ b/app/iscsi_tgt/Makefile @@ -33,7 +33,6 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -include $(SPDK_ROOT_DIR)/mk/spdk.app.mk include $(SPDK_ROOT_DIR)/mk/spdk.modules.mk APP = iscsi_tgt @@ -53,15 +52,4 @@ ifeq ($(OS),Linux) SPDK_LIB_LIST += event_nbd nbd endif -LIBS += $(SPDK_LIB_LINKER_ARGS) - -all : $(APP) - @: - -$(APP) : $(OBJS) $(SPDK_LIB_FILES) $(ENV_LIBS) - $(LINK_C) - -clean : - $(CLEAN_C) $(APP) - -include $(SPDK_ROOT_DIR)/mk/spdk.deps.mk +include $(SPDK_ROOT_DIR)/mk/spdk.app.mk diff --git a/app/nvmf_tgt/Makefile b/app/nvmf_tgt/Makefile index f501a5871..481b04652 100644 --- a/app/nvmf_tgt/Makefile +++ b/app/nvmf_tgt/Makefile @@ -33,7 +33,6 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -include $(SPDK_ROOT_DIR)/mk/spdk.app.mk include $(SPDK_ROOT_DIR)/mk/spdk.modules.mk APP = nvmf_tgt @@ -49,15 +48,4 @@ ifeq ($(OS),Linux) SPDK_LIB_LIST += event_nbd nbd endif -LIBS += $(SPDK_LIB_LINKER_ARGS) - -all : $(APP) - @: - -$(APP) : $(OBJS) $(SPDK_LIB_FILES) $(ENV_LIBS) - $(LINK_C) - -clean : - $(CLEAN_C) $(APP) - -include $(SPDK_ROOT_DIR)/mk/spdk.deps.mk +include $(SPDK_ROOT_DIR)/mk/spdk.app.mk diff --git a/app/spdk_tgt/Makefile b/app/spdk_tgt/Makefile index 054dbf5a9..237c6b191 100644 --- a/app/spdk_tgt/Makefile +++ b/app/spdk_tgt/Makefile @@ -33,7 +33,6 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -include $(SPDK_ROOT_DIR)/mk/spdk.app.mk include $(SPDK_ROOT_DIR)/mk/spdk.modules.mk APP = spdk_tgt @@ -56,18 +55,7 @@ ifeq ($(OS),Linux) SPDK_LIB_LIST += event_nbd nbd endif -LIBS += $(SPDK_LIB_LINKER_ARGS) - -all: $(APP) - @: - -$(APP): $(OBJS) $(SPDK_LIB_FILES) $(ENV_LIBS) - $(LINK_C) - -clean: - $(CLEAN_C) $(APP) +include $(SPDK_ROOT_DIR)/mk/spdk.app.mk install: $(APP) $(INSTALL_APP) - -include $(SPDK_ROOT_DIR)/mk/spdk.deps.mk diff --git a/app/vhost/Makefile b/app/vhost/Makefile index 83bba65ab..3ca096c00 100644 --- a/app/vhost/Makefile +++ b/app/vhost/Makefile @@ -33,7 +33,6 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -include $(SPDK_ROOT_DIR)/mk/spdk.app.mk include $(SPDK_ROOT_DIR)/mk/spdk.modules.mk 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 += event_nbd nbd net sock -LIBS += $(SPDK_LIB_LINKER_ARGS) - -all : $(APP) - @: - -$(APP) : $(OBJS) $(SPDK_LIB_FILES) $(ENV_LIBS) - $(LINK_C) - -clean : - $(CLEAN_C) $(APP) - -include $(SPDK_ROOT_DIR)/mk/spdk.deps.mk +include $(SPDK_ROOT_DIR)/mk/spdk.app.mk diff --git a/examples/bdev/fio_plugin/Makefile b/examples/bdev/fio_plugin/Makefile index c3bda5523..e9731dc8b 100644 --- a/examples/bdev/fio_plugin/Makefile +++ b/examples/bdev/fio_plugin/Makefile @@ -34,7 +34,6 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -include $(SPDK_ROOT_DIR)/mk/spdk.app.mk include $(SPDK_ROOT_DIR)/mk/spdk.modules.mk APP := fio_plugin @@ -46,15 +45,4 @@ LDFLAGS += -shared -rdynamic SPDK_LIB_LIST = $(ALL_MODULES_LIST) SPDK_LIB_LIST += thread util bdev conf copy rpc jsonrpc json log sock trace -LIBS += $(SPDK_LIB_LINKER_ARGS) - -all: $(APP) - @: - -$(APP) : $(OBJS) $(SPDK_LIB_FILES) $(ENV_LIBS) - $(LINK_C) - -clean: - $(CLEAN_C) $(APP) - -include $(SPDK_ROOT_DIR)/mk/spdk.deps.mk +include $(SPDK_ROOT_DIR)/mk/spdk.app.mk diff --git a/examples/bdev/hello_world/Makefile b/examples/bdev/hello_world/Makefile index 7a7f7816c..1f556b67f 100644 --- a/examples/bdev/hello_world/Makefile +++ b/examples/bdev/hello_world/Makefile @@ -31,7 +31,6 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -include $(SPDK_ROOT_DIR)/mk/spdk.app.mk include $(SPDK_ROOT_DIR)/mk/spdk.modules.mk APP = hello_bdev @@ -42,15 +41,4 @@ SPDK_LIB_LIST = $(ALL_MODULES_LIST) SPDK_LIB_LIST += event_bdev event_copy SPDK_LIB_LIST += bdev copy event thread util conf trace log jsonrpc json rpc sock -LIBS += $(SPDK_LIB_LINKER_ARGS) - -all : $(APP) - @: - -$(APP) : $(OBJS) $(SPDK_LIB_FILES) $(ENV_LIBS) - $(LINK_C) - -clean : - $(CLEAN_C) $(APP) - -include $(SPDK_ROOT_DIR)/mk/spdk.deps.mk +include $(SPDK_ROOT_DIR)/mk/spdk.app.mk diff --git a/examples/blob/cli/Makefile b/examples/blob/cli/Makefile index d64f9417b..34c49ea9b 100644 --- a/examples/blob/cli/Makefile +++ b/examples/blob/cli/Makefile @@ -31,7 +31,6 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -include $(SPDK_ROOT_DIR)/mk/spdk.app.mk include $(SPDK_ROOT_DIR)/mk/spdk.modules.mk APP = blobcli @@ -44,15 +43,4 @@ SPDK_LIB_LIST += event_bdev event_copy SPDK_LIB_LIST += bdev copy event thread util conf trace \ log jsonrpc json rpc sock -LIBS += $(SPDK_LIB_LINKER_ARGS) - -all : $(APP) - @: - -$(APP) : $(OBJS) $(SPDK_LIB_FILES) $(ENV_LIBS) - $(LINK_C) - -clean : - $(CLEAN_C) $(APP) - -include $(SPDK_ROOT_DIR)/mk/spdk.deps.mk +include $(SPDK_ROOT_DIR)/mk/spdk.app.mk diff --git a/examples/blob/hello_world/Makefile b/examples/blob/hello_world/Makefile index b1f4d4924..1455b0aa3 100644 --- a/examples/blob/hello_world/Makefile +++ b/examples/blob/hello_world/Makefile @@ -31,7 +31,6 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -include $(SPDK_ROOT_DIR)/mk/spdk.app.mk include $(SPDK_ROOT_DIR)/mk/spdk.modules.mk APP = hello_blob @@ -43,15 +42,4 @@ SPDK_LIB_LIST += event_bdev event_copy SPDK_LIB_LIST += bdev copy event thread util conf trace \ log jsonrpc json rpc sock -LIBS += $(SPDK_LIB_LINKER_ARGS) - -all : $(APP) - @: - -$(APP) : $(OBJS) $(SPDK_LIB_FILES) $(ENV_LIBS) - $(LINK_C) - -clean : - $(CLEAN_C) $(APP) - -include $(SPDK_ROOT_DIR)/mk/spdk.deps.mk +include $(SPDK_ROOT_DIR)/mk/spdk.app.mk diff --git a/examples/ioat/perf/Makefile b/examples/ioat/perf/Makefile index 54d14a535..44eb752d4 100644 --- a/examples/ioat/perf/Makefile +++ b/examples/ioat/perf/Makefile @@ -33,7 +33,6 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -include $(SPDK_ROOT_DIR)/mk/spdk.app.mk APP = perf @@ -41,15 +40,4 @@ C_SRCS := perf.c SPDK_LIB_LIST = ioat thread util log -LIBS += $(SPDK_LIB_LINKER_ARGS) - -all: $(APP) - @: - -$(APP): $(OBJS) $(SPDK_LIB_FILES) $(ENV_LIBS) - $(LINK_C) - -clean: - $(CLEAN_C) $(APP) - -include $(SPDK_ROOT_DIR)/mk/spdk.deps.mk +include $(SPDK_ROOT_DIR)/mk/spdk.app.mk diff --git a/examples/ioat/verify/Makefile b/examples/ioat/verify/Makefile index 4929c523c..50cfc6665 100644 --- a/examples/ioat/verify/Makefile +++ b/examples/ioat/verify/Makefile @@ -33,7 +33,6 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -include $(SPDK_ROOT_DIR)/mk/spdk.app.mk APP = verify @@ -41,15 +40,4 @@ C_SRCS := verify.c SPDK_LIB_LIST = ioat thread util log -LIBS += $(SPDK_LIB_LINKER_ARGS) - -all: $(APP) - @: - -$(APP): $(OBJS) $(SPDK_LIB_FILES) $(ENV_LIBS) - $(LINK_C) - -clean: - $(CLEAN_C) $(APP) - -include $(SPDK_ROOT_DIR)/mk/spdk.deps.mk +include $(SPDK_ROOT_DIR)/mk/spdk.app.mk diff --git a/examples/sock/hello_world/Makefile b/examples/sock/hello_world/Makefile index b7989f2d6..e8915d7fb 100644 --- a/examples/sock/hello_world/Makefile +++ b/examples/sock/hello_world/Makefile @@ -31,7 +31,6 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -include $(SPDK_ROOT_DIR)/mk/spdk.app.mk include $(SPDK_ROOT_DIR)/mk/spdk.modules.mk APP = hello_sock @@ -41,15 +40,4 @@ C_SRCS := hello_sock.c SPDK_LIB_LIST = $(SOCK_MODULES_LIST) SPDK_LIB_LIST += event thread util conf trace log jsonrpc json rpc sock -LIBS += $(SPDK_LIB_LINKER_ARGS) - -all : $(APP) - @: - -$(APP) : $(OBJS) $(SPDK_LIB_FILES) $(ENV_LIBS) - $(LINK_C) - -clean : - $(CLEAN_C) $(APP) - -include $(SPDK_ROOT_DIR)/mk/spdk.deps.mk +include $(SPDK_ROOT_DIR)/mk/spdk.app.mk diff --git a/mk/nvme.libtest.mk b/mk/nvme.libtest.mk index 8c40f46de..d59884f37 100644 --- a/mk/nvme.libtest.mk +++ b/mk/nvme.libtest.mk @@ -34,7 +34,6 @@ NVME_DIR := $(SPDK_ROOT_DIR)/lib/nvme include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -include $(SPDK_ROOT_DIR)/mk/spdk.app.mk include $(SPDK_ROOT_DIR)/mk/spdk.modules.mk C_SRCS = $(APP:%=%.c) @@ -42,19 +41,8 @@ C_SRCS = $(APP:%=%.c) SPDK_LIB_LIST = $(SOCK_MODULES_LIST) SPDK_LIB_LIST += nvme thread util log sock -LIBS += $(SPDK_LIB_LINKER_ARGS) - ifeq ($(CONFIG_RDMA),y) SYS_LIBS += -libverbs -lrdmacm endif -all: $(APP) - @: - -$(APP) : $(OBJS) $(SPDK_LIB_FILES) $(ENV_LIBS) - $(LINK_C) - -clean: - $(CLEAN_C) $(APP) - -include $(SPDK_ROOT_DIR)/mk/spdk.deps.mk +include $(SPDK_ROOT_DIR)/mk/spdk.app.mk diff --git a/mk/spdk.app.mk b/mk/spdk.app.mk index 6bafee330..beba2f563 100644 --- a/mk/spdk.app.mk +++ b/mk/spdk.app.mk @@ -33,4 +33,17 @@ include $(SPDK_ROOT_DIR)/mk/spdk.app_vars.mk +LIBS += $(SPDK_LIB_LINKER_ARGS) + +all : $(APP) + @: + install: all + +$(APP) : $(OBJS) $(SPDK_LIB_FILES) $(ENV_LIBS) + $(LINK_C) + +clean : + $(CLEAN_C) $(APP) + +include $(SPDK_ROOT_DIR)/mk/spdk.deps.mk diff --git a/mk/spdk.unittest.mk b/mk/spdk.unittest.mk index 826cc3f13..338a632cd 100644 --- a/mk/spdk.unittest.mk +++ b/mk/spdk.unittest.mk @@ -32,7 +32,7 @@ # 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 C_SRCS = $(TEST_FILE) @@ -50,6 +50,8 @@ ifneq ($(UNIT_TEST_LINK_ENV),1) ENV_LINKER_ARGS = endif +install: all + all: $(APP) @: diff --git a/test/app/bdev_svc/Makefile b/test/app/bdev_svc/Makefile index cbe7bf307..39e3e3d77 100644 --- a/test/app/bdev_svc/Makefile +++ b/test/app/bdev_svc/Makefile @@ -33,7 +33,6 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -include $(SPDK_ROOT_DIR)/mk/spdk.app.mk include $(SPDK_ROOT_DIR)/mk/spdk.modules.mk APP = bdev_svc @@ -49,15 +48,4 @@ ifeq ($(OS),Linux) SPDK_LIB_LIST += event_nbd nbd endif -LIBS += $(SPDK_LIB_LINKER_ARGS) - -all : $(APP) - @: - -$(APP) : $(OBJS) $(SPDK_LIB_FILES) $(ENV_LIBS) - $(LINK_C) - -clean : - $(CLEAN_C) $(APP) - -include $(SPDK_ROOT_DIR)/mk/spdk.deps.mk +include $(SPDK_ROOT_DIR)/mk/spdk.app.mk diff --git a/test/app/histogram_perf/Makefile b/test/app/histogram_perf/Makefile index ab3fc34fd..b60c704a8 100644 --- a/test/app/histogram_perf/Makefile +++ b/test/app/histogram_perf/Makefile @@ -33,7 +33,6 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -include $(SPDK_ROOT_DIR)/mk/spdk.app.mk APP = histogram_perf @@ -41,15 +40,4 @@ C_SRCS = histogram_perf.c SPDK_LIB_LIST = thread util log -LIBS += $(SPDK_LIB_LINKER_ARGS) - -all: $(APP) - @: - -$(APP): $(OBJS) $(SPDK_LIB_FILES) - $(LINK_C) - -clean: - $(CLEAN_C) $(APP) - -include $(SPDK_ROOT_DIR)/mk/spdk.deps.mk +include $(SPDK_ROOT_DIR)/mk/spdk.app.mk diff --git a/test/app/jsoncat/Makefile b/test/app/jsoncat/Makefile index da6a25fc0..2635e501b 100644 --- a/test/app/jsoncat/Makefile +++ b/test/app/jsoncat/Makefile @@ -33,7 +33,6 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -include $(SPDK_ROOT_DIR)/mk/spdk.app.mk APP = jsoncat @@ -41,15 +40,4 @@ C_SRCS = jsoncat.c SPDK_LIB_LIST = json thread util log -LIBS += $(SPDK_LIB_LINKER_ARGS) - -all: $(APP) - @: - -$(APP): $(OBJS) $(SPDK_LIB_FILES) - $(LINK_C) - -clean: - $(CLEAN_C) $(APP) - -include $(SPDK_ROOT_DIR)/mk/spdk.deps.mk +include $(SPDK_ROOT_DIR)/mk/spdk.app.mk diff --git a/test/app/stub/Makefile b/test/app/stub/Makefile index bf4f16874..df989f3f0 100644 --- a/test/app/stub/Makefile +++ b/test/app/stub/Makefile @@ -33,7 +33,6 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -include $(SPDK_ROOT_DIR)/mk/spdk.app.mk include $(SPDK_ROOT_DIR)/mk/spdk.modules.mk APP = stub @@ -43,15 +42,4 @@ C_SRCS := stub.c SPDK_LIB_LIST = $(SOCK_MODULES_LIST) SPDK_LIB_LIST += event conf nvme log trace rpc jsonrpc json thread util sock -LIBS += $(SPDK_LIB_LINKER_ARGS) - -all : $(APP) - @: - -$(APP) : $(OBJS) $(SPDK_LIB_FILES) $(ENV_LIBS) - $(LINK_C) - -clean : - $(CLEAN_C) $(APP) - -include $(SPDK_ROOT_DIR)/mk/spdk.deps.mk +include $(SPDK_ROOT_DIR)/mk/spdk.app.mk diff --git a/test/bdev/bdevio/Makefile b/test/bdev/bdevio/Makefile index 1314fe107..e1870a4ff 100644 --- a/test/bdev/bdevio/Makefile +++ b/test/bdev/bdevio/Makefile @@ -33,7 +33,6 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -include $(SPDK_ROOT_DIR)/mk/spdk.app.mk include $(SPDK_ROOT_DIR)/mk/spdk.modules.mk APP = bdevio @@ -44,15 +43,6 @@ SPDK_LIB_LIST = $(ALL_MODULES_LIST) SPDK_LIB_LIST += event_bdev event_copy 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) - @: - -$(APP) : $(OBJS) $(SPDK_LIB_FILES) $(ENV_LIBS) - $(LINK_C) - -clean : - $(CLEAN_C) $(APP) - -include $(SPDK_ROOT_DIR)/mk/spdk.deps.mk +include $(SPDK_ROOT_DIR)/mk/spdk.app.mk diff --git a/test/bdev/bdevperf/Makefile b/test/bdev/bdevperf/Makefile index 08691e9c7..4fd16159e 100644 --- a/test/bdev/bdevperf/Makefile +++ b/test/bdev/bdevperf/Makefile @@ -33,7 +33,6 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -include $(SPDK_ROOT_DIR)/mk/spdk.app.mk include $(SPDK_ROOT_DIR)/mk/spdk.modules.mk APP = bdevperf @@ -44,15 +43,4 @@ SPDK_LIB_LIST = $(ALL_MODULES_LIST) SPDK_LIB_LIST += event_bdev event_copy SPDK_LIB_LIST += bdev copy event trace log conf thread util rpc jsonrpc json sock -LIBS += $(SPDK_LIB_LINKER_ARGS) - -all : $(APP) - @: - -$(APP) : $(OBJS) $(SPDK_LIB_FILES) $(ENV_LIBS) - $(LINK_C) - -clean : - $(CLEAN_C) $(APP) - -include $(SPDK_ROOT_DIR)/mk/spdk.deps.mk +include $(SPDK_ROOT_DIR)/mk/spdk.app.mk diff --git a/test/blobfs/fuse/Makefile b/test/blobfs/fuse/Makefile index 62137f2fe..97c5990ba 100644 --- a/test/blobfs/fuse/Makefile +++ b/test/blobfs/fuse/Makefile @@ -33,7 +33,6 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -include $(SPDK_ROOT_DIR)/mk/spdk.app.mk include $(SPDK_ROOT_DIR)/mk/spdk.modules.mk APP = fuse @@ -45,16 +44,6 @@ SPDK_LIB_LIST += event_bdev event_copy SPDK_LIB_LIST += bdev copy event thread util conf trace \ log jsonrpc json rpc sock -LIBS += $(SPDK_LIB_LINKER_ARGS) LIBS+= -L/usr/local/lib -lfuse3 -all : $(APP) - @: - -$(APP) : $(OBJS) $(SPDK_LIB_FILES) $(ENV_LIBS) - $(LINK_C) - -clean : - $(CLEAN_C) $(APP) - -include $(SPDK_ROOT_DIR)/mk/spdk.deps.mk +include $(SPDK_ROOT_DIR)/mk/spdk.app.mk diff --git a/test/blobfs/mkfs/Makefile b/test/blobfs/mkfs/Makefile index 542740301..8e069adcd 100644 --- a/test/blobfs/mkfs/Makefile +++ b/test/blobfs/mkfs/Makefile @@ -33,7 +33,6 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -include $(SPDK_ROOT_DIR)/mk/spdk.app.mk include $(SPDK_ROOT_DIR)/mk/spdk.modules.mk APP = mkfs @@ -45,15 +44,4 @@ SPDK_LIB_LIST += event_bdev event_copy SPDK_LIB_LIST += bdev copy event thread util conf trace \ log jsonrpc json rpc sock -LIBS += $(SPDK_LIB_LINKER_ARGS) - -all : $(APP) - @: - -$(APP) : $(OBJS) $(SPDK_LIB_FILES) $(ENV_LIBS) - $(LINK_C) - -clean : - $(CLEAN_C) $(APP) - -include $(SPDK_ROOT_DIR)/mk/spdk.deps.mk +include $(SPDK_ROOT_DIR)/mk/spdk.app.mk diff --git a/test/event/event_perf/Makefile b/test/event/event_perf/Makefile index 6fda5a6b9..0de3186a4 100644 --- a/test/event/event_perf/Makefile +++ b/test/event/event_perf/Makefile @@ -32,7 +32,6 @@ # SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) -include $(SPDK_ROOT_DIR)/mk/spdk.app.mk include $(SPDK_ROOT_DIR)/mk/spdk.common.mk 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 -LIBS += $(SPDK_LIB_LINKER_ARGS) - -all : $(APP) - @: - -$(APP) : $(OBJS) $(SPDK_LIB_FILES) $(ENV_LIBS) - $(LINK_C) - -clean : - $(CLEAN_C) $(APP) - -include $(SPDK_ROOT_DIR)/mk/spdk.deps.mk +include $(SPDK_ROOT_DIR)/mk/spdk.app.mk diff --git a/test/event/reactor/Makefile b/test/event/reactor/Makefile index 80298ee3b..56139d41d 100644 --- a/test/event/reactor/Makefile +++ b/test/event/reactor/Makefile @@ -32,7 +32,6 @@ # SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) -include $(SPDK_ROOT_DIR)/mk/spdk.app.mk include $(SPDK_ROOT_DIR)/mk/spdk.common.mk APP = reactor @@ -40,15 +39,4 @@ C_SRCS := reactor.c SPDK_LIB_LIST = event trace conf thread util log rpc jsonrpc json sock -LIBS += $(SPDK_LIB_LINKER_ARGS) - -all : $(APP) - @: - -$(APP) : $(OBJS) $(SPDK_LIB_FILES) $(ENV_LIBS) - $(LINK_C) - -clean : - $(CLEAN_C) $(APP) - -include $(SPDK_ROOT_DIR)/mk/spdk.deps.mk +include $(SPDK_ROOT_DIR)/mk/spdk.app.mk diff --git a/test/event/reactor_perf/Makefile b/test/event/reactor_perf/Makefile index 146f1f1fc..ee17711dd 100644 --- a/test/event/reactor_perf/Makefile +++ b/test/event/reactor_perf/Makefile @@ -32,7 +32,6 @@ # SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) -include $(SPDK_ROOT_DIR)/mk/spdk.app.mk include $(SPDK_ROOT_DIR)/mk/spdk.common.mk 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 -LIBS += $(SPDK_LIB_LINKER_ARGS) - -all : $(APP) - @: - -$(APP) : $(OBJS) $(SPDK_LIB_FILES) $(ENV_LIBS) - $(LINK_C) - -clean : - $(CLEAN_C) $(APP) - -include $(SPDK_ROOT_DIR)/mk/spdk.deps.mk +include $(SPDK_ROOT_DIR)/mk/spdk.app.mk diff --git a/test/rpc_client/Makefile b/test/rpc_client/Makefile index 4f5609273..e26b17470 100644 --- a/test/rpc_client/Makefile +++ b/test/rpc_client/Makefile @@ -33,7 +33,6 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -include $(SPDK_ROOT_DIR)/mk/spdk.app.mk include $(SPDK_ROOT_DIR)/mk/spdk.modules.mk APP = rpc_client_test @@ -42,15 +41,4 @@ C_SRCS := rpc_client_test.c SPDK_LIB_LIST = jsonrpc json rpc log util -LIBS += $(SPDK_LIB_LINKER_ARGS) - -all : $(APP) - @: - -$(APP) : $(OBJS) $(SPDK_LIB_FILES) - $(LINK_C) - -clean : - $(CLEAN_C) $(APP) - -include $(SPDK_ROOT_DIR)/mk/spdk.deps.mk +include $(SPDK_ROOT_DIR)/mk/spdk.app.mk