[PATCH] block: Refactor subdirectory recursion during make

[PATCH] block: Refactor subdirectory recursion during make

[Eric Blake]

Rather than listing block/monitor from the top-level Makefile.objs, we
should instead list monitor from block/Makefile.objs.

Suggested-by: Kevin Wolf <kwolf@redhat.com>
Fixes: bb4e58c613
Signed-off-by: Eric Blake <eblake@redhat.com>
---
 Makefile.objs       | 2 +-
 block/Makefile.objs | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Makefile.objs b/Makefile.objs
index 99774cfd2545..0c08eb863a14 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -13,7 +13,7 @@ chardev-obj-y = chardev/

 authz-obj-y = authz/

-block-obj-y = block/ block/monitor/ nbd/ scsi/
+block-obj-y = block/ nbd/ scsi/
 block-obj-y += block.o blockjob.o job.o
 block-obj-y += qemu-io-cmds.o
 block-obj-$(CONFIG_REPLICATION) += replication.o
diff --git a/block/Makefile.objs b/block/Makefile.objs
index 87357529f339..5947da08575f 100644
--- a/block/Makefile.objs
+++ b/block/Makefile.objs
@@ -47,6 +47,7 @@ block-obj-y += aio_task.o
 block-obj-y += backup-top.o
 block-obj-y += filter-compress.o
 common-obj-y += monitor/
+block-obj-y += monitor/

 block-obj-y += stream.o

-- 
2.27.0

Re: [PATCH] block: Refactor subdirectory recursion during make

[Kevin Wolf]

Am 08.06.2020 um 19:33 hat Eric Blake geschrieben:
> Rather than listing block/monitor from the top-level Makefile.objs, we
> should instead list monitor from block/Makefile.objs.
> 
> Suggested-by: Kevin Wolf <kwolf@redhat.com>
> Fixes: bb4e58c613
> Signed-off-by: Eric Blake <eblake@redhat.com>

Thanks, applied to the block branch.

Kevin