journal-remote: drop dependencies to journald

Now journal-remote can be built without libjournal_core.

diff --git a/meson.build b/meson.build
index 4ef68c7f1c36180151061ab272ceb1449825e47b..475f02b66a10aa74f1ffbcee8ee13dd6c65dcbeb 100644 (file)
--- 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 26e2009e14526d7ddda1fd459241405148bf8524..e23012c472e171888d483cbebabfeeae87e69dc2 100644 (file)
--- 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 06be2d08e2bb5e143c754c3898bd2979038ef6e3..79010d048280fcfd8ba6518b5c66256ea99eb3b7 100644 (file)
--- 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 fe766dbb018535f6651a5f87a538d71f04dad4b7..4251624864059018f634015421e494fb4e2a4f02 100644 (file)
--- 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,
         },
 ]