systemd: move "src/core/systemd" to "src/libnm-systemd-core"

This follows the recently introduced naming scheme and directory layout.
"libnm-systemd-core" is an independent component, and as such should no
be inside "src/core/".

Move it.

https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/875

Makefile.am

@@ -2071,7 +2071,7 @@ libexec_PROGRAMS += \
 noinst_LTLIBRARIES += \
 	src/core/libNetworkManagerBase.la \
 	src/core/libNetworkManager.la \
-	src/core/libnm-systemd-core.la \
+	src/libnm-systemd-core/libnm-systemd-core.la \
 	$(NULL)
 
 check-config-options:
@@ -2250,102 +2250,98 @@ EXTRA_DIST += src/libnm-systemd-shared/meson.build
 
 ###############################################################################
 
-src_core_libnm_systemd_core_la_cppflags = \
+src_libnm_systemd_core_libnm_systemd_core_la_cppflags = \
 	$(libsystemd_cppflags) \
-	-I$(builddir)/src/libnm-core-public \
-	-I$(srcdir)/src/libnm-core-public \
-	-I$(srcdir)/src \
-	-I$(srcdir)/src/core \
-	-I$(srcdir)/src/core/systemd/sd-adapt-core \
-	-I$(srcdir)/src/core/systemd/src/systemd \
-	-I$(srcdir)/src/core/systemd/src/libsystemd-network \
-	-I$(srcdir)/src/core/systemd/src/libsystemd/sd-event \
+	-I$(srcdir)/src/libnm-systemd-core/sd-adapt-core \
+	-I$(srcdir)/src/libnm-systemd-core/src/systemd \
+	-I$(srcdir)/src/libnm-systemd-core/src/libsystemd-network \
+	-I$(srcdir)/src/libnm-systemd-core/src/libsystemd/sd-event \
 	$(NULL)
 
-src_core_libnm_systemd_core_la_libadd = \
+src_libnm_systemd_core_libnm_systemd_core_la_libadd = \
 	$(GLIB_LIBS) \
 	$(CODE_COVERAGE_LDFLAGS) \
 	$(NULL)
 
