[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 065/150] meson: qemu-{img,io,nbd}
From: |
Paolo Bonzini |
Subject: |
[PULL 065/150] meson: qemu-{img,io,nbd} |
Date: |
Tue, 18 Aug 2020 10:09:00 -0400 |
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
Makefile | 5 -----
configure | 3 +--
meson.build | 14 ++++++++++++--
3 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/Makefile b/Makefile
index 4abc29cd59..e67fe52ed3 100644
--- a/Makefile
+++ b/Makefile
@@ -280,11 +280,6 @@ Makefile: $(version-obj-y)
COMMON_LDADDS = libqemuutil.a
-qemu-img.o: qemu-img-cmds.h
-
-qemu-img$(EXESUF): qemu-img.o $(authz-obj-y) $(block-obj-y) $(crypto-obj-y)
$(io-obj-y) $(qom-obj-y) $(COMMON_LDADDS)
-qemu-nbd$(EXESUF): qemu-nbd.o $(authz-obj-y) $(block-obj-y) $(crypto-obj-y)
$(io-obj-y) $(qom-obj-y) $(COMMON_LDADDS)
-qemu-io$(EXESUF): qemu-io.o $(authz-obj-y) $(block-obj-y) $(crypto-obj-y)
$(io-obj-y) $(qom-obj-y) $(COMMON_LDADDS)
qemu-storage-daemon$(EXESUF): qemu-storage-daemon.o $(authz-obj-y)
$(block-obj-y) $(crypto-obj-y) $(chardev-obj-y) $(io-obj-y) $(qom-obj-y)
$(storage-daemon-obj-y) $(COMMON_LDADDS)
scsi/qemu-pr-helper$(EXESUF): scsi/qemu-pr-helper.o scsi/utils.o
$(authz-obj-y) $(crypto-obj-y) $(io-obj-y) $(qom-obj-y) $(COMMON_LDADDS)
diff --git a/configure b/configure
index e15e038813..013ee3bda4 100755
--- a/configure
+++ b/configure
@@ -6670,9 +6670,8 @@ fi
tools=""
helpers=""
if test "$want_tools" = "yes" ; then
- tools="qemu-img\$(EXESUF) qemu-io\$(EXESUF) $tools"
if [ "$linux" = "yes" -o "$bsd" = "yes" -o "$solaris" = "yes" ] ; then
- tools="qemu-nbd\$(EXESUF) qemu-storage-daemon\$(EXESUF) $tools"
+ tools="qemu-storage-daemon\$(EXESUF) $tools"
fi
fi
if test "$softmmu" = yes ; then
diff --git a/meson.build b/meson.build
index 299313beca..a6d4057e0d 100644
--- a/meson.build
+++ b/meson.build
@@ -347,7 +347,7 @@ if have_system
]
endif
foreach d : hx_headers
- custom_target(d[1],
+ hxdep += custom_target(d[1],
input: files(d[0]),
output: d[1],
capture: true,
@@ -556,7 +556,8 @@ libblock = static_library('block', block_ss.sources(),
build_by_default: false)
block = declare_dependency(link_whole: [libblock],
- link_args: '@block.syms')
+ link_args: '@block.syms',
+ dependencies: [crypto, io])
foreach m : block_mods + softmmu_mods
shared_module(m.name(),
@@ -634,6 +635,15 @@ if 'CONFIG_GUEST_AGENT' in config_host
endif
if have_tools
+ qemu_img = executable('qemu-img', [files('qemu-img.c'), hxdep],
+ dependencies: [authz, block, crypto, io, qom, qemuutil], install:
true)
+ qemu_io = executable('qemu-io', files('qemu-io.c'),
+ dependencies: [block, qemuutil], install: true)
+ if targetos == 'linux' or targetos == 'sunos' or targetos.endswith('bsd')
+ qemu_nbd = executable('qemu-nbd', files('qemu-nbd.c'),
+ dependencies: [block, qemuutil], install: true)
+ endif
+
subdir('contrib/rdmacm-mux')
subdir('contrib/elf2dmp')
--
2.26.2
- [PULL 049/150] meson: generate qemu-version.h, (continued)
- [PULL 049/150] meson: generate qemu-version.h, Paolo Bonzini, 2020/08/18
- [PULL 052/150] meson: handle edk2 bios and descriptors, Paolo Bonzini, 2020/08/18
- [PULL 047/150] meson: add virtfs-proxy-helper, Paolo Bonzini, 2020/08/18
- [PULL 048/150] meson: keymap-gen, Paolo Bonzini, 2020/08/18
- [PULL 051/150] meson: generate hxtool files, Paolo Bonzini, 2020/08/18
- [PULL 058/150] meson: convert crypto directory to Meson, Paolo Bonzini, 2020/08/18
- [PULL 059/150] meson: convert io directory to Meson, Paolo Bonzini, 2020/08/18
- [PULL 040/150] meson: convert qemu-ga, Paolo Bonzini, 2020/08/18
- [PULL 054/150] meson: convert tests/fp and check-softfloat, Paolo Bonzini, 2020/08/18
- [PULL 057/150] meson: convert authz directory to Meson, Paolo Bonzini, 2020/08/18
- [PULL 065/150] meson: qemu-{img,io,nbd},
Paolo Bonzini <=
- [PULL 055/150] meson: convert check-qapi-schema, Paolo Bonzini, 2020/08/18
- [PULL 056/150] meson: convert qom directory to Meson (tools part), Paolo Bonzini, 2020/08/18
- [PULL 062/150] meson: add modules infrastructure, Paolo Bonzini, 2020/08/18
- [PULL 053/150] meson: convert check-decodetree, Paolo Bonzini, 2020/08/18
- [PULL 066/150] meson: qemu-pr-helper, Paolo Bonzini, 2020/08/18
- [PULL 063/150] meson: convert chardev directory to Meson (tools part), Paolo Bonzini, 2020/08/18
- [PULL 067/150] configure, Makefile; remove TOOLS and HELPERS-y variable, Paolo Bonzini, 2020/08/18
- [PULL 060/150] meson: convert target/s390x/gen-features.h, Paolo Bonzini, 2020/08/18
- [PULL 072/150] meson: convert root directory to Meson, Paolo Bonzini, 2020/08/18
- [PULL 068/150] meson: convert chardev directory to Meson (emulator part), Paolo Bonzini, 2020/08/18