diff --git a/meson.build b/meson.build index 4ef68c7f1c..475f02b66a 100644 --- a/meson.build +++ b/meson.build @@ -2097,8 +2097,6 @@ module_additional_kwargs = { # systemd-analyze requires 'libcore' subdir('src/core') -# systemd-journal-remote requires 'libjournal_core' -subdir('src/journal') # systemd-networkd requires 'libsystemd_network' subdir('src/libsystemd-network') # hwdb requires 'udev_link_with' and 'udev_rpath' @@ -2139,6 +2137,7 @@ subdir('src/id128') subdir('src/import') subdir('src/initctl') subdir('src/integritysetup') +subdir('src/journal') subdir('src/journal-remote') subdir('src/kernel-install') subdir('src/locale') diff --git a/src/journal-remote/journal-remote-parse.c b/src/journal-remote/journal-remote-parse.c index 26e2009e14..e23012c472 100644 --- a/src/journal-remote/journal-remote-parse.c +++ b/src/journal-remote/journal-remote-parse.c @@ -3,7 +3,6 @@ #include "alloc-util.h" #include "fd-util.h" #include "journal-remote-parse.h" -#include "journald-native.h" #include "parse-util.h" #include "string-util.h" diff --git a/src/journal-remote/journal-remote.c b/src/journal-remote/journal-remote.c index 06be2d08e2..79010d0482 100644 --- a/src/journal-remote/journal-remote.c +++ b/src/journal-remote/journal-remote.c @@ -17,7 +17,6 @@ #include "journal-file-util.h" #include "journal-remote-write.h" #include "journal-remote.h" -#include "journald-native.h" #include "macro.h" #include "parse-util.h" #include "parse-helpers.h" diff --git a/src/journal-remote/meson.build b/src/journal-remote/meson.build index fe766dbb01..4251624864 100644 --- a/src/journal-remote/meson.build +++ b/src/journal-remote/meson.build @@ -20,8 +20,7 @@ endif libsystemd_journal_remote = static_library( 'systemd-journal-remote', libsystemd_journal_remote_sources, - include_directories : journal_includes, - link_with : libjournal_core, + include_directories : includes, dependencies : [libgnutls, liblz4, libmicrohttpd, @@ -64,7 +63,6 @@ executables += [ 'HAVE_MICROHTTPD', ], 'sources' : systemd_journal_remote_sources, - 'include_directories' : journal_includes, 'link_with' : [ libshared, libsystemd_journal_remote, @@ -87,7 +85,6 @@ executables += [ libshared, libsystemd_journal_remote, ], - 'include_directories' : journal_includes, }, ]