-src_core_libnm_systemd_core_la_SOURCES = \
-	src/core/systemd/nm-default-systemd.h \
-	src/core/systemd/nm-sd-utils-core.c \
-	src/core/systemd/nm-sd-utils-core.h \
-	src/core/systemd/nm-sd.c \
-	src/core/systemd/nm-sd.h \
-	src/core/systemd/nm-sd-utils-dhcp.h \
-	src/core/systemd/nm-sd-utils-dhcp.c \
-	src/core/systemd/sd-adapt-core/condition.h \
-	src/core/systemd/sd-adapt-core/conf-parser.h \
-	src/core/systemd/sd-adapt-core/device-util.h \
-	src/core/systemd/sd-adapt-core/khash.h \
-	src/core/systemd/sd-adapt-core/network-util.h \
-	src/core/systemd/sd-adapt-core/nm-sd-adapt-core.c \
-	src/core/systemd/sd-adapt-core/nm-sd-adapt-core.h \
-	src/core/systemd/sd-adapt-core/sd-daemon.h \
-	src/core/systemd/sd-adapt-core/sd-device.h \
-	src/core/systemd/sd-adapt-core/udev-util.h \
-	src/core/systemd/src/libsystemd-network/arp-util.c \
-	src/core/systemd/src/libsystemd-network/arp-util.h \
-	src/core/systemd/src/libsystemd-network/dhcp-identifier.c \
-	src/core/systemd/src/libsystemd-network/dhcp-identifier.h \
-	src/core/systemd/src/libsystemd-network/dhcp-internal.h \
-	src/core/systemd/src/libsystemd-network/dhcp-lease-internal.h \
-	src/core/systemd/src/libsystemd-network/dhcp-network.c \
-	src/core/systemd/src/libsystemd-network/dhcp-option.c \
-	src/core/systemd/src/libsystemd-network/dhcp-packet.c \
-	src/core/systemd/src/libsystemd-network/dhcp-protocol.h \
-	src/core/systemd/src/libsystemd-network/dhcp6-internal.h \
-	src/core/systemd/src/libsystemd-network/dhcp6-lease-internal.h \
-	src/core/systemd/src/libsystemd-network/dhcp6-network.c \
-	src/core/systemd/src/libsystemd-network/dhcp6-option.c \
-	src/core/systemd/src/libsystemd-network/dhcp6-protocol.h \
-	src/core/systemd/src/libsystemd-network/lldp-internal.h \
-	src/core/systemd/src/libsystemd-network/lldp-neighbor.c \
-	src/core/systemd/src/libsystemd-network/lldp-neighbor.h \
-	src/core/systemd/src/libsystemd-network/lldp-network.c \
-	src/core/systemd/src/libsystemd-network/lldp-network.h \
-	src/core/systemd/src/libsystemd-network/network-common.c \
-	src/core/systemd/src/libsystemd-network/network-common.h \
-	src/core/systemd/src/libsystemd-network/network-internal.c \
-	src/core/systemd/src/libsystemd-network/network-internal.h \
-	src/core/systemd/src/libsystemd-network/sd-dhcp-client.c \
-	src/core/systemd/src/libsystemd-network/sd-dhcp-lease.c \
-	src/core/systemd/src/libsystemd-network/sd-dhcp6-client.c \
-	src/core/systemd/src/libsystemd-network/sd-dhcp6-lease.c \
-	src/core/systemd/src/libsystemd-network/sd-ipv4acd.c \
-	src/core/systemd/src/libsystemd-network/sd-ipv4ll.c \
-	src/core/systemd/src/libsystemd-network/sd-lldp.c \
-	src/core/systemd/src/libsystemd/sd-event/event-source.h \
-	src/core/systemd/src/libsystemd/sd-event/event-util.c \
-	src/core/systemd/src/libsystemd/sd-event/event-util.h \
-	src/core/systemd/src/libsystemd/sd-event/sd-event.c \
-	src/core/systemd/src/libsystemd/sd-id128/id128-util.c \
-	src/core/systemd/src/libsystemd/sd-id128/id128-util.h \
-	src/core/systemd/src/libsystemd/sd-id128/sd-id128.c \
-	src/core/systemd/src/systemd/_sd-common.h \
-	src/core/systemd/src/systemd/sd-dhcp-client.h \
-	src/core/systemd/src/systemd/sd-dhcp-lease.h \
-	src/core/systemd/src/systemd/sd-dhcp-option.h \
-	src/core/systemd/src/systemd/sd-dhcp6-client.h \
-	src/core/systemd/src/systemd/sd-dhcp6-lease.h \
-	src/core/systemd/src/systemd/sd-dhcp6-option.h \
-	src/core/systemd/src/systemd/sd-event.h \
-	src/core/systemd/src/systemd/sd-id128.h \
-	src/core/systemd/src/systemd/sd-ipv4acd.h \
-	src/core/systemd/src/systemd/sd-ipv4ll.h \
-	src/core/systemd/src/systemd/sd-lldp.h \
-	src/core/systemd/src/systemd/sd-ndisc.h \
+src_libnm_systemd_core_libnm_systemd_core_la_SOURCES = \
+	src/libnm-systemd-core/nm-default-systemd-core.h \
+	src/libnm-systemd-core/nm-sd-utils-core.c \
+	src/libnm-systemd-core/nm-sd-utils-core.h \
+	src/libnm-systemd-core/nm-sd.c \
+	src/libnm-systemd-core/nm-sd.h \
+	src/libnm-systemd-core/nm-sd-utils-dhcp.h \
+	src/libnm-systemd-core/nm-sd-utils-dhcp.c \
+	src/libnm-systemd-core/sd-adapt-core/condition.h \
+	src/libnm-systemd-core/sd-adapt-core/conf-parser.h \
+	src/libnm-systemd-core/sd-adapt-core/device-util.h \
+	src/libnm-systemd-core/sd-adapt-core/khash.h \
+	src/libnm-systemd-core/sd-adapt-core/network-util.h \
+	src/libnm-systemd-core/sd-adapt-core/nm-sd-adapt-core.c \
+	src/libnm-systemd-core/sd-adapt-core/nm-sd-adapt-core.h \
+	src/libnm-systemd-core/sd-adapt-core/sd-daemon.h \
+	src/libnm-systemd-core/sd-adapt-core/sd-device.h \
+	src/libnm-systemd-core/sd-adapt-core/udev-util.h \
+	src/libnm-systemd-core/src/libsystemd-network/arp-util.c \
+	src/libnm-systemd-core/src/libsystemd-network/arp-util.h \
+	src/libnm-systemd-core/src/libsystemd-network/dhcp-identifier.c \
+	src/libnm-systemd-core/src/libsystemd-network/dhcp-identifier.h \
+	src/libnm-systemd-core/src/libsystemd-network/dhcp-internal.h \
+	src/libnm-systemd-core/src/libsystemd-network/dhcp-lease-internal.h \
+	src/libnm-systemd-core/src/libsystemd-network/dhcp-network.c \
+	src/libnm-systemd-core/src/libsystemd-network/dhcp-option.c \
+	src/libnm-systemd-core/src/libsystemd-network/dhcp-packet.c \
+	src/libnm-systemd-core/src/libsystemd-network/dhcp-protocol.h \
+	src/libnm-systemd-core/src/libsystemd-network/dhcp6-internal.h \
+	src/libnm-systemd-core/src/libsystemd-network/dhcp6-lease-internal.h \
+	src/libnm-systemd-core/src/libsystemd-network/dhcp6-network.c \
+	src/libnm-systemd-core/src/libsystemd-network/dhcp6-option.c \
+	src/libnm-systemd-core/src/libsystemd-network/dhcp6-protocol.h \
+	src/libnm-systemd-core/src/libsystemd-network/lldp-internal.h \
+	src/libnm-systemd-core/src/libsystemd-network/lldp-neighbor.c \
+	src/libnm-systemd-core/src/libsystemd-network/lldp-neighbor.h \
+	src/libnm-systemd-core/src/libsystemd-network/lldp-network.c \
+	src/libnm-systemd-core/src/libsystemd-network/lldp-network.h \
+	src/libnm-systemd-core/src/libsystemd-network/network-common.c \
+	src/libnm-systemd-core/src/libsystemd-network/network-common.h \
+	src/libnm-systemd-core/src/libsystemd-network/network-internal.c \
+	src/libnm-systemd-core/src/libsystemd-network/network-internal.h \
+	src/libnm-systemd-core/src/libsystemd-network/sd-dhcp-client.c \
+	src/libnm-systemd-core/src/libsystemd-network/sd-dhcp-lease.c \
+	src/libnm-systemd-core/src/libsystemd-network/sd-dhcp6-client.c \
+	src/libnm-systemd-core/src/libsystemd-network/sd-dhcp6-lease.c \
+	src/libnm-systemd-core/src/libsystemd-network/sd-ipv4acd.c \
+	src/libnm-systemd-core/src/libsystemd-network/sd-ipv4ll.c \
+	src/libnm-systemd-core/src/libsystemd-network/sd-lldp.c \
+	src/libnm-systemd-core/src/libsystemd/sd-event/event-source.h \
+	src/libnm-systemd-core/src/libsystemd/sd-event/event-util.c \
+	src/libnm-systemd-core/src/libsystemd/sd-event/event-util.h \
+	src/libnm-systemd-core/src/libsystemd/sd-event/sd-event.c \
+	src/libnm-systemd-core/src/libsystemd/sd-id128/id128-util.c \
+	src/libnm-systemd-core/src/libsystemd/sd-id128/id128-util.h \
+	src/libnm-systemd-core/src/libsystemd/sd-id128/sd-id128.c \
+	src/libnm-systemd-core/src/systemd/_sd-common.h \
+	src/libnm-systemd-core/src/systemd/sd-dhcp-client.h \
+	src/libnm-systemd-core/src/systemd/sd-dhcp-lease.h \
+	src/libnm-systemd-core/src/systemd/sd-dhcp-option.h \
+	src/libnm-systemd-core/src/systemd/sd-dhcp6-client.h \
+	src/libnm-systemd-core/src/systemd/sd-dhcp6-lease.h \
+	src/libnm-systemd-core/src/systemd/sd-dhcp6-option.h \
+	src/libnm-systemd-core/src/systemd/sd-event.h \
+	src/libnm-systemd-core/src/systemd/sd-id128.h \
+	src/libnm-systemd-core/src/systemd/sd-ipv4acd.h \
+	src/libnm-systemd-core/src/systemd/sd-ipv4ll.h \
+	src/libnm-systemd-core/src/systemd/sd-lldp.h \
+	src/libnm-systemd-core/src/systemd/sd-ndisc.h \
 	$(NULL)
 
