OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

meson: convert qom directory to Meson (tools part) 

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 19:40:16 +04:00 committed by Paolo Bonzini
parent 3afe7ab0d3
commit de59dda32d
6 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -248,7 +248,6 @@ dummy := $(call unnest-vars,, \
storage-daemon-obj-y \
storage-daemon-obj-m \
crypto-obj-y \
qom-obj-y \
io-obj-y \
common-obj-y \
common-obj-m)
@ -269,6 +268,7 @@ $(SOFTMMU_ALL_RULES): $(storage-daemon-obj-y)
$(SOFTMMU_ALL_RULES): $(chardev-obj-y)
$(SOFTMMU_ALL_RULES): $(crypto-obj-y)
$(SOFTMMU_ALL_RULES): $(io-obj-y)
$(SOFTMMU_ALL_RULES): $(qom-obj-y)
$(SOFTMMU_ALL_RULES): config-all-devices.mak
SOFTMMU_FUZZ_RULES=$(filter %-softmmu/fuzz, $(TARGET_DIRS_RULES))

2
Makefile.objs
View File

@ -1,6 +1,6 @@
#######################################################################
# Common libraries for tools and emulators
qom-obj-y = qom/
qom-obj-y = qom/libqom.fa
#######################################################################
# code used by both qemu system emulation and qemu-img

3
Makefile.target
View File

@ -191,13 +191,14 @@ all-obj-y := $(obj-y)
common-obj-m :=
include $(SRC_PATH)/Makefile.objs
dummy := $(call fix-paths,../,, \
qom-obj-y)
dummy := $(call unnest-vars,.., \
authz-obj-y \
block-obj-y \
block-obj-m \
chardev-obj-y \
crypto-obj-y \
qom-obj-y \
io-obj-y \
common-obj-y \
common-obj-m)

1
meson.build
View File

@ -340,6 +340,7 @@ libqemuutil = static_library('qemuutil',
qemuutil = declare_dependency(link_with: libqemuutil,
sources: genh + version_res)
subdir('qom')
subdir('fsdev')
# Other build targets

3
qom/Makefile.objs
View File

@ -1,5 +1,2 @@
qom-obj-y = object.o container.o qom-qobject.o
qom-obj-y += object_interfaces.o
common-obj-$(CONFIG_SOFTMMU) += qom-hmp-cmds.o qom-qmp-cmds.o
storage-daemon-obj-y += qom-qmp-cmds.o

15
qom/meson.build Normal file
View File

@ -0,0 +1,15 @@
qom_ss = ss.source_set()
qom_ss.add(files(
'container.c',
'object.c',
'object_interfaces.c',
'qom-qobject.c',
))
qom_ss = qom_ss.apply(config_host, strict: false)
libqom = static_library('qom', qom_ss.sources() + genh,
dependencies: [qom_ss.dependencies()],
link_with: [libqemuutil],
name_suffix: 'fa')
qom = declare_dependency(link_whole: libqom)