X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=219d8ded8e6115c14f63f2dd8c24e440bb49f420;hp=0bd893f20b089f4187280899f4b9547ead3dee67;hb=b070e7f3c9ed680c821bd89d42506695f2438506;hpb=db5973704b9e03e5902072354d3a2697f7992a21

diff --git a/Makefile.am b/Makefile.am
index 0bd893f20..219d8ded8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,20 +20,20 @@ ACLOCAL_AMFLAGS = -I m4
 
 SUBDIRS = po
 
-LIBSYSTEMD_LOGIN_CURRENT=1
-LIBSYSTEMD_LOGIN_REVISION=0
-LIBSYSTEMD_LOGIN_AGE=1
+LIBSYSTEMD_LOGIN_CURRENT=2
+LIBSYSTEMD_LOGIN_REVISION=1
+LIBSYSTEMD_LOGIN_AGE=2
 
 LIBSYSTEMD_DAEMON_CURRENT=0
-LIBSYSTEMD_DAEMON_REVISION=0
+LIBSYSTEMD_DAEMON_REVISION=1
 LIBSYSTEMD_DAEMON_AGE=0
 
 LIBSYSTEMD_ID128_CURRENT=0
-LIBSYSTEMD_ID128_REVISION=0
+LIBSYSTEMD_ID128_REVISION=3
 LIBSYSTEMD_ID128_AGE=0
 
 LIBSYSTEMD_JOURNAL_CURRENT=0
-LIBSYSTEMD_JOURNAL_REVISION=0
+LIBSYSTEMD_JOURNAL_REVISION=3
 LIBSYSTEMD_JOURNAL_AGE=0
 
 # Dirs of external packages
@@ -52,6 +52,7 @@ bashcompletiondir=$(sysconfdir)/bash_completion.d
 pkgsysconfdir=$(sysconfdir)/systemd
 userunitdir=$(prefix)/lib/systemd/user
 tmpfilesdir=$(prefix)/lib/tmpfiles.d
+sysctldir=$(prefix)/lib/sysctl.d
 usergeneratordir=$(pkglibexecdir)/user-generators
 pkgincludedir=$(includedir)/systemd
 
@@ -72,6 +73,7 @@ pkginclude_HEADERS =
 lib_LTLIBRARIES =
 pkgconfiglib_DATA =
 polkitpolicy_in_files =
+dist_udevrules_DATA =
 
 AM_CPPFLAGS = \
 	-include $(top_builddir)/config.h \
@@ -84,7 +86,7 @@ AM_CPPFLAGS = \
 	-DUSER_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/user\" \
 	-DUSER_DATA_UNIT_PATH=\"$(userunitdir)\" \
 	-DSYSTEMD_CGROUP_AGENT_PATH=\"$(rootlibexecdir)/systemd-cgroups-agent\" \
-	-DSYSTEMD_BINARY_PATH=\"$(rootbindir)/systemd\" \
+	-DSYSTEMD_BINARY_PATH=\"$(rootlibexecdir)/systemd\" \
 	-DSYSTEMD_SHUTDOWN_BINARY_PATH=\"$(rootlibexecdir)/systemd-shutdown\" \
 	-DSYSTEMCTL_BINARY_PATH=\"$(rootbindir)/systemctl\" \
 	-DSYSTEMD_TTY_ASK_PASSWORD_AGENT_BINARY_PATH=\"$(rootbindir)/systemd-tty-ask-password-agent\" \
@@ -97,12 +99,16 @@ AM_CPPFLAGS = \
 	-DUSER_GENERATOR_PATH=\"$(usergeneratordir)\" \
 	-DSYSTEM_SHUTDOWN_PATH=\"$(systemshutdowndir)\" \
 	-DSYSTEMD_KBD_MODEL_MAP=\"$(pkgdatadir)/kbd-model-map\" \
+        -DX_SERVER=\"$(bindir)/X\" \
 	-I $(top_srcdir)/src \
 	-I $(top_srcdir)/src/readahead \
 	-I $(top_srcdir)/src/login \
 	-I $(top_srcdir)/src/journal \
 	-I $(top_srcdir)/src/systemd
 
+AM_CFLAGS = $(WARNINGFLAGS)
+AM_LDFLAGS = $(GCLDFLAGS)
+
 if TARGET_GENTOO
 AM_CPPFLAGS += \
 	-DKBD_LOADKEYS=\"/usr/bin/loadkeys\" \
@@ -158,7 +164,6 @@ endif
 endif
 
 rootbin_PROGRAMS = \
-	systemd \
 	systemctl \
 	systemd-notify \
 	systemd-ask-password \
@@ -168,19 +173,15 @@ rootbin_PROGRAMS = \
 
 bin_PROGRAMS = \
 	systemd-cgls \
