meson: drop implicit libudev link dependencies

Executables which link against libshared do not need an explicit
dependency on libudev, as libshared will make sure that those symbols
are available.

diff --git a/meson.build b/meson.build
index b18e645d39d8b012a10cba0f07220b219b754520..a7a316a74f6d45f306cb9cf2ef296a669a6e2cb7 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -1184,8 +1184,7 @@ executable('systemd',
            systemd_sources,
            include_directories : includes,
            link_with : [libcore,
-                        libshared,
-                        libudev],
+                        libshared],
            dependencies : [threads,
                            librt,
                            libseccomp,
@@ -1200,7 +1199,6 @@ exe = executable('systemd-analyze',
                  systemd_analyze_sources,
                  include_directories : includes,
                  link_with : [libcore,
-                              libudev,
                               libshared],
                  dependencies : [threads,
                                  librt,
@@ -1216,8 +1214,7 @@ executable('systemd-journald',
            systemd_journald_sources,
            include_directories : includes,
            link_with : [libjournal_core,
-                        libshared,
-                        libudev],
+                        libshared],
            dependencies : [threads,
                            libxz,
                            liblz4,
@@ -1230,8 +1227,7 @@ exe = executable('systemd-cat',
                  systemd_cat_sources,
                  include_directories : includes,
                  link_with : [libjournal_core,
-                              libshared,
-                              libudev],
+                              libshared],
                  dependencies : [threads],
                  install_rpath : rootlibexecdir,
                  install : true)
@@ -1240,8 +1236,7 @@ public_programs += [exe]
 exe = executable('journalctl',
                  journalctl_sources,
                  include_directories : includes,
-                 link_with : [libshared,
-                              libudev],
+                 link_with : [libshared],
                  dependencies : [threads,
                                  libqrencode,
                                  libxz,
@@ -1313,8 +1308,7 @@ if conf.get('HAVE_BLKID', 0) == 1
                    'src/gpt-auto-generator/gpt-auto-generator.c',
                    'src/basic/blkid-util.h',
                    include_directories : includes,
-                   link_with : [libshared,
-                                libudev],
+                   link_with : [libshared],
                    dependencies : libblkid,
                    install_rpath : rootlibexecdir,
                    install : true,
@@ -1365,8 +1359,7 @@ if conf.get('ENABLE_LOGIND', 0) == 1
                    systemd_logind_sources,
                    include_directories : includes,
                    link_with : [liblogind_core,
-                                libshared,
-                                libudev],
+                                libshared],
                    dependencies : [threads,
                                    libacl],
                    install_rpath : rootlibexecdir,
@@ -1376,8 +1369,7 @@ if conf.get('ENABLE_LOGIND', 0) == 1
         exe = executable('loginctl',
                          loginctl_sources,
                          include_directories : includes,
-                         link_with : [libshared,
-                                      libudev],
+                         link_with : [libshared],
                          dependencies : [threads,
                                          liblz4,
                                          libxz],
@@ -1465,8 +1457,7 @@ if conf.get('ENABLE_BACKLIGHT', 0) == 1
         executable('systemd-backlight',
                    'src/backlight/backlight.c',
                    include_directories : includes,
-                   link_with : [libshared,
-                                libudev],
+                   link_with : [libshared],
                    install_rpath : rootlibexecdir,
                    install : true,
                    install_dir : rootlibexecdir)
@@ -1476,8 +1467,7 @@ if conf.get('ENABLE_RFKILL', 0) == 1
         executable('systemd-rfkill',
                    'src/rfkill/rfkill.c',
                    include_directories : includes,
-                   link_with : [libshared,
-                                libudev],
+                   link_with : [libshared],
                    install_rpath : rootlibexecdir,
                    install : true,
                    install_dir : rootlibexecdir)
@@ -1975,8 +1965,7 @@ executable('systemd-initctl',
 exe = executable('systemd-mount',
                  'src/mount/mount-tool.c',
                  include_directories : includes,
-                 link_with : [libshared,
-                              libudev],
+                 link_with : [libshared],
                  install_rpath : rootlibexecdir,
                  install : true)
 public_programs += [exe]
@@ -2100,8 +2089,7 @@ public_programs += [exe]
 executable('systemd-shutdown',
            systemd_shutdown_sources,
            include_directories : includes,
-           link_with : [libshared,
-                        libudev],
+           link_with : [libshared],
            install_rpath : rootlibexecdir,
            install : true,
            install_dir : rootlibexecdir)
@@ -2147,8 +2135,7 @@ exe = executable('systemd-nspawn',
                  'src/core/loopback-setup.h',
                  include_directories : [includes, include_directories('src/nspawn')],
                  link_with : [libfirewall,
-                              libshared,
-                              libudev],
+                              libshared],
                  dependencies : [libacl,
                                  libblkid,
                                  libseccomp,

diff --git a/src/machine/meson.build b/src/machine/meson.build
index 4ecb1cdb93dc46762cd0743c300c09b352d18e84..953774fdb6d41285be4ca3e1168c4a2b2720a81a 100644 (file)
--- a/src/machine/meson.build
+++ b/src/machine/meson.build
@@ -39,8 +39,7 @@ endif
 tests += [
         [['src/machine/test-machine-tables.c'],
          [libmachine_core,
-          libshared,
-          libudev],
+          libshared],
          [threads],
          'ENABLE_MACHINED'],
 ]

diff --git a/src/test/meson.build b/src/test/meson.build
index 6c0fd4dca9a0b0bd1375524d0253b7ac041750ef..488d1ebaaa53c6de0f2833acb4c05c34b0cc74ed 100644 (file)
--- a/src/test/meson.build
+++ b/src/test/meson.build
@@ -55,8 +55,7 @@ tests += [
 
         [['src/test/test-job-type.c'],
          [libcore,
-          libshared,
-          libudev],
+          libshared],
          [threads,
           librt,
           libseccomp,
@@ -66,8 +65,7 @@ tests += [
 
         [['src/test/test-ns.c'],
          [libcore,
-          libshared,
-          libudev],
+          libshared],
          [threads,
           librt,
           libseccomp,
@@ -88,8 +86,7 @@ tests += [
 
         [['src/test/test-hostname.c'],
          [libcore,
-          libshared,
-          libudev],
+          libshared],
          [threads,
           librt,
           libseccomp,
@@ -110,8 +107,7 @@ tests += [
 
         [['src/test/test-unit-name.c'],
          [libcore,
-          libshared,
-          libudev],
+          libshared],
          [threads,
           librt,
           libseccomp,
@@ -121,8 +117,7 @@ tests += [
 
         [['src/test/test-unit-file.c'],
          [libcore,
-          libshared,
-          libudev],
+          libshared],
          [threads,
           librt,
           libseccomp,
@@ -285,8 +280,7 @@ tests += [
 
         [['src/test/test-namespace.c'],
          [libcore,
-          libshared,
-          libudev],
+          libshared],
          [threads,
           libblkid]],
 
@@ -461,8 +455,7 @@ tests += [
 
         [['src/test/test-cgroup-mask.c'],
          [libcore,
-          libshared,
-          libudev],
+          libshared],
          [threads,
           librt,
           libseccomp,
@@ -492,8 +485,7 @@ tests += [
 
         [['src/test/test-path.c'],
          [libcore,
-          libshared,
-          libudev],
+          libshared],
          [threads,
           librt,
           libseccomp,
@@ -503,8 +495,7 @@ tests += [
 
         [['src/test/test-execute.c'],
          [libcore,
-          libshared,
-          libudev],
+          libshared],
          [threads,
           librt,
           libseccomp,
@@ -532,8 +523,7 @@ tests += [
 
         [['src/test/test-sched-prio.c'],
          [libcore,
-          libshared,
-          libudev],
+          libshared],
          [threads,
           librt,
           libseccomp,
@@ -564,8 +554,7 @@ tests += [
          []],
 
         [['src/test/test-libudev.c'],
-         [libshared,
-          libudev],
+         [libshared],
          []],
 
         [['src/test/test-udev.c'],
@@ -615,8 +604,7 @@ tests += [
 
         [['src/journal/test-journal-syslog.c'],
          [libjournal_core,
-          libshared,
-          libudev],
+          libshared],
          [threads,
           libxz,
           liblz4,
@@ -818,8 +806,7 @@ tests += [
           'src/libsystemd-network/dhcp-internal.h',
           'src/systemd/sd-dhcp-client.h'],
          [libshared,
-          libsystemd_network,
-          libudev],
+          libsystemd_network],
          []],
 
         [['src/libsystemd-network/test-dhcp-server.c'],
@@ -855,8 +842,7 @@ tests += [
           'src/systemd/sd-dhcp6-client.h',
           'src/systemd/sd-ndisc.h'],
          [libshared,
-          libsystemd_network,
-          libudev],
+          libsystemd_network],
          []],
 
         [['src/libsystemd-network/test-dhcp6-client.c',
@@ -865,8 +851,7 @@ tests += [
           'src/libsystemd-network/dhcp6-internal.h',
           'src/systemd/sd-dhcp6-client.h'],
          [libshared,
-          libsystemd_network,
-          libudev],
+          libsystemd_network],
          []],
 
         [['src/libsystemd-network/test-lldp.c'],
@@ -889,7 +874,6 @@ tests += [
 
         [['src/login/test-login-tables.c'],
          [liblogind_core,
-          libshared,
-          libudev],
+          libshared],
          [threads]],
 ]