Skip to content

Commit 99b9f8f

Browse files
yuwatayuwata
committed
sd-journal: move source files for sd-journal to src/libsystemd/sd-journal
1 parent 4db4792 commit 99b9f8f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+83
-92
lines changed

‎meson.build‎

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1609,6 +1609,7 @@ includes = include_directories('src/basic',
16091609
'src/libsystemd/sd-event',
16101610
'src/libsystemd/sd-hwdb',
16111611
'src/libsystemd/sd-id128',
1612+
'src/libsystemd/sd-journal',
16121613
'src/libsystemd/sd-netlink',
16131614
'src/libsystemd/sd-network',
16141615
'src/libsystemd/sd-resolve',
@@ -1665,8 +1666,7 @@ libsystemd = shared_library(
16651666
'-Wl,--version-script=' + libsystemd_sym_path],
16661667
link_with : [libbasic,
16671668
libbasic_gcrypt],
1668-
link_whole : [libsystemd_static,
1669-
libjournal_client],
1669+
link_whole : [libsystemd_static],
16701670
dependencies : [threads,
16711671
librt,
16721672
libxz,
@@ -1682,7 +1682,6 @@ static_libsystemd_pic = static_libsystemd == 'true' or static_libsystemd == 'pic
16821682
install_libsystemd_static = static_library(
16831683
'systemd',
16841684
libsystemd_sources,
1685-
journal_client_sources,
16861685
basic_sources,
16871686
basic_gcrypt_sources,
16881687
disable_mempool_c,
@@ -2150,7 +2149,6 @@ if get_option('link-systemctl-shared')
21502149
else
21512150
systemctl_link_with = [libsystemd_static,
21522151
libshared_static,
2153-
libjournal_client,
21542152
libbasic_gcrypt]
21552153
endif
21562154

@@ -2619,7 +2617,6 @@ if conf.get('ENABLE_TIMESYNCD') == 1
26192617
else
26202618
timesyncd_link_with = [libsystemd_static,
26212619
libshared_static,
2622-
libjournal_client,
26232620
libbasic_gcrypt]
26242621
endif
26252622

@@ -3189,8 +3186,7 @@ if enable_sysusers
31893186
link_with : [libshared_static,
31903187
libbasic,
31913188
libbasic_gcrypt,
3192-
libsystemd_static,
3193-
libjournal_client],
3189+
libsystemd_static],
31943190
install : true,
31953191
install_dir : rootbindir)
31963192
public_programs += exe
@@ -3232,8 +3228,7 @@ if conf.get('ENABLE_TMPFILES') == 1
32323228
link_with : [libshared_static,
32333229
libbasic,
32343230
libbasic_gcrypt,
3235-
libsystemd_static,
3236-
libjournal_client],
3231+
libsystemd_static],
32373232
dependencies : [libacl],
32383233
install : true,
32393234
install_dir : rootbindir)

‎src/journal/meson.build‎

Lines changed: 0 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -1,69 +1,5 @@
11
# SPDX-License-Identifier: LGPL-2.1-or-later
22

