From: Zbigniew Jędrzejewski-Szmek Date: Wed, 16 May 2018 08:21:58 +0000 (+0200) Subject: journal-remote: split out µhttpd support and main() into a separate file X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=a1517bda5fc61271bc01ba7424b70e94a56e35a9;p=elogind.git journal-remote: split out µhttpd support and main() into a separate file This is in preparation to reusing the RemoteServer in other concepts. I tried to keep changes to minimum: - arg_* global variables are now passed as state in RemoteServer - exported functions get the "journal_remote_" prefix - some variables are renamed In particular, there is an ugly global RemoveServer* variable. It was originally added because µhttpd did not allow state to be passed to the callbacks. I'm not sure if this has been remediated in µhttpd, but either way, this is not changed here, the global variable is only renamed for clarity. --- diff --git a/meson.build b/meson.build index 6691ca7fb..1f29a8dd3 100644 --- a/meson.build +++ b/meson.build @@ -1923,6 +1923,7 @@ executable('elogind-user-runtime-dir', executable('elogind-user-runtime-dir', executable('elogind-user-runtime-dir', executable('elogind-user-runtime-dir', +executable('elogind-user-runtime-dir', executable('elogind-user-runtime-dir', user_runtime_dir_sources, include_directories : includes, @@ -2283,7 +2284,8 @@ endif # s_j_remote = executable('systemd-journal-remote', # systemd_journal_remote_sources, # include_directories : includes, -# link_with : [libshared], +# link_with : [libshared, +# libsystemd_journal_remote], # dependencies : [threads, # libmicrohttpd, # libgnutls,