From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Philippe Mathieu-Daudé" <philmd@redhat.com>
Subject: [PULL 11/15] meson: build contrib/ executables after generated headers
Date: Thu, 23 Dec 2021 12:51:30 +0100 [thread overview]
Message-ID: <20211223115134.579235-12-pbonzini@redhat.com> (raw)
In-Reply-To: <20211223115134.579235-1-pbonzini@redhat.com>
This will be needed as soon as config-poison.h moves from configure to
a meson custom_target (which is built at "ninja" time).
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
contrib/elf2dmp/meson.build | 2 +-
contrib/ivshmem-client/meson.build | 2 +-
contrib/ivshmem-server/meson.build | 2 +-
contrib/rdmacm-mux/meson.build | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/contrib/elf2dmp/meson.build b/contrib/elf2dmp/meson.build
index 4d86cb390a..6707d43c4f 100644
--- a/contrib/elf2dmp/meson.build
+++ b/contrib/elf2dmp/meson.build
@@ -1,5 +1,5 @@
if curl.found()
- executable('elf2dmp', files('main.c', 'addrspace.c', 'download.c', 'pdb.c', 'qemu_elf.c'),
+ executable('elf2dmp', files('main.c', 'addrspace.c', 'download.c', 'pdb.c', 'qemu_elf.c'), genh,
dependencies: [glib, curl],
install: true)
endif
diff --git a/contrib/ivshmem-client/meson.build b/contrib/ivshmem-client/meson.build
index 1b171efb4f..ce8dcca84d 100644
--- a/contrib/ivshmem-client/meson.build
+++ b/contrib/ivshmem-client/meson.build
@@ -1,4 +1,4 @@
-executable('ivshmem-client', files('ivshmem-client.c', 'main.c'),
+executable('ivshmem-client', files('ivshmem-client.c', 'main.c'), genh,
dependencies: glib,
build_by_default: targetos == 'linux',
install: false)
diff --git a/contrib/ivshmem-server/meson.build b/contrib/ivshmem-server/meson.build
index 3a53942201..c6c3c82e89 100644
--- a/contrib/ivshmem-server/meson.build
+++ b/contrib/ivshmem-server/meson.build
@@ -1,4 +1,4 @@
-executable('ivshmem-server', files('ivshmem-server.c', 'main.c'),
+executable('ivshmem-server', files('ivshmem-server.c', 'main.c'), genh,
dependencies: [qemuutil, rt],
build_by_default: targetos == 'linux',
install: false)
diff --git a/contrib/rdmacm-mux/meson.build b/contrib/rdmacm-mux/meson.build
index 6cc5016747..7674f54cc5 100644
--- a/contrib/rdmacm-mux/meson.build
+++ b/contrib/rdmacm-mux/meson.build
@@ -2,7 +2,7 @@ if 'CONFIG_PVRDMA' in config_host
# if not found, CONFIG_PVRDMA should not be set
# FIXME: broken on big endian architectures
libumad = cc.find_library('ibumad', required: true)
- executable('rdmacm-mux', files('main.c'),
+ executable('rdmacm-mux', files('main.c'), genh,
dependencies: [glib, libumad],
build_by_default: false,
install: false)
--
2.33.1
next prev parent reply other threads:[~2021-12-23 12:07 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-23 11:51 [PULL 00/15] Build system and KVM changes for 2021-12-23 Paolo Bonzini
2021-12-23 11:51 ` [PULL 01/15] docker: include bison in debian-tricore-cross Paolo Bonzini
2021-12-23 11:51 ` [PULL 02/15] meson: reuse common_user_inc when building files specific to user-mode emulators Paolo Bonzini
2021-12-23 11:51 ` [PULL 03/15] user: move common-user includes to a subdirectory of {bsd, linux}-user/ Paolo Bonzini
2021-12-23 23:50 ` [PULL 03/15] user: move common-user includes to a subdirectory of {bsd,linux}-user/ Richard Henderson
2021-12-23 11:51 ` [PULL 04/15] meson: cleanup common-user/ build Paolo Bonzini
2021-12-23 11:51 ` [PULL 05/15] block/file-posix: Simplify the XFS_IOC_DIOINFO handling Paolo Bonzini
2021-12-23 11:51 ` [PULL 06/15] configure: simplify creation of plugin symbol list Paolo Bonzini
2021-12-23 11:51 ` [PULL 07/15] configure: do not set bsd_user/linux_user early Paolo Bonzini
2021-12-23 11:51 ` [PULL 08/15] configure, makefile: remove traces of really old files Paolo Bonzini
2021-12-23 11:51 ` [PULL 09/15] configure: parse --enable/--disable-strip automatically, flip default Paolo Bonzini
2021-12-23 11:51 ` [PULL 10/15] configure: move non-command-line variables away from command-line parsing section Paolo Bonzini
2021-12-23 11:51 ` Paolo Bonzini [this message]
2021-12-23 11:51 ` [PULL 12/15] configure, meson: move config-poison.h to meson Paolo Bonzini
2021-12-23 11:51 ` [PULL 13/15] meson: add comments in the target-specific flags section Paolo Bonzini
2021-12-23 11:51 ` [PULL 14/15] KVM: use KVM_{GET|SET}_SREGS2 when supported Paolo Bonzini
2021-12-23 11:51 ` [PULL 15/15] KVM: x86: ignore interrupt_bitmap field of KVM_GET/SET_SREGS Paolo Bonzini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211223115134.579235-12-pbonzini@redhat.com \
--to=pbonzini@redhat.com \
--cc=philmd@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).