diff options
| author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2023-06-25 09:06:20 +0200 |
|---|---|---|
| committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2023-08-01 08:54:45 +0200 |
| commit | c26c97af26d92a06f6e21ac70f45a1dddd8c1078 (patch) | |
| tree | 754dbd88bf853980982941809721b343672d2101 | |
| parent | meson: move declarations of machined and friends (diff) | |
| download | systemd-c26c97af26d92a06f6e21ac70f45a1dddd8c1078.tar.xz systemd-c26c97af26d92a06f6e21ac70f45a1dddd8c1078.zip | |
meson: move declarations of journal-remote and friends
| -rw-r--r-- | meson.build | 53 | ||||
| -rw-r--r-- | src/journal-remote/meson.build | 46 |
2 files changed, 46 insertions, 53 deletions
diff --git a/meson.build b/meson.build index beced78837..9231f68172 100644 --- a/meson.build +++ b/meson.build @@ -2581,59 +2581,6 @@ meson.add_install_script(meson_make_symlink, bindir / 'udevadm', libexecdir / 'systemd-udevd') -if conf.get('ENABLE_REMOTE') == 1 and conf.get('HAVE_LIBCURL') == 1 - public_programs += executable( - 'systemd-journal-upload', - systemd_journal_upload_sources, - include_directories : includes, - link_with : [libshared], - dependencies : [libcurl, - libgnutls, - liblz4, - libxz, - libzstd, - threads, - userspace], - install_rpath : pkglibdir, - install : true, - install_dir : libexecdir) -endif - -if conf.get('ENABLE_REMOTE') == 1 and conf.get('HAVE_MICROHTTPD') == 1 - public_programs += executable( - 'systemd-journal-remote', - systemd_journal_remote_sources, - include_directories : journal_includes, - link_with : [libshared, - libsystemd_journal_remote], - dependencies : [libgnutls, - liblz4, - libmicrohttpd, - libxz, - libzstd, - threads, - userspace], - install_rpath : pkglibdir, - install : true, - install_dir : libexecdir) - - public_programs += executable( - 'systemd-journal-gatewayd', - systemd_journal_gatewayd_sources, - include_directories : journal_includes, - link_with : [libshared], - dependencies : [libgnutls, - liblz4, - libmicrohttpd, - libxz, - libzstd, - threads, - userspace], - install_rpath : pkglibdir, - install : true, - install_dir : libexecdir) -endif - if conf.get('ENABLE_COREDUMP') == 1 executable( 'systemd-coredump', diff --git a/src/journal-remote/meson.build b/src/journal-remote/meson.build index 9fe1b8049b..89419f1de1 100644 --- a/src/journal-remote/meson.build +++ b/src/journal-remote/meson.build @@ -37,6 +37,52 @@ systemd_journal_gatewayd_sources = files( 'microhttpd-util.c', ) +common_deps = [ + libgnutls, + liblz4, + libxz, + libzstd, + threads, +] + +executables += [ + libexec_template + { + 'name' : 'systemd-journal-upload', + 'public' : true, + 'conditions' : [ + 'ENABLE_REMOTE', + 'HAVE_LIBCURL', + ], + 'sources' : systemd_journal_upload_sources, + 'dependencies' : common_deps + [libcurl], + }, + libexec_template + { + 'name' : 'systemd-journal-remote', + 'public' : true, + 'conditions' : [ + 'ENABLE_REMOTE', + 'HAVE_MICROHTTPD', + ], + 'sources' : systemd_journal_remote_sources, + 'include_directories' : journal_includes, + 'link_with' : [ + libshared, + libsystemd_journal_remote, + ], + 'dependencies' : common_deps + [libmicrohttpd], + }, + libexec_template + { + 'name' : 'systemd-journal-gatewayd', + 'public' : true, + 'conditions' : [ + 'ENABLE_REMOTE', + 'HAVE_MICROHTTPD', + ], + 'sources' : systemd_journal_gatewayd_sources, + 'dependencies' : common_deps + [libmicrohttpd], + }, +] + in_files = [ ['journal-upload.conf', conf.get('ENABLE_REMOTE') == 1 and conf.get('HAVE_LIBCURL') == 1 and install_sysconfdir_samples], |