From: Marc-André Lureau <marcandre.lur...@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lur...@redhat.com>
Signed-off-by: Paolo Bonzini <pbonz...@redhat.com>
---
Makefile | 6 ------
configure | 6 ------
meson.build | 8 +++++++-
3 files changed, 7 insertions(+), 13 deletions(-)
diff --git a/Makefile b/Makefile
index cdd9d14..764981d 100644
--- a/Makefile
+++ b/Makefile
@@ -231,12 +231,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)
-
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)
ifdef CONFIG_MPATH
scsi/qemu-pr-helper$(EXESUF): LIBS += -ludev -lmultipath -lmpathpersist
diff --git a/configure b/configure
index 7be08f3..964897c 100755
--- a/configure
+++ b/configure
@@ -6043,12 +6043,6 @@ if [ "$eventfd" = "yes" ]; then
fi
tools=""
-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) $tools"
- fi
-fi
if test "$softmmu" = yes ; then
if test "$linux" = yes; then
if test "$virtfs" != no && test "$cap_ng" = yes && test "$attr" = yes ;
then
diff --git a/meson.build b/meson.build
index a46b671..2b4b36d 100644
--- a/meson.build
+++ b/meson.build
@@ -280,7 +280,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,
@@ -591,6 +591,12 @@ if 'CONFIG_GUEST_AGENT' in config_host
endif
if have_tools
+ executable('qemu-img', [files('qemu-img.c'), hxdep], dependencies: [block,
qemuutil], install: true)
+ if host_machine.system() == 'linux' or host_machine.system() == 'sunos' or
host_machine.system().endswith('bsd')
+ executable('qemu-nbd', files('qemu-nbd.c'), dependencies: [block,
qemuutil], install: true)
+ endif
+ executable('qemu-io', files('qemu-io.c'), dependencies: [block, qemuutil],
install: true)
+
subdir('contrib/rdmacm-mux')
subdir('contrib/elf2dmp')
--
1.8.3.1