-src_core_libnm_systemd_core_la_CPPFLAGS = $(src_core_libnm_systemd_core_la_cppflags)
-src_core_libnm_systemd_core_la_LIBADD = \
+src_libnm_systemd_core_libnm_systemd_core_la_CPPFLAGS = $(src_libnm_systemd_core_libnm_systemd_core_la_cppflags)
+src_libnm_systemd_core_libnm_systemd_core_la_LIBADD = \
 	$(GLIB_LIBS) \
 	$(CODE_COVERAGE_LDFLAGS) \
 	$(NULL)
-$(src_core_libnm_systemd_core_la_OBJECTS): $(src_libnm_core_public_mkenums_h)
+$(src_libnm_systemd_core_libnm_systemd_core_la_OBJECTS): $(src_libnm_core_public_mkenums_h)
 
-EXTRA_DIST += src/core/systemd/meson.build
+EXTRA_DIST += src/libnm-systemd-core/meson.build
 
 ###############################################################################
 
@@ -2609,7 +2605,7 @@ src_core_libNetworkManager_la_LIBADD = \
 	src/libnm-udev-aux/libnm-udev-aux.la \
 	src/libnm-glib-aux/libnm-glib-aux.la \
 	src/libnm-std-aux/libnm-std-aux.la \
-	src/core/libnm-systemd-core.la \
+	src/libnm-systemd-core/libnm-systemd-core.la \
 	src/libnm-systemd-shared/libnm-systemd-shared.la \
 	src/n-acd/libn-acd.la \
 	src/n-dhcp4/libn-dhcp4.la \
