X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=27666ea0872bf6617305a2655a6531b2eec4936d;hp=95758429e63148b16a855b09a626dcf905d9c050;hb=b56d18ee605d5dfb0680c154010178d0da2e4af3;hpb=e5e25a685722d5a748bbf6e63c5d80349aa96e59

diff --git a/Makefile.am b/Makefile.am
index 95758429e..27666ea08 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -27,7 +27,7 @@ SUBDIRS = . po
 .DELETE_ON_ERROR:
 
 LIBUDEV_CURRENT=1
-LIBUDEV_REVISION=2
+LIBUDEV_REVISION=3
 LIBUDEV_AGE=0
 
 LIBGUDEV_CURRENT=1
@@ -35,20 +35,20 @@ LIBGUDEV_REVISION=2
 LIBGUDEV_AGE=1
 
 LIBSYSTEMD_LOGIN_CURRENT=3
-LIBSYSTEMD_LOGIN_REVISION=0
+LIBSYSTEMD_LOGIN_REVISION=1
 LIBSYSTEMD_LOGIN_AGE=3
 
 LIBSYSTEMD_DAEMON_CURRENT=0
-LIBSYSTEMD_DAEMON_REVISION=2
+LIBSYSTEMD_DAEMON_REVISION=3
 LIBSYSTEMD_DAEMON_AGE=0
 
 LIBSYSTEMD_ID128_CURRENT=0
-LIBSYSTEMD_ID128_REVISION=6
+LIBSYSTEMD_ID128_REVISION=7
 LIBSYSTEMD_ID128_AGE=0
 
-LIBSYSTEMD_JOURNAL_CURRENT=2
+LIBSYSTEMD_JOURNAL_CURRENT=3
 LIBSYSTEMD_JOURNAL_REVISION=0
-LIBSYSTEMD_JOURNAL_AGE=2
+LIBSYSTEMD_JOURNAL_AGE=3
 
 # Dirs of external packages
 dbuspolicydir=@dbuspolicydir@
@@ -82,7 +82,7 @@ rootprefix=@rootprefix@
 rootbindir=$(rootprefix)/bin
 rootlibexecdir=$(rootprefix)/lib/systemd
 
-CLEANFILES = BUILT_SOURCES
+CLEANFILES = $(BUILT_SOURCES)
 EXTRA_DIST =
 BUILT_SOURCES =
 INSTALL_EXEC_HOOKS =
@@ -455,6 +455,7 @@ MANPAGES = \
 	man/systemd.device.5 \
 	man/systemd.snapshot.5 \
 	man/systemd.exec.5 \
+	man/systemd.kill.5 \
 	man/systemd.special.7 \
 	man/systemd.journal-fields.7 \
 	man/kernel-command-line.7 \
@@ -537,6 +538,7 @@ MANPAGES_ALIAS = \
 	man/systemd-poweroff.service.8 \
 	man/systemd-reboot.service.8 \
 	man/systemd-kexec.service.8 \
+	man/systemd-fsck.8 \
 	man/systemd-fsck-root.service.8 \
 	man/systemd-ask-password-console.path.8 \
 	man/systemd-ask-password-wall.service.8 \
@@ -603,6 +605,7 @@ man/systemd-shutdown.8: man/systemd-halt.service.8
 man/systemd-poweroff.service.8: man/systemd-halt.service.8
 man/systemd-reboot.service.8: man/systemd-halt.service.8
 man/systemd-kexec.service.8: man/systemd-halt.service.8
+man/systemd-fsck.8: man/systemd-fsck@.service.8
 man/systemd-fsck-root.service.8: man/systemd-fsck@.service.8
 man/systemd-ask-password-console.path.8: man/systemd-ask-password-console.service.8
 man/systemd-ask-password-wall.service.8: man/systemd-ask-password-console.service.8
@@ -672,9 +675,9 @@ noinst_DATA += \
 CLEANFILES += \
 	man/index.html
 
