basic: move version() to build.h+c

diff --git a/src/ac-power/ac-power.c b/src/ac-power/ac-power.c
index 12379df344f26c02a8b38aaf4866a082ac5e437a..853635047d9d2b3a9ecfea010712617491031285 100644 (file)
--- a/src/ac-power/ac-power.c
+++ b/src/ac-power/ac-power.c
@@ -2,6 +2,7 @@
 
 #include <getopt.h>
 
+#include "build.h"
 #include "main-func.h"
 #include "udev-util.h"
 

diff --git a/src/activate/activate.c b/src/activate/activate.c
index 24ebde0283971e429deb412a55190096990b52ef..5934e7a57a629654df467ceee8de990aa48676e4 100644 (file)
--- a/src/activate/activate.c
+++ b/src/activate/activate.c
@@ -9,6 +9,7 @@
 #include "sd-daemon.h"
 
 #include "alloc-util.h"
+#include "build.h"
 #include "env-util.h"
 #include "errno-util.h"
 #include "escape.h"
@@ -23,7 +24,6 @@
 #include "string-util.h"
 #include "strv.h"
 #include "terminal-util.h"
-#include "util.h"
 
 static char **arg_listen = NULL;
 static bool arg_accept = false;

diff --git a/src/analyze/analyze.c b/src/analyze/analyze.c
index 6e47357a119b942714df5abb991bbf1a96c4cfb0..74556ac0f72c39a049ec046b780791f59616f505 100644 (file)
--- a/src/analyze/analyze.c
+++ b/src/analyze/analyze.c
@@ -37,6 +37,7 @@
 #include "analyze-unit-paths.h"
 #include "analyze-compare-versions.h"
 #include "analyze-verify.h"
+#include "build.h"
 #include "bus-error.h"
 #include "bus-locator.h"
 #include "bus-map-properties.h"
@@ -79,7 +80,6 @@
 #include "time-util.h"
 #include "tmpfile-util.h"
 #include "unit-name.h"
-#include "util.h"
 #include "verb-log-control.h"
 #include "verbs.h"
 #include "version.h"

diff --git a/src/ask-password/ask-password.c b/src/ask-password/ask-password.c
index 093533182f28cc4acbb3702565dd1bba7b19ea96..a92adbfca5e7307bd48bdd25e22281cd3dd4a63d 100644 (file)
--- a/src/ask-password/ask-password.c
+++ b/src/ask-password/ask-password.c
@@ -6,6 +6,7 @@
 #include <unistd.h>
 
 #include "ask-password-api.h"
+#include "build.h"
 #include "def.h"
 #include "log.h"
 #include "macro.h"

diff --git a/src/basic/build.c b/src/basic/build.c
index 4a15f901d0ba9f8c45cdecb724fd2dbf7dac27e4..360ff1357b032097febb382a2e5633e521c69fec 100644 (file)
--- a/src/basic/build.c
+++ b/src/basic/build.c
@@ -1,6 +1,9 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include <stdio.h>
+
 #include "build.h"
+#include "macro.h"
 
 const char* const systemd_features =
 
@@ -226,3 +229,9 @@ const char* const systemd_features =
 
         " default-hierarchy=" DEFAULT_HIERARCHY_NAME
         ;
+
+int version(void) {
+        printf("systemd " STRINGIFY(PROJECT_VERSION) " (" GIT_VERSION ")\n%s\n",
+               systemd_features);
+        return 0;
+}

diff --git a/src/basic/build.h b/src/basic/build.h
index 87276bf686b426e9b17394ebe0a122982b9907c5..27d44111d4c2fcd00f565a679a026ec634ef0832 100644 (file)
--- a/src/basic/build.h
+++ b/src/basic/build.h
@@ -4,3 +4,5 @@
 #include "version.h"
 
 extern const char* const systemd_features;
+
+int version(void);

diff --git a/src/basic/util.c b/src/basic/util.c
index c63e2bb5830ffa3bec0b1ea90224dd208497e10c..e5e61e66d89f4a5d8e86b268982aa8f5ac1effa8 100644 (file)
--- a/src/basic/util.c
+++ b/src/basic/util.c
@@ -20,9 +20,3 @@
 
 int saved_argc = 0;
 char **saved_argv = NULL;
-
-int version(void) {
-        printf("systemd " STRINGIFY(PROJECT_VERSION) " (" GIT_VERSION ")\n%s\n",
-               systemd_features);
-        return 0;
-}

diff --git a/src/basic/util.h b/src/basic/util.h
index f28fd2f327f0c3d5332230e5465ae62fb4cd6905..95f71a66eddf84fd36e00c712c2814c10ecc905d 100644 (file)
--- a/src/basic/util.h
+++ b/src/basic/util.h
@@ -65,5 +65,3 @@ static inline unsigned log2u_round_up(unsigned x) {
 
         return log2u(x - 1) + 1;
 }
-
-int version(void);

diff --git a/src/binfmt/binfmt.c b/src/binfmt/binfmt.c
index 71cb56aa4a935f2ceb863017611d19a60f3861e0..3fc954f7c619a7f8f8deee39bdf907629e22bf89 100644 (file)
--- a/src/binfmt/binfmt.c
+++ b/src/binfmt/binfmt.c
@@ -11,6 +11,7 @@
 
 #include "alloc-util.h"
 #include "binfmt-util.h"
+#include "build.h"
 #include "conf-files.h"
 #include "def.h"
 #include "fd-util.h"

diff --git a/src/boot/bless-boot.c b/src/boot/bless-boot.c
index 554a716d8a8ccbdfe1edb353f94696391547b4f1..b2dd60f8ad44022e035bc99068139af4b1ef5a15 100644 (file)
--- a/src/boot/bless-boot.c
+++ b/src/boot/bless-boot.c
@@ -5,6 +5,7 @@
 
 #include "alloc-util.h"
 #include "bootspec.h"