@@ -2723,7 +2719,7 @@ src_core_nm_iface_helper_LDADD = \
 	src/libnm-udev-aux/libnm-udev-aux.la \
 	src/libnm-glib-aux/libnm-glib-aux.la \
 	src/libnm-std-aux/libnm-std-aux.la \
-	src/core/libnm-systemd-core.la \
+	src/libnm-systemd-core/libnm-systemd-core.la \
 	src/libnm-systemd-shared/libnm-systemd-shared.la \
 	src/n-acd/libn-acd.la \
 	src/n-dhcp4/libn-dhcp4.la \
@@ -4423,7 +4419,7 @@ $(src_core_tests_test_utils_OBJECTS): $(src_libnm_core_public_mkenums_h)
 $(src_core_tests_test_wired_defname_OBJECTS): $(src_libnm_core_public_mkenums_h)
 
 src_core_tests_test_systemd_CPPFLAGS = \
-	$(src_core_libnm_systemd_core_la_cppflags) \
+	$(src_libnm_systemd_core_libnm_systemd_core_la_cppflags) \
 	$(NULL)
 
 src_core_tests_test_systemd_LDFLAGS = \
@@ -4431,8 +4427,9 @@ src_core_tests_test_systemd_LDFLAGS = \
 	$(NULL)
 
 src_core_tests_test_systemd_LDADD = \
