From 529642936be63dbf226be8ce81a5b502f148c891 Mon Sep 17 00:00:00 2001
From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Mon, 4 Jan 2021 21:16:15 +0900
Subject: [PATCH] meson: move libjournal_core definition to
 src/journal/meson.build

---
 meson.build             |  7 -------
 src/journal/meson.build | 20 +++++++++++++-------
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/meson.build b/meson.build
index bea4d561557..f6ce4df0565 100644
--- a/meson.build
+++ b/meson.build
@@ -1650,13 +1650,6 @@ subdir('src/shared')
 subdir('src/udev')
 subdir('src/libudev')
 
-libjournal_core = static_library(
-        'journal-core',
-        libjournal_core_sources,
-        journald_gperf_c,
-        include_directories : includes,
-        install : false)
-
 libsystemd_sym_path = '@0@/@1@'.format(project_source_root, libsystemd_sym)
 libsystemd = shared_library(
         'systemd',
diff --git a/src/journal/meson.build b/src/journal/meson.build
index 59da7aa7e0c..177eb330476 100644
--- a/src/journal/meson.build
+++ b/src/journal/meson.build
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
-libjournal_core_sources = files('''
+sources = files('''
         journald-audit.c
         journald-audit.h
         journald-console.c
@@ -23,17 +23,23 @@ libjournal_core_sources = files('''
         journald-wall.h
 '''.split())
 
-systemd_journald_sources = files('''
-        journald.c
-        journald-server.h
-'''.split())
-
-journald_gperf_c = custom_target(
+sources += custom_target(
         'journald-gperf.c',
         input : 'journald-gperf.gperf',
         output : 'journald-gperf.c',
         command : [gperf, '@INPUT@', '--output-file', '@OUTPUT@'])
 
+libjournal_core = static_library(
+        'journal-core',
+        sources,
+        include_directories : includes,
+        install : false)
+
+systemd_journald_sources = files('''
+        journald.c
+        journald-server.h
+'''.split())
+
 systemd_cat_sources = files('cat.c')
 
 journalctl_sources = files('''