+	systemd-cgtop \
 	systemd-stdio-bridge \
 	systemd-nspawn
 
 dist_bin_SCRIPTS = \
 	src/systemd-analyze
 
-if HAVE_GTK
-bin_PROGRAMS += \
-	systemadm \
-	systemd-gnome-ask-password-agent
-endif
-
 rootlibexec_PROGRAMS = \
+	systemd \
 	systemd-cgroups-agent \
 	systemd-initctl \
 	systemd-update-utmp \
@@ -188,7 +189,6 @@ rootlibexec_PROGRAMS = \
 	systemd-shutdown \
 	systemd-modules-load \
 	systemd-remount-api-vfs \
-	systemd-kmsg-syslogd \
 	systemd-reply-password \
 	systemd-fsck \
 	systemd-timestamp \
@@ -221,11 +221,7 @@ dist_dbuspolicy_DATA = \
 dist_dbussystemservice_DATA = \
 	src/org.freedesktop.systemd1.service
 
-dist_udevrules_DATA = \
-	src/71-seat.rules
-
 nodist_udevrules_DATA = \
-	src/73-seat-late.rules \
 	src/99-systemd.rules
 
 dbusinterface_DATA = \
@@ -292,10 +288,8 @@ dist_systemunit_DATA = \
 	units/dev-mqueue.mount \
 	units/sys-kernel-config.mount \
 	units/sys-kernel-debug.mount \
-	units/sys-kernel-security.mount \
 	units/sys-fs-fuse-connections.mount \
-	units/var-run.mount \
-	units/media.mount \
+	units/tmp.mount \
 	units/remount-rootfs.service \
 	units/printer.target \
 	units/sound.target \
@@ -307,18 +301,12 @@ dist_systemunit_DATA = \
 	units/systemd-ask-password-console.path \
 	units/syslog.target
 
-if HAVE_SYSV_COMPAT
-dist_systemunit_DATA += \
-	units/var-lock.mount
-endif
-
 nodist_systemunit_DATA = \
 	units/getty@.service \
 	units/serial-getty@.service \
 	units/console-shell.service \
 	units/systemd-initctl.service \
 	units/systemd-shutdownd.service \
-	units/systemd-kmsg-syslogd.service \
 	units/systemd-modules-load.service \
 	units/systemd-remount-api-vfs.service \
 	units/systemd-update-utmp-runlevel.service \
@@ -351,7 +339,6 @@ EXTRA_DIST += \
 	units/rescue.service.m4 \
 	units/systemd-initctl.service.in \
 	units/systemd-shutdownd.service.in \
-	units/systemd-kmsg-syslogd.service.in \
 	units/systemd-modules-load.service.in \
 	units/systemd-remount-api-vfs.service.in \
 	units/systemd-update-utmp-runlevel.service.in \
@@ -369,9 +356,8 @@ EXTRA_DIST += \
 	units/fsck@.service.in \
 	units/fsck-root.service.in \
 	units/user@.service.in \
-	systemd.pc.in \
+	src/systemd.pc.in \
 	introspect.awk \
-	src/73-seat-late.rules.in \
 	src/99-systemd.rules.in \
 	man/custom-html.xsl
 
@@ -436,11 +422,12 @@ endif
 
 dist_doc_DATA = \
 	README \
+        NEWS \
 	LICENSE \
 	DISTRO_PORTING
 
 pkgconfigdata_DATA = \
-	systemd.pc
+	src/systemd.pc
 
 # First passed through sed, followed by intltool
 polkitpolicy_in_in_files = \
@@ -471,7 +458,8 @@ libsystemd_basic_la_SOURCES = \
 	src/socket-util.c \
 	src/log.c \
 	src/ratelimit.c \
-	src/exit-status.c
+	src/exit-status.c \
+        src/utf8.c
 
 libsystemd_basic_la_CFLAGS = \
 	$(AM_CFLAGS) \
@@ -519,6 +507,7 @@ libsystemd_core_la_SOURCES = \
 	src/mount-setup.c \
 	src/hostname-setup.c \
 	src/selinux-setup.c \
+	src/ima-setup.c \
 	src/loopback-setup.c \
 	src/kmod-setup.c \
 	src/locale-setup.c \
@@ -549,7 +538,8 @@ libsystemd_core_la_CFLAGS = \
 	$(UDEV_CFLAGS) \
 	$(LIBWRAP_CFLAGS) \
 	$(PAM_CFLAGS) \
-	$(AUDIT_CFLAGS)
+	$(AUDIT_CFLAGS) \
+	$(KMOD_CFLAGS)
 
 libsystemd_core_la_LIBADD = \
 	libsystemd-basic.la \
