From: Louis Taylor <louis@kragniz.eu>
Date: Mon, 21 Jan 2019 21:45:36 +0000 (+0000)
Subject: meson: make version a dependency and use it in libbasic
X-Git-Tag: v241-rc1~19
X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fsystemd.git;a=commitdiff_plain;h=d1084aa2f803cdce6b3809dc9b7ec899251fd5dc

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 011e449806e..5cf2fc26645 100644
--- 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 349957f2151..e5852f32f9a 100644
--- 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