-	src/core/libnm-systemd-core.la \
+	src/libnm-systemd-core/libnm-systemd-core.la \
 	src/libnm-systemd-shared/libnm-systemd-shared.la \
+	src/libnm-log-null/libnm-log-null.la \
 	src/c-siphash/libc-siphash.la \
 	$(GLIB_LIBS) \
 	$(CODE_COVERAGE_LDFLAGS) \

contrib/scripts/nm-code-format.sh

@@ -14,9 +14,9 @@ EXCLUDE=(
     ":(exclude)src/c-rbtree"
     ":(exclude)src/c-siphash"
     ":(exclude)src/c-stdaux"
-    ":(exclude)src/core/systemd/src"
     ":(exclude)src/libnm-std-aux/unaligned.h"
     ":(exclude)src/libnm-systemd-shared/src"
+    ":(exclude)src/libnm-systemd-core/src"
     ":(exclude)src/n-acd"
     ":(exclude)src/n-dhcp4"
 )

src/core/devices/nm-device.c

@@ -68,7 +68,7 @@
 #include "dns/nm-dns-manager.h"
 #include "nm-acd-manager.h"
 #include "libnm-core-intern/nm-core-internal.h"
-#include "systemd/nm-sd.h"
+#include "libnm-systemd-core/nm-sd.h"
 #include "nm-lldp-listener.h"
 #include "nm-audit-manager.h"
 #include "nm-connectivity.h"

src/core/devices/nm-lldp-listener.c

@@ -17,7 +17,7 @@
 #include "libnm-glib-aux/nm-c-list.h"
 #include "nm-utils.h"
 
-#include "systemd/nm-sd.h"
+#include "libnm-systemd-core/nm-sd.h"
 
 #define MAX_NEIGHBORS            128
 #define MIN_UPDATE_INTERVAL_NSEC (2 * NM_UTILS_NSEC_PER_SEC)

src/core/devices/tests/test-lldp.c

@@ -13,7 +13,7 @@
 #include <sys/types.h>
 
 #include "devices/nm-lldp-listener.h"
-#include "systemd/nm-sd.h"
+#include "libnm-systemd-core/nm-sd.h"
 
 #include "platform/tests/test-common.h"
 

src/core/dhcp/nm-dhcp-nettools.c

@@ -27,7 +27,7 @@
 #include "nm-dhcp-client-logging.h"
 #include "n-dhcp4/src/n-dhcp4.h"
 #include "libnm-systemd-shared/nm-sd-utils-shared.h"
-#include "systemd/nm-sd-utils-dhcp.h"
+#include "libnm-systemd-core/nm-sd-utils-dhcp.h"
 
 /*****************************************************************************/
 