@@ -558,7 +548,8 @@ libsystemd_core_la_LIBADD = \
 	$(LIBWRAP_LIBS) \
 	$(PAM_LIBS) \
 	$(AUDIT_LIBS) \
-	$(CAP_LIBS)
+	$(CAP_LIBS) \
+	$(KMOD_LIBS)
 
 # This is needed because automake is buggy in how it generates the
 # rules for C programs, but not Vala programs.	We therefore can't
@@ -650,13 +641,16 @@ EXTRA_DIST += \
 	src/dbus-loop.h \
 	src/spawn-agent.h \
 	src/acl-util.h \
-	src/logs-show.h
+	src/logs-show.h \
+        src/utf8.h \
+        src/journal/sparse-endian.h \
+        src/ima-setup.h
 
 MANPAGES = \
 	man/systemd.1 \
 	man/systemctl.1 \
-	man/systemadm.1 \
 	man/systemd-cgls.1 \
+	man/systemd-cgtop.1 \
 	man/systemd-nspawn.1 \
 	man/systemd-tmpfiles.8 \
 	man/systemd-notify.1 \
@@ -672,6 +666,7 @@ MANPAGES = \
 	man/systemd.device.5 \
 	man/systemd.snapshot.5 \
 	man/systemd.exec.5 \
+	man/systemd.special.7 \
 	man/daemon.7 \
 	man/runlevel.8 \
 	man/telinit.8 \
@@ -688,7 +683,11 @@ MANPAGES = \
 	man/machine-info.5 \
 	man/modules-load.d.5 \
 	man/sysctl.d.5 \
-	man/systemd-ask-password.1
+	man/systemd-ask-password.1 \
+	man/systemd-cat.1 \
+	man/systemd-machine-id-setup.1 \
+	man/journald.conf.5 \
+	man/journalctl.1
 
 MANPAGES_ALIAS = \
 	man/reboot.8 \
@@ -699,30 +698,23 @@ man/reboot.8: man/halt.8
 man/poweroff.8: man/halt.8
 man/init.1: man/systemd.1
 
-dist_man_MANS = \
-	$(MANPAGES) \
-	$(MANPAGES_ALIAS)
-
-nodist_man_MANS = \
-	man/systemd.special.7
-
 XML_FILES = \
 	${patsubst %.1,%.xml,${patsubst %.3,%.xml,${patsubst %.5,%.xml,${patsubst %.7,%.xml,${patsubst %.8,%.xml,$(MANPAGES)}}}}}
 
-XML_IN_FILES = \
-	${patsubst %.1,%.xml.in,${patsubst %.3,%.xml.in,${patsubst %.5,%.xml.in,${patsubst %.7,%.xml.in,${patsubst %.8,%.xml.in,$(nodist_man_MANS)}}}}}
+if ENABLE_MANPAGES
+man_MANS = \
+	$(MANPAGES) \
+	$(MANPAGES_ALIAS)
 
-dist_noinst_DATA = \
+noinst_DATA = \
 	${XML_FILES:.xml=.html}
-
-nodist_noinst_DATA = \
-	${XML_IN_FILES:.xml.in=.html}
+endif
 
 EXTRA_DIST += \
 	$(XML_FILES) \
-	$(XML_IN_FILES) \
-	${nodist_man_MANS:=.in} \
-	${XML_IN_FILES:.xml.in=.html.in}
+	${XML_FILES:.xml=.html} \
+	$(MANPAGES) \
+	$(MANPAGES_ALIAS)
 
 systemd_SOURCES = \
 	src/main.c
@@ -862,8 +854,12 @@ systemd_shutdown_LDADD = \
 systemd_modules_load_SOURCES = \
 	src/modules-load.c
 
+systemd_modules_load_CFLAGS = \
+	$(KMOD_CFLAGS)
+
 systemd_modules_load_LDADD = \
-	libsystemd-basic.la
+	libsystemd-basic.la \
+	$(KMOD_LIBS)
 
 systemd_tmpfiles_SOURCES = \
 	src/tmpfiles.c
@@ -955,14 +951,6 @@ systemd_cgroups_agent_LDADD = \
 	libsystemd-basic.la \
 	$(DBUS_LIBS)
 
-systemd_kmsg_syslogd_SOURCES = \
-	src/kmsg-syslogd.c \
-	src/fdset.c
-
-systemd_kmsg_syslogd_LDADD = \
-	libsystemd-basic.la \
-	libsystemd-daemon.la
-
 systemctl_SOURCES = \
 	src/systemctl.c \
 	src/utmp-wtmp.c \
@@ -985,6 +973,7 @@ systemctl_LDADD = \
 	libsystemd-basic.la \
 	libsystemd-daemon.la \
 	libsystemd-journal.la \
