meson: drop libsystemd_network from several binaries

This reduces the size of udevadm:

Before:
```
$ ll udevadm
-rwxrwxr-x 1 watanabe watanabe 1203800 Oct 29 01:36 udevadm
```

After:
```
$ ll udevadm
-rwxrwxr-x 1 watanabe watanabe 1094384 Oct 29 01:38 udevadm
```

diff --git a/meson.build b/meson.build
index 5cfc24c2d6d5b47331d5c9a906245e9cfc679143..dba721208beb2fe92d86394b57e9a604ca962037 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -3188,7 +3188,6 @@ public_programs += executable(
         c_args : '-DLOG_REALM=LOG_REALM_UDEV',
         include_directories : includes,
         link_with : [libudev_core,
-                     libsystemd_network,
                      libudev_static],
         dependencies : [versiondep,
                         threads,

diff --git a/src/fuzz/meson.build b/src/fuzz/meson.build
index 01f119fcd0b374586ba98979b3a87aec77065c77..d984382020dc1a6c54a379204a5fd6dc288be3e4 100644 (file)
--- a/src/fuzz/meson.build
+++ b/src/fuzz/meson.build
@@ -108,7 +108,6 @@ fuzzers += [
         [['src/fuzz/fuzz-udev-rules.c'],
          [libudev_core,
           libudev_static,
-          libsystemd_network,
           libshared],
          [threads,
           libacl]],

diff --git a/src/libsystemd-network/meson.build b/src/libsystemd-network/meson.build
index 7fa0c67956213bfc9604e98ae4d897818ab15875..a4c74222cb852c814ff8903e4702b78c6f2888b0 100644 (file)
--- a/src/libsystemd-network/meson.build
+++ b/src/libsystemd-network/meson.build
@@ -17,6 +17,7 @@ sources = files('''
         arp-util.h
         arp-util.c
         network-internal.c
+        network-internal.h
         sd-ndisc.c
         ndisc-internal.h
         ndisc-router.h
@@ -42,10 +43,7 @@ sources = files('''
         sd-lldp.c
 '''.split())
 
-network_internal_h = files('network-internal.h')
-
 libsystemd_network = static_library(
         'systemd-network',
         sources,
-        network_internal_h,
         include_directories : includes)

diff --git a/src/network/meson.build b/src/network/meson.build
index c2a197162f2c9931debb3267a9e7310f650ea466..86cca329c3c600019366e5f034980a7e157f4f67 100644 (file)
--- a/src/network/meson.build
+++ b/src/network/meson.build
@@ -171,7 +171,7 @@ systemd_networkd_wait_online_sources = files('''
         wait-online/manager.c
         wait-online/manager.h
         wait-online/wait-online.c
-'''.split()) + network_internal_h
+'''.split())
 
 networkctl_sources = files('networkctl.c')
 
@@ -214,7 +214,6 @@ if conf.get('ENABLE_NETWORKD') == 1
         libnetworkd_core = static_library(
                 'networkd-core',
                 sources,
-                network_internal_h,
                 networkd_gperf_c,
                 networkd_network_gperf_c,
                 netdev_gperf_c,

diff --git a/src/test/meson.build b/src/test/meson.build
index e4ce8ac51aeec203b7807c928bf57abedfde6f88..11bb3db23a05885c8662bc8816653d37ba18ecf2 100644 (file)
--- a/src/test/meson.build
+++ b/src/test/meson.build
@@ -126,8 +126,7 @@ tests += [
 
         [['src/test/test-dns-domain.c'],
          [libcore,
-          libshared,
-          libsystemd_network],
+          libshared],
          []],
 
         [['src/test/test-boot-timestamps.c'],
@@ -529,7 +528,6 @@ tests += [
           libjournal_core,
           libudev_core,
           libudev_static,
-          libsystemd_network,
           libshared],
          [threads,
           libseccomp,
@@ -765,7 +763,6 @@ tests += [
         [['src/test/test-udev.c'],
          [libudev_core,
           libudev_static,
-          libsystemd_network,
           libshared],
          [threads,
           librt,

diff --git a/src/udev/meson.build b/src/udev/meson.build
index aa23b07090458837902e340682e3948774d18452..f8431b3da4c9d61970554095a53a5733320f6233 100644 (file)
--- a/src/udev/meson.build
+++ b/src/udev/meson.build
@@ -202,7 +202,6 @@ fuzzers += [
           'src/fuzz/fuzz.h'],
          [libudev_core,
           libudev_static,
-          libsystemd_network,
           libshared],
          [threads,
           libacl]],