meson: make version a dependency and use it in libbasic

This should hopefully ensure it gets generated before basic build
happens.

Fixes #11483.

diff --git a/meson.build b/meson.build
index 011e449806e320b906fbf1b1a9afeca153d2ccfa..5cf2fc266458a4abb4dbf3e81834e38535a42a51 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -580,6 +580,13 @@ vcs_tagger = [meson.source_root() + '/tools/meson-vcs-tag.sh',
               get_option('version-tag'),
               meson.project_version()]
 
+version_h = vcs_tag(
+        input : 'src/version/version.h.in',
+        output : 'version.h',
+        command: vcs_tagger)
+
+versiondep = declare_dependency(sources: version_h)
+
 sed = find_program('sed')
 awk = find_program('awk')
 m4 = find_program('m4')

diff --git a/src/basic/meson.build b/src/basic/meson.build
index 349957f215123babd3f81e090bf39f631e40a85f..e5852f32f9ae0c4140615df24f10d4872df7bcb3 100644 (file)
--- a/src/basic/meson.build
+++ b/src/basic/meson.build
@@ -1,10 +1,5 @@
 # SPDX-License-Identifier: LGPL-2.1+
 
-version_h = vcs_tag(
-        command: vcs_tagger,
-        input : 'version.h.in',
-        output : 'version.h')
-
 basic_sources = files('''
         MurmurHash2.c
         MurmurHash2.h
@@ -216,8 +211,6 @@ basic_sources = files('''
         xattr-util.h
 '''.split())
 
-basic_sources += version_h
-
 missing_audit_h = files('missing_audit.h')
 missing_capability_h = files('missing_capability.h')
 missing_network_h = files('missing_network.h')
@@ -299,7 +292,8 @@ libbasic = static_library(
         'basic',
         basic_sources,
         include_directories : includes,
-        dependencies : [threads,
+        dependencies : [versiondep,
+                        threads,
                         libcap,
                         libselinux,
                         libm],

diff --git a/src/basic/version.h.in b/src/version/version.h.in
similarity index 100%
rename from src/basic/version.h.in
rename to src/version/version.h.in