+	libsystemd-id128.la \
 	$(DBUS_LIBS)
 
 systemd_notify_SOURCES = \
@@ -1017,6 +1006,13 @@ systemd_cgls_SOURCES = \
 systemd_cgls_LDADD = \
 	libsystemd-basic.la
 
+systemd_cgtop_SOURCES = \
+	src/cgtop.c \
+        src/cgroup-util.c
+
+systemd_cgtop_LDADD = \
+	libsystemd-basic.la
+
 systemd_nspawn_SOURCES = \
 	src/nspawn.c \
 	src/cgroup-util.c \
@@ -1032,52 +1028,6 @@ systemd_stdio_bridge_SOURCES = \
 systemd_stdio_bridge_LDADD = \
 	libsystemd-basic.la
 
-systemadm_SOURCES = \
-	src/systemadm.vala \
-	src/systemd-interfaces.vala \
-	src/wraplabel.vala
-
-systemadm_CFLAGS = \
-	$(AM_CFLAGS) \
-	$(GTK_CFLAGS) \
-	-Wno-unused-variable \
-	-Wno-unused-function \
-	-Wno-shadow \
-	-Wno-format-nonliteral
-
-systemadm_VALAFLAGS = \
-	--pkg=posix \
-	--pkg=gtk+-2.0 \
-	--pkg=gee-1.0 \
-	-g
-
-systemadm_LDADD = \
-	$(GTK_LIBS)
-
-systemd_gnome_ask_password_agent_SOURCES = \
-	src/gnome-ask-password-agent.vala
-
-systemd_gnome_ask_password_agent_CFLAGS = \
-	$(AM_CFLAGS) \
-	$(LIBNOTIFY_CFLAGS) \
-	$(GTK_CFLAGS) \
-	-Wno-unused-variable \
-	-Wno-unused-function \
-	-Wno-shadow \
-	-Wno-format-nonliteral
-
-systemd_gnome_ask_password_agent_VALAFLAGS = \
-	--pkg=posix \
-	--pkg=gtk+-2.0 \
-	--pkg=linux \
-	--pkg=gio-unix-2.0 \
-	--pkg=libnotify \
-	-g
-
-systemd_gnome_ask_password_agent_LDADD = \
-	$(LIBNOTIFY_LIBS) \
-	$(GTK_LIBS)
-
 systemd_tty_ask_password_agent_SOURCES = \
 	src/tty-ask-password-agent.c \
 	src/ask-password-api.c \
@@ -1126,7 +1076,7 @@ lib_LTLIBRARIES += \
 	libsystemd-daemon.la
 
 pkgconfiglib_DATA += \
-	libsystemd-daemon.pc
+	src/libsystemd-daemon.pc
 
 MANPAGES += \
 	man/sd-daemon.7 \
@@ -1149,7 +1099,7 @@ man/sd_is_mq.3: man/sd_is_fifo.3
 man/sd_notifyf.3: man/sd_notify.3
 
 EXTRA_DIST += \
-	libsystemd-daemon.pc.in \
+	src/libsystemd-daemon.pc.in \
 	src/libsystemd-daemon.sym
 
 # ------------------------------------------------------------------------------
@@ -1185,7 +1135,7 @@ lib_LTLIBRARIES += \
 	libsystemd-id128.la
 
 pkgconfiglib_DATA += \
-	libsystemd-id128.pc
+	src/libsystemd-id128.pc
 
 # move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
 libsystemd-id128-install-hook:
@@ -1207,7 +1157,7 @@ UNINSTALL_EXEC_HOOKS += \
 	libsystemd-id128-uninstall-hook
 
 EXTRA_DIST += \
-	libsystemd-id128.pc.in \
+	src/libsystemd-id128.pc.in \
 	src/libsystemd-id128.sym
 
 # ------------------------------------------------------------------------------
@@ -1218,9 +1168,13 @@ systemd_journald_SOURCES = \
 	src/journal/lookup3.c \
 	src/journal/journal-rate-limit.c \
 	src/sd-id128.c \
-	src/acl-util.c \
 	src/cgroup-util.c
 
+if HAVE_ACL
+systemd_journald_SOURCES += \
+	src/acl-util.c
+endif
+
 nodist_systemd_journald_SOURCES = \
 	src/journal/journald-gperf.c
 
@@ -1243,22 +1197,30 @@ systemd_journald_LDADD += \
 	$(XZ_LIBS)
 endif
 
-systemd_journalctl_SOURCES = \
+systemd_cat_SOURCES = \
+	src/journal/cat.c
+
+systemd_cat_LDADD = \
+	libsystemd-basic.la \
+	libsystemd-journal.la
+
+journalctl_SOURCES = \
 	src/journal/journalctl.c \
 	src/pager.c \
 	src/logs-show.c
 
