mirror of
https://gitlab.com/qemu-project/qemu
synced 2024-07-21 18:34:33 +00:00
meson: convert io directory to Meson
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
parent
5582c58f82
commit
7fcfd45666
1
Makefile
1
Makefile
|
@ -246,7 +246,6 @@ dummy := $(call unnest-vars,, \
|
||||||
block-obj-m \
|
block-obj-m \
|
||||||
storage-daemon-obj-y \
|
storage-daemon-obj-y \
|
||||||
storage-daemon-obj-m \
|
storage-daemon-obj-m \
|
||||||
io-obj-y \
|
|
||||||
common-obj-y \
|
common-obj-y \
|
||||||
common-obj-m)
|
common-obj-m)
|
||||||
|
|
||||||
|
|
|
@ -21,7 +21,7 @@ block-obj-m = block/
|
||||||
|
|
||||||
crypto-obj-y = crypto/libcrypto.fa
|
crypto-obj-y = crypto/libcrypto.fa
|
||||||
|
|
||||||
io-obj-y = io/
|
io-obj-y = io/libio.fa
|
||||||
|
|
||||||
endif # CONFIG_SOFTMMU or CONFIG_TOOLS
|
endif # CONFIG_SOFTMMU or CONFIG_TOOLS
|
||||||
|
|
||||||
|
|
|
@ -194,12 +194,12 @@ include $(SRC_PATH)/Makefile.objs
|
||||||
dummy := $(call fix-paths,../,, \
|
dummy := $(call fix-paths,../,, \
|
||||||
authz-obj-y \
|
authz-obj-y \
|
||||||
crypto-obj-y \
|
crypto-obj-y \
|
||||||
|
io-obj-y \
|
||||||
qom-obj-y)
|
qom-obj-y)
|
||||||
dummy := $(call unnest-vars,.., \
|
dummy := $(call unnest-vars,.., \
|
||||||
block-obj-y \
|
block-obj-y \
|
||||||
block-obj-m \
|
block-obj-m \
|
||||||
chardev-obj-y \
|
chardev-obj-y \
|
||||||
io-obj-y \
|
|
||||||
common-obj-y \
|
common-obj-y \
|
||||||
common-obj-m)
|
common-obj-m)
|
||||||
all-obj-y += $(common-obj-y)
|
all-obj-y += $(common-obj-y)
|
||||||
|
|
|
@ -1,12 +0,0 @@
|
||||||
io-obj-y = channel.o
|
|
||||||
io-obj-y += channel-buffer.o
|
|
||||||
io-obj-y += channel-command.o
|
|
||||||
io-obj-y += channel-file.o
|
|
||||||
io-obj-y += channel-socket.o
|
|
||||||
io-obj-y += channel-tls.o
|
|
||||||
io-obj-y += channel-watch.o
|
|
||||||
io-obj-y += channel-websock.o
|
|
||||||
io-obj-y += channel-util.o
|
|
||||||
io-obj-y += dns-resolver.o
|
|
||||||
io-obj-y += net-listener.o
|
|
||||||
io-obj-y += task.o
|
|
25
io/meson.build
Normal file
25
io/meson.build
Normal file
|
@ -0,0 +1,25 @@
|
||||||
|
io_ss = ss.source_set()
|
||||||
|
io_ss.add(genh)
|
||||||
|
io_ss.add(files(
|
||||||
|
'channel-buffer.c',
|
||||||
|
'channel-command.c',
|
||||||
|
'channel-file.c',
|
||||||
|
'channel-socket.c',
|
||||||
|
'channel-tls.c',
|
||||||
|
'channel-util.c',
|
||||||
|
'channel-watch.c',
|
||||||
|
'channel-websock.c',
|
||||||
|
'channel.c',
|
||||||
|
'dns-resolver.c',
|
||||||
|
'net-listener.c',
|
||||||
|
'task.c',
|
||||||
|
))
|
||||||
|
|
||||||
|
io_ss = io_ss.apply(config_host, strict: false)
|
||||||
|
libio = static_library('io', io_ss.sources() + genh,
|
||||||
|
dependencies: [io_ss.dependencies()],
|
||||||
|
link_with: libqemuutil,
|
||||||
|
name_suffix: 'fa',
|
||||||
|
build_by_default: false)
|
||||||
|
|
||||||
|
io = declare_dependency(link_whole: libio, dependencies: [crypto, qom])
|
|
@ -346,6 +346,7 @@ libqemuutil = static_library('qemuutil',
|
||||||
qemuutil = declare_dependency(link_with: libqemuutil,
|
qemuutil = declare_dependency(link_with: libqemuutil,
|
||||||
sources: genh + version_res)
|
sources: genh + version_res)
|
||||||
|
|
||||||
|
subdir('io')
|
||||||
subdir('fsdev')
|
subdir('fsdev')
|
||||||
|
|
||||||
# Other build targets
|
# Other build targets
|
||||||
|
|
Loading…
Reference in a new issue