@@ -949,7 +949,7 @@ nettools_create(NMDhcpNettools *self, GError **error)
                      NM_DHCP_CLIENT_FLAGS_REQUEST_BROADCAST));
     r = n_dhcp4_client_config_set_client_id(config,
                                             client_id_arr,
-                                            NM_MIN(client_id_len, 1 + _NM_SD_MAX_CLIENT_ID_LEN));
+                                            NM_MIN(client_id_len, 1 + _NM_MAX_CLIENT_ID_LEN));
     if (r) {
         set_error_nettools(error, r, "failed to set client-id");
         return FALSE;

src/core/dhcp/nm-dhcp-systemd.c

@@ -23,8 +23,8 @@
 #include "NetworkManagerUtils.h"
 #include "libnm-platform/nm-platform.h"
 #include "nm-dhcp-client-logging.h"
-#include "systemd/nm-sd.h"
-#include "systemd/nm-sd-utils-dhcp.h"
+#include "libnm-systemd-core/nm-sd.h"
+#include "libnm-systemd-core/nm-sd-utils-dhcp.h"
 
 /*****************************************************************************/
 
@@ -678,7 +678,7 @@ ip4_start(NMDhcpClient *client, const char *last_ip4_address, GError **error)
     r = sd_dhcp_client_set_client_id(sd_client,
                                      client_id_arr[0],
                                      client_id_arr + 1,
-                                     NM_MIN(client_id_len - 1, _NM_SD_MAX_CLIENT_ID_LEN));
+                                     NM_MIN(client_id_len - 1, _NM_MAX_CLIENT_ID_LEN));
     if (r < 0) {
         nm_utils_error_set_errno(error, r, "failed to set IPv4 client-id: %s");
         return FALSE;

src/core/main.c

@@ -34,7 +34,7 @@
 #include "nm-dbus-object.h"
 #include "nm-connectivity.h"
 #include "dns/nm-dns-manager.h"
-#include "systemd/nm-sd.h"
+#include "libnm-systemd-core/nm-sd.h"
 #include "nm-netns.h"
 
 #if !defined(NM_DIST_VERSION)

src/core/meson.build

@@ -30,8 +30,6 @@ install_data(
   install_dir: dbus_conf_dir,
 )
 
-subdir('systemd')
-
 core_plugins = []
 
 libNetworkManagerBase = static_library(

src/core/nm-iface-helper.c

@@ -28,7 +28,7 @@
 #include "nm-utils.h"
 #include "libnm-core-intern/nm-core-internal.h"
 #include "nm-setting-ip6-config.h"
-#include "systemd/nm-sd.h"
+#include "libnm-systemd-core/nm-sd.h"
 
 #if !defined(NM_DIST_VERSION)
     #define NM_DIST_VERSION VERSION

src/core/nm-types.h

@@ -10,8 +10,6 @@
     #error Cannot use this header.
 #endif
 
-#define _NM_SD_MAX_CLIENT_ID_LEN (sizeof(guint32) + 128)
-
 /* core */
 typedef struct _NMDBusObject            NMDBusObject;
 typedef struct _NMActiveConnection      NMActiveConnection;

src/core/tests/meson.build

@@ -35,14 +35,16 @@ exe = executable(
   include_directories: [
     top_inc,
     src_inc,
-    src_core_inc,
   ],
   dependencies: [
-    libnm_core_public_dep,
-    libnm_systemd_core_dep,
+    libnm_systemd_shared_dep_inc,
+    libnm_systemd_core_dep_inc,
+    glib_dep,
   ],
   link_with: [
     libnm_systemd_shared,
+    libnm_systemd_core,
+    libnm_log_null,
     libc_siphash,
   ],
 )

src/core/tests/test-core.c

@@ -15,7 +15,7 @@
 #include "NetworkManagerUtils.h"
 #include "libnm-core-intern/nm-core-internal.h"
 #include "nm-core-utils.h"
-#include "systemd/nm-sd-utils-core.h"
+#include "libnm-systemd-core/nm-sd-utils-core.h"
 
 #include "dns/nm-dns-manager.h"
 #include "nm-connectivity.h"

src/core/tests/test-systemd.c

@@ -3,68 +3,12 @@
  * Copyright (C) 2016 Red Hat, Inc.
  */
 
-#include "src/core/systemd/nm-default-systemd.h"
+#include "libnm-systemd-core/nm-default-systemd-core.h"
 
-#include "systemd/nm-sd.h"
+#include "libnm-systemd-core/nm-sd.h"
 #include "libnm-systemd-shared/nm-sd-utils-shared.h"
 
-#include "nm-test-utils-core.h"
-
-/*****************************************************************************
- * Stub implementations of libNetworkManagerBase symbols
- *****************************************************************************/
-
-gboolean
-nm_utils_get_testing_initialized(void)
-{
-    return TRUE;
-}
-
-void
-_nm_utils_set_testing(NMUtilsTestFlags flags)
-{
-    g_assert_not_reached();
-}
-
-gint32
-nm_utils_get_monotonic_timestamp_sec(void)
-{
-    return 1;
-}
-
-NMLogDomain _nm_logging_enabled_state[_LOGL_N_REAL];
-
-gboolean
-_nm_log_enabled_impl(gboolean mt_require_locking, NMLogLevel level, NMLogDomain domain)
-{
-    return FALSE;
-}
-
-void
-_nm_log_impl(const char *file,
-             guint       line,
-             const char *func,
-             gboolean    mt_require_locking,
-             NMLogLevel  level,
-             NMLogDomain domain,
-             int         error,
-             const char *ifname,
-             const char *con_uuid,
-             const char *fmt,
-             ...)
-{}
-
-gboolean
-nm_logging_setup(const char *level, const char *domains, char **bad_domains, GError **error)
-{
-    return TRUE;
-}
-
-const char *
-nm_strerror_native(int errsv)
-{
-    return g_strerror(errsv);
-}
+#include "libnm-glib-aux/nm-test-utils.h"
 
 /*****************************************************************************/
 
@@ -327,7 +271,7 @@ NMTST_DEFINE();
 int
 main(int argc, char **argv)
 {
-    nmtst_init_assert_logging(&argc, &argv, "INFO", "ALL");
+    nmtst_init(&argc, &argv, TRUE);
 
     g_test_add_func("/systemd/dhcp/create", test_dhcp_create);
     g_test_add_func("/systemd/lldp/create", test_lldp_create);

src/libnm-base/nm-base.h

@@ -11,6 +11,8 @@
 /* this must be the same as NM_UTILS_HWADDR_LEN_MAX from libnm. */
 #define _NM_UTILS_HWADDR_LEN_MAX 20
 
+#define _NM_MAX_CLIENT_ID_LEN (sizeof(guint32) + 128)
+
 /*****************************************************************************/
 
 typedef enum {

src/libnm-systemd-core/meson.build

@@ -1,12 +1,5 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
-incs = include_directories(
-  'sd-adapt-core',
-  'src/libsystemd-network',
-  'src/libsystemd/sd-event',
-  'src/systemd',
-)
-
 libnm_systemd_core = static_library(
   'nm-systemd-core',
   sources: files(
@@ -38,28 +31,26 @@ libnm_systemd_core = static_library(
     'sd-adapt-core/nm-sd-adapt-core.c',
   ),
   include_directories: [
-    incs,
+    include_directories(
+      'sd-adapt-core',
+      'src/libsystemd-network',
+      'src/libsystemd/sd-event',
+      'src/systemd',
+    ),
     top_inc,
     src_inc,
-    src_core_inc,
   ],
   dependencies: [
-    libnm_core_public_dep,
     libnm_systemd_shared_dep_inc,
     glib_dep,
   ],
 )
 
-libnm_systemd_core_dep = declare_dependency(
-  include_directories: [
-    incs,
-  ],
-  dependencies: [
-    glib_dep,
-  ],
-  link_with: [
-    libnm_core_impl,
-    libnm_systemd_shared,
-    libnm_systemd_core,
-  ],
+libnm_systemd_core_dep_inc = declare_dependency(
+  include_directories: include_directories(
+    'sd-adapt-core',
+    'src/libsystemd-network',
+    'src/libsystemd/sd-event',
+    'src/systemd',
+  ),
 )

src/libnm-systemd-core/nm-default-systemd-core.h

@@ -8,7 +8,7 @@
 
 /*****************************************************************************/
 
-#include "nm-default-daemon.h"
+#include "libnm-glib-aux/nm-default-glib.h"
 
 #undef NETWORKMANAGER_COMPILATION
 #define NETWORKMANAGER_COMPILATION NM_NETWORKMANAGER_COMPILATION_SYSTEMD

src/libnm-systemd-core/nm-sd-utils-core.c

@@ -3,7 +3,7 @@
  * Copyright (C) 2018 Red Hat, Inc.
  */
 
-#include "src/core/systemd/nm-default-systemd.h"
+#include "libnm-systemd-core/nm-default-systemd-core.h"
 
 #include "nm-sd-utils-core.h"
 

src/libnm-systemd-core/nm-sd-utils-dhcp.c

@@ -3,7 +3,7 @@
  * Copyright (C) 2019 Red Hat, Inc.
  */
 
-#include "src/core/systemd/nm-default-systemd.h"
+#include "libnm-systemd-core/nm-default-systemd-core.h"
 
 #include "nm-sd-utils-dhcp.h"
 

src/libnm-systemd-core/nm-sd.c

@@ -3,7 +3,7 @@
  * Copyright (C) 2014 - 2016 Red Hat, Inc.
  */
 
-#include "src/core/systemd/nm-default-systemd.h"
+#include "libnm-systemd-core/nm-default-systemd-core.h"
 
 #include "nm-sd.h"
 

src/libnm-systemd-core/nm-sd.h

@@ -6,10 +6,10 @@
 #ifndef __NM_SD_H__
 #define __NM_SD_H__
 
-#include "systemd/src/systemd/sd-dhcp-client.h"
-#include "systemd/src/systemd/sd-dhcp6-client.h"
-#include "systemd/src/systemd/sd-lldp.h"
-#include "systemd/src/systemd/sd-ipv4ll.h"
+#include "src/systemd/sd-dhcp-client.h"
+#include "src/systemd/sd-dhcp6-client.h"
+#include "src/systemd/sd-lldp.h"
+#include "src/systemd/sd-ipv4ll.h"
 
 /*****************************************************************************/
 

src/libnm-systemd-core/sd-adapt-core/nm-sd-adapt-core.c

@@ -3,7 +3,7 @@
  * Copyright (C) 2014 - 2016 Red Hat, Inc.
  */
 
-#include "src/core/systemd/nm-default-systemd.h"
+#include "libnm-systemd-core/nm-default-systemd-core.h"
 
 #include "nm-sd-adapt-core.h"
 

src/libnm-systemd-core/sd-adapt-core/nm-sd-adapt-core.h

@@ -6,7 +6,7 @@
 #ifndef __NM_SD_ADAPT_CORE_H__
 #define __NM_SD_ADAPT_CORE_H__
 
-#include "src/core/systemd/nm-default-systemd.h"
+#include "libnm-systemd-core/nm-default-systemd-core.h"
 
 #include <stdbool.h>
 #include <sys/resource.h>
@@ -57,6 +57,8 @@
         #endif
     #endif
 
+    #include "libnm-base/nm-base.h"
+
 /*****************************************************************************/
 
 static inline int

src/libnm-systemd-core/src/libsystemd-network/sd-dhcp-client.c

@@ -394,7 +394,7 @@ int sd_dhcp_client_set_client_id(
         assert_return(client, -EINVAL);
         assert_return(data, -EINVAL);
         assert_return(data_len > 0 && data_len <= MAX_CLIENT_ID_LEN, -EINVAL);
-        G_STATIC_ASSERT_EXPR (_NM_SD_MAX_CLIENT_ID_LEN == MAX_CLIENT_ID_LEN);
+        G_STATIC_ASSERT_EXPR (_NM_MAX_CLIENT_ID_LEN == MAX_CLIENT_ID_LEN);
 
         if (client->client_id_len == data_len + sizeof(client->client_id.type) &&
             client->client_id.type == type &&

src/meson.build

@@ -74,6 +74,7 @@ subdir('libnm-glib-aux')
 subdir('libnm-log-null')
 subdir('libnm-log-core')
 subdir('libnm-systemd-shared')
+subdir('libnm-systemd-core')
 subdir('libnm-udev-aux')
 subdir('libnm-base')
 subdir('libnm-platform')