build-sys: make sure kdbus.h is part of tarball

Also fix 'update-man-list' rule and add rules for new man pages.

diff --git a/Makefile-man.am b/Makefile-man.am
index 0e08eb5a52e78876df45c9a3c67c032da2387abc..10779ddbafdc8e9eddc48408a6b57d345044a54d 100644 (file)
--- a/Makefile-man.am
+++ b/Makefile-man.am
@@ -793,8 +793,10 @@ MANPAGES_ALIAS += \
        man/sd_login_monitor_get_fd.3 \
        man/sd_login_monitor_get_timeout.3 \
        man/sd_login_monitor_unref.3 \
        man/sd_login_monitor_get_fd.3 \
        man/sd_login_monitor_get_timeout.3 \
        man/sd_login_monitor_unref.3 \

+       man/sd_pid_get_machine_name.3 \

        man/sd_pid_get_owner_uid.3 \
        man/sd_pid_get_unit.3 \
        man/sd_pid_get_owner_uid.3 \
        man/sd_pid_get_unit.3 \

+       man/sd_pid_get_user_unit.3 \

        man/sd_seat_can_multi_session.3 \
        man/sd_seat_get_sessions.3 \
        man/sd_session_get_class.3 \
        man/sd_seat_can_multi_session.3 \
        man/sd_seat_get_sessions.3 \
        man/sd_session_get_class.3 \


@@ -817,8 +819,10 @@ man/sd_login_monitor_get_events.3: man/sd_login_monitor_new.3
 man/sd_login_monitor_get_fd.3: man/sd_login_monitor_new.3
 man/sd_login_monitor_get_timeout.3: man/sd_login_monitor_new.3
 man/sd_login_monitor_unref.3: man/sd_login_monitor_new.3
 man/sd_login_monitor_get_fd.3: man/sd_login_monitor_new.3
 man/sd_login_monitor_get_timeout.3: man/sd_login_monitor_new.3
 man/sd_login_monitor_unref.3: man/sd_login_monitor_new.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_unit.3: man/sd_pid_get_session.3
 man/sd_pid_get_owner_uid.3: man/sd_pid_get_session.3
 man/sd_pid_get_unit.3: man/sd_pid_get_session.3

+man/sd_pid_get_user_unit.3: man/sd_pid_get_session.3

 man/sd_seat_can_multi_session.3: man/sd_seat_get_active.3
 man/sd_seat_get_sessions.3: man/sd_seat_get_active.3
 man/sd_session_get_class.3: man/sd_session_is_active.3
 man/sd_seat_can_multi_session.3: man/sd_seat_get_active.3
 man/sd_seat_get_sessions.3: man/sd_seat_get_active.3
 man/sd_session_get_class.3: man/sd_session_is_active.3


@@ -857,12 +861,18 @@ man/sd_login_monitor_get_timeout.html: man/sd_login_monitor_new.html
 man/sd_login_monitor_unref.html: man/sd_login_monitor_new.html
        $(html-alias)
 
 man/sd_login_monitor_unref.html: man/sd_login_monitor_new.html
        $(html-alias)
 

+man/sd_pid_get_machine_name.html: man/sd_pid_get_session.html
+       $(html-alias)
+

 man/sd_pid_get_owner_uid.html: man/sd_pid_get_session.html
        $(html-alias)
 
 man/sd_pid_get_unit.html: man/sd_pid_get_session.html
        $(html-alias)
 
 man/sd_pid_get_owner_uid.html: man/sd_pid_get_session.html
        $(html-alias)
 
 man/sd_pid_get_unit.html: man/sd_pid_get_session.html
        $(html-alias)
 

+man/sd_pid_get_user_unit.html: man/sd_pid_get_session.html
+       $(html-alias)
+

 man/sd_seat_can_multi_session.html: man/sd_seat_get_active.html
        $(html-alias)
 
 man/sd_seat_can_multi_session.html: man/sd_seat_get_active.html
        $(html-alias)
 

diff --git a/Makefile.am b/Makefile.am
index 6f2b6ef96adcd8cd29a519a483b22f1b8fde1232..7b4b2d8c48a832b1949de6dbba0c1593d208d83a 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -560,7 +560,7 @@ noinst_DATA += \
 CLEANFILES += \
        man/index.html
 
 CLEANFILES += \
        man/index.html
 

-XML_GLOB = $(wildcard $(top_srcdir)/man/*.xml)
+XML_GLOB = $(wildcard $(top_srcdir)/man/*.xml $(top_builddir)/man/*.xml)

 NON_INDEX_XML_FILES = $(filter-out man/systemd.index.xml,$(XML_FILES))
 SOURCE_XML_FILES = $(filter-out man/systemd.directives.xml,$(NON_INDEX_XML_FILES))
 
 NON_INDEX_XML_FILES = $(filter-out man/systemd.index.xml,$(XML_FILES))
 SOURCE_XML_FILES = $(filter-out man/systemd.directives.xml,$(NON_INDEX_XML_FILES))
 


@@ -1715,7 +1715,8 @@ libsystemd_bus_la_SOURCES = \
        src/libsystemd-bus/bus-match.c \
        src/libsystemd-bus/bus-match.h \
        src/libsystemd-bus/bus-bloom.c \
        src/libsystemd-bus/bus-match.c \
        src/libsystemd-bus/bus-match.h \
        src/libsystemd-bus/bus-bloom.c \

-       src/libsystemd-bus/bus-bloom.h
+       src/libsystemd-bus/bus-bloom.h \
+       src/libsystemd-bus/kdbus.h

 
 libsystemd_bus_la_LIBADD =  \
        libsystemd-id128-internal.la \
 
 libsystemd_bus_la_LIBADD =  \
        libsystemd-id128-internal.la \