-systemd_journalctl_LDADD = \
+journalctl_LDADD = \
 	libsystemd-basic.la \
-	libsystemd-journal.la
+	libsystemd-journal.la \
+	libsystemd-id128.la
 
 if HAVE_XZ
-systemd_journalctl_SOURCES += \
+journalctl_SOURCES += \
 	src/journal/compress.c
-systemd_journalctl_CFLAGS = \
+journalctl_CFLAGS = \
 	$(AM_CFLAGS) \
 	$(XZ_CFLAGS)
-systemd_journalctl_LDADD += \
+journalctl_LDADD += \
 	$(XZ_LIBS)
 endif
 
@@ -1285,6 +1247,13 @@ test_journal_LDADD += \
 	$(XZ_LIBS)
 endif
 
+test_journal_send_SOURCES = \
+	src/journal/test-journal-send.c
+
+test_journal_send_LDADD = \
+	libsystemd-basic.la \
+	libsystemd-journal.la
+
 libsystemd_journal_la_SOURCES = \
 	src/journal/sd-journal.c \
 	src/journal/journal-file.c \
@@ -1335,11 +1304,12 @@ UNINSTALL_EXEC_HOOKS += \
 	libsystemd-journal-uninstall-hook
 
 noinst_PROGRAMS += \
-	test-journal
+	test-journal \
+        test-journal-send
 
 pkginclude_HEADERS += \
 	src/systemd/sd-journal.h \
-        src/systemd/sd-messages.h
+	src/systemd/sd-messages.h
 
 lib_LTLIBRARIES += \
 	libsystemd-journal.la
@@ -1348,7 +1318,10 @@ rootlibexec_PROGRAMS += \
 	systemd-journald
 
 rootbin_PROGRAMS += \
-	systemd-journalctl
+	journalctl
+
+bin_PROGRAMS += \
+	systemd-cat
 
 dist_systemunit_DATA += \
 	units/systemd-journald.socket
@@ -1357,17 +1330,21 @@ nodist_systemunit_DATA += \
 	units/systemd-journald.service
 
 dist_pkgsysconf_DATA += \
-	src/journal/systemd-journald.conf
+	src/journal/journald.conf
 
 pkgconfiglib_DATA += \
 	src/journal/libsystemd-journal.pc
 
 journal-install-data-hook:
 	$(MKDIR_P) -m 0755 \
-		$(DESTDIR)$(systemunitdir)/sockets.target.wants
+		$(DESTDIR)$(systemunitdir)/sockets.target.wants \
+		$(DESTDIR)$(systemunitdir)/sysinit.target.wants
 	( cd $(DESTDIR)$(systemunitdir)/sockets.target.wants && \
 		rm -f systemd-journald.socket && \
 		$(LN_S) ../systemd-journald.socket )
+	( cd $(DESTDIR)$(systemunitdir)/sysinit.target.wants && \
+		rm -f systemd-journald.service && \
+		$(LN_S) ../systemd-journald.service )
 
 INSTALL_DATA_HOOKS += \
 	journal-install-data-hook
@@ -1388,6 +1365,29 @@ EXTRA_DIST += \
 CLEANFILES += \
 	src/journal/journald-gperf.c
 
+# ------------------------------------------------------------------------------
+if ENABLE_COREDUMP
+systemd_coredump_SOURCES = \
+	src/journal/coredump.c
+
+systemd_coredump_LDADD = \
+	libsystemd-basic.la \
+	libsystemd-journal.la \
+	libsystemd-login.la
+
+rootlibexec_PROGRAMS += \
+	systemd-coredump
+
+sysctl_DATA = \
+	sysctl.d/coredump.conf
+
+EXTRA_DIST += \
+	sysctl.d/coredump.conf.in
+
+CLEANFILES += \
+	sysctl.d/coredump.conf
+endif
+
 # ------------------------------------------------------------------------------
 if ENABLE_BINFMT
 systemd_binfmt_SOURCES = \
@@ -1818,26 +1818,26 @@ rootlibexec_PROGRAMS += \
 	systemd-logind \
 	systemd-user-sessions
 
-systemd_loginctl_SOURCES = \
+loginctl_SOURCES = \
 	src/login/loginctl.c \
+	src/login/sysfs-show.c \
 	src/dbus-common.c \
 	src/cgroup-show.c \
 	src/cgroup-util.c \
-	src/pager.c \
-	src/sysfs-show.c
+	src/pager.c
 
-systemd_loginctl_CFLAGS = \
+loginctl_CFLAGS = \
 	$(AM_CFLAGS) \
 	$(DBUS_CFLAGS) \
 	$(UDEV_CFLAGS)
 
