system/systemd
system/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd synced 2024-07-21 10:17:21 +00:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

journal-remote: drop dependencies to journald

Browse source 
Now journal-remote can be built without libjournal_core.
This commit is contained in:
Yu Watanabe 2023-09-30 19:08:23 +09:00
parent 1e09470303
commit f7b349e88d
4 changed files with 2 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
meson.build
View file

@ -2097,8 +2097,6 @@ module_additional_kwargs = {
# systemd-analyze requires 'libcore' # systemd-analyze requires 'libcore'
subdir('src/core') subdir('src/core')
# systemd-journal-remote requires 'libjournal_core'
subdir('src/journal')
# systemd-networkd requires 'libsystemd_network' # systemd-networkd requires 'libsystemd_network'
subdir('src/libsystemd-network') subdir('src/libsystemd-network')
# hwdb requires 'udev_link_with' and 'udev_rpath' # hwdb requires 'udev_link_with' and 'udev_rpath'
@ -2139,6 +2137,7 @@ subdir('src/id128')
subdir('src/import') subdir('src/import')
subdir('src/initctl') subdir('src/initctl')
subdir('src/integritysetup') subdir('src/integritysetup')
subdir('src/journal')
subdir('src/journal-remote') subdir('src/journal-remote')
subdir('src/kernel-install') subdir('src/kernel-install')
subdir('src/locale') subdir('src/locale')

1
src/journal-remote/journal-remote-parse.c
View file

@ -3,7 +3,6 @@
#include "alloc-util.h" #include "alloc-util.h"
#include "fd-util.h" #include "fd-util.h"
#include "journal-remote-parse.h" #include "journal-remote-parse.h"
#include "journald-native.h"
#include "parse-util.h" #include "parse-util.h"
#include "string-util.h" #include "string-util.h"

1
src/journal-remote/journal-remote.c
View file

@ -17,7 +17,6 @@
#include "journal-file-util.h" #include "journal-file-util.h"
#include "journal-remote-write.h" #include "journal-remote-write.h"
#include "journal-remote.h" #include "journal-remote.h"
#include "journald-native.h"
#include "macro.h" #include "macro.h"
#include "parse-util.h" #include "parse-util.h"
#include "parse-helpers.h" #include "parse-helpers.h"

5
src/journal-remote/meson.build
View file

@ -20,8 +20,7 @@ endif
libsystemd_journal_remote = static_library( libsystemd_journal_remote = static_library(
'systemd-journal-remote', 'systemd-journal-remote',
libsystemd_journal_remote_sources, libsystemd_journal_remote_sources,
include_directories : journal_includes, include_directories : includes,
link_with : libjournal_core,
dependencies : [libgnutls, dependencies : [libgnutls,
liblz4, liblz4,
libmicrohttpd, libmicrohttpd,
@ -64,7 +63,6 @@ executables += [
'HAVE_MICROHTTPD', 'HAVE_MICROHTTPD',
], ],
'sources' : systemd_journal_remote_sources, 'sources' : systemd_journal_remote_sources,
'include_directories' : journal_includes,
'link_with' : [ 'link_with' : [
libshared, libshared,
libsystemd_journal_remote, libsystemd_journal_remote,
@ -87,7 +85,6 @@ executables += [
libshared, libshared,
libsystemd_journal_remote, libsystemd_journal_remote,
], ],
'include_directories' : journal_includes,
}, },
] ]