meson: move declarations of journal-remote and friends

diff --git a/meson.build b/meson.build
index beced788372e9245edd8af89f0136d1dcfc8b1eb..9231f681722dfa0f35fb4f0e864d9f767e064e84 100644 (file)
--- 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 9fe1b8049b58144b7df7aceefe1194bcc1bade5e..89419f1de17dfc03e44d2ac0381b146b6fe5fe14 100644 (file)
--- 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],