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.
This commit is contained in:
@@ -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,
|
||||
},
|
||||
|
||||
@@ -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) {
|
||||
|
||||
@@ -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);
|
||||
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user