Merge remote-tracking branch 'remotes/rth-gitlab/tags/pull-tcg-20210317' into staging

[qemu.git] / qapi / meson.build

diff --git a/qapi/meson.build b/qapi/meson.build
index ab68e7900e41ed57e0b884b03882ad56bad9aa94..d4424ae6e78bb61e3ea2b44c204dd178ef9f89d3 100644 (file)
--- a/qapi/meson.build
+++ b/qapi/meson.build
@@ -4,18 +4,21 @@ util_ss.add(files(
   'qapi-dealloc-visitor.c',
   'qapi-util.c',
   'qapi-visit-core.c',
-  'qmp-dispatch.c',
-  'qmp-event.c',
-  'qmp-registry.c',
   'qobject-input-visitor.c',
   'qobject-output-visitor.c',
   'string-input-visitor.c',
   'string-output-visitor.c',
+  'hmp-output-visitor.c',
 ))
+if have_system or have_tools
+  util_ss.add(files(
+    'qmp-dispatch.c',
+    'qmp-event.c',
+    'qmp-registry.c',
+  ))
+endif
 
 qapi_all_modules = [
-  'acpi',
-  'audio',
   'authz',
   'block',
   'block-core',
@@ -35,20 +38,30 @@ qapi_all_modules = [
   'misc-target',
   'net',
   'pragma',
-  'qdev',
-  'pci',
   'qom',
-  'rdma',
   'replay',
-  'rocker',
   'run-state',
   'sockets',
-  'tpm',
   'trace',
   'transaction',
-  'ui',
   'yank',
 ]
+if have_system
+  qapi_all_modules += [
+    'acpi',
+    'audio',
+    'qdev',
+    'pci',
+    'rdma',
+    'rocker',
+    'tpm',
+  ]
+endif
+if have_system or have_tools
+  qapi_all_modules += [
+    'ui',
+  ]
+endif
 
 qapi_storage_daemon_modules = [
   'block-core',
@@ -90,11 +103,15 @@ foreach module : qapi_all_modules
     'qapi-types-@[email protected]'.format(module),
     'qapi-visit-@[email protected]'.format(module),
     'qapi-visit-@[email protected]'.format(module),
-    'qapi-events-@[email protected]'.format(module),
-    'qapi-events-@[email protected]'.format(module),
-    'qapi-commands-@[email protected]'.format(module),
-    'qapi-commands-@[email protected]'.format(module),
   ]
+  if have_system or have_tools
+    qapi_module_outputs += [
+      'qapi-events-@[email protected]'.format(module),
+      'qapi-events-@[email protected]'.format(module),
+      'qapi-commands-@[email protected]'.format(module),
+      'qapi-commands-@[email protected]'.format(module),
+    ]
+  endif
   if module.endswith('-target')
     qapi_specific_outputs += qapi_module_outputs
   else