-systemd_loginctl_LDADD = \
+loginctl_LDADD = \
 	libsystemd-basic.la \
 	$(DBUS_LIBS) \
 	$(UDEV_LIBS)
 
 rootbin_PROGRAMS += \
-	systemd-loginctl
+	loginctl
 
 test_login_SOURCES = \
 	src/login/test-login.c
@@ -1923,7 +1923,7 @@ dist_dbuspolicy_DATA += \
 	src/login/org.freedesktop.login1.conf
 
 dist_pkgsysconf_DATA += \
-	src/login/systemd-logind.conf
+	src/login/logind.conf
 
 pkginclude_HEADERS += \
 	src/systemd/sd-login.h
@@ -1939,7 +1939,8 @@ polkitpolicy_in_files += \
 
 logind-install-data-hook:
 	$(MKDIR_P) -m 0755 \
-		$(DESTDIR)$(systemunitdir)/multi-user.target.wants
+		$(DESTDIR)$(systemunitdir)/multi-user.target.wants \
+                $(DESTDIR)$(localstatedir)/lib/systemd
 	( cd $(DESTDIR)$(systemunitdir) && \
 		rm -f dbus-org.freedesktop.login1.service && \
 		$(LN_S) systemd-logind.service dbus-org.freedesktop.login1.service)
@@ -1951,6 +1952,20 @@ logind-install-data-hook:
 INSTALL_DATA_HOOKS += \
 	logind-install-data-hook
 
+systemd_multi_seat_x_SOURCES = \
+	src/login/multi-seat-x.c
+
+systemd_multi_seat_x_CFLAGS = \
+	$(AM_CFLAGS) \
+	$(UDEV_CFLAGS)
+
+systemd_multi_seat_x_LDADD = \
+	libsystemd-basic.la \
+	$(UDEV_LIBS)
+
+rootlibexec_PROGRAMS += \
+	systemd-multi-seat-x
+
 systemd_uaccess_SOURCES = \
 	src/login/uaccess.c
 
@@ -1976,12 +1991,18 @@ rootlibexec_PROGRAMS += \
 	systemd-uaccess
 
 dist_udevrules_DATA += \
-	src/70-uaccess.rules
+	src/login/70-uaccess.rules
+
+dist_udevrules_DATA += \
+	src/login/71-seat.rules
+
+nodist_udevrules_DATA += \
+	src/login/73-seat-late.rules
 
 MANPAGES += \
-	man/systemd-logind.conf.5 \
+	man/logind.conf.5 \
 	man/sd-login.7 \
-	man/systemd-loginctl.1 \
+	man/loginctl.1 \
 	man/sd_login_monitor_new.3 \
 	man/sd_pid_get_session.3 \
 	man/sd_uid_get_state.3 \
@@ -1995,6 +2016,10 @@ MANPAGES_ALIAS += \
 	man/sd_login_monitor_get_fd.3 \
 	man/sd_session_get_uid.3 \
 	man/sd_session_get_seat.3 \
+	man/sd_session_get_service.3 \
+	man/sd_session_get_type.3 \
+	man/sd_session_get_class.3 \
+	man/sd_session_get_display.3 \
 	man/sd_pid_get_owner_uid.3 \
 	man/sd_pid_get_unit.3 \
 	man/sd_uid_is_on_seat.3 \
@@ -2010,6 +2035,10 @@ man/sd_login_monitor_flush.3: man/sd_login_monitor_new.3
 man/sd_login_monitor_get_fd.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_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
 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_uid_is_on_seat.3: man/sd_uid_get_state.3
@@ -2022,8 +2051,6 @@ man/sd_get_uids.3: man/sd_get_seats.3
 
 EXTRA_DIST += \
 	src/login/logind-gperf.gperf \
-	units/systemd-logind.service.in \
-	units/systemd-user-sessions.service.in \
 	src/login/libsystemd-login.pc.in \
 	src/login/libsystemd-login.sym \
 	src/login/logind.h \
@@ -2031,10 +2058,14 @@ EXTRA_DIST += \
 	src/login/logind-seat.h \
 	src/login/logind-session.h \
 	src/login/logind-user.h \
-	src/login/logind-acl.h
+	src/login/logind-acl.h \
+	src/login/73-seat-late.rules.in \
+	units/systemd-logind.service.in \
+	units/systemd-user-sessions.service.in
 
 CLEANFILES += \
-	src/login/logind-gperf.c
+	src/login/logind-gperf.c \
+	src/login/73-seat-late.rules
 endif
 # ------------------------------------------------------------------------------
 
