2 files changed, 15 insertions, 78 deletions

diff --git a/src/fuzz/meson.build b/src/fuzz/meson.build
index 7a62527321..56a8b48c7a 100644
--- a/src/fuzz/meson.build
+++ b/src/fuzz/meson.build
@@ -3,9 +3,7 @@
 fuzzers += [
         [['src/fuzz/fuzz-bus-message.c']],
 
-        [['src/fuzz/fuzz-catalog.c'],
-         [libjournal_core,
-          libshared]],
+        [['src/fuzz/fuzz-catalog.c']],
 
         [['src/resolve/fuzz-dns-packet.c'],
          [libsystemd_resolve_core,
diff --git a/src/test/meson.build b/src/test/meson.build
index 0c5652a52b..6c1abd6f59 100644
--- a/src/test/meson.build
+++ b/src/test/meson.build
@@ -570,19 +570,9 @@ tests += [
 # define some tests here, because the link_with deps were not defined earlier
 
 tests += [
-        [['src/libsystemd/sd-journal/test-journal.c'],
-         [libjournal_core,
-          libshared],
-         [threads,
-          libxz,
-          liblz4]],
+        [['src/libsystemd/sd-journal/test-journal.c']],
 
-        [['src/libsystemd/sd-journal/test-journal-send.c'],
-         [libjournal_core,
-          libshared],
-         [threads,
-          libxz,
-          liblz4]],
+        [['src/libsystemd/sd-journal/test-journal-send.c']],
 
         [['src/journal/test-journal-syslog.c'],
          [libjournal_core,
@@ -592,41 +582,16 @@ tests += [
           liblz4,
           libselinux]],
 
-        [['src/libsystemd/sd-journal/test-journal-match.c'],
-         [libjournal_core,
-          libshared],
-         [threads,
-          libxz,
-          liblz4]],
+        [['src/libsystemd/sd-journal/test-journal-match.c']],
 
         [['src/libsystemd/sd-journal/test-journal-enum.c'],
-         [libjournal_core,
-          libshared],
-         [threads,
-          libxz,
-          liblz4],
-         [], '', 'timeout=360'],
+         [], [], [], '', 'timeout=360'],
 
-        [['src/libsystemd/sd-journal/test-journal-stream.c'],
-         [libjournal_core,
-          libshared],
-         [threads,
-          libxz,
-          liblz4]],
+        [['src/libsystemd/sd-journal/test-journal-stream.c']],
 
-        [['src/libsystemd/sd-journal/test-journal-flush.c'],
-         [libjournal_core,
-          libshared],
-         [threads,
-          libxz,
-          liblz4]],
+        [['src/libsystemd/sd-journal/test-journal-flush.c']],
 
-        [['src/libsystemd/sd-journal/test-journal-init.c'],
-         [libjournal_core,
-          libshared],
-         [threads,
-          libxz,
-          liblz4]],
+        [['src/libsystemd/sd-journal/test-journal-init.c']],
 
         [['src/journal/test-journal-config.c'],
          [libjournal_core,
@@ -635,54 +600,28 @@ tests += [
           liblz4,
           libselinux]],
 
-        [['src/libsystemd/sd-journal/test-journal-verify.c'],
-         [libjournal_core,
-          libshared],
-         [threads,
-          libxz,
-          liblz4]],
+        [['src/libsystemd/sd-journal/test-journal-verify.c']],
 
-        [['src/libsystemd/sd-journal/test-journal-interleaving.c'],
-         [libjournal_core,
-          libshared],
-         [threads,
-          libxz,
-          liblz4]],
+        [['src/libsystemd/sd-journal/test-journal-interleaving.c']],
 
-        [['src/libsystemd/sd-journal/test-mmap-cache.c'],
-         [libjournal_core,
-          libshared],
-         [threads,
-          libxz,
-          liblz4]],
+        [['src/libsystemd/sd-journal/test-mmap-cache.c']],
 
-        [['src/libsystemd/sd-journal/test-catalog.c'],
-         [libjournal_core,
-          libshared],
-         [threads,
-          libxz,
-          liblz4]],
+        [['src/libsystemd/sd-journal/test-catalog.c']],
 
         [['src/libsystemd/sd-journal/test-compress.c'],
-         [libjournal_core,
-          libshared],
+         [],
          [liblz4,
           libzstd,
           libxz]],
 
         [['src/libsystemd/sd-journal/test-compress-benchmark.c'],
-         [libjournal_core,
-          libshared],
+         [],
          [liblz4,
           libzstd,
           libxz],
          [], '', 'timeout=90'],
 
-        [['src/libsystemd/sd-journal/test-audit-type.c'],
-         [libjournal_core,
-          libshared],
-         [liblz4,
-          libxz]],
+        [['src/libsystemd/sd-journal/test-audit-type.c']],
 ]
 
 ############################################################