Prep v239: Add man/custom-entities.ent.in, we now need it.

diff --git a/cb/elogind.cbp b/cb/elogind.cbp
index 4168fbec7feba25abd822d96b693a475ab6aa400..65da13a703ec4c77b6bf8cf23a9f4819eb8bf052 100644 (file)
--- a/cb/elogind.cbp
+++ b/cb/elogind.cbp
@@ -54,10 +54,90 @@
                <Compiler>
                        <Add option="-Wall" />
                </Compiler>
-               <Unit filename="../man/meson.build">
-                       <Option target="all" />
-                       <Option target="clean" />
-               </Unit>
+               <Unit filename="../man/custom-entities.ent.in" />
+               <Unit filename="../man/custom-html.xsl" />
+               <Unit filename="../man/custom-man.xsl" />
+               <Unit filename="../man/elogind.syntax.xml" />
+               <Unit filename="../man/elogind.xml" />
+               <Unit filename="../man/glib-event-glue.c">
+                       <Option compilerVar="CC" />
+               </Unit>
+               <Unit filename="../man/less-variables.xml" />
+               <Unit filename="../man/libelogind-pkgconfig.xml" />
+               <Unit filename="../man/loginctl.xml" />
+               <Unit filename="../man/logind.conf.xml" />
+               <Unit filename="../man/meson.build" />
+               <Unit filename="../man/pam_elogind.xml" />
+               <Unit filename="../man/sd-bus.xml" />
+               <Unit filename="../man/sd-event.xml" />
+               <Unit filename="../man/sd-login.xml" />
+               <Unit filename="../man/sd_booted.xml" />
+               <Unit filename="../man/sd_bus_add_match.xml" />
+               <Unit filename="../man/sd_bus_creds_get_pid.xml" />
+               <Unit filename="../man/sd_bus_creds_new_from_pid.xml" />
+               <Unit filename="../man/sd_bus_default.xml" />
+               <Unit filename="../man/sd_bus_error.xml" />
+               <Unit filename="../man/sd_bus_error_add_map.xml" />
+               <Unit filename="../man/sd_bus_get_fd.xml" />
+               <Unit filename="../man/sd_bus_is_open.xml" />
+               <Unit filename="../man/sd_bus_message_append.xml" />
+               <Unit filename="../man/sd_bus_message_append_array.xml" />
+               <Unit filename="../man/sd_bus_message_append_basic.xml" />
+               <Unit filename="../man/sd_bus_message_append_string_memfd.xml" />
+               <Unit filename="../man/sd_bus_message_append_strv.xml" />
+               <Unit filename="../man/sd_bus_message_get_cookie.xml" />
+               <Unit filename="../man/sd_bus_message_get_monotonic_usec.xml" />
+               <Unit filename="../man/sd_bus_message_read_basic.xml" />
+               <Unit filename="../man/sd_bus_negotiate_fds.xml" />
+               <Unit filename="../man/sd_bus_new.xml" />
+               <Unit filename="../man/sd_bus_path_encode.xml" />
+               <Unit filename="../man/sd_bus_process.xml" />
+               <Unit filename="../man/sd_bus_request_name.xml" />
+               <Unit filename="../man/sd_bus_set_connected_signal.xml" />
+               <Unit filename="../man/sd_bus_set_sender.xml" />
+               <Unit filename="../man/sd_bus_set_watch_bind.xml" />
+               <Unit filename="../man/sd_bus_slot_set_destroy_callback.xml" />
+               <Unit filename="../man/sd_bus_slot_set_floating.xml" />
+               <Unit filename="../man/sd_bus_track_add_name.xml" />
+               <Unit filename="../man/sd_bus_track_new.xml" />
+               <Unit filename="../man/sd_event_add_child.xml" />
+               <Unit filename="../man/sd_event_add_defer.xml" />
+               <Unit filename="../man/sd_event_add_inotify.xml" />
+               <Unit filename="../man/sd_event_add_io.xml" />
+               <Unit filename="../man/sd_event_add_signal.xml" />
+               <Unit filename="../man/sd_event_add_time.xml" />
+               <Unit filename="../man/sd_event_exit.xml" />
+               <Unit filename="../man/sd_event_get_fd.xml" />
+               <Unit filename="../man/sd_event_new.xml" />
+               <Unit filename="../man/sd_event_now.xml" />
+               <Unit filename="../man/sd_event_run.xml" />
+               <Unit filename="../man/sd_event_set_watchdog.xml" />
+               <Unit filename="../man/sd_event_source_get_event.xml" />
+               <Unit filename="../man/sd_event_source_get_pending.xml" />
+               <Unit filename="../man/sd_event_source_set_description.xml" />
+               <Unit filename="../man/sd_event_source_set_destroy_callback.xml" />
+               <Unit filename="../man/sd_event_source_set_enabled.xml" />
+               <Unit filename="../man/sd_event_source_set_prepare.xml" />
+               <Unit filename="../man/sd_event_source_set_priority.xml" />
+               <Unit filename="../man/sd_event_source_set_userdata.xml" />
+               <Unit filename="../man/sd_event_source_unref.xml" />
+               <Unit filename="../man/sd_event_wait.xml" />
+               <Unit filename="../man/sd_get_seats.xml" />
+               <Unit filename="../man/sd_id128_get_machine.xml" />
+               <Unit filename="../man/sd_id128_randomize.xml" />
+               <Unit filename="../man/sd_id128_to_string.xml" />
+               <Unit filename="../man/sd_is_fifo.xml" />
+               <Unit filename="../man/sd_listen_fds.xml" />
+               <Unit filename="../man/sd_login_monitor_new.xml" />
+               <Unit filename="../man/sd_machine_get_class.xml" />
+               <Unit filename="../man/sd_notify.xml" />
+               <Unit filename="../man/sd_pid_get_owner_uid.xml" />
+               <Unit filename="../man/sd_seat_get_active.xml" />
+               <Unit filename="../man/sd_session_is_active.xml" />
+               <Unit filename="../man/sd_uid_get_state.xml" />
+               <Unit filename="../man/sd_watchdog_enabled.xml" />
+               <Unit filename="../man/standard-options.xml" />
+               <Unit filename="../man/user-system-options.xml" />
                <Unit filename="../meson.build">
                        <Option target="all" />
                        <Option target="clean" />
