diff options
Diffstat (limited to 'qom')
-rw-r--r-- | qom/Makefile.objs | 5 | ||||
-rw-r--r-- | qom/meson.build | 18 | ||||
-rw-r--r-- | qom/trace.h | 1 |
3 files changed, 19 insertions, 5 deletions
diff --git a/qom/Makefile.objs b/qom/Makefile.objs deleted file mode 100644 index 1b45d104ba..0000000000 --- a/qom/Makefile.objs +++ /dev/null @@ -1,5 +0,0 @@ -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 diff --git a/qom/meson.build b/qom/meson.build new file mode 100644 index 0000000000..a1cd03c82c --- /dev/null +++ b/qom/meson.build @@ -0,0 +1,18 @@ +qom_ss = ss.source_set() +qom_ss.add(genh) +qom_ss.add(files( + 'container.c', + 'object.c', + 'object_interfaces.c', + 'qom-qobject.c', +)) + +qmp_ss.add(files('qom-qmp-cmds.c')) +softmmu_ss.add(files('qom-hmp-cmds.c')) + +qom_ss = qom_ss.apply(config_host, strict: false) +libqom = static_library('qom', qom_ss.sources() + genh, + dependencies: [qom_ss.dependencies()], + name_suffix: 'fa') + +qom = declare_dependency(link_whole: libqom) diff --git a/qom/trace.h b/qom/trace.h new file mode 100644 index 0000000000..f2895e699b --- /dev/null +++ b/qom/trace.h @@ -0,0 +1 @@ +#include "trace/trace-qom.h" |