-$(builddir)/man/index.html: $(XML_FILES:.xml=.html) $(top_srcdir)/make-man-index.py
+man/index.html: make-man-index.py $(XML_FILES)
 	$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
-	$(PYTHON) $(top_srcdir)/make-man-index.py $(XML_FILES) > $@
+	$(PYTHON) $^ > $@
 
 EXTRA_DIST += \
 	man/index.html
@@ -904,6 +907,8 @@ libsystemd_core_la_SOURCES = \
 	src/core/load-dropin.h \
 	src/core/execute.c \
 	src/core/execute.h \
+	src/core/kill.c \
+	src/core/kill.h \
 	src/core/dbus.c \
 	src/core/dbus.h \
 	src/core/dbus-manager.c \
@@ -932,6 +937,8 @@ libsystemd_core_la_SOURCES = \
 	src/core/dbus-device.h \
 	src/core/dbus-execute.c \
 	src/core/dbus-execute.h \
+	src/core/dbus-kill.c \
+	src/core/dbus-kill.h \
 	src/core/dbus-path.c \
 	src/core/dbus-path.h \
 	src/core/cgroup.c \
@@ -1468,7 +1475,8 @@ systemd_nspawn_LDADD = \
 	libsystemd-label.la \
 	libsystemd-capability.la \
 	libsystemd-shared.la \
-	libsystemd-daemon.la
+	libsystemd-daemon.la \
+	libsystemd-id128-internal.la
 
 # ------------------------------------------------------------------------------
 systemd_stdio_bridge_SOURCES = \
@@ -1653,7 +1661,13 @@ MANPAGES += \
 	man/systemd-udevd.service.8
 
 MANPAGES_ALIAS += \
-	man/systemd-udevd.8
+	man/systemd-udevd.8 \
+	man/systemd-udevd-control.socket.8 \
+	man/systemd-udevd-kernel.socket.8
+
+man/systemd-udevd.8: man/systemd-udevd.service.8
+man/systemd-udevd-control.socket.8: man/systemd-udevd.service.8
+man/systemd-udevd-kernel.socket.8: man/systemd-udevd.service.8
 
 udev-confdirs:
 	-mkdir -p $(DESTDIR)$(sysconfdir)/udev/rules.d
@@ -3238,7 +3252,6 @@ MANPAGES += \
 	man/systemd-user-sessions.service.8
 
 MANPAGES_ALIAS += \
-	man/systemd-logind.8 \
 	man/sd_login_monitor_unref.3 \
 	man/sd_login_monitor_flush.3 \
 	man/sd_login_monitor_get_fd.3 \
@@ -3246,6 +3259,7 @@ MANPAGES_ALIAS += \
 	man/sd_session_get_uid.3 \
 	man/sd_session_get_seat.3 \
 	man/sd_session_get_service.3 \
+	man/sd_session_get_state.3 \
 	man/sd_session_get_type.3 \
 	man/sd_session_get_class.3 \
 	man/sd_session_get_display.3 \
@@ -3258,6 +3272,7 @@ MANPAGES_ALIAS += \
 	man/sd_seat_can_multi_session.3 \
 	man/sd_get_sessions.3 \
 	man/sd_get_uids.3 \
+	man/systemd-logind.8 \
 	man/systemd-user-sessions.8
 
 man/systemd-logind.8: man/systemd-logind.service.8
@@ -3268,6 +3283,7 @@ man/sd_login_monitor.3: man/sd_login_monitor_new.3
 man/sd_session_get_uid.3: man/sd_session_is_active.3
 man/sd_session_get_seat.3: man/sd_session_is_active.3
 man/sd_session_get_service.3: man/sd_session_is_active.3
+man/sd_session_get_state.3: man/sd_session_is_active.3
 man/sd_session_get_type.3: man/sd_session_is_active.3
 man/sd_session_get_class.3: man/sd_session_is_active.3
 man/sd_session_get_display.3: man/sd_session_is_active.3