meson: move declaration of systemd-analyze

diff --git a/meson.build b/meson.build
index 4b68ccfeddf39dcd122f16d6d23ee88d74abc099..f8451ba7acbd80ec34e838f72a14ee56328204a2 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -2533,21 +2533,8 @@ endforeach
 
 ############################################################
 
-exe = executable(
-        'systemd-analyze',
-        systemd_analyze_sources,
-        include_directories : core_includes,
-        link_with : [libcore,
-                     libshared],
-        dependencies : [libseccomp,
-                        userspace],
-        install_rpath : pkglibdir,
-        install : conf.get('ENABLE_ANALYZE') == 1)
-if conf.get('ENABLE_ANALYZE') == 1
-        public_programs += exe
-endif
-
 if want_tests != 'false'
+        exe = executables_by_name.get('systemd-analyze')
         test('test-compare-versions',
              test_compare_versions_sh,
              args : exe.full_path())

diff --git a/src/analyze/meson.build b/src/analyze/meson.build
index 911c0bc3ed21cee8d2e41eff31dbb7e61a807aba..2bbcf26d1cb745ec5ebc2c81d449362e8091612b 100644 (file)
--- a/src/analyze/meson.build
+++ b/src/analyze/meson.build
@@ -33,6 +33,21 @@ systemd_analyze_sources = files(
         'analyze.c',
 )
 
+executables += [
+        executable_template + {
+                'name' : 'systemd-analyze',
+                'public' : conf.get('ENABLE_ANALYZE') == 1,
+                'sources' : systemd_analyze_sources,
+                'include_directories' : core_includes,
+                'link_with' : [
+                        libcore,
+                        libshared,
+                ],
+                'dependencies' : libseccomp,
+                'install' : conf.get('ENABLE_ANALYZE') == 1,
+        },
+]
+
 tests += [
         {
                 'sources' : files(