From: Tomas Krizek <tomas.krizek@nic.cz>
Date: Thu, 14 Feb 2019 15:20:26 +0000 (+0100)
Subject: meson: clean up meson.build
X-Git-Tag: v4.0.0~24^2~117
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4847edefc95aaaeaeb30016c3a2b2f96f11a99d2;p=thirdparty%2Fknot-resolver.git

meson: clean up meson.build
---

diff --git a/meson.build b/meson.build
index ebbdaa15d..c5a4f2ed7 100644
--- a/meson.build
+++ b/meson.build
@@ -116,10 +116,11 @@ integr_tests = [
 ]
 
 
-# NOTE "dist" target is explicitly not supported for two reasons
-#   1) we use meson test to run integration / postinstall tests
-#   2) we want custom version number, not the hard-coded string in project()
-# Use "archive" target instead
+# Tarball
+## NOTE "dist" target is explicitly not supported for two reasons
+##   1) we use meson test to run integration / postinstall tests
+##   2) we want custom version number, not the hard-coded string in project()
+## Use "archive" target instead
 run_target(
   'archive',
   command: [
@@ -153,30 +154,33 @@ kresconfig_dep = declare_dependency(
 )
 
 
-# NOTE order of subdir includes is significant
-# compile
+# Compile
+## Dependencies first
 subdir('contrib')
 subdir('lib')
+
+## Remaining code
+subdir('client')
 subdir('daemon')
 subdir('modules')
-subdir('client')
 
 
-# tests
+# Tests
 subdir('tests')
 
 
-# documentation, examples
+# Documentation & configs
 subdir('doc')
 subdir('etc')
 
-# systemd integration
+
+# Systemd unit files
 if systemd_unit_files != 'disabled'
   subdir('systemd')
 endif
 
 
-# summary message
+# Summary message
 # NOTE: ternary operator in format() not supported
 # https://github.com/mesonbuild/meson/issues/2404
 summary_managed_ta = managed_ta ? 'enabled' : 'disabled'
@@ -216,7 +220,6 @@ message('''
     user:               @0@'''.format(user) + '''
     group:              @0@'''.format(group) + '''
     install_kresd_conf: @0@'''.format(summary_install_kresd_conf) + '''
-    version:            @0@'''.format(meson.project_version()) + '''
 
 =======================================================