3-
journal_client_sources = files('''
4-
audit-type.c
5-
audit-type.h
6-
catalog.c
7-
catalog.h
8-
compress.c
9-
compress.h
10-
journal-def.h
11-
journal-file.c
12-
journal-file.h
13-
journal-send.c
14-
journal-vacuum.c
15-
journal-vacuum.h
16-
journal-verify.c
17-
journal-verify.h
18-
lookup3.c
19-
lookup3.h
20-
mmap-cache.c
21-
mmap-cache.h
22-
sd-journal.c
23-
'''.split())
24-
25-
if conf.get('HAVE_GCRYPT') == 1
26-
journal_client_sources += files('''
27-
journal-authenticate.c
28-
journal-authenticate.h
29-
fsprg.c
30-
fsprg.h
31-
'''.split())
32-
endif
33-
34-
############################################################
35-
36-
audit_type_includes = [config_h,
37-
missing_audit_h,
38-
'linux/audit.h']
39-
if conf.get('HAVE_AUDIT') == 1
40-
audit_type_includes += 'libaudit.h'
41-
endif
42-
43-
generate_audit_type_list = find_program('generate-audit_type-list.sh')
44-
audit_type_list_txt = custom_target(
45-
'audit_type-list.txt',
46-
output : 'audit_type-list.txt',
47-
command : [generate_audit_type_list, cpp] + audit_type_includes,
48-
capture : true)
49-
50-
audit_type_to_name = custom_target(
51-
'audit_type-to-name.h',
52-
input : ['audit_type-to-name.awk', audit_type_list_txt],
53-
output : 'audit_type-to-name.h',
54-
command : [awk, '-f', '@INPUT0@', '@INPUT1@'],
55-
capture : true)
56-
57-
journal_client_sources += [audit_type_to_name]
58-
59-
libjournal_client = static_library(
60-
'journal-client',
61-
journal_client_sources,
62-
include_directories : includes,
63-
c_args : ['-fvisibility=default'])
64-
65-
############################################################
66-
673
libjournal_core_sources = files('''
684
journald-audit.c
695
journald-audit.h
@@ -85,7 +21,6 @@ libjournal_core_sources = files('''
8521
journald-syslog.h
8622
journald-wall.c
8723
journald-wall.h
88-
journal-internal.h
8924
'''.split())
9025

9126
systemd_journald_sources = files('''

‎src/libsystemd/meson.build‎

Lines changed: 64 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,85 @@
11
# SPDX-License-Identifier: LGPL-2.1-or-later
22

3+
sd_journal_sources = files(
4+
'sd-journal/audit-type.c',
5+
'sd-journal/audit-type.h',
6+
'sd-journal/catalog.c',
7+
'sd-journal/catalog.h',
8+
'sd-journal/compress.c',
9+
'sd-journal/compress.h',
10+
'sd-journal/journal-def.h',
11+
'sd-journal/journal-file.c',
12+
'sd-journal/journal-file.h',
13+
'sd-journal/journal-internal.h',
14+
'sd-journal/journal-send.c',
15+
'sd-journal/journal-vacuum.c',
16+
'sd-journal/journal-vacuum.h',
17+
'sd-journal/journal-verify.c',
18+
'sd-journal/journal-verify.h',
19+
'sd-journal/lookup3.c',
20+
'sd-journal/lookup3.h',
21+
'sd-journal/mmap-cache.c',
22+
'sd-journal/mmap-cache.h',
23+
'sd-journal/sd-journal.c')
24+
25+
if conf.get('HAVE_GCRYPT') == 1
26+
sd_journal_sources += files(
27+
'sd-journal/fsprg.c',
28+
'sd-journal/fsprg.h',
29+
'sd-journal/journal-authenticate.c',
30+
'sd-journal/journal-authenticate.h')
31+
endif
32+
33+
audit_type_includes = [config_h,
34+
missing_audit_h,
35+
'linux/audit.h']
36+
if conf.get('HAVE_AUDIT') == 1
37+
audit_type_includes += 'libaudit.h'
38+
endif
39+
40+
generate_audit_type_list = find_program('sd-journal/generate-audit_type-list.sh')
41+
audit_type_list_txt = custom_target(
42+
'audit_type-list.txt',
43+
output : 'audit_type-list.txt',
44+
command : [generate_audit_type_list, cpp] + audit_type_includes,
45+
capture : true)
46+
47+
audit_type_to_name = custom_target(
48+
'audit_type-to-name.h',
49+
input : ['sd-journal/audit_type-to-name.awk', audit_type_list_txt],
50+
output : 'audit_type-to-name.h',
51+
command : [awk, '-f', '@INPUT0@', '@INPUT1@'],
52+
capture : true)
53+
54+
sd_journal_sources += [audit_type_to_name]
55+
56+
############################################################
57+
358
id128_sources = files('''
459
sd-id128/id128-util.c
560
sd-id128/id128-util.h
661
sd-id128/sd-id128.c
762
'''.split())
863

64+
############################################################
65+
966
sd_daemon_sources = files('sd-daemon/sd-daemon.c')
1067

68+
############################################################
69+
1170
sd_event_sources = files('''
1271
sd-event/event-source.h
1372
sd-event/event-util.c
1473
sd-event/event-util.h
1574
sd-event/sd-event.c
1675
'''.split())
1776

77+
############################################################
78+
1879
sd_login_sources = files('sd-login/sd-login.c')
1980

81+
############################################################
82+
2083
libsystemd_sources = files('''
2184
sd-bus/bus-common-errors.c
2285
sd-bus/bus-common-errors.h
@@ -91,7 +154,7 @@ libsystemd_sources = files('''
91154
sd-resolve/resolve-private.h
92155
sd-resolve/sd-resolve.c
93156
sd-utf8/sd-utf8.c
94-
'''.split()) + id128_sources + sd_daemon_sources + sd_event_sources + sd_login_sources
157+
'''.split()) + sd_journal_sources + id128_sources + sd_daemon_sources + sd_event_sources + sd_login_sources
95158

96159
disable_mempool_c = files('disable-mempool.c')
97160

src/journal/audit-type.c renamed to src/libsystemd/sd-journal/audit-type.c

File renamed without changes.

src/journal/audit-type.h renamed to src/libsystemd/sd-journal/audit-type.h

File renamed without changes.

src/journal/audit_type-to-name.awk renamed to src/libsystemd/sd-journal/audit_type-to-name.awk

File renamed without changes.

src/journal/catalog.c renamed to src/libsystemd/sd-journal/catalog.c

File renamed without changes.

src/journal/catalog.h renamed to src/libsystemd/sd-journal/catalog.h

File renamed without changes.

src/journal/compress.c renamed to src/libsystemd/sd-journal/compress.c

File renamed without changes.

src/journal/compress.h renamed to src/libsystemd/sd-journal/compress.h

File renamed without changes.

0 commit comments

Comments
 (0)