From 945edb0186db8c7c9b1d536672983f27db7c3317 Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Tue, 10 Sep 2024 20:14:22 +0200 Subject: [PATCH] meson.build: move writing conf_data into tail of main meson file This allows us to do further probing in the included meson files: Individual subdirectories (eg. DDXes, extensions, OS layer, ...) can now probe things that are only relevant to them - no need to fill the already too fat includes/meson.build with even more things. Preparation for upcoming commits that'll make us of that. Signed-off-by: Enrico Weigelt, metux IT consult --- hw/xwin/meson.build | 2 +- include/meson.build | 9 --------- meson.build | 11 +++++++++++ 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/hw/xwin/meson.build b/hw/xwin/meson.build index 1161c9dda..7c2ec792e 100644 --- a/hw/xwin/meson.build +++ b/hw/xwin/meson.build @@ -105,7 +105,7 @@ srcs_windows += [ rsrc = windows.compile_resources( 'XWin.rc', - include_directories: include_directories('../../include/'), + include_directories: include_directories('../../include/', '../..'), depend_files: ['XWin.exe.manifest', 'X.ico'], ) srcs_windows += rsrc diff --git a/include/meson.build b/include/meson.build index cbc746da2..484c5579c 100644 --- a/include/meson.build +++ b/include/meson.build @@ -329,15 +329,6 @@ conf_data.set('XSERVER_LIBPCIACCESS', get_option('pciaccess') ? '1' : false) conf_data.set('XSERVER_PLATFORM_BUS', build_udev_kms ? '1' : false) conf_data.set('XSERVER_SCREEN_VRR', '1') -configure_file(output : 'dix-config.h', - configuration : conf_data) - -configure_file(output : 'xorg-server.h', - input : 'xorg-server.h.meson.in', - configuration : conf_data, - install: build_xorg, - install_dir: xorgsdkdir) - version_data = configuration_data() version_data.set('VENDOR_RELEASE', '@0@'.format(release)) version_data.set_quoted('VENDOR_NAME', get_option('vendor_name')) diff --git a/meson.build b/meson.build index bcaaed79d..f59947251 100644 --- a/meson.build +++ b/meson.build @@ -908,3 +908,14 @@ if build_docs or build_docs_devel configuration: docxmlconfig ) endif + +# finally write config files. doing that very late, so other subdirs still +# have a change to add config items +configure_file(output : 'dix-config.h', + configuration : conf_data) + +configure_file(output : 'xorg-server.h', + input : 'include/xorg-server.h.meson.in', + configuration : conf_data, + install: build_xorg, + install_dir: xorgsdkdir)