@@ -2065,6 +2096,9 @@ units/%: units/%.in Makefile
 man/%: man/%.in Makefile
 	$(SED_PROCESS)
 
+sysctl.d/%: sysctl.d/%.in Makefile
+	$(SED_PROCESS)
+
 %.pc: %.pc.in Makefile
 	$(SED_PROCESS)
 
@@ -2104,20 +2138,13 @@ CLEANFILES += \
 	$(nodist_systemunit_DATA) \
 	$(nodist_userunit_DATA) \
 	$(nodist_man_MANS) \
-	${XML_IN_FILES:.xml.in=.html} \
 	$(pkgconfigdata_DATA) \
 	$(pkgconfiglib_DATA) \
 	$(nodist_polkitpolicy_DATA) \
-	src/73-seat-late.rules \
-	src/99-systemd.rules \
 	src/load-fragment-gperf.gperf \
 	src/load-fragment-gperf.c \
-	src/load-fragment-gperf-nulstr.c
-
-if HAVE_VALAC
-CLEANFILES += \
-	${systemadm_SOURCES:.vala=.c}
-endif
+	src/load-fragment-gperf-nulstr.c \
+	src/99-systemd.rules
 
 if HAVE_XSLTPROC
 XSLTPROC_FLAGS = \
@@ -2128,61 +2155,31 @@ XSLTPROC_PROCESS_MAN = \
 	$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
 	$(XSLTPROC) -o $@ $(XSLTPROC_FLAGS) http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
 
-XSLTPROC_PROCESS_MAN_IN = \
-	$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
-	$(XSLTPROC) -o ${@:.in=} $(XSLTPROC_FLAGS) http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $< && \
-	mv ${@:.in=} $@
-
 XSLTPROC_PROCESS_HTML = \
 	$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
 	$(XSLTPROC) -o $@ $(XSLTPROC_FLAGS) $(srcdir)/man/custom-html.xsl $<
 
-XSLTPROC_PROCESS_HTML_IN = \
-	$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
-	$(XSLTPROC) -o ${@:.in=} $(XSLTPROC_FLAGS) $(srcdir)/man/custom-html.xsl $< && \
-	mv ${@:.in=} $@
-
 man/%.1: man/%.xml
 	$(XSLTPROC_PROCESS_MAN)
 
-man/%.1.in: man/%.xml.in
-	$(XSLTPROC_PROCESS_MAN)
-
 man/%.3: man/%.xml
 	$(XSLTPROC_PROCESS_MAN)
 
-man/%.3.in: man/%.xml.in
-	$(XSLTPROC_PROCESS_MAN)
-
 man/%.5: man/%.xml
 	$(XSLTPROC_PROCESS_MAN)
 
-man/%.5.in: man/%.xml.in
-	$(XSLTPROC_PROCESS_MAN)
-
 man/%.7: man/%.xml
 	$(XSLTPROC_PROCESS_MAN)
 
-man/%.7.in: man/%.xml.in
-	$(XSLTPROC_PROCESS_MAN_IN)
-
 man/%.8: man/%.xml
 	$(XSLTPROC_PROCESS_MAN)
 
-man/%.8.in: man/%.xml.in
-	$(XSLTPROC_PROCESS_MAN_IN)
-
 man/%.html: man/%.xml
 	$(XSLTPROC_PROCESS_HTML)
 
-man/%.html.in: man/%.xml.in
-	$(XSLTPROC_PROCESS_HTML_IN)
-
 CLEANFILES += \
 	$(dist_man_MANS) \
-	${nodist_man_MANS:=.in} \
-	${XML_FILES:.xml=.html} \
-	${XML_IN_FILES:.xml.in=.html.in}
+	${XML_FILES:.xml=.html}
 endif
 
 DBUS_PREPROCESS = $(CPP) -P $(DBUS_CFLAGS) -imacros dbus/dbus-protocol.h
@@ -2233,10 +2230,9 @@ systemd-install-data-hook:
 		rm -f user && \
 		$(LN_S) $(pkgsysconfdir)/user user )
 	( cd $(DESTDIR)$(systemunitdir)/sockets.target.wants && \
-		rm -f systemd-initctl.socket systemd-shutdownd.socket syslog.socket && \
+		rm -f systemd-initctl.socket systemd-shutdownd.socket && \
 		$(LN_S) ../systemd-initctl.socket systemd-initctl.socket && \
-		$(LN_S) ../systemd-shutdownd.socket systemd-shutdownd.socket && \
-		$(LN_S) ../syslog.socket syslog.socket )
+		$(LN_S) ../systemd-shutdownd.socket systemd-shutdownd.socket )
 	( cd $(DESTDIR)$(systemunitdir)/runlevel1.target.wants && \
 		rm -f systemd-update-utmp-runlevel.service && \
 		$(LN_S) ../systemd-update-utmp-runlevel.service systemd-update-utmp-runlevel.service )
