1
0
mirror of https://github.com/systemd/systemd.git synced 2024-12-22 17:35:35 +03:00

sd-journal: move source files for sd-journal to src/libsystemd/sd-journal

This commit is contained in:
Yu Watanabe 2021-01-01 04:30:47 +09:00
parent 4db4792a93
commit 99b9f8fddd
46 changed files with 83 additions and 92 deletions

View File

@ -1609,6 +1609,7 @@ includes = include_directories('src/basic',
'src/libsystemd/sd-event',
'src/libsystemd/sd-hwdb',
'src/libsystemd/sd-id128',
'src/libsystemd/sd-journal',
'src/libsystemd/sd-netlink',
'src/libsystemd/sd-network',
'src/libsystemd/sd-resolve',
@ -1665,8 +1666,7 @@ libsystemd = shared_library(
'-Wl,--version-script=' + libsystemd_sym_path],
link_with : [libbasic,
libbasic_gcrypt],
link_whole : [libsystemd_static,
libjournal_client],
link_whole : [libsystemd_static],
dependencies : [threads,
librt,
libxz,
@ -1682,7 +1682,6 @@ static_libsystemd_pic = static_libsystemd == 'true' or static_libsystemd == 'pic
install_libsystemd_static = static_library(
'systemd',
libsystemd_sources,
journal_client_sources,
basic_sources,
basic_gcrypt_sources,
disable_mempool_c,
@ -2150,7 +2149,6 @@ if get_option('link-systemctl-shared')
else
systemctl_link_with = [libsystemd_static,
libshared_static,
libjournal_client,
libbasic_gcrypt]
endif
@ -2619,7 +2617,6 @@ if conf.get('ENABLE_TIMESYNCD') == 1
else
timesyncd_link_with = [libsystemd_static,
libshared_static,
libjournal_client,
libbasic_gcrypt]
endif
@ -3189,8 +3186,7 @@ if enable_sysusers
link_with : [libshared_static,
libbasic,
libbasic_gcrypt,
libsystemd_static,
libjournal_client],
libsystemd_static],
install : true,
install_dir : rootbindir)
public_programs += exe
@ -3232,8 +3228,7 @@ if conf.get('ENABLE_TMPFILES') == 1
link_with : [libshared_static,
libbasic,
libbasic_gcrypt,
libsystemd_static,
libjournal_client],
libsystemd_static],
dependencies : [libacl],
install : true,
install_dir : rootbindir)

View File

