[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 10/18] meson: build contrib/ executables after generated headers
From: |
Paolo Bonzini |
Subject: |
[PULL 10/18] meson: build contrib/ executables after generated headers |
Date: |
Mon, 10 Jan 2022 15:40:26 +0100 |
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
- [PULL v4 00/18] Build system and KVM changes for 2021-12-23, Paolo Bonzini, 2022/01/10
- [PULL 01/18] meson: reuse common_user_inc when building files specific to user-mode emulators, Paolo Bonzini, 2022/01/10
- [PULL 02/18] user: move common-user includes to a subdirectory of {bsd, linux}-user/, Paolo Bonzini, 2022/01/10
- [PULL 03/18] meson: cleanup common-user/ build, Paolo Bonzini, 2022/01/10
- [PULL 04/18] block/file-posix: Simplify the XFS_IOC_DIOINFO handling, Paolo Bonzini, 2022/01/10
- [PULL 07/18] configure, makefile: remove traces of really old files, Paolo Bonzini, 2022/01/10
- [PULL 05/18] configure: simplify creation of plugin symbol list, Paolo Bonzini, 2022/01/10
- [PULL 06/18] configure: do not set bsd_user/linux_user early, Paolo Bonzini, 2022/01/10
- [PULL 09/18] configure: move non-command-line variables away from command-line parsing section, Paolo Bonzini, 2022/01/10
- [PULL 08/18] configure: parse --enable/--disable-strip automatically, flip default, Paolo Bonzini, 2022/01/10
- [PULL 10/18] meson: build contrib/ executables after generated headers,
Paolo Bonzini <=
- [PULL 11/18] configure, meson: move config-poison.h to meson, Paolo Bonzini, 2022/01/10
- [PULL 12/18] meson: add comments in the target-specific flags section, Paolo Bonzini, 2022/01/10
- [PULL 13/18] KVM: use KVM_{GET|SET}_SREGS2 when supported., Paolo Bonzini, 2022/01/10
- [PULL 14/18] KVM: x86: ignore interrupt_bitmap field of KVM_GET/SET_SREGS, Paolo Bonzini, 2022/01/10
- [PULL 15/18] tests/tcg: Fix target-specific Makefile variables path for user-mode, Paolo Bonzini, 2022/01/10
- [PULL 16/18] configure: do not create roms/seabios/config.mak if SeaBIOS not present, Paolo Bonzini, 2022/01/10
- [PULL 17/18] meson: build all modules by default, Paolo Bonzini, 2022/01/10
- [PULL 18/18] meson: reenable filemonitor-inotify compilation, Paolo Bonzini, 2022/01/10
- Re: [PULL v4 00/18] Build system and KVM changes for 2021-12-23, Peter Maydell, 2022/01/11