Move the qemu-bridge-helper sources to the tools/ directory. Note that we have to keep the meson.build rule for building the executable in the top-level meson.build file rather than putting it in tools/meson.build, because meson has no way to say "build executable foo in the top level of the build directory" using "executable()" in the meson.build file in a subdirectory. We don't want to have the tools executables themselves built to tools/foo, because developers and test-harness code all assumes they are in the root of the build tree.
Signed-off-by: Peter Maydell <[email protected]> --- MAINTAINERS | 2 +- meson.build | 2 +- qemu-bridge-helper.c => tools/qemu-bridge-helper.c | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename qemu-bridge-helper.c => tools/qemu-bridge-helper.c (100%) diff --git a/MAINTAINERS b/MAINTAINERS index 9d3d645953..06d703d422 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3430,7 +3430,7 @@ M: Jason Wang <[email protected]> S: Maintained F: net/ F: include/net/ -F: qemu-bridge-helper.c +F: tools/qemu-bridge-helper.c T: git https://github.com/jasowang/qemu.git net F: qapi/net.json diff --git a/meson.build b/meson.build index 5fbdc75a0f..b7b260e40c 100644 --- a/meson.build +++ b/meson.build @@ -4558,7 +4558,7 @@ if have_tools endif if host_os == 'linux' - executable('qemu-bridge-helper', files('qemu-bridge-helper.c'), + executable('qemu-bridge-helper', files('tools/qemu-bridge-helper.c'), dependencies: [qemuutil, libcap_ng], install: true, install_dir: get_option('libexecdir')) diff --git a/qemu-bridge-helper.c b/tools/qemu-bridge-helper.c similarity index 100% rename from qemu-bridge-helper.c rename to tools/qemu-bridge-helper.c -- 2.43.0