+#include "build.h"
 #include "devnum-util.h"
 #include "efi-api.h"
 #include "efi-loader.h"
@@ -19,7 +20,6 @@
 #include "pretty-print.h"
 #include "sync-util.h"
 #include "terminal-util.h"
-#include "util.h"
 #include "verbs.h"
 #include "virt.h"
 

diff --git a/src/boot/boot-check-no-failures.c b/src/boot/boot-check-no-failures.c
index 78642063c4a61c7fc4198d13d03e81077c384782..4ff91cb9062719c17971904440a23b5199d12ab7 100644 (file)
--- a/src/boot/boot-check-no-failures.c
+++ b/src/boot/boot-check-no-failures.c
@@ -8,12 +8,12 @@
 #include "sd-bus.h"
 
 #include "alloc-util.h"
+#include "build.h"
 #include "bus-error.h"
 #include "log.h"
 #include "main-func.h"
 #include "pretty-print.h"
 #include "terminal-util.h"
-#include "util.h"
 
 static int help(void) {
         _cleanup_free_ char *link = NULL;

diff --git a/src/boot/bootctl.c b/src/boot/bootctl.c
index b53df11764418a42bfea3467bd97020de6a4d075..79b26765373c6d5d4ef5d879d3e6feb40c6d8d72 100644 (file)
--- a/src/boot/bootctl.c
+++ b/src/boot/bootctl.c
@@ -15,6 +15,7 @@
 #include "alloc-util.h"
 #include "blkid-util.h"
 #include "bootspec.h"
+#include "build.h"
 #include "chase-symlinks.h"
 #include "copy.h"
 #include "devnum-util.h"
@@ -53,7 +54,6 @@
 #include "tpm2-util.h"
 #include "umask-util.h"
 #include "utf8.h"
-#include "util.h"
 #include "verbs.h"
 #include "virt.h"
 

diff --git a/src/boot/measure.c b/src/boot/measure.c
index 4f16acedf063ef4fefb487b99a33efcefc0a2b45..b9cd2853b612aadc349f164627bb78ae4f75d6bb 100644 (file)
--- a/src/boot/measure.c
+++ b/src/boot/measure.c
@@ -4,6 +4,7 @@
 #include <unistd.h>
 
 #include "alloc-util.h"
+#include "build.h"
 #include "efi-loader.h"
 #include "fd-util.h"
 #include "fileio.h"

diff --git a/src/boot/pcrphase.c b/src/boot/pcrphase.c
index 267f66767c6d480c89dc47da8226b6afc633fffb..a77a85fb2e87905de026060c164634d2f1a2a05d 100644 (file)
--- a/src/boot/pcrphase.c
+++ b/src/boot/pcrphase.c
@@ -4,6 +4,7 @@
 
 #include <sd-messages.h>
 
+#include "build.h"
 #include "efivars.h"
 #include "main-func.h"
 #include "openssl-util.h"

diff --git a/src/busctl/busctl.c b/src/busctl/busctl.c
index f57a5d605d8d46c30fba1804664e9eb41d3cc055..32c6ed7cacf813117aa77519297c70e823860745 100644 (file)
--- a/src/busctl/busctl.c
+++ b/src/busctl/busctl.c
@@ -5,6 +5,7 @@
 #include "sd-bus.h"
 
 #include "alloc-util.h"
+#include "build.h"
 #include "bus-dump.h"
 #include "bus-internal.h"
 #include "bus-message.h"

diff --git a/src/cgls/cgls.c b/src/cgls/cgls.c
index 6af95204e3ddd5f58dcb0dd04bb51c8e51c89fbc..a6ec6326f35bc7338a71ca1741fef2e27d2a7989 100644 (file)
--- a/src/cgls/cgls.c
+++ b/src/cgls/cgls.c
@@ -8,6 +8,7 @@
 #include "sd-bus.h"
 
 #include "alloc-util.h"
+#include "build.h"
 #include "bus-util.h"
 #include "cgroup-show.h"
 #include "cgroup-util.h"
@@ -21,7 +22,6 @@
 #include "pretty-print.h"
 #include "strv.h"
 #include "unit-name.h"
-#include "util.h"
 
 static PagerFlags arg_pager_flags = 0;
 static OutputFlags arg_output_flags = OUTPUT_CGROUP_XATTRS | OUTPUT_CGROUP_ID;

diff --git a/src/cgtop/cgtop.c b/src/cgtop/cgtop.c
index 95c39875256c71b5c8b8106fa27188f73dbd495c..cf51024dcbeff8e2677a20399ab55caf3ee7b275 100644 (file)
--- a/src/cgtop/cgtop.c
+++ b/src/cgtop/cgtop.c
@@ -10,6 +10,7 @@
 #include "sd-bus.h"
 
 #include "alloc-util.h"
+#include "build.h"
 #include "bus-error.h"
 #include "bus-util.h"
 #include "cgroup-show.h"

diff --git a/src/coredump/coredumpctl.c b/src/coredump/coredumpctl.c
index 30ea08702efdb8e506d5a200596d5225c3aa49d9..9507374307f808cb24e9fe365da0bbe0f76098b1 100644 (file)
--- a/src/coredump/coredumpctl.c
+++ b/src/coredump/coredumpctl.c
@@ -11,6 +11,7 @@
 #include "sd-messages.h"
 
 #include "alloc-util.h"
+#include "build.h"
 #include "bus-error.h"
 #include "bus-locator.h"
 #include "bus-util.h"
@@ -42,7 +43,6 @@
 #include "terminal-util.h"
 #include "tmpfile-util.h"
 #include "user-util.h"
-#include "util.h"
 #include "verbs.h"
 
 #define SHORT_BUS_CALL_TIMEOUT_USEC (3 * USEC_PER_SEC)

diff --git a/src/creds/creds.c b/src/creds/creds.c
index a755a52c34065daeb0af7d0fd4142bde233fa3e3..3c86b10aab0f445245bfc539007974814eef90bf 100644 (file)
--- a/src/creds/creds.c
+++ b/src/creds/creds.c
@@ -3,6 +3,7 @@
 #include <getopt.h>
 #include <unistd.h>
 
+#include "build.h"
 #include "creds-util.h"
 #include "dirent-util.h"
 #include "escape.h"

diff --git a/src/cryptenroll/cryptenroll.c b/src/cryptenroll/cryptenroll.c
index 6a9170f0001a5f3370213a756bbee16df3a0589e..dbf6cf45af4cc545d010c7f6be67d0f458208c46 100644 (file)
--- a/src/cryptenroll/cryptenroll.c
+++ b/src/cryptenroll/cryptenroll.c
@@ -3,6 +3,7 @@
 #include <getopt.h>
 
 #include "ask-password-api.h"
+#include "build.h"
 #include "cryptenroll-fido2.h"
 #include "cryptenroll-list.h"
 #include "cryptenroll-password.h"

diff --git a/src/delta/delta.c b/src/delta/delta.c
index a08d35e43c392cbec67e054a1a752d7c2c88a62e..da648bc837dbfb40ee21cf301e9f3d208e12a5c5 100644 (file)
--- a/src/delta/delta.c
+++ b/src/delta/delta.c
@@ -6,6 +6,7 @@
 #include <unistd.h>
 
 #include "alloc-util.h"
+#include "build.h"
 #include "chase-symlinks.h"
 #include "dirent-util.h"
 #include "fd-util.h"

diff --git a/src/detect-virt/detect-virt.c b/src/detect-virt/detect-virt.c
index af2a58b78d4f0b27a0f4af00f91d3d96ed1da629..b75e3c34ca84c866268df61de105ddc1793b658c 100644 (file)
--- a/src/detect-virt/detect-virt.c
+++ b/src/detect-virt/detect-virt.c
@@ -6,10 +6,10 @@
 #include <stdlib.h>
 
 #include "alloc-util.h"
+#include "build.h"
 #include "main-func.h"
 #include "pretty-print.h"
 #include "string-table.h"
-#include "util.h"
 #include "virt.h"
 
 static bool arg_quiet = false;

diff --git a/src/dissect/dissect.c b/src/dissect/dissect.c
index b30144ec2e899e96e4b2617780bcf141be89084f..db7e7884220d267a1340312825d5860e7b92c543 100644 (file)
--- a/src/dissect/dissect.c
+++ b/src/dissect/dissect.c
@@ -12,6 +12,7 @@
 
 #include "architecture.h"
 #include "blockdev-util.h"
+#include "build.h"
 #include "chase-symlinks.h"
 #include "copy.h"
 #include "device-util.h"
@@ -42,7 +43,6 @@
 #include "terminal-util.h"
 #include "tmpfile-util.h"
 #include "user-util.h"
-#include "util.h"
 
 static enum {
         ACTION_DISSECT,

diff --git a/src/escape/escape.c b/src/escape/escape.c
index 0ad77f3f941d7af426b1263d0139b99777a5d2b9..abbc08b37f7f3b4c9b9a90fa219098d1b66fb92a 100644 (file)
--- a/src/escape/escape.c
+++ b/src/escape/escape.c
@@ -5,6 +5,7 @@
 #include <stdlib.h>
 
 #include "alloc-util.h"
+#include "build.h"
 #include "log.h"
 #include "main-func.h"
 #include "path-util.h"

diff --git a/src/firstboot/firstboot.c b/src/firstboot/firstboot.c
index 63db78b52dc0f4eac03993acce77757bbf651288..7cd9aed579974bfb347522f0ef3089b81fd698fc 100644 (file)
--- a/src/firstboot/firstboot.c
+++ b/src/firstboot/firstboot.c
@@ -9,6 +9,7 @@
 
 #include "alloc-util.h"
 #include "ask-password-api.h"
+#include "build.h"
 #include "chase-symlinks.h"
 #include "copy.h"
 #include "creds-util.h"

diff --git a/src/home/homectl.c b/src/home/homectl.c
index 87a1c6883f6da2b1afe3b8ad94126a29a539eb1c..3e846e370ab588b1c6d94855ae6a748bb3665a83 100644 (file)
--- a/src/home/homectl.c
+++ b/src/home/homectl.c
@@ -5,6 +5,7 @@
 #include "sd-bus.h"
 
 #include "ask-password-api.h"
+#include "build.h"
 #include "bus-common-errors.h"
 #include "bus-error.h"
 #include "bus-locator.h"

diff --git a/src/hostname/hostnamectl.c b/src/hostname/hostnamectl.c
index bb014973fbe78eaf4435a6416c7ee4834e91ff44..826826d70b9437989034f2170bfd6d5d7b58d208 100644 (file)
--- a/src/hostname/hostnamectl.c
+++ b/src/hostname/hostnamectl.c
@@ -11,6 +11,7 @@
 
 #include "alloc-util.h"
 #include "architecture.h"
+#include "build.h"
 #include "bus-common-errors.h"
 #include "bus-error.h"
 #include "bus-map-properties.h"
@@ -23,7 +24,6 @@
 #include "pretty-print.h"
 #include "spawn-polkit-agent.h"
 #include "terminal-util.h"
-#include "util.h"
 #include "verbs.h"
 
 static bool arg_ask_password = true;

diff --git a/src/hwdb/hwdb.c b/src/hwdb/hwdb.c
index 6925aecd8493bfd728ffb78db8ec9d978c79c5bb..edc5dfc1f5fc798c417ef9bdfabf90140c17a39f 100644 (file)
--- a/src/hwdb/hwdb.c
+++ b/src/hwdb/hwdb.c
@@ -5,12 +5,12 @@
 #include "sd-hwdb.h"
 
 #include "alloc-util.h"
+#include "build.h"
 #include "hwdb-util.h"
 #include "main-func.h"
 #include "pretty-print.h"
 #include "selinux-util.h"
 #include "terminal-util.h"
-#include "util.h"
 #include "verbs.h"
 
 static const char *arg_hwdb_bin_dir = NULL;

diff --git a/src/id128/id128.c b/src/id128/id128.c
index 6f4d65103ce45a342b74817132d2ca15fe3a6fb6..af88e315bbcfca56442043e6fa96ceab17572fe2 100644 (file)
--- a/src/id128/id128.c
+++ b/src/id128/id128.c
@@ -4,6 +4,7 @@
 #include <stdio.h>
 
 #include "alloc-util.h"
+#include "build.h"
 #include "gpt.h"
 #include "id128-print.h"
 #include "main-func.h"
@@ -11,7 +12,6 @@
 #include "strv.h"
 #include "format-table.h"
 #include "terminal-util.h"
-#include "util.h"
 #include "verbs.h"
 
 static Id128PrettyPrintMode arg_mode = ID128_PRINT_ID128;

diff --git a/src/import/export.c b/src/import/export.c
index 26533baeb89a11e5a7e42c4823c06ed3b568112c..690e19445335e2f20445849d7dd5dee7d540fe38 100644 (file)
--- a/src/import/export.c
+++ b/src/import/export.c
@@ -7,6 +7,7 @@
 #include "sd-id128.h"
 
 #include "alloc-util.h"
+#include "build.h"
 #include "discover-image.h"
 #include "export-raw.h"
 #include "export-tar.h"

diff --git a/src/import/import-fs.c b/src/import/import-fs.c
index 1c5581fd61e44354d2a6f05e8343ab847527eccb..4e7250c02e9df365802fdb7cda1d2aee5e0e6954 100644 (file)
--- a/src/import/import-fs.c
+++ b/src/import/import-fs.c
@@ -4,6 +4,7 @@
 #include <locale.h>
 
 #include "alloc-util.h"
+#include "build.h"
 #include "btrfs-util.h"
 #include "discover-image.h"
 #include "fd-util.h"

diff --git a/src/import/import.c b/src/import/import.c
index c76212494b2815f3bd36d40b1263ded25401066b..13f34633d2a5dae016b94ce9152b9b32b454fb31 100644 (file)
--- a/src/import/import.c
+++ b/src/import/import.c
@@ -7,6 +7,7 @@
 #include "sd-id128.h"
 
 #include "alloc-util.h"
+#include "build.h"
 #include "discover-image.h"
 #include "env-util.h"
 #include "fd-util.h"

diff --git a/src/import/pull.c b/src/import/pull.c
index 2cf0cca14ff8857ba21d4c7d1a9222ff84587ff7..38821b5790f57e05be8908e6644100b0158d706d 100644 (file)
--- a/src/import/pull.c
+++ b/src/import/pull.c
@@ -7,6 +7,7 @@
 #include "sd-id128.h"
 
 #include "alloc-util.h"
+#include "build.h"
 #include "discover-image.h"
 #include "env-util.h"
 #include "hexdecoct.h"

diff --git a/src/journal-remote/journal-gatewayd.c b/src/journal-remote/journal-gatewayd.c
index 34def4670e9b35bb9cce29e063cfe8e9838f2932..b3b44bceb8b50850d11af6465671f15669abbd85 100644 (file)
--- a/src/journal-remote/journal-gatewayd.c
+++ b/src/journal-remote/journal-gatewayd.c
@@ -14,6 +14,7 @@
 #include "sd-journal.h"
 
 #include "alloc-util.h"
+#include "build.h"
 #include "bus-util.h"
 #include "errno-util.h"
 #include "fd-util.h"
@@ -30,7 +31,6 @@
 #include "pretty-print.h"
 #include "sigbus.h"
 #include "tmpfile-util.h"
-#include "util.h"
 
 #define JOURNAL_WAIT_TIMEOUT (10*USEC_PER_SEC)
 

diff --git a/src/journal-remote/journal-remote-main.c b/src/journal-remote/journal-remote-main.c
index 008865218488dec2d2d1627073928f416d038ac0..1ebcb8ddceb408be3411ed3606aa6a07ee1c4cd9 100644 (file)
--- a/src/journal-remote/journal-remote-main.c
+++ b/src/journal-remote/journal-remote-main.c
@@ -5,6 +5,7 @@
 
 #include "sd-daemon.h"
 
+#include "build.h"
 #include "conf-parser.h"
 #include "daemon-util.h"
 #include "def.h"

diff --git a/src/journal-remote/journal-upload.c b/src/journal-remote/journal-upload.c
index 06448b2225f99642754bae8087e1703803b54302..6d58e48bbfbf36664b9ba422db45d7da81db11e2 100644 (file)
--- a/src/journal-remote/journal-upload.c
+++ b/src/journal-remote/journal-upload.c
@@ -10,6 +10,7 @@
 #include "sd-daemon.h"
 
 #include "alloc-util.h"
+#include "build.h"
 #include "conf-parser.h"
 #include "daemon-util.h"
 #include "def.h"
@@ -32,7 +33,6 @@
 #include "string-util.h"
 #include "strv.h"
 #include "tmpfile-util.h"
-#include "util.h"
 #include "version.h"
 
 #define PRIV_KEY_FILE CERTIFICATE_ROOT "/private/journal-upload.pem"

diff --git a/src/journal/cat.c b/src/journal/cat.c
index 0c2c0d6152d113de3c5d53d1e63f5396e47bf481..404a74873634d33696467870fd375c50328631d3 100644 (file)
--- a/src/journal/cat.c
+++ b/src/journal/cat.c
@@ -10,6 +10,7 @@
 #include "sd-journal.h"
 
 #include "alloc-util.h"
+#include "build.h"
 #include "fd-util.h"
 #include "main-func.h"
 #include "parse-argument.h"
@@ -18,7 +19,6 @@
 #include "string-util.h"
 #include "syslog-util.h"
 #include "terminal-util.h"
-#include "util.h"
 
 static const char *arg_identifier = NULL;
 static int arg_priority = LOG_INFO;

diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c
index 11de07fcfa112dbf3d1f3661d566beaa0eee71a3..7de1bd557a50d9eabc6397483ba93fec0fc0979b 100644 (file)
--- a/src/journal/journalctl.c
+++ b/src/journal/journalctl.c
@@ -19,6 +19,7 @@
 
 #include "acl-util.h"
 #include "alloc-util.h"
+#include "build.h"
 #include "bus-error.h"
 #include "bus-util.h"
 #include "catalog.h"

diff --git a/src/locale/localectl.c b/src/locale/localectl.c
index c23f1fa3f67063cc9d8bb20d06d48631808e0c66..e44e287282774874ccfd0bdbceb67913fae0464e 100644 (file)
--- a/src/locale/localectl.c
+++ b/src/locale/localectl.c
@@ -5,6 +5,7 @@
 
 #include "sd-bus.h"
 
+#include "build.h"
 #include "bus-error.h"
 #include "bus-locator.h"
 #include "bus-map-properties.h"

diff --git a/src/login/inhibit.c b/src/login/inhibit.c
index 211af404bd8efedfb3dcd45d52503ebcfbd172c5..6184d10cde57ad04935e697b7f1d71cf604d3ed2 100644 (file)
--- a/src/login/inhibit.c
+++ b/src/login/inhibit.c
@@ -9,6 +9,7 @@
 #include "sd-bus.h"
 
 #include "alloc-util.h"
+#include "build.h"
 #include "bus-error.h"
 #include "bus-util.h"
 #include "fd-util.h"
@@ -22,7 +23,6 @@
 #include "strv.h"
 #include "terminal-util.h"
 #include "user-util.h"
-#include "util.h"
 
 static const char* arg_what = "idle:sleep:shutdown";
 static const char* arg_who = NULL;

diff --git a/src/login/loginctl.c b/src/login/loginctl.c
index 4dbfa0db44fea8f96ea194a129eec82c66544a84..244708d2f506ad72e8ec089686c75e94f8bf203c 100644 (file)
--- a/src/login/loginctl.c
+++ b/src/login/loginctl.c
@@ -8,6 +8,7 @@
 #include "sd-bus.h"
 
 #include "alloc-util.h"
+#include "build.h"
 #include "bus-error.h"
 #include "bus-locator.h"
 #include "bus-map-properties.h"

diff --git a/src/machine-id-setup/machine-id-setup-main.c b/src/machine-id-setup/machine-id-setup-main.c
index 8a3b1efb4ce407dc92e9cc28d3a3db4b2c1da63c..6aef48650d21d4da422167917cedd4f058b5466f 100644 (file)
--- a/src/machine-id-setup/machine-id-setup-main.c
+++ b/src/machine-id-setup/machine-id-setup-main.c
@@ -6,6 +6,7 @@
 #include <stdlib.h>
 
 #include "alloc-util.h"
+#include "build.h"
 #include "dissect-image.h"
 #include "id128-util.h"
 #include "log.h"
@@ -16,7 +17,6 @@
 #include "path-util.h"
 #include "pretty-print.h"
 #include "terminal-util.h"
-#include "util.h"
 
 static char *arg_root = NULL;
 static char *arg_image = NULL;

diff --git a/src/machine/machinectl.c b/src/machine/machinectl.c
index 14085f739737b6234238a811bf245ac58e94961e..a1671e3252345f1c6f8fd5de2a623b38773f756b 100644 (file)
--- a/src/machine/machinectl.c
+++ b/src/machine/machinectl.c
@@ -14,6 +14,7 @@
 #include "sd-bus.h"
 
 #include "alloc-util.h"
+#include "build.h"
 #include "bus-common-errors.h"
 #include "bus-error.h"
 #include "bus-locator.h"

diff --git a/src/modules-load/modules-load.c b/src/modules-load/modules-load.c
index 9e20d59389e2f291420084139120455069a7c4ca..f8f0eb49004c1a093d6a5ce6acd8a8a67ce8b303 100644 (file)
--- a/src/modules-load/modules-load.c
+++ b/src/modules-load/modules-load.c
@@ -5,6 +5,7 @@
 #include <limits.h>
 #include <sys/stat.h>
 
+#include "build.h"
 #include "conf-files.h"
 #include "def.h"
 #include "fd-util.h"
@@ -16,7 +17,6 @@
 #include "proc-cmdline.h"
 #include "string-util.h"
 #include "strv.h"
-#include "util.h"
 
 static char **arg_proc_cmdline_modules = NULL;
 static const char conf_file_dirs[] = CONF_PATHS_NULSTR("modules-load.d");

diff --git a/src/mount/mount-tool.c b/src/mount/mount-tool.c
index 25e18d279cbe80846cb859b9eed1ef0b0dc1e733..95dcf1bab0610f45ba00e7ec7422b74b7f06d867 100644 (file)
--- a/src/mount/mount-tool.c
+++ b/src/mount/mount-tool.c
@@ -5,6 +5,7 @@
 #include "sd-bus.h"
 #include "sd-device.h"
 
+#include "build.h"
 #include "bus-error.h"
 #include "bus-locator.h"
 #include "bus-unit-util.h"

diff --git a/src/network/generator/main.c b/src/network/generator/main.c
index a36fe98c864a6192beed0af262bd9b68d7de154e..a0af0b831b40660aa012844bbc7486d62bda65c4 100644 (file)
--- a/src/network/generator/main.c
+++ b/src/network/generator/main.c
@@ -2,6 +2,7 @@
 
 #include <getopt.h>
 
+#include "build.h"
 #include "fd-util.h"
 #include "generator.h"
 #include "macro.h"

diff --git a/src/network/networkctl.c b/src/network/networkctl.c
index a2e216e779b8dc959e5e30946a62ac002608f269..8146125fc8a44b365aafc7e5ed53f03dbdd82427 100644 (file)
--- a/src/network/networkctl.c
+++ b/src/network/networkctl.c
@@ -22,6 +22,7 @@
 #include "alloc-util.h"
 #include "bond-util.h"
 #include "bridge-util.h"
+#include "build.h"
 #include "bus-common-errors.h"
 #include "bus-error.h"
 #include "bus-locator.h"

diff --git a/src/network/wait-online/wait-online.c b/src/network/wait-online/wait-online.c
index a679b858fa13e7dc02343eb4accbac8a64b531de..5328bba2d8c0a53f18354153454d53cb33a1bab7 100644 (file)
--- a/src/network/wait-online/wait-online.c
+++ b/src/network/wait-online/wait-online.c
@@ -6,6 +6,7 @@
 
 #include "sd-daemon.h"
 
+#include "build.h"
 #include "daemon-util.h"
 #include "main-func.h"
 #include "manager.h"

diff --git a/src/notify/notify.c b/src/notify/notify.c
index 7b23e7bdb0e5ec80afa512dcd624d15b1897e2d8..c4f54920aca29a9113f57afd267016d5cae1ec5d 100644 (file)
--- a/src/notify/notify.c
+++ b/src/notify/notify.c
@@ -9,6 +9,7 @@
 #include "sd-daemon.h"
 
 #include "alloc-util.h"
+#include "build.h"
 #include "env-util.h"
 #include "format-util.h"
 #include "log.h"
@@ -20,7 +21,6 @@
 #include "terminal-util.h"
 #include "time-util.h"
 #include "user-util.h"
-#include "util.h"
 
 static bool arg_ready = false;
 static pid_t arg_pid = 0;

diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
index 01a67b5553a3ca382ee20cb8e0ea074eb28580e1..fb9fbed12cbed749e108df2fde5f6349b46c4766 100644 (file)
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -28,6 +28,7 @@
 #include "base-filesystem.h"
 #include "blkid-util.h"
 #include "btrfs-util.h"
+#include "build.h"
 #include "bus-error.h"
 #include "bus-util.h"
 #include "cap-list.h"
@@ -110,7 +111,6 @@
 #include "umask-util.h"
 #include "unit-name.h"
 #include "user-util.h"
-#include "util.h"
 
 /* The notify socket inside the container it can use to talk to nspawn using the sd_notify(3) protocol */
 #define NSPAWN_NOTIFY_SOCKET_PATH "/run/host/notify"

diff --git a/src/oom/oomctl.c b/src/oom/oomctl.c
index 2ffb9d4d191a7f43d72b497cd48606159ab1e348..e527abf5da294b6baaced427cb94b11a2eabbef5 100644 (file)
--- a/src/oom/oomctl.c
+++ b/src/oom/oomctl.c
@@ -3,6 +3,7 @@
 #include <getopt.h>
 #include <unistd.h>
 
+#include "build.h"
 #include "bus-error.h"
 #include "copy.h"
 #include "main-func.h"

diff --git a/src/oom/oomd.c b/src/oom/oomd.c
index 6cfe1a3f4cf909f28533fefa35456c3414c5d16c..eb1b830605950bc49a069900826160a0b9592be3 100644 (file)
--- a/src/oom/oomd.c
+++ b/src/oom/oomd.c
@@ -2,6 +2,7 @@
 
 #include <getopt.h>
 
+#include "build.h"
 #include "bus-log-control-api.h"
 #include "bus-object.h"
 #include "cgroup-util.h"

diff --git a/src/partition/growfs.c b/src/partition/growfs.c
index 8a04071f170c435c38413c63869bf00206f2b517..bb2b53103ff6e2586d8bee53d04b07c2d4d23a37 100644 (file)
--- a/src/partition/growfs.c
+++ b/src/partition/growfs.c
@@ -14,6 +14,7 @@
 
 #include "blockdev-util.h"
 #include "btrfs-util.h"
+#include "build.h"
 #include "cryptsetup-util.h"
 #include "device-nodes.h"
 #include "device-util.h"

diff --git a/src/partition/repart.c b/src/partition/repart.c
index 44060c9413ff1dbaa2d0d14a87c1d5e417c6a068..51fdaabc42a9556c874600c4dd464a0a25fd4818 100644 (file)
--- a/src/partition/repart.c
+++ b/src/partition/repart.c
@@ -19,6 +19,7 @@
 #include "blkid-util.h"
 #include "blockdev-util.h"
 #include "btrfs-util.h"
+#include "build.h"
 #include "chase-symlinks.h"
 #include "conf-files.h"
 #include "conf-parser.h"

diff --git a/src/path/path.c b/src/path/path.c
index 0024a606112961b5db5bc49ef57755ffc28c67bf..d3348ce04fd8a33837a56ebab779e45b2f1fa774 100644 (file)
--- a/src/path/path.c
+++ b/src/path/path.c
@@ -8,12 +8,12 @@
 #include "sd-path.h"
 
 #include "alloc-util.h"
+#include "build.h"
 #include "log.h"
 #include "macro.h"
 #include "main-func.h"
 #include "pretty-print.h"
 #include "string-util.h"
-#include "util.h"
 
 static const char *arg_suffix = NULL;
 

diff --git a/src/portable/portablectl.c b/src/portable/portablectl.c
index dbae8a4d47603da0e72bccf2b85c0c8c0756ef99..d0d7bb1caf475bc4882bdb58addbb09540c58030 100644 (file)
--- a/src/portable/portablectl.c
+++ b/src/portable/portablectl.c
@@ -6,6 +6,7 @@
 #include "sd-bus.h"
 
 #include "alloc-util.h"
+#include "build.h"
 #include "bus-error.h"
 #include "bus-locator.h"
 #include "bus-unit-util.h"

diff --git a/src/random-seed/random-seed.c b/src/random-seed/random-seed.c
index 22ddf659ae71776b18cadc86306d1f7d3e52cff9..65de1aa986eeaf58854677b46bd72acec8f41c6f 100644 (file)
--- a/src/random-seed/random-seed.c
+++ b/src/random-seed/random-seed.c
@@ -15,6 +15,7 @@
 #include "sd-id128.h"
 
 #include "alloc-util.h"
+#include "build.h"
 #include "fd-util.h"
 #include "fs-util.h"
 #include "io-util.h"
@@ -33,7 +34,6 @@
 #include "sync-util.h"
 #include "sha256.h"
 #include "terminal-util.h"
-#include "util.h"
 #include "xattr-util.h"
 
 typedef enum SeedAction {

diff --git a/src/resolve/resolvconf-compat.c b/src/resolve/resolvconf-compat.c
index d95df29793bcf1c66c671038ab312262edfa8451..0a0b97fa015c9f0e3f952b4c1a1b22cc3db3d52a 100644 (file)
--- a/src/resolve/resolvconf-compat.c
+++ b/src/resolve/resolvconf-compat.c
@@ -4,6 +4,7 @@
 #include <net/if.h>
 
 #include "alloc-util.h"
+#include "build.h"
 #include "def.h"
 #include "dns-domain.h"
 #include "extract-word.h"

diff --git a/src/resolve/resolvectl.c b/src/resolve/resolvectl.c
index b07761a4957d9477c94bc46ae197b29424610d8a..dd0a8e121e256e39125c186d4f6c8928be21a340 100644 (file)
--- a/src/resolve/resolvectl.c
+++ b/src/resolve/resolvectl.c
@@ -9,6 +9,7 @@
 
 #include "af-list.h"
 #include "alloc-util.h"
+#include "build.h"
 #include "bus-common-errors.h"
 #include "bus-error.h"
 #include "bus-locator.h"

diff --git a/src/run/run.c b/src/run/run.c
index 627a6b11dab1c989669ff6f8e4a8028301ddf2fa..5f7d651b905c3fb04ba5b5dd7adf3ee20c0b77ac 100644 (file)
--- a/src/run/run.c
+++ b/src/run/run.c
@@ -10,6 +10,7 @@
 #include "sd-event.h"
 
 #include "alloc-util.h"
+#include "build.h"
 #include "bus-error.h"
 #include "bus-locator.h"
 #include "bus-map-properties.h"

diff --git a/src/shared/service-util.c b/src/shared/service-util.c
index 68aa5775f5ac4d7bfdeda00f66f75912ba752ae2..b0585ba5467fa6125443ca3a3a9d52be4b829a70 100644 (file)
--- a/src/shared/service-util.c
+++ b/src/shared/service-util.c
@@ -4,10 +4,10 @@
 #include <stdio.h>
 
 #include "alloc-util.h"
+#include "build.h"
 #include "pretty-print.h"
 #include "service-util.h"
 #include "terminal-util.h"
-#include "util.h"
 
 static int help(const char *program_path, const char *service, const char *description, bool bus_introspect) {
         _cleanup_free_ char *link = NULL;

diff --git a/src/sleep/sleep.c b/src/sleep/sleep.c
index 3461d3e45f0987a98265c3f6a853d742a29ba697..4d5b9d55794cd5be0dd45a2a4dd256ebd5e27ed3 100644 (file)
--- a/src/sleep/sleep.c
+++ b/src/sleep/sleep.c
@@ -18,6 +18,7 @@
 #include "sd-messages.h"
 
 #include "btrfs-util.h"
+#include "build.h"
 #include "bus-error.h"
 #include "bus-locator.h"
 #include "bus-util.h"
@@ -37,7 +38,6 @@
 #include "string-util.h"
 #include "strv.h"
 #include "time-util.h"
-#include "util.h"
 
 static SleepOperation arg_operation = _SLEEP_OPERATION_INVALID;
 

diff --git a/src/socket-proxy/socket-proxyd.c b/src/socket-proxy/socket-proxyd.c
index c740b22057b96682e822c998d7e3a49d8c361931..2a6eeb661a67768de30c39e79b84bd6a10a35ddf 100644 (file)
--- a/src/socket-proxy/socket-proxyd.c
+++ b/src/socket-proxy/socket-proxyd.c
@@ -14,6 +14,7 @@
 #include "sd-resolve.h"
 
 #include "alloc-util.h"
+#include "build.h"
 #include "errno-util.h"
 #include "fd-util.h"
 #include "log.h"
@@ -25,7 +26,6 @@
 #include "set.h"
 #include "socket-util.h"
 #include "string-util.h"
-#include "util.h"
 
 #define BUFFER_SIZE (256 * 1024)
 

diff --git a/src/stdio-bridge/stdio-bridge.c b/src/stdio-bridge/stdio-bridge.c
index c851059a0955a7713dc7cc647859375bd50c21bf..3c5ba074c7de3fc4940063c9b1c0c8c11aa237f5 100644 (file)
--- a/src/stdio-bridge/stdio-bridge.c
+++ b/src/stdio-bridge/stdio-bridge.c
@@ -10,13 +10,13 @@
 #include "sd-daemon.h"
 
 #include "alloc-util.h"
+#include "build.h"
 #include "bus-internal.h"
 #include "bus-util.h"
 #include "errno-util.h"
 #include "io-util.h"
 #include "log.h"
 #include "main-func.h"
-#include "util.h"
 #include "version.h"
 
 #define DEFAULT_BUS_PATH "unix:path=/run/dbus/system_bus_socket"

diff --git a/src/sysctl/sysctl.c b/src/sysctl/sysctl.c
index 5de5d81655f1a435e528f0d7734498273cca210b..34f0182fc933fef720531f8d94591a964ae57bd8 100644 (file)
--- a/src/sysctl/sysctl.c
+++ b/src/sysctl/sysctl.c
@@ -9,6 +9,7 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 
+#include "build.h"
 #include "conf-files.h"
 #include "creds-util.h"
 #include "def.h"

diff --git a/src/sysext/sysext.c b/src/sysext/sysext.c
index 839e2f92b825d6dcc1e63cde1759f318b66ce3a4..9a7ef8eb2906a29ed36cf87d77bf4ef96b61d06b 100644 (file)
--- a/src/sysext/sysext.c
+++ b/src/sysext/sysext.c
@@ -7,6 +7,7 @@
 #include <sys/mount.h>
 #include <unistd.h>
 
+#include "build.h"
 #include "capability-util.h"
 #include "chase-symlinks.h"
 #include "devnum-util.h"

diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
index 02a298d5729bd646e224969fb4c1827f269653f0..3f28bcc3dc916cc326aac165290393d288850602 100644 (file)
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -6,6 +6,7 @@
 
 #include "sd-daemon.h"
 
+#include "build.h"
 #include "bus-util.h"
 #include "dissect-image.h"
 #include "install.h"

diff --git a/src/sysupdate/sysupdate.c b/src/sysupdate/sysupdate.c
index 944ac41a41f85f4a4734302ef1af81b3799b12ae..14a3cf95d728c373b66363fbaff50d651414dd76 100644 (file)
--- a/src/sysupdate/sysupdate.c
+++ b/src/sysupdate/sysupdate.c
@@ -3,6 +3,7 @@
 #include <getopt.h>
 #include <unistd.h>
 
+#include "build.h"
 #include "bus-error.h"
 #include "bus-locator.h"
 #include "chase-symlinks.h"

diff --git a/src/sysusers/sysusers.c b/src/sysusers/sysusers.c
index e2533e0128dbb96da2564c598f64eb535c25fc89..a520d76dce9b23fb58c82d81e5b1b598e4da4cc7 100644 (file)
--- a/src/sysusers/sysusers.c
+++ b/src/sysusers/sysusers.c
@@ -4,6 +4,7 @@
 #include <utmp.h>
 
 #include "alloc-util.h"
+#include "build.h"
 #include "chase-symlinks.h"
 #include "conf-files.h"
 #include "copy.h"
@@ -38,7 +39,6 @@
 #include "uid-range.h"
 #include "user-util.h"
 #include "utf8.h"
-#include "util.h"
 
 typedef enum ItemType {
         ADD_USER =   'u',

diff --git a/src/timedate/timedatectl.c b/src/timedate/timedatectl.c
index ac4d3dc3edd28a2871b39e0fb68b32a9c5d1cecc..e3c722610a2ca9081ed9f831bf2b9c5463d2daa4 100644 (file)
--- a/src/timedate/timedatectl.c
+++ b/src/timedate/timedatectl.c
@@ -8,6 +8,7 @@
 
 #include "sd-bus.h"
 
+#include "build.h"
 #include "bus-error.h"
 #include "bus-locator.h"
 #include "bus-map-properties.h"
@@ -24,7 +25,6 @@
 #include "string-table.h"
 #include "strv.h"
 #include "terminal-util.h"
-#include "util.h"
 #include "verbs.h"
 
 static PagerFlags arg_pager_flags = 0;

diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c
index 784b8955778990aafba6308572ca3f63ed6f411d..06328d495900f73cbee3f93eec7f89a788093358 100644 (file)
--- a/src/tmpfiles/tmpfiles.c
+++ b/src/tmpfiles/tmpfiles.c
@@ -20,6 +20,7 @@
 #include "acl-util.h"
 #include "alloc-util.h"
 #include "btrfs-util.h"
+#include "build.h"
 #include "capability-util.h"
 #include "chase-symlinks.h"
 #include "chattr-util.h"

diff --git a/src/tty-ask-password-agent/tty-ask-password-agent.c b/src/tty-ask-password-agent/tty-ask-password-agent.c
index b7d279cc22c632f2242a7d6642b064fea55dbe3c..50b6776039feb57bf99b3bbe922e82fcafc845a8 100644 (file)
--- a/src/tty-ask-password-agent/tty-ask-password-agent.c
+++ b/src/tty-ask-password-agent/tty-ask-password-agent.c
@@ -18,6 +18,7 @@
 
 #include "alloc-util.h"
 #include "ask-password-api.h"
+#include "build.h"
 #include "conf-parser.h"
 #include "def.h"
 #include "dirent-util.h"

diff --git a/src/userdb/userdbctl.c b/src/userdb/userdbctl.c
index 63b0c4dde12e602e49e430329659dd406baea4bc..49bdaf666f646db16070b2d91c26856d436bfb65 100644 (file)
--- a/src/userdb/userdbctl.c
+++ b/src/userdb/userdbctl.c
@@ -3,6 +3,7 @@
 #include <getopt.h>
 #include <utmp.h>
 
+#include "build.h"
 #include "dirent-util.h"
 #include "errno-list.h"
 #include "escape.h"