summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2013-04-16 23:38:28 -0400
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2013-04-17 00:09:16 -0400
commita1c65062148a11db39b2ed25bc16ccde0a36e391 (patch)
treee97f7f086a6df93e41e17f0f9b54cc9bd74f1b7a
parent21ae45930dab96b794f6faf027ad9ace64bc7b08 (diff)
build-sys: make sure kdbus.h is part of tarball
Also fix 'update-man-list' rule and add rules for new man pages.
-rw-r--r--Makefile-man.am10
-rw-r--r--Makefile.am5
2 files changed, 13 insertions, 2 deletions
diff --git a/Makefile-man.am b/Makefile-man.am
index 0e08eb5a52..10779ddbaf 100644
--- 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_pid_get_machine_name.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 \
@@ -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_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_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
@@ -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_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_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)
diff --git a/Makefile.am b/Makefile.am
index 6f2b6ef96a..7b4b2d8c48 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -560,7 +560,7 @@ noinst_DATA += \
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))
@@ -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-bloom.h
+ src/libsystemd-bus/bus-bloom.h \
+ src/libsystemd-bus/kdbus.h
libsystemd_bus_la_LIBADD = \
libsystemd-id128-internal.la \