tree-wide: Ensure source file names are unique

Let's ensure all of our source file names are unique without having
to take the directory into account.

This allows us to create meson targets or unit tests identified by the
the name of the source file they operate on without having to include
the full path of the source file in the target or test name to avoid
conflicts.

src/boot/boot.c

@@ -8,8 +8,8 @@
 #include "device-path-util.h"
 #include "devicetree.h"
 #include "drivers.h"
+#include "efi-efivars.h"
 #include "efi-string-table.h"
-#include "efivars.h"
 #include "efivars-fundamental.h"
 #include "export-vars.h"
 #include "graphics.h"

src/boot/edid.c

@@ -2,7 +2,7 @@
 
 #include "edid.h"
 #include "edid-fundamental.h"
-#include "log.h"
+#include "efi-log.h"
 #include "proto/edid-discovered.h"
 #include "util.h"
 

src/boot/efi-efivars.c

@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include "efi-efivars.h"
 #include "efi-string.h"
-#include "efivars.h"
 #include "ticks.h"
 #include "util.h"
 

src/boot/efi-log.c

@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include "log.h"
+#include "efi-log.h"
 #include "proto/rng.h"
 #include "util.h"
 

src/boot/export-vars.c

@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include "device-path-util.h"
-#include "efivars.h"
+#include "efi-efivars.h"
 #include "export-vars.h"
 #include "part-discovery.h"
 #include "url-discovery.h"

src/boot/meson.build

@@ -298,13 +298,13 @@ libefi_sources = files(
         'devicetree.c',
         'drivers.c',
         'edid.c',
+        'efi-efivars.c',
         'efi-firmware.c',
+        'efi-log.c',
         'efi-string.c',
-        'efivars.c',
         'export-vars.c',
         'graphics.c',
         'initrd.c',
-        'log.c',
         'measure.c',
         'part-discovery.c',
         'pe.c',

src/boot/random-seed.c

@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include "efivars.h"
+#include "efi-efivars.h"
 #include "memory-util-fundamental.h"
 #include "proto/rng.h"
 #include "random-seed.h"

src/boot/secure-boot.c

@@ -1,8 +1,8 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include "console.h"
+#include "efi-efivars.h"
 #include "efi-string-table.h"
-#include "efivars.h"
 #include "proto/security-arch.h"
 #include "secure-boot.h"
 #include "util.h"

src/boot/shim.c

@@ -9,7 +9,7 @@
  */
 
 #include "device-path-util.h"
-#include "efivars.h"
+#include "efi-efivars.h"
 #include "secure-boot.h"
 #include "shim.h"
 #include "util.h"

src/boot/smbios.c

@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
+#include "efi-efivars.h"
 #include "efi-string.h"
-#include "efivars.h"
 #include "proto/device-path.h"
 #include "smbios.h"
 #include "string-util-fundamental.h"

src/boot/stub.c

@@ -5,7 +5,7 @@
 #include "cpio.h"
 #include "device-path-util.h"
 #include "devicetree.h"
-#include "efivars.h"
+#include "efi-efivars.h"
 #include "export-vars.h"
 #include "graphics.h"
 #include "iovec-util-fundamental.h"

src/boot/ubsan.c

@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
-#include "log.h"
+#include "efi-log.h"
 
 typedef struct {
         const char *filename;

src/boot/util.c

@@ -1,8 +1,8 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 
 #include "device-path-util.h"
+#include "efi-efivars.h"
 #include "efi-string.h"
-#include "efivars.h"
 #include "memory-util-fundamental.h"
 #include "proto/device-path.h"
 #include "proto/simple-text-io.h"

src/boot/util.h

@@ -8,7 +8,7 @@
 
 #if SD_BOOT
 
-#include "log.h"
+#include "efi-log.h"
 #include "proto/file-io.h"
 
 /* This is provided by the linker. */

src/boot/vmm.c

@@ -8,7 +8,7 @@
 #include "device-path-util.h"
 #include "drivers.h"
 #include "efi-string.h"
-#include "efivars.h"
+#include "efi-efivars.h"
 #include "proto/device-path.h"
 #include "smbios.h"
 #include "string-util-fundamental.h"

src/escape/meson.build

@@ -4,6 +4,6 @@ executables += [
         executable_template + {
                 'name' : 'systemd-escape',
                 'public' : true,
-                'sources' : files('escape.c'),
+                'sources' : files('escape-tool.c'),
         },
 ]

src/measure/meson.build

@@ -8,7 +8,7 @@ executables += [
                         'HAVE_OPENSSL',
                         'HAVE_TPM2',
                 ],
-                'sources' : files('measure.c'),
+                'sources' : files('measure-tool.c'),
                 'dependencies' : libopenssl,
         },
 ]

src/network/meson.build

@@ -116,8 +116,8 @@ systemd_networkd_extract_sources = files(
 
 systemd_networkd_wait_online_sources = files(
         'wait-online/dns-configuration.c',
-        'wait-online/link.c',
-        'wait-online/manager.c',
+        'wait-online/wait-online-link.c',
+        'wait-online/wait-online-manager.c',
         'wait-online/wait-online.c',
 )
 
@@ -229,7 +229,7 @@ executables += [
         },
         libexec_template + {
                 'name' : 'systemd-network-generator',
-                'sources' : files('generator/network-generator.c', 'generator/main.c'),
+                'sources' : files('generator/network-generator.c', 'generator/network-generator-main.c'),
                 'extract' : files('generator/network-generator.c'),
                 'link_with' : networkd_link_with,
         },

src/network/wait-online/wait-online-link.c

@@ -6,10 +6,10 @@
 #include "dns-configuration.h"
 #include "format-ifname.h"
 #include "hashmap.h"
-#include "link.h"
-#include "manager.h"
 #include "string-util.h"
 #include "strv.h"
+#include "wait-online-link.h"
+#include "wait-online-manager.h"
 
 static Link* link_free(Link *l) {
 

src/network/wait-online/wait-online-manager.c

@@ -11,11 +11,12 @@
 #include "alloc-util.h"
 #include "dns-configuration.h"
 #include "json-util.h"
-#include "link.h"
-#include "manager.h"
 #include "netlink-util.h"
+#include "string-util.h"
 #include "strv.h"
 #include "time-util.h"
+#include "wait-online-link.h"
+#include "wait-online-manager.h"
 
 static bool link_in_command_line_interfaces(Link *link, Manager *m) {
         assert(link);

src/network/wait-online/wait-online.c

@@ -11,12 +11,12 @@
 #include "daemon-util.h"
 #include "log.h"
 #include "main-func.h"
-#include "manager.h"
 #include "parse-argument.h"
 #include "pretty-print.h"
 #include "signal-util.h"
 #include "socket-util.h"
 #include "strv.h"
+#include "wait-online-manager.h"
 
 static bool arg_quiet = false;
 static usec_t arg_timeout = 120 * USEC_PER_SEC;

src/path/meson.build

@@ -4,6 +4,6 @@ executables += [
         executable_template + {
                 'name' : 'systemd-path',
                 'public' : true,
-                'sources' : files('path.c'),
+                'sources' : files('path-tool.c'),
         },
 ]

src/random-seed/meson.build

@@ -4,6 +4,6 @@ executables += [
         libexec_template + {
                 'name' : 'systemd-random-seed',
                 'conditions' : ['ENABLE_RANDOMSEED'],
-                'sources' : files('random-seed.c'),
+                'sources' : files('random-seed-tool.c'),
         },
 ]