Merge pull request #1060 from poettering/resolved-man-2

[thirdparty/systemd.git] / Makefile-man.am

diff --git a/Makefile-man.am b/Makefile-man.am
index 08d22b344c35d71b7c2d94914adccb392479db86..65287371b921edfdd7596ccd95732247f15f11f0 100644 (file)
--- a/Makefile-man.am
+++ b/Makefile-man.am
@@ -91,7 +91,6 @@ MANPAGES += \
        man/systemd-debug-generator.8 \
        man/systemd-delta.1 \
        man/systemd-detect-virt.1 \
-       man/systemd-efi-boot-generator.8 \
        man/systemd-escape.1 \
        man/systemd-fsck@.service.8 \
        man/systemd-fstab-generator.8 \
@@ -1775,13 +1774,19 @@ endif
 
 if ENABLE_RESOLVED
 MANPAGES += \
+       man/nss-resolve.8 \
        man/resolved.conf.5 \
        man/systemd-resolved.service.8
 MANPAGES_ALIAS += \
+       man/libnss_resolve.so.2.8 \
        man/resolved.conf.d.5 \
        man/systemd-resolved.8
+man/libnss_resolve.so.2.8: man/nss-resolve.8
 man/resolved.conf.d.5: man/resolved.conf.5
 man/systemd-resolved.8: man/systemd-resolved.service.8
+man/libnss_resolve.so.2.html: man/nss-resolve.html
+       $(html-alias)
+
 man/resolved.conf.d.html: man/resolved.conf.html
        $(html-alias)
 
@@ -1937,11 +1942,13 @@ MANPAGES_ALIAS += \
        man/sd_peer_get_session.3 \
        man/sd_peer_get_slice.3 \
        man/sd_peer_get_unit.3 \
+       man/sd_peer_get_user_slice.3 \
        man/sd_peer_get_user_unit.3 \
        man/sd_pid_get_machine_name.3 \
        man/sd_pid_get_owner_uid.3 \
        man/sd_pid_get_slice.3 \
        man/sd_pid_get_unit.3 \
+       man/sd_pid_get_user_slice.3 \
        man/sd_pid_get_user_unit.3 \
        man/sd_seat_can_graphical.3 \
        man/sd_seat_can_multi_session.3 \
@@ -1979,11 +1986,13 @@ man/sd_peer_get_owner_uid.3: man/sd_pid_get_session.3
 man/sd_peer_get_session.3: man/sd_pid_get_session.3
 man/sd_peer_get_slice.3: man/sd_pid_get_session.3
 man/sd_peer_get_unit.3: man/sd_pid_get_session.3
+man/sd_peer_get_user_slice.3: man/sd_pid_get_session.3
 man/sd_peer_get_user_unit.3: man/sd_pid_get_session.3
 man/sd_pid_get_machine_name.3: man/sd_pid_get_session.3
 man/sd_pid_get_owner_uid.3: man/sd_pid_get_session.3
 man/sd_pid_get_slice.3: man/sd_pid_get_session.3
 man/sd_pid_get_unit.3: man/sd_pid_get_session.3
+man/sd_pid_get_user_slice.3: man/sd_pid_get_session.3
 man/sd_pid_get_user_unit.3: man/sd_pid_get_session.3
 man/sd_seat_can_graphical.3: man/sd_seat_get_active.3
 man/sd_seat_can_multi_session.3: man/sd_seat_get_active.3
@@ -2049,6 +2058,9 @@ man/sd_peer_get_slice.html: man/sd_pid_get_session.html
 man/sd_peer_get_unit.html: man/sd_pid_get_session.html
        $(html-alias)
 
+man/sd_peer_get_user_slice.html: man/sd_pid_get_session.html
+       $(html-alias)
+
 man/sd_peer_get_user_unit.html: man/sd_pid_get_session.html
        $(html-alias)
 
@@ -2064,6 +2076,9 @@ man/sd_pid_get_slice.html: man/sd_pid_get_session.html
 man/sd_pid_get_unit.html: man/sd_pid_get_session.html
        $(html-alias)
 
+man/sd_pid_get_user_slice.html: man/sd_pid_get_session.html
+       $(html-alias)
+
 man/sd_pid_get_user_unit.html: man/sd_pid_get_session.html
        $(html-alias)
 
@@ -2208,6 +2223,7 @@ EXTRA_DIST += \
        man/networkctl.xml \
        man/nss-myhostname.xml \
        man/nss-mymachines.xml \
+       man/nss-resolve.xml \
        man/os-release.xml \
        man/pam_systemd.xml \
        man/resolved.conf.xml \
@@ -2294,7 +2310,6 @@ EXTRA_DIST += \
        man/systemd-debug-generator.xml \
        man/systemd-delta.xml \
        man/systemd-detect-virt.xml \
-       man/systemd-efi-boot-generator.xml \
        man/systemd-escape.xml \
        man/systemd-firstboot.xml \
        man/systemd-fsck@.service.xml \