mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

meson: qemu-{img,io,nbd}

Browse Source 
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Marc-André Lureau 2019-07-16 21:37:25 +04:00 committed by Paolo Bonzini
parent 5e5733e599
commit b7c70bf2c5
3 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

@ -289,11 +289,6 @@ Makefile: $(version-obj-y)
COMMON_LDADDS = libqemuutil.a 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) 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) 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)

3
configure vendored
View File

@ -6719,9 +6719,8 @@ fi
tools="" tools=""
helpers="" helpers=""
if test "$want_tools" = "yes" ; then if test "$want_tools" = "yes" ; then
tools="qemu-img\$(EXESUF) qemu-io\$(EXESUF) $tools"
if [ "$linux" = "yes" -o "$bsd" = "yes" -o "$solaris" = "yes" ] ; then 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
fi fi
if test "$softmmu" = yes ; then if test "$softmmu" = yes ; then

14
meson.build
View File

@ -350,7 +350,7 @@ if have_system
] ]
endif endif
foreach d : hx_headers foreach d : hx_headers
custom_target(d[1], hxdep += custom_target(d[1],
input: files(d[0]), input: files(d[0]),
output: d[1], output: d[1],
capture: true, capture: true,
@ -559,7 +559,8 @@ libblock = static_library('block', block_ss.sources() + genh,
build_by_default: false) build_by_default: false)
block = declare_dependency(link_whole: [libblock], block = declare_dependency(link_whole: [libblock],
link_args: '@block.syms') link_args: '@block.syms',
dependencies: [crypto, io])
foreach m : block_mods + softmmu_mods foreach m : block_mods + softmmu_mods
shared_module(m.name(), shared_module(m.name(),
@ -637,6 +638,15 @@ if 'CONFIG_GUEST_AGENT' in config_host
endif endif
if have_tools 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/rdmacm-mux')
subdir('contrib/elf2dmp') subdir('contrib/elf2dmp')