@@ -213,6 +293,7 @@
                </Unit>
                <Unit filename="../src/basic/mkdir.h" />
                <Unit filename="../src/basic/mount-util.c">
+                       <Option compilerVar="CC" />
                </Unit>
                <Unit filename="../src/basic/mount-util.h" />
                <Unit filename="../src/basic/os-util.c">

diff --git a/man/custom-entities.ent.in b/man/custom-entities.ent.in
new file mode 100644 (file)
index 0000000..002028d
--- /dev/null
+++ b/man/custom-entities.ent.in
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!-- 0 /// elogind does not has any of these but KILL_USER_PROCESSES.
+<!ENTITY MOUNT_PATH @MOUNT_PATH@>
+<!ENTITY UMOUNT_PATH @UMOUNT_PATH@>
+<!ENTITY systemgeneratordir @SYSTEM_GENERATOR_PATH@>
+<!ENTITY usergeneratordir @USER_GENERATOR_PATH@>
+<!ENTITY systemenvgeneratordir @SYSTEM_ENV_GENERATOR_PATH@>
+<!ENTITY userenvgeneratordir @USER_ENV_GENERATOR_PATH@>
+<!ENTITY CERTIFICATE_ROOT @CERTIFICATE_ROOT@>
+<!ENTITY MEMORY_ACCOUNTING_DEFAULT @MEMORY_ACCOUNTING_DEFAULT_YES_NO@>
+// 0 -->
+<!ENTITY KILL_USER_PROCESSES @KILL_USER_PROCESSES_YES_NO@>

diff --git a/man/meson.build b/man/meson.build
index 8357f1682df4598a3c53f138193cb61cea99502d..d5895eb2fc8352df8fb8deb962c1e03a3b149458 100644 (file)
--- a/man/meson.build
+++ b/man/meson.build
@@ -26,12 +26,10 @@ custom_man_xsl = files('custom-man.xsl')
 custom_html_xsl = files('custom-html.xsl')
 xslt_cmd = [xsltproc, '-o', '@OUTPUT0@'] + xsltproc_flags
 
-#if 0 /// UNNEEDED by elogind
-# custom_entities_ent = configure_file(
-#         input : 'custom-entities.ent.in',
-#         output : 'custom-entities.ent',
-#         configuration : conf)
-#endif // 0
+custom_entities_ent = configure_file(
+        input : 'custom-entities.ent.in',
+        output : 'custom-entities.ent',
+        configuration : conf)
 
 man_pages = []
 html_pages = []