diff options
| author | Paolo Bonzini | 2020-08-19 14:44:56 +0200 |
|---|---|---|
| committer | Paolo Bonzini | 2020-08-21 12:30:08 +0200 |
| commit | a81df1b68b656f2487f556240baf2af83e60ec6c (patch) | |
| tree | eb98104c0a66b6a6d7675055d92c36b60d683796 /storage-daemon | |
| parent | meson: add testsuite Makefile generator (diff) | |
| download | qemu-a81df1b68b656f2487f556240baf2af83e60ec6c.tar.gz qemu-a81df1b68b656f2487f556240baf2af83e60ec6c.tar.xz qemu-a81df1b68b656f2487f556240baf2af83e60ec6c.zip | |
libqemuutil, qapi, trace: convert to meson
This shows how to do some "computations" in meson.build using its array
and dictionary data structures, and also a basic usage of the sourceset
module for conditional compilation.
Notice the new "if have_system" part of util/meson.build, which fixes
a bug in the old build system was buggy: util/dbus.c was built even for
non-softmmu builds, but the dependency on -lgio was lost when the linking
was done through libqemuutil.a. Because all of its users required gio
otherwise, the bug was hidden. Meson instead propagates libqemuutil's
dependencies down to its users, and shows the problem.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'storage-daemon')
| -rw-r--r-- | storage-daemon/Makefile.objs | 4 | ||||
| -rw-r--r-- | storage-daemon/meson.build | 1 | ||||
| -rw-r--r-- | storage-daemon/qapi/Makefile.objs | 1 | ||||
| -rw-r--r-- | storage-daemon/qapi/meson.build | 10 |
4 files changed, 14 insertions, 2 deletions
diff --git a/storage-daemon/Makefile.objs b/storage-daemon/Makefile.objs index cfe6beee52..41c0d02178 100644 --- a/storage-daemon/Makefile.objs +++ b/storage-daemon/Makefile.objs @@ -1 +1,3 @@ -storage-daemon-obj-y += qapi/ +storage-daemon-obj-y = qapi/libqsd-qapi.fa + +qemu-storage-daemon.o: storage-daemon/qapi/qapi-commands.h storage-daemon/qapi/qapi-init-commands.h diff --git a/storage-daemon/meson.build b/storage-daemon/meson.build new file mode 100644 index 0000000000..35f8949924 --- /dev/null +++ b/storage-daemon/meson.build @@ -0,0 +1 @@ +subdir('qapi') diff --git a/storage-daemon/qapi/Makefile.objs b/storage-daemon/qapi/Makefile.objs deleted file mode 100644 index 8a4b220c96..0000000000 --- a/storage-daemon/qapi/Makefile.objs +++ /dev/null @@ -1 +0,0 @@ -storage-daemon-obj-y += qapi-commands.o qapi-init-commands.o qapi-introspect.o diff --git a/storage-daemon/qapi/meson.build b/storage-daemon/qapi/meson.build new file mode 100644 index 0000000000..7a2b041247 --- /dev/null +++ b/storage-daemon/qapi/meson.build @@ -0,0 +1,10 @@ +qsd_qapi_files = custom_target('QAPI files for qemu-storage-daemon', + output: qapi_nonmodule_outputs + ['qapi-doc.texi'], + input: [ files('qapi-schema.json') ], + command: [ qapi_gen, '-o', 'storage-daemon/qapi', '@INPUT@' ], + depend_files: [ qapi_inputs, qapi_gen_depends ]) + +static_library('qsd-qapi', + qsd_qapi_files.to_list(), + name_suffix: 'fa', + build_by_default: false) |