From dc4954943d3adc82c4052aed592f2dc5a14c3fc7 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Wed, 30 Aug 2023 11:29:54 +0200 Subject: meson: remove CONFIG_POSIX and CONFIG_WIN32 from config_targetos For consistency with other OSes, use if...endif for rules that are target-independent. Signed-off-by: Paolo Bonzini --- qga/meson.build | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) (limited to 'qga') diff --git a/qga/meson.build b/qga/meson.build index 50edaf1c3d..1113e7c7fa 100644 --- a/qga/meson.build +++ b/qga/meson.build @@ -67,22 +67,25 @@ qga_ss.add(files( 'main.c', 'cutils.c', )) -qga_ss.add(when: 'CONFIG_POSIX', if_true: files( - 'channel-posix.c', - 'commands-posix.c', - 'commands-posix-ssh.c', -)) -if targetos == 'linux' - qga_ss.add(files('commands-linux.c')) -elif targetos in bsd_oses - qga_ss.add(files('commands-bsd.c')) +if targetos == 'windows' + qga_ss.add(files( + 'channel-win32.c', + 'commands-win32.c', + 'service-win32.c', + 'vss-win32.c' + )) +else + qga_ss.add(files( + 'channel-posix.c', + 'commands-posix.c', + 'commands-posix-ssh.c', + )) + if targetos == 'linux' + qga_ss.add(files('commands-linux.c')) + elif targetos in bsd_oses + qga_ss.add(files('commands-bsd.c')) + endif endif -qga_ss.add(when: 'CONFIG_WIN32', if_true: files( - 'channel-win32.c', - 'commands-win32.c', - 'service-win32.c', - 'vss-win32.c' -)) qga_ss = qga_ss.apply(config_targetos, strict: false) -- cgit v1.2.3-70-g09d2