@@ -2259,13 +2255,11 @@ systemd-install-data-hook:
 		rm -f systemd-remount-api-vfs.service \
 			fsck-root.service \
 			remount-rootfs.service \
-			var-run.mount \
-			media.mount && \
+			tmp.mount && \
 		$(LN_S) ../systemd-remount-api-vfs.service systemd-remount-api-vfs.service && \
 		$(LN_S) ../fsck-root.service fsck-root.service && \
 		$(LN_S) ../remount-rootfs.service remount-rootfs.service && \
-		$(LN_S) ../var-run.mount var-run.mount && \
-		$(LN_S) ../media.mount media.mount )
+		$(LN_S) ../tmp.mount tmp.mount )
 	( cd $(DESTDIR)$(userunitdir) && \
 		rm -f shutdown.target sockets.target bluetooth.target printer.target sound.target && \
 		$(LN_S) $(systemunitdir)/shutdown.target shutdown.target && \
@@ -2302,24 +2296,20 @@ systemd-install-data-hook:
 			dev-mqueue.mount \
 			sys-kernel-config.mount \
 			sys-kernel-debug.mount \
-			sys-kernel-security.mount \
 			sys-fs-fuse-connections.mount \
 			systemd-modules-load.service \
 			systemd-tmpfiles-setup.service \
 			systemd-sysctl.service \
-			systemd-ask-password-console.path \
-			systemd-kmsg-syslogd.service && \
+			systemd-ask-password-console.path && \
 		$(LN_S) ../dev-hugepages.mount dev-hugepages.mount && \
 		$(LN_S) ../dev-mqueue.mount dev-mqueue.mount && \
 		$(LN_S) ../sys-kernel-config.mount sys-kernel-config.mount && \
 		$(LN_S) ../sys-kernel-debug.mount sys-kernel-debug.mount && \
-		$(LN_S) ../sys-kernel-security.mount sys-kernel-security.mount && \
 		$(LN_S) ../sys-fs-fuse-connections.mount sys-fs-fuse-connections.mount && \
 		$(LN_S) ../systemd-modules-load.service systemd-modules-load.service && \
 		$(LN_S) ../systemd-tmpfiles-setup.service systemd-tmpfiles-setup.service && \
 		$(LN_S) ../systemd-sysctl.service systemd-sysctl.service && \
-		$(LN_S) ../systemd-ask-password-console.path systemd-ask-password-console.path && \
-		$(LN_S) ../systemd-kmsg-syslogd.service )
+		$(LN_S) ../systemd-ask-password-console.path systemd-ask-password-console.path )
 	( cd $(DESTDIR)$(systemunitdir)/basic.target.wants && \
 		rm -f systemd-tmpfiles-clean.timer && \
 		$(LN_S) ../systemd-tmpfiles-clean.timer systemd-tmpfiles-clean.timer )
@@ -2428,12 +2418,6 @@ if TARGET_MAGEIA
 		$(LN_S) $(systemunitdir)/display-manager.service display-manager.service )
 endif
 
-if HAVE_SYSV_COMPAT
-	( cd $(DESTDIR)$(systemunitdir)/local-fs.target.wants && \
-		rm -f var-lock.mount && \
-		$(LN_S) ../var-lock.mount var-lock.mount )
-endif
-
 install-exec-hook: $(INSTALL_EXEC_HOOKS)
 
 uninstall-hook: $(UNINSTALL_EXEC_HOOKS)
@@ -2447,11 +2431,13 @@ DISTCHECK_CONFIGURE_FLAGS = \
 	--with-dbusinterfacedir=$$dc_install_base/$(dbusinterfacedir) \
 	--with-udevrulesdir=$$dc_install_base/$(udevrulesdir) \
 	--with-pamlibdir=$$dc_install_base/$(pamlibdir) \
-	--with-rootprefix=$$dc_install_base/$(rootprefix)
+        --with-rootprefix=$$dc_install_base \
+        --disable-split-usr
 
 upload: all distcheck
-	cp -v systemd-$(VERSION).tar.bz2 /home/lennart/git.fedora/systemd/
-	scp systemd-$(VERSION).tar.bz2 fdo:/srv/www.freedesktop.org/www/software/systemd/
+	cp -v systemd-$(VERSION).tar.xz /home/lennart/git.fedora/systemd/
+	scp systemd-$(VERSION).tar.xz fdo:/srv/www.freedesktop.org/www/software/systemd/
+	scp man/*.html fdo:/srv/www.freedesktop.org/www/software/systemd/man/
 	scp man/*.html tango:public/systemd-man/
 
 git-tag: