X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=3b7ec0b7ba24526bbb0bc2b341b4b311b3fed0ff;hp=3718fa871e95b4c2be0269ff25edc7505aa4fa58;hb=9946996cda11a18b44d82344676e5a0e96339408;hpb=d0d6944cdc17295b17875054ac05e667fe496fed

diff --git a/Makefile.am b/Makefile.am
index 3718fa871..3b7ec0b7b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,28 +24,28 @@ AM_MAKEFLAGS = --no-print-directory
 SUBDIRS = . po
 
 LIBUDEV_CURRENT=1
-LIBUDEV_REVISION=1
+LIBUDEV_REVISION=2
 LIBUDEV_AGE=0
 
 LIBGUDEV_CURRENT=1
 LIBGUDEV_REVISION=2
 LIBGUDEV_AGE=1
 
-LIBSYSTEMD_LOGIN_CURRENT=2
-LIBSYSTEMD_LOGIN_REVISION=4
-LIBSYSTEMD_LOGIN_AGE=2
+LIBSYSTEMD_LOGIN_CURRENT=3
+LIBSYSTEMD_LOGIN_REVISION=0
+LIBSYSTEMD_LOGIN_AGE=3
 
 LIBSYSTEMD_DAEMON_CURRENT=0
 LIBSYSTEMD_DAEMON_REVISION=2
 LIBSYSTEMD_DAEMON_AGE=0
 
 LIBSYSTEMD_ID128_CURRENT=0
-LIBSYSTEMD_ID128_REVISION=5
+LIBSYSTEMD_ID128_REVISION=6
 LIBSYSTEMD_ID128_AGE=0
 
-LIBSYSTEMD_JOURNAL_CURRENT=1
-LIBSYSTEMD_JOURNAL_REVISION=1
-LIBSYSTEMD_JOURNAL_AGE=1
+LIBSYSTEMD_JOURNAL_CURRENT=2
+LIBSYSTEMD_JOURNAL_REVISION=0
+LIBSYSTEMD_JOURNAL_AGE=2
 
 # Dirs of external packages
 dbuspolicydir=@dbuspolicydir@
@@ -96,6 +96,7 @@ dist_udevrules_DATA =
 nodist_udevrules_DATA =
 dist_man_MANS =
 dist_pkgsysconf_DATA =
+dist_pkgdata_DATA =
 dist_dbuspolicy_DATA =
 dbusinterface_DATA =
 dist_dbussystemservice_DATA =
@@ -307,9 +308,8 @@ dist_systemunit_DATA = \
 	units/systemd-ask-password-wall.path \
 	units/systemd-ask-password-console.path \
 	units/syslog.target \
-	units/systemd-udev-control.socket \
-	units/systemd-udev-kernel.socket \
-	units/systemd-timedated-ntp.target  \
+	units/systemd-udevd-control.socket \
+	units/systemd-udevd-kernel.socket \
 	units/system-update.target
 
 nodist_systemunit_DATA = \
@@ -339,10 +339,10 @@ nodist_systemunit_DATA = \
 	units/systemd-kexec.service \
 	units/systemd-fsck@.service \
 	units/systemd-fsck-root.service \
-	units/systemd-udev.service \
+	units/systemd-udevd.service \
 	units/systemd-udev-trigger.service \
 	units/systemd-udev-settle.service \
-	units/systemd-debug-shell.service
+	units/debug-shell.service
 
 dist_userunit_DATA = \
 	units/user/default.target \
@@ -377,10 +377,10 @@ EXTRA_DIST += \
 	units/systemd-fsck@.service.in \
 	units/systemd-fsck-root.service.in \
 	units/user@.service.in \
-	units/systemd-udev.service \
+	units/systemd-udevd.service \
 	units/systemd-udev-trigger.service \
 	units/systemd-udev-settle.service \
-	units/systemd-debug-shell.service.in \
+	units/debug-shell.service.in \
 	units/systemd-hibernate.service.in \
 	units/systemd-suspend.service.in \
 	introspect.awk \
@@ -497,7 +497,11 @@ MANPAGES = \
 	man/systemd-fsck@.service.8 \
 	man/systemd-ask-password-console.service.8 \
 	man/systemd-analyze.1 \
-	man/systemd-tty-ask-password-agent.1
+	man/systemd-tty-ask-password-agent.1 \
+	man/systemd-getty-generator.8 \
+	man/systemd-system-update-generator.8 \
+	man/systemd-fstab-generator.8 \
+	man/systemd.preset.5
 
 MANPAGES_ALIAS = \
 	man/reboot.8 \
@@ -523,7 +527,10 @@ MANPAGES_ALIAS = \
 	man/systemd-fsck-root.service.8 \
 	man/systemd-ask-password-console.path.8 \
 	man/systemd-ask-password-wall.service.8 \
-	man/systemd-ask-password-wall.path.8
+	man/systemd-ask-password-wall.path.8 \
+	man/systemd-tmpfiles-setup.service.8 \
+	man/systemd-tmpfiles-clean.service.8 \
+	man/systemd-tmpfiles-clean.timer.8
 
 man/reboot.8: man/halt.8
 man/poweroff.8: man/halt.8
@@ -549,6 +556,9 @@ 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
 man/systemd-ask-password-wall.path.8: man/systemd-ask-password-console.service.8
+man/systemd-tmpfiles-setup.service.8: man/systemd-tmpfiles.8
+man/systemd-tmpfiles-clean.service.8: man/systemd-tmpfiles.8
+man/systemd-tmpfiles-clean.timer.8: man/systemd-tmpfiles.8
 
 XML_FILES = \
 	${patsubst %.1,%.xml,${patsubst %.3,%.xml,${patsubst %.5,%.xml,${patsubst %.7,%.xml,${patsubst %.8,%.xml,$(MANPAGES)}}}}}
@@ -1523,21 +1533,21 @@ CLEANFILES += \
 	src/udev/udev.pc
 
 EXTRA_DIST += \
-	units/systemd-udev.service.in \
+	units/systemd-udevd.service.in \
 	units/systemd-udev-trigger.service.in \
 	units/systemd-udev-settle.service.in
 
 CLEANFILES += \
-	units/systemd-udev.service \
+	units/systemd-udevd.service \
 	units/systemd-udev-trigger.service \
 	units/systemd-udev-settle.service
 
 systemd-install-hook:
 	mkdir -p $(DESTDIR)$(systemunitdir)/sockets.target.wants
-	ln -sf ../systemd-udev-control.socket $(DESTDIR)$(systemunitdir)/sockets.target.wants/systemd-udev-control.socket
-	ln -sf ../systemd-udev-kernel.socket $(DESTDIR)$(systemunitdir)/sockets.target.wants/systemd-udev-kernel.socket
+	ln -sf ../systemd-udevd-control.socket $(DESTDIR)$(systemunitdir)/sockets.target.wants/systemd-udevd-control.socket
+	ln -sf ../systemd-udevd-kernel.socket $(DESTDIR)$(systemunitdir)/sockets.target.wants/systemd-udevd-kernel.socket
 	mkdir -p $(DESTDIR)$(systemunitdir)/sysinit.target.wants
-	ln -sf ../systemd-udev.service $(DESTDIR)$(systemunitdir)/sysinit.target.wants/systemd-udev.service
+	ln -sf ../systemd-udevd.service $(DESTDIR)$(systemunitdir)/sysinit.target.wants/systemd-udevd.service
 	ln -sf ../systemd-udev-trigger.service $(DESTDIR)$(systemunitdir)/sysinit.target.wants/systemd-udev-trigger.service
 
 INSTALL_DATA_HOOKS += systemd-install-hook
@@ -2610,7 +2620,9 @@ INSTALL_DATA_HOOKS += \
 	cryptsetup-install-data-hook
 
 MANPAGES += \
-	man/systemd-cryptsetup@.service.8
+	man/systemd-cryptsetup@.service.8 \
+	man/systemd-cryptsetup-generator.8 \
+	man/crypttab.5
 
 MANPAGES_ALIAS += \
 	man/systemd-cryptsetup.8
@@ -2733,7 +2745,7 @@ man/systemd-localed.8: man/systemd-localed.service.8
 EXTRA_DIST += \
 	units/systemd-localed.service.in
 
-dist_pkgdata_DATA = \
+dist_pkgdata_DATA += \
 	src/locale/kbd-model-map
 
 dist_noinst_SCRIPT = \
@@ -3377,9 +3389,6 @@ if TARGET_FEDORA
 		rm -f display-manager.service single.service && \
 		$(LN_S) prefdm.service display-manager.service && \
 		$(LN_S) rescue.service single.service )
-	( cd $(DESTDIR)$(systemunitdir)/graphical.target.wants && \
-		rm -f display-manager.service && \
-		$(LN_S) $(systemunitdir)/display-manager.service display-manager.service )
 endif
 
 if TARGET_MANDRIVA
@@ -3388,9 +3397,6 @@ if TARGET_MANDRIVA
 		$(LN_S) prefdm.service display-manager.service && \
 		$(LN_S) prefdm.service dm.service && \
 		$(LN_S) rescue.service single.service )
-	( cd $(DESTDIR)$(systemunitdir)/graphical.target.wants && \
-		rm -f display-manager.service && \
-		$(LN_S) $(systemunitdir)/display-manager.service display-manager.service )
 endif
 
 if TARGET_DEBIAN_OR_UBUNTU
@@ -3410,9 +3416,6 @@ if TARGET_MAGEIA
 		rm -f display-manager.service && \
 		$(LN_S) prefdm.service display-manager.service && \
 		$(LN_S) prefdm.service dm.service )
-	( cd $(DESTDIR)$(systemunitdir)/graphical.target.wants && \
-		rm -f display-manager.service && \
-		$(LN_S) $(systemunitdir)/display-manager.service display-manager.service )
 endif
 
 install-exec-hook: $(INSTALL_EXEC_HOOKS)