@ -1,69 +1,5 @@
# SPDX-License-Identifier: LGPL-2.1-or-later
journal_client_sources = files('''
audit-type.c
audit-type.h
catalog.c
catalog.h
compress.c
compress.h
journal-def.h
journal-file.c
journal-file.h
journal-send.c
journal-vacuum.c
journal-vacuum.h
journal-verify.c
journal-verify.h
lookup3.c
lookup3.h
mmap-cache.c
mmap-cache.h
sd-journal.c
'''.split())
if conf.get('HAVE_GCRYPT') == 1
journal_client_sources += files('''
journal-authenticate.c
journal-authenticate.h
fsprg.c
fsprg.h
'''.split())
endif
############################################################
audit_type_includes = [config_h,
missing_audit_h,
'linux/audit.h']
if conf.get('HAVE_AUDIT') == 1
audit_type_includes += 'libaudit.h'
endif
generate_audit_type_list = find_program('generate-audit_type-list.sh')
audit_type_list_txt = custom_target(
'audit_type-list.txt',
output : 'audit_type-list.txt',
command : [generate_audit_type_list, cpp] + audit_type_includes,
capture : true)
audit_type_to_name = custom_target(
'audit_type-to-name.h',
input : ['audit_type-to-name.awk', audit_type_list_txt],
output : 'audit_type-to-name.h',
command : [awk, '-f', '@INPUT0@', '@INPUT1@'],
capture : true)
journal_client_sources += [audit_type_to_name]
libjournal_client = static_library(
'journal-client',
journal_client_sources,
include_directories : includes,
c_args : ['-fvisibility=default'])
############################################################
libjournal_core_sources = files('''
journald-audit.c
journald-audit.h
@ -85,7 +21,6 @@ libjournal_core_sources = files('''
journald-syslog.h
journald-wall.c
journald-wall.h
journal-internal.h
'''.split())
systemd_journald_sources = files('''

View File

@ -1,13 +1,72 @@
# SPDX-License-Identifier: LGPL-2.1-or-later
sd_journal_sources = files(
'sd-journal/audit-type.c',
'sd-journal/audit-type.h',
'sd-journal/catalog.c',
'sd-journal/catalog.h',
'sd-journal/compress.c',
'sd-journal/compress.h',
'sd-journal/journal-def.h',
'sd-journal/journal-file.c',
'sd-journal/journal-file.h',
'sd-journal/journal-internal.h',
'sd-journal/journal-send.c',
'sd-journal/journal-vacuum.c',
'sd-journal/journal-vacuum.h',
'sd-journal/journal-verify.c',
'sd-journal/journal-verify.h',
'sd-journal/lookup3.c',
'sd-journal/lookup3.h',
'sd-journal/mmap-cache.c',
'sd-journal/mmap-cache.h',
'sd-journal/sd-journal.c')
if conf.get('HAVE_GCRYPT') == 1
sd_journal_sources += files(
'sd-journal/fsprg.c',
'sd-journal/fsprg.h',
'sd-journal/journal-authenticate.c',
'sd-journal/journal-authenticate.h')
endif
audit_type_includes = [config_h,
missing_audit_h,
'linux/audit.h']
if conf.get('HAVE_AUDIT') == 1
audit_type_includes += 'libaudit.h'
endif
generate_audit_type_list = find_program('sd-journal/generate-audit_type-list.sh')
audit_type_list_txt = custom_target(
'audit_type-list.txt',
output : 'audit_type-list.txt',
command : [generate_audit_type_list, cpp] + audit_type_includes,
capture : true)
audit_type_to_name = custom_target(
'audit_type-to-name.h',
input : ['sd-journal/audit_type-to-name.awk', audit_type_list_txt],
output : 'audit_type-to-name.h',
command : [awk, '-f', '@INPUT0@', '@INPUT1@'],
capture : true)
sd_journal_sources += [audit_type_to_name]
############################################################
id128_sources = files('''
sd-id128/id128-util.c
sd-id128/id128-util.h
sd-id128/sd-id128.c
'''.split())
############################################################
sd_daemon_sources = files('sd-daemon/sd-daemon.c')
############################################################
sd_event_sources = files('''
sd-event/event-source.h
sd-event/event-util.c
@ -15,8 +74,12 @@ sd_event_sources = files('''
sd-event/sd-event.c
'''.split())
############################################################
sd_login_sources = files('sd-login/sd-login.c')
############################################################
libsystemd_sources = files('''
sd-bus/bus-common-errors.c
sd-bus/bus-common-errors.h
@ -91,7 +154,7 @@ libsystemd_sources = files('''
sd-resolve/resolve-private.h
sd-resolve/sd-resolve.c
sd-utf8/sd-utf8.c
'''.split()) + id128_sources + sd_daemon_sources + sd_event_sources + sd_login_sources
'''.split()) + sd_journal_sources + id128_sources + sd_daemon_sources + sd_event_sources + sd_login_sources
disable_mempool_c = files('disable-mempool.c')

View File

@ -189,7 +189,6 @@ if conf.get('ENABLE_NETWORKD') == 1
else
networkd_link_with = [libsystemd_static,
libshared_static,
libjournal_client,
libbasic_gcrypt]
endif

View File

@ -399,8 +399,7 @@ libshared = shared_library(
link_whole : [libshared_static,
libbasic,
libbasic_gcrypt,
libsystemd_static,
libjournal_client],
libsystemd_static],
c_args : ['-fvisibility=default'],
dependencies : libshared_deps,
install : true,

View File

@ -834,14 +834,14 @@ endif
# define some tests here, because the link_with deps were not defined earlier
tests += [
[['src/journal/test-journal.c'],
[['src/libsystemd/sd-journal/test-journal.c'],
[libjournal_core,
libshared],
[threads,
libxz,
liblz4]],
[['src/journal/test-journal-send.c'],
[['src/libsystemd/sd-journal/test-journal-send.c'],
[libjournal_core,
libshared],
[threads,
@ -856,14 +856,14 @@ tests += [
liblz4,
libselinux]],
[['src/journal/test-journal-match.c'],
[['src/libsystemd/sd-journal/test-journal-match.c'],
[libjournal_core,
libshared],
[threads,
libxz,
liblz4]],
[['src/journal/test-journal-enum.c'],
[['src/libsystemd/sd-journal/test-journal-enum.c'],
[libjournal_core,
libshared],
[threads,
@ -871,21 +871,21 @@ tests += [
liblz4],
'', 'timeout=360'],
[['src/journal/test-journal-stream.c'],
[['src/libsystemd/sd-journal/test-journal-stream.c'],
[libjournal_core,
libshared],
[threads,
libxz,
liblz4]],
[['src/journal/test-journal-flush.c'],
[['src/libsystemd/sd-journal/test-journal-flush.c'],
[libjournal_core,
libshared],
[threads,
libxz,
liblz4]],
[['src/journal/test-journal-init.c'],
[['src/libsystemd/sd-journal/test-journal-init.c'],
[libjournal_core,
libshared],
[threads,
@ -899,42 +899,42 @@ tests += [
liblz4,
libselinux]],
[['src/journal/test-journal-verify.c'],
[['src/libsystemd/sd-journal/test-journal-verify.c'],
[libjournal_core,
libshared],
[threads,
libxz,
liblz4]],
[['src/journal/test-journal-interleaving.c'],
[['src/libsystemd/sd-journal/test-journal-interleaving.c'],
[libjournal_core,
libshared],
[threads,
libxz,
liblz4]],
[['src/journal/test-mmap-cache.c'],
[['src/libsystemd/sd-journal/test-mmap-cache.c'],
[libjournal_core,
libshared],
[threads,
libxz,
liblz4]],
[['src/journal/test-catalog.c'],
[['src/libsystemd/sd-journal/test-catalog.c'],
[libjournal_core,
libshared],
[threads,
libxz,
liblz4]],
[['src/journal/test-compress.c'],
[['src/libsystemd/sd-journal/test-compress.c'],
[libjournal_core,
libshared],
[liblz4,
libzstd,
libxz]],
[['src/journal/test-compress-benchmark.c'],
[['src/libsystemd/sd-journal/test-compress-benchmark.c'],
[libjournal_core,
libshared],
[liblz4,
@ -942,7 +942,7 @@ tests += [
libxz],
'', 'timeout=90'],
[['src/journal/test-audit-type.c'],
[['src/libsystemd/sd-journal/test-audit-type.c'],
[libjournal_core,
libshared],
[liblz4,