From 9c577fe7c0227b8d3fb27a68c9eafb0baf6ac88f Mon Sep 17 00:00:00 2001 From: Daniel Verkamp Date: Tue, 12 Jun 2018 11:09:29 -0700 Subject: [PATCH] Add copy module dependencies to Makefiles Several apps link against $(COPY_MODULES_LINKER_ARGS) without adding $(COPY_MODULES_FILES) to the dependency list. This means that those apps would not get rebuilt if the copy modules were modified without a 'make clean'. The blobfs example apps were also missing other dependencies; add those while we're here. Change-Id: Iac6606b650d32bf21f7f31bd2727f9e92c0da748 Signed-off-by: Daniel Verkamp Reviewed-on: https://review.gerrithub.io/414888 Reviewed-by: Jim Harris Reviewed-by: Shuhei Matsumoto Tested-by: SPDK Automated Test System --- app/nvmf_tgt/Makefile | 2 +- examples/blob/cli/Makefile | 2 +- examples/blob/hello_world/Makefile | 2 +- test/app/bdev_svc/Makefile | 2 +- test/bdev/bdevio/Makefile | 2 +- test/blobfs/fuse/Makefile | 2 +- test/blobfs/mkfs/Makefile | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/nvmf_tgt/Makefile b/app/nvmf_tgt/Makefile index 9afab0a7d5..f24fa32969 100644 --- a/app/nvmf_tgt/Makefile +++ b/app/nvmf_tgt/Makefile @@ -55,7 +55,7 @@ LIBS += $(BLOCKDEV_MODULES_LINKER_ARGS) \ all : $(APP) @: -$(APP) : $(OBJS) $(SPDK_LIB_FILES) $(SPDK_WHOLE_LIBS) $(BLOCKDEV_MODULES_FILES) $(LINKER_MODULES) $(ENV_LIBS) +$(APP) : $(OBJS) $(SPDK_LIB_FILES) $(SPDK_WHOLE_LIBS) $(BLOCKDEV_MODULES_FILES) $(COPY_MODULES_FILES) $(LINKER_MODULES) $(ENV_LIBS) $(LINK_C) clean : diff --git a/examples/blob/cli/Makefile b/examples/blob/cli/Makefile index 2eaca606a1..c733ba626e 100644 --- a/examples/blob/cli/Makefile +++ b/examples/blob/cli/Makefile @@ -48,7 +48,7 @@ LIBS += $(SPDK_LIB_LINKER_ARGS) $(ENV_LINKER_ARGS) all : $(APP) @: -$(APP) : $(OBJS) $(SPDK_LIB_FILES) $(BLOCKDEV_NO_LVOL_MODULES_FILES) $(LINKER_MODULES) $(ENV_LIBS) +$(APP) : $(OBJS) $(SPDK_LIB_FILES) $(COPY_MODULES_FILES) $(BLOCKDEV_NO_LVOL_MODULES_FILES) $(LINKER_MODULES) $(ENV_LIBS) $(LINK_C) clean : diff --git a/examples/blob/hello_world/Makefile b/examples/blob/hello_world/Makefile index d98ecaa087..9ece8c0448 100644 --- a/examples/blob/hello_world/Makefile +++ b/examples/blob/hello_world/Makefile @@ -48,7 +48,7 @@ LIBS += $(SPDK_LIB_LINKER_ARGS) $(ENV_LINKER_ARGS) all : $(APP) @: -$(APP) : $(OBJS) $(SPDK_LIB_FILES) $(BLOCKDEV_MODULES_FILES) $(LINKER_MODULES) $(ENV_LIBS) +$(APP) : $(OBJS) $(SPDK_LIB_FILES) $(COPY_MODULES_FILES) $(BLOCKDEV_MODULES_FILES) $(LINKER_MODULES) $(ENV_LIBS) $(LINK_C) clean : diff --git a/test/app/bdev_svc/Makefile b/test/app/bdev_svc/Makefile index 7b10aa9414..6337cb2c23 100644 --- a/test/app/bdev_svc/Makefile +++ b/test/app/bdev_svc/Makefile @@ -55,7 +55,7 @@ LIBS += $(BLOCKDEV_MODULES_LINKER_ARGS) \ all : $(APP) @: -$(APP) : $(OBJS) $(SPDK_LIB_FILES) $(SPDK_WHOLE_LIBS) $(BLOCKDEV_MODULES_FILES) $(LINKER_MODULES) $(ENV_LIBS) +$(APP) : $(OBJS) $(SPDK_LIB_FILES) $(SPDK_WHOLE_LIBS) $(COPY_MODULES_FILES) $(BLOCKDEV_MODULES_FILES) $(LINKER_MODULES) $(ENV_LIBS) $(LINK_C) clean : diff --git a/test/bdev/bdevio/Makefile b/test/bdev/bdevio/Makefile index d78b1d739d..eaf233f825 100644 --- a/test/bdev/bdevio/Makefile +++ b/test/bdev/bdevio/Makefile @@ -51,7 +51,7 @@ LIBS += $(SPDK_LIB_LINKER_ARGS) $(ENV_LINKER_ARGS) -lcunit all : $(APP) @: -$(APP) : $(OBJS) $(SPDK_LIB_FILES) $(BLOCKDEV_MODULES_FILES) $(LINKER_MODULES) $(ENV_LIBS) +$(APP) : $(OBJS) $(SPDK_LIB_FILES) $(COPY_MODULES_FILES) $(BLOCKDEV_MODULES_FILES) $(LINKER_MODULES) $(ENV_LIBS) $(LINK_C) clean : diff --git a/test/blobfs/fuse/Makefile b/test/blobfs/fuse/Makefile index a3fad0cf75..847da50eab 100644 --- a/test/blobfs/fuse/Makefile +++ b/test/blobfs/fuse/Makefile @@ -51,7 +51,7 @@ LIBS+= -L/usr/local/lib -lfuse3 all : $(APP) @: -$(APP) : $(OBJS) $(SPDK_LIB_FILES) +$(APP) : $(OBJS) $(SPDK_LIB_FILES) $(COPY_MODULES_FILES) $(BLOCKDEV_MODULES_FILES) $(ENV_LIBS) $(LINK_C) clean : diff --git a/test/blobfs/mkfs/Makefile b/test/blobfs/mkfs/Makefile index a6349d2341..b2b192e23b 100644 --- a/test/blobfs/mkfs/Makefile +++ b/test/blobfs/mkfs/Makefile @@ -50,7 +50,7 @@ LIBS += $(SPDK_LIB_LINKER_ARGS) $(ENV_LINKER_ARGS) all : $(APP) @: -$(APP) : $(OBJS) $(SPDK_LIB_FILES) +$(APP) : $(OBJS) $(SPDK_LIB_FILES) $(COPY_MODULES_FILES) $(BLOCKDEV_MODULES_FILES) $(ENV_LIBS) $(LINK_C) clean :