netlink: move local-addresses.[ch] to src/shared

This code is not part of the public API of sd-netlink, nor used by it
internally and hence should not be in the sd-netlink directory.

Also, move the test case for it to src/test/.

diff --git a/meson.build b/meson.build
index 76b3d53391651b0165dded0f86c7aa73199ee2c4..e5ceb1e169db344f49849986a81e96c48b2cf2b0 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -1540,6 +1540,7 @@ foreach tuple : [['myhostname', 'ENABLE_NSS_MYHOSTNAME'],
                                      '-shared',
                                      '-Wl,--version-script=' + version_script_arg],
                         link_with : [libsystemd_static,
+                                     libshared_static,
                                      libbasic],
                         dependencies : [threads,
                                         librt],

diff --git a/src/libsystemd/meson.build b/src/libsystemd/meson.build
index 67add387e6ba02acfc576c6ad52df9b76dc8e2c0..77fe6e780ff3adb184d1dde0ebd45feae1f5455f 100644 (file)
--- a/src/libsystemd/meson.build
+++ b/src/libsystemd/meson.build
@@ -71,8 +71,6 @@ libsystemd_sources = files('''
         sd-hwdb/hwdb-util.h
         sd-hwdb/sd-hwdb.c
         sd-netlink/generic-netlink.c
-        sd-netlink/local-addresses.c
-        sd-netlink/local-addresses.h
         sd-netlink/netlink-internal.h
         sd-netlink/netlink-message.c
         sd-netlink/netlink-slot.c

diff --git a/src/libsystemd/sd-netlink/local-addresses.c b/src/shared/local-addresses.c
similarity index 100%
rename from src/libsystemd/sd-netlink/local-addresses.c
rename to src/shared/local-addresses.c

diff --git a/src/libsystemd/sd-netlink/local-addresses.h b/src/shared/local-addresses.h
similarity index 100%
rename from src/libsystemd/sd-netlink/local-addresses.h
rename to src/shared/local-addresses.h

diff --git a/src/shared/meson.build b/src/shared/meson.build
index ca24d15eabf9682bea15f51fc14a01f8b3a5a040..ca1a5547c4b359ce5a0a3ea6e27fb9780bafa539 100644 (file)
--- a/src/shared/meson.build
+++ b/src/shared/meson.build
@@ -109,6 +109,8 @@ shared_sources = files('''
         linux/bpf_insn.h
         linux/dm-ioctl.h
         linux/ethtool.h
+        local-addresses.c
+        local-addresses.h
         lockfile-util.c
         lockfile-util.h
         log-link.h

diff --git a/src/test/meson.build b/src/test/meson.build
index ddc04dda65ebfeb14a3ecd5418cf264d56eff187..e337e5014692dc10f46461f6ed9f3930cf0d4987 100644 (file)
--- a/src/test/meson.build
+++ b/src/test/meson.build
@@ -754,6 +754,10 @@ tests += [
         [['src/test/test-sd-hwdb.c'],
          [],
          []],
+
+        [['src/test/test-local-addresses.c'],
+         [],
+         []],
 ]
 
 ############################################################
@@ -964,10 +968,6 @@ tests += [
          [],
          []],
 
-        [['src/libsystemd/sd-netlink/test-local-addresses.c'],
-         [],
-         []],
-
         [['src/libsystemd/sd-resolve/test-resolve.c'],
          [],
          [threads],

diff --git a/src/libsystemd/sd-netlink/test-local-addresses.c b/src/test/test-local-addresses.c
similarity index 100%
rename from src/libsystemd/sd-netlink/test-local-addresses.c
rename to src/test/test-local-addresses.c