chiark / gitweb /
build-sys: Add --disable-timedated configure switch
[elogind.git] / Makefile.am
index b4644fa75e7cd6b5c2d64c1f1f6ecfb3cb4776c2..ef3bd846c6a99e87c0829097c1c112d85ae81c43 100644 (file)
 
 ACLOCAL_AMFLAGS = -I m4
 
+SUBDIRS = po
+
+LIBSYSTEMD_LOGIN_CURRENT=0
+LIBSYSTEMD_LOGIN_REVISION=2
+LIBSYSTEMD_LOGIN_AGE=0
+
+LIBSYSTEMD_DAEMON_CURRENT=0
+LIBSYSTEMD_DAEMON_REVISION=0
+LIBSYSTEMD_DAEMON_AGE=0
+
 # Dirs of external packages
 dbuspolicydir=@dbuspolicydir@
 dbussessionservicedir=@dbussessionservicedir@
@@ -25,14 +35,16 @@ dbusinterfacedir=@dbusinterfacedir@
 udevrulesdir=@udevrulesdir@
 pamlibdir=@pamlibdir@
 pkgconfigdatadir=$(datadir)/pkgconfig
+pkgconfiglibdir=$(libdir)/pkgconfig
 polkitpolicydir=$(datadir)/polkit-1/actions
 bashcompletiondir=$(sysconfdir)/bash_completion.d
 
 # Our own, non-special dirs
 pkgsysconfdir=$(sysconfdir)/systemd
 userunitdir=$(prefix)/lib/systemd/user
-tmpfilesdir=$(sysconfdir)/tmpfiles.d
+tmpfilesdir=$(prefix)/lib/tmpfiles.d
 usergeneratordir=$(pkglibexecdir)/user-generators
+pkgincludedir=$(includedir)/systemd
 
 # And these are the special ones for /
 rootdir=@rootdir@
@@ -96,6 +108,12 @@ AM_CPPFLAGS += \
        -DKBD_SETFONT=\"/bin/setfont\" \
        -DDEFAULT_FONT=\"LatArCyrHeb-16\"
 else
+if TARGET_ANGSTROM
+AM_CPPFLAGS += \
+       -DKBD_LOADKEYS=\"/usr/bin/loadkeys\" \
+       -DKBD_SETFONT=\"/usr/bin/setfont\" \
+       -DDEFAULT_FONT=\"LatArCyrHeb-16\"
+else
 AM_CPPFLAGS += \
        -DKBD_LOADKEYS=\"/bin/loadkeys\" \
        -DKBD_SETFONT=\"/bin/setfont\" \
@@ -105,10 +123,12 @@ endif
 endif
 endif
 endif
+endif
 
 rootbin_PROGRAMS = \
        systemd \
        systemctl \
+        systemd-loginctl \
        systemd-notify \
        systemd-ask-password \
        systemd-tty-ask-password-agent \
@@ -151,8 +171,24 @@ rootlibexec_PROGRAMS = \
        systemd-ac-power \
        systemd-detect-virt \
        systemd-sysctl \
-       systemd-binfmt \
-        systemd-hostnamed
+        systemd-localed \
+        systemd-logind \
+        systemd-uaccess
+
+if ENABLE_BINFMT
+rootlibexec_PROGRAMS += \
+       systemd-binfmt
+endif
+
+if ENABLE_HOSTNAMED
+rootlibexec_PROGRAMS += \
+       systemd-hostnamed
+endif
+
+if ENABLE_TIMEDATED
+rootlibexec_PROGRAMS += \
+       systemd-timedated
+endif
 
 systemgenerator_PROGRAMS = \
        systemd-getty-generator
@@ -165,6 +201,14 @@ systemgenerator_PROGRAMS += \
        systemd-cryptsetup-generator
 endif
 
+lib_LTLIBRARIES = \
+       libsystemd-daemon.la \
+       libsystemd-login.la
+
+pkginclude_HEADERS = \
+       src/sd-daemon.h \
+       src/sd-login.h
+
 noinst_PROGRAMS = \
        test-engine \
        test-job-type \
@@ -174,7 +218,9 @@ noinst_PROGRAMS = \
        test-daemon \
        test-cgroup \
        test-env-replace \
-       test-strv
+       test-strv \
+        test-login \
+        test-install
 
 if HAVE_PAM
 pamlib_LTLIBRARIES = \
@@ -182,18 +228,47 @@ pamlib_LTLIBRARIES = \
 endif
 
 dist_pkgsysconf_DATA = \
-       src/system.conf
+       src/system.conf \
+        src/user.conf \
+        src/systemd-logind.conf
 
 dist_dbuspolicy_DATA = \
        src/org.freedesktop.systemd1.conf \
-        src/org.freedesktop.hostname1.conf
+        src/org.freedesktop.locale1.conf \
+        src/org.freedesktop.login1.conf
+
+if ENABLE_HOSTNAMED
+dist_dbuspolicy_DATA += \
+       src/org.freedesktop.hostname1.conf
+endif
+
+if ENABLE_TIMEDATED
+dist_dbuspolicy_DATA += \
+       src/org.freedesktop.timedate1.conf
+endif
 
 dist_dbussystemservice_DATA = \
        src/org.freedesktop.systemd1.service \
-        src/org.freedesktop.hostname1.service
+        src/org.freedesktop.locale1.service \
+        src/org.freedesktop.login1.service
+
+if ENABLE_HOSTNAMED
+dist_dbussystemservice_DATA += \
+       src/org.freedesktop.hostname1.service
+endif
+
+if ENABLE_TIMEDATED
+dist_dbussystemservice_DATA += \
+       src/org.freedesktop.timedate1.service
+endif
 
 dist_udevrules_DATA = \
-       src/99-systemd.rules
+        src/70-uaccess.rules \
+        src/71-seat.rules
+
+nodist_udevrules_DATA = \
+        src/73-seat-late.rules \
+        src/99-systemd.rules
 
 dbusinterface_DATA = \
        org.freedesktop.systemd1.Manager.xml \
@@ -208,7 +283,18 @@ dbusinterface_DATA = \
        org.freedesktop.systemd1.Automount.xml \
        org.freedesktop.systemd1.Snapshot.xml \
        org.freedesktop.systemd1.Swap.xml \
-       org.freedesktop.systemd1.Path.xml
+       org.freedesktop.systemd1.Path.xml \
+        org.freedesktop.locale1.xml
+
+if ENABLE_HOSTNAMED
+dbusinterface_DATA += \
+       org.freedesktop.hostname1.xml
+endif
+
+if ENABLE_TIMEDATED
+dbusinterface_DATA += \
+       org.freedesktop.timedate1.xml
+endif
 
 dist_bashcompletion_DATA = \
        src/systemctl-bash-completion.sh
@@ -233,6 +319,7 @@ dist_systemunit_DATA = \
        units/halt.target \
        units/kexec.target \
        units/local-fs.target \
+       units/remote-fs.target \
        units/cryptsetup.target \
        units/network.target \
        units/nss-lookup.target \
@@ -257,16 +344,12 @@ dist_systemunit_DATA = \
        units/dev-hugepages.mount \
        units/dev-mqueue.automount \
        units/dev-mqueue.mount \
-       units/proc-sys-fs-binfmt_misc.automount \
-       units/proc-sys-fs-binfmt_misc.mount \
        units/sys-kernel-debug.automount \
        units/sys-kernel-debug.mount \
        units/sys-kernel-security.automount \
        units/sys-kernel-security.mount \
        units/var-run.mount \
        units/media.mount \
-       units/hwclock-load.service \
-       units/hwclock-save.service \
        units/remount-rootfs.service \
        units/printer.target \
        units/sound.target \
@@ -284,15 +367,21 @@ dist_systemunit_DATA += \
        units/var-lock.mount
 endif
 
+if ENABLE_BINFMT
+dist_systemunit_DATA += \
+       units/proc-sys-fs-binfmt_misc.automount \
+       units/proc-sys-fs-binfmt_misc.mount
+endif
+
 nodist_systemunit_DATA = \
        units/getty@.service \
        units/serial-getty@.service \
        units/console-shell.service \
-       units/remote-fs.target \
        units/systemd-initctl.service \
        units/systemd-logger.service \
        units/systemd-shutdownd.service \
-       units/systemd-hostnamed.service \
+       units/systemd-localed.service \
+       units/systemd-logind.service \
        units/systemd-kmsg-syslogd.service \
        units/systemd-modules-load.service \
        units/systemd-vconsole-setup.service \
@@ -310,7 +399,6 @@ nodist_systemunit_DATA = \
        units/systemd-ask-password-wall.service \
        units/systemd-ask-password-console.service \
        units/systemd-sysctl.service \
-       units/systemd-binfmt.service \
        units/halt.service \
        units/poweroff.service \
        units/reboot.service \
@@ -318,26 +406,41 @@ nodist_systemunit_DATA = \
        units/fsck@.service \
        units/fsck-root.service \
        units/quotacheck.service \
-       units/rescue.service
+       units/rescue.service \
+        units/user@.service
+
+if ENABLE_BINFMT
+nodist_systemunit_DATA += \
+       units/systemd-binfmt.service
+endif
+
+if ENABLE_HOSTNAMED
+nodist_systemunit_DATA += \
+       units/systemd-hostnamed.service
+endif
+
+if ENABLE_TIMEDATED
+nodist_systemunit_DATA += \
+       units/systemd-timedated.service
+endif
 
 dist_userunit_DATA = \
        units/user/default.target \
        units/user/exit.target
 
 nodist_userunit_DATA = \
-       units/user/remote-fs.target \
        units/user/exit.service
 
 EXTRA_DIST = \
        units/getty@.service.m4 \
        units/serial-getty@.service.m4 \
        units/console-shell.service.m4 \
-       units/remote-fs.target.m4 \
        units/rescue.service.m4 \
        units/systemd-initctl.service.in \
        units/systemd-logger.service.in \
        units/systemd-shutdownd.service.in \
-       units/systemd-hostnamed.service.in \
+       units/systemd-localed.service.in \
+       units/systemd-logind.service.in \
        units/systemd-kmsg-syslogd.service.in \
        units/systemd-modules-load.service.in \
        units/systemd-vconsole-setup.service.in \
@@ -355,7 +458,6 @@ EXTRA_DIST = \
        units/systemd-ask-password-wall.service.in \
        units/systemd-ask-password-console.service.in \
        units/systemd-sysctl.service.in \
-       units/systemd-binfmt.service.in \
        units/halt.service.in \
        units/poweroff.service.in \
        units/reboot.service.in \
@@ -364,9 +466,30 @@ EXTRA_DIST = \
        units/fsck@.service.in \
        units/fsck-root.service.in \
        units/quotacheck.service.in \
+       units/user@.service.in \
        systemd.pc.in \
+       libsystemd-daemon.pc.in \
+       libsystemd-login.pc.in \
+       src/libsystemd-daemon.sym \
+       src/libsystemd-login.sym \
        introspect.awk \
-       src/org.freedesktop.systemd1.policy.in
+       src/73-seat-late.rules.in \
+        src/99-systemd.rules.in
+
+if ENABLE_BINFMT
+EXTRA_DIST += \
+       units/systemd-binfmt.service.in
+endif
+
+if ENABLE_HOSTNAMED
+EXTRA_DIST += \
+       units/systemd-hostnamed.service.in
+endif
+
+if ENABLE_TIMEDATED
+EXTRA_DIST += \
+       units/systemd-timedated.service.in
+endif
 
 if TARGET_FEDORA
 dist_systemunit_DATA += \
@@ -387,6 +510,12 @@ dist_systemunit_DATA += \
        units/frugalware/display-manager.service
 endif
 
+if TARGET_SUSE
+dist_systemunit_DATA += \
+       units/suse/rc-local.service \
+       units/suse/halt-local.service
+endif
+
 if HAVE_PLYMOUTH
 dist_systemunit_DATA += \
        units/plymouth-start.service \
@@ -418,16 +547,42 @@ dist_doc_DATA = \
 pkgconfigdata_DATA = \
        systemd.pc
 
+pkgconfiglib_DATA = \
+        libsystemd-daemon.pc \
+        libsystemd-login.pc
+
+# Passed through intltool only
+polkitpolicy_in_files = \
+        src/org.freedesktop.locale1.policy.in \
+        src/org.freedesktop.login1.policy.in
+
+if ENABLE_HOSTNAMED
+polkitpolicy_in_files += \
+       src/org.freedesktop.hostname1.policy.in
+endif
+
+if ENABLE_TIMEDATED
+polkitpolicy_in_files += \
+       src/org.freedesktop.timedate1.policy.in
+endif
+
+# First passed through sed, followed by intltool
+polkitpolicy_in_in_files = \
+       src/org.freedesktop.systemd1.policy.in.in
+
 nodist_polkitpolicy_DATA = \
-       src/org.freedesktop.systemd1.policy
+        $(polkitpolicy_in_files:.policy.in=.policy) \
+        $(polkitpolicy_in_in_files:.policy.in.in=.policy)
+
+EXTRA_DIST += \
+        $(polkitpolicy_in_files) \
+        $(polkitpolicy_in_in_files)
 
-dist_polkitpolicy_DATA = \
-        src/org.freedesktop.hostname1.policy
+@INTLTOOL_POLICY_RULE@
 
 noinst_LTLIBRARIES = \
        libsystemd-basic.la \
-       libsystemd-core.la \
-       libsystemd-daemon.la
+       libsystemd-core.la
 
 libsystemd_basic_la_SOURCES = \
        src/util.c \
@@ -446,7 +601,8 @@ libsystemd_basic_la_CFLAGS = \
        $(SELINUX_CFLAGS)
 
 libsystemd_basic_la_LIBADD = \
-       $(SELINUX_LIBS)
+       $(SELINUX_LIBS) \
+       $(CAP_LIBS)
 
 libsystemd_core_la_SOURCES = \
        src/unit.c \
@@ -497,7 +653,17 @@ libsystemd_core_la_SOURCES = \
        src/tcpwrap.c \
        src/cgroup-util.c \
        src/condition.c \
-        src/dbus-common.c
+        src/dbus-common.c \
+        src/sd-daemon.c \
+        src/install.c \
+        src/cgroup-attr.c
+
+nodist_libsystemd_core_la_SOURCES = \
+        src/load-fragment-gperf.c \
+        src/load-fragment-gperf-nulstr.c
+
+EXTRA_DIST += \
+        src/load-fragment-gperf.gperf.m4
 
 libsystemd_core_la_CFLAGS = \
        $(AM_CFLAGS) \
@@ -513,10 +679,8 @@ libsystemd_core_la_LIBADD = \
        $(UDEV_LIBS) \
        $(LIBWRAP_LIBS) \
        $(PAM_LIBS) \
-       $(AUDIT_LIBS)
-
-libsystemd_daemon_la_SOURCES = \
-       src/sd-daemon.c
+       $(AUDIT_LIBS) \
+       $(CAP_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
@@ -544,7 +708,18 @@ EXTRA_DIST += \
        src/shutdownd.h \
        src/umount.h \
        src/readahead-common.h \
-       src/ask-password-api.h
+       src/ask-password-api.h \
+        src/pager.h \
+        src/sysfs-show.h \
+        src/polkit.h \
+        src/logind.h \
+        src/logind-device.h \
+        src/logind-seat.h \
+        src/logind-session.h \
+        src/logind-user.h \
+        src/logind-acl.h \
+        src/dbus-loop.h \
+        src/spawn-agent.h
 
 MANPAGES = \
        man/systemd.1 \
@@ -580,6 +755,7 @@ MANPAGES = \
        man/shutdown.8 \
        man/pam_systemd.8 \
        man/systemd.conf.5 \
+       man/systemd-logind.conf.5 \
        man/tmpfiles.d.5 \
        man/hostname.5 \
        man/machine-id.5 \
@@ -588,9 +764,14 @@ MANPAGES = \
        man/os-release.5 \
         man/machine-info.5 \
        man/modules-load.d.5 \
-       man/binfmt.d.5 \
        man/sysctl.d.5 \
-        man/systemd-ask-password.1
+        man/systemd-ask-password.1 \
+        man/systemd-loginctl.1
+
+if ENABLE_BINFMT
+MANPAGES += \
+       man/binfmt.d.5
+endif
 
 MANPAGES_ALIAS = \
        man/reboot.8 \
@@ -713,6 +894,29 @@ test_strv_CFLAGS = \
 test_strv_LDADD = \
        libsystemd-basic.la
 
+test_login_SOURCES = \
+       src/test-login.c
+
+test_login_CFLAGS = \
+       $(AM_CFLAGS)
+
+test_login_LDADD = \
+       libsystemd-basic.la \
+        libsystemd-login.la
+
+test_install_SOURCES = \
+       src/test-install.c \
+        src/install.c \
+        src/path-lookup.c \
+        src/unit-name.c
+
+test_install_CFLAGS = \
+       $(AM_CFLAGS) \
+        $(DBUS_CFLAGS)
+
+test_install_LDADD = \
+       libsystemd-basic.la
+
 systemd_logger_SOURCES = \
        src/logger.c \
        src/tcpwrap.c
@@ -772,7 +976,8 @@ systemd_shutdownd_LDADD = \
 
 systemd_hostnamed_SOURCES = \
        src/hostnamed.c \
-        src/dbus-common.c
+        src/dbus-common.c \
+        src/polkit.c
 
 systemd_hostnamed_CFLAGS = \
        $(AM_CFLAGS) \
@@ -783,6 +988,91 @@ systemd_hostnamed_LDADD = \
        libsystemd-daemon.la \
        $(DBUS_LIBS)
 
+systemd_localed_SOURCES = \
+       src/localed.c \
+        src/dbus-common.c \
+        src/polkit.c
+
+systemd_localed_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(DBUS_CFLAGS)
+
+systemd_localed_LDADD = \
+       libsystemd-basic.la \
+       libsystemd-daemon.la \
+       $(DBUS_LIBS)
+
+systemd_timedated_SOURCES = \
+       src/timedated.c \
+        src/dbus-common.c \
+        src/polkit.c
+
+systemd_timedated_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(DBUS_CFLAGS)
+
+systemd_timedated_LDADD = \
+       libsystemd-basic.la \
+       libsystemd-daemon.la \
+       $(DBUS_LIBS)
+
+systemd_logind_SOURCES = \
+       src/logind.c \
+       src/logind-dbus.c \
+        src/logind-device.c \
+        src/logind-seat.c \
+        src/logind-seat-dbus.c \
+        src/logind-session.c \
+        src/logind-session-dbus.c \
+        src/logind-user.c \
+        src/logind-user-dbus.c \
+        src/dbus-common.c \
+        src/dbus-loop.c \
+        src/cgroup-util.c \
+        src/polkit.c
+
+nodist_systemd_logind_SOURCES = \
+        src/logind-gperf.c
+
+EXTRA_DIST += \
+        src/logind-gperf.gperf
+
+systemd_logind_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(DBUS_CFLAGS) \
+        $(UDEV_CFLAGS) \
+        $(ACL_CFLAGS)
+
+systemd_logind_LDADD = \
+       libsystemd-basic.la \
+       libsystemd-daemon.la \
+       $(DBUS_LIBS) \
+        $(UDEV_LIBS) \
+        $(ACL_LIBS)
+
+systemd_uaccess_SOURCES = \
+       src/uaccess.c
+
+if HAVE_ACL
+systemd_logind_SOURCES += \
+       src/logind-acl.c
+
+systemd_uaccess_SOURCES += \
+       src/logind-acl.c
+endif
+
+systemd_uaccess_CFLAGS = \
+       $(AM_CFLAGS) \
+        $(UDEV_CFLAGS) \
+        $(ACL_CFLAGS)
+
+systemd_uaccess_LDADD = \
+       libsystemd-basic.la \
+       libsystemd-daemon.la \
+       libsystemd-login.la \
+        $(UDEV_LIBS) \
+        $(ACL_LIBS)
+
 systemd_shutdown_SOURCES = \
        src/mount-setup.c \
        src/umount.c \
@@ -989,7 +1279,10 @@ systemctl_SOURCES = \
        src/cgroup-show.c \
        src/cgroup-util.c \
        src/exit-status.c \
-       src/unit-name.c
+       src/unit-name.c \
+        src/pager.c \
+        src/install.c \
+        src/spawn-agent.c
 
 systemctl_CFLAGS = \
        $(AM_CFLAGS) \
@@ -1000,6 +1293,24 @@ systemctl_LDADD = \
        libsystemd-daemon.la \
        $(DBUS_LIBS)
 
+systemd_loginctl_SOURCES = \
+       src/loginctl.c \
+       src/dbus-common.c \
+       src/cgroup-show.c \
+       src/cgroup-util.c \
+        src/pager.c \
+        src/sysfs-show.c
+
+systemd_loginctl_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(DBUS_CFLAGS) \
+        $(UDEV_CFLAGS)
+
+systemd_loginctl_LDADD = \
+       libsystemd-basic.la \
+       $(DBUS_LIBS) \
+        $(UDEV_LIBS)
+
 systemd_notify_SOURCES = \
        src/notify.c \
        src/sd-readahead.c
@@ -1048,7 +1359,8 @@ systemd_readahead_replay_LDADD = \
 systemd_cgls_SOURCES = \
        src/cgls.c \
        src/cgroup-show.c \
-       src/cgroup-util.c
+       src/cgroup-util.c \
+        src/pager.c
 
 systemd_cgls_CFLAGS = \
        $(AM_CFLAGS)
@@ -1058,7 +1370,8 @@ systemd_cgls_LDADD = \
 
 systemd_nspawn_SOURCES = \
        src/nspawn.c \
-       src/cgroup-util.c
+       src/cgroup-util.c \
+        src/loopback-setup.c
 
 systemd_nspawn_CFLAGS = \
        $(AM_CFLAGS)
@@ -1132,10 +1445,12 @@ systemd_tty_ask_password_agent_LDADD = \
 
 pam_systemd_la_SOURCES = \
        src/pam-module.c \
-       src/cgroup-util.c
+        src/dbus-common.c
 
 pam_systemd_la_CFLAGS = \
-       $(AM_CFLAGS)
+       $(AM_CFLAGS) \
+        $(PAM_CFLAGS) \
+        $(DBUS_CFLAGS) \
        -fvisibility=hidden
 
 pam_systemd_la_LDFLAGS = \
@@ -1148,7 +1463,63 @@ pam_systemd_la_LDFLAGS = \
 pam_systemd_la_LIBADD = \
        libsystemd-basic.la \
        libsystemd-daemon.la \
-       $(PAM_LIBS)
+       $(PAM_LIBS) \
+        $(DBUS_LIBS)
+
+libsystemd_daemon_la_SOURCES = \
+       src/sd-daemon.c
+
+libsystemd_daemon_la_CFLAGS = \
+        $(AM_CFLAGS) \
+       -fvisibility=hidden \
+        -DSD_EXPORT_SYMBOLS
+
+libsystemd_daemon_la_LDFLAGS = \
+        -shared \
+        -version-info $(LIBSYSTEMD_DAEMON_CURRENT):$(LIBSYSTEMD_DAEMON_REVISION):$(LIBSYSTEMD_DAEMON_AGE) \
+        -Wl,--version-script=$(top_srcdir)/src/libsystemd-daemon.sym
+
+# move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
+libsystemd-daemon-install-hook:
+       if test "$(libdir)" != "$(rootlibdir)"; then \
+               mkdir -p $(DESTDIR)$(rootlibdir) && \
+               so_img_name=$$(readlink $(DESTDIR)$(libdir)/libsystemd-daemon.so) && \
+               so_img_rel_target_prefix=$$(echo $(libdir) | sed 's,\(^/\|\)[^/][^/]*,..,g') && \
+               ln -sf $$so_img_rel_target_prefix$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/libsystemd-daemon.so && \
+               mv $(DESTDIR)$(libdir)/libsystemd-daemon.so.* $(DESTDIR)$(rootlibdir); \
+       fi
+
+libsystemd-daemon-uninstall-hook:
+       rm -f $(DESTDIR)$(rootlibdir)/libsystemd-daemon.so*
+
+libsystemd_login_la_SOURCES = \
+        src/sd-login.c \
+        src/cgroup-util.c
+
+libsystemd_login_la_CFLAGS = \
+        $(AM_CFLAGS) \
+       -fvisibility=hidden
+
+libsystemd_login_la_LDFLAGS = \
+        -shared \
+        -version-info $(LIBSYSTEMD_LOGIN_CURRENT):$(LIBSYSTEMD_LOGIN_REVISION):$(LIBSYSTEMD_LOGIN_AGE) \
+        -Wl,--version-script=$(top_srcdir)/src/libsystemd-login.sym
+
+libsystemd_login_la_LIBADD = \
+       libsystemd-basic.la
+
+# move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
+libsystemd-login-install-hook:
+       if test "$(libdir)" != "$(rootlibdir)"; then \
+               mkdir -p $(DESTDIR)$(rootlibdir) && \
+               so_img_name=$$(readlink $(DESTDIR)$(libdir)/libsystemd-login.so) && \
+               so_img_rel_target_prefix=$$(echo $(libdir) | sed 's,\(^/\|\)[^/][^/]*,..,g') && \
+               ln -sf $$so_img_rel_target_prefix$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/libsystemd-login.so && \
+               mv $(DESTDIR)$(libdir)/libsystemd-login.so.* $(DESTDIR)$(rootlibdir); \
+       fi
+
+libsystemd-login-uninstall-hook:
+       rm -f $(DESTDIR)$(rootlibdir)/libsystemd-login.so*
 
 SED_PROCESS = \
        $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
@@ -1166,6 +1537,9 @@ SED_PROCESS = \
                -e 's,@PACKAGE_NAME\@,$(PACKAGE_NAME),g' \
                -e 's,@PACKAGE_URL\@,$(PACKAGE_URL),g' \
                -e 's,@prefix\@,$(prefix),g' \
+               -e 's,@exec_prefix\@,$(exec_prefix),g' \
+               -e 's,@libdir\@,$(libdir),g' \
+               -e 's,@includedir\@,$(includedir),g' \
                < $< > $@ || rm $@
 
 units/%: units/%.in Makefile
@@ -1177,16 +1551,31 @@ man/%: man/%.in Makefile
 %.pc: %.pc.in Makefile
        $(SED_PROCESS)
 
-src/%.policy: src/%.policy.in Makefile
+src/%.policy.in: src/%.policy.in.in Makefile
+       $(SED_PROCESS)
+
+src/%.rules: src/%.rules.in Makefile
        $(SED_PROCESS)
 
+src/%.c: src/%.gperf
+       $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
+       $(GPERF) < $< > $@
+
+src/%: src/%.m4
+       $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
+       $(M4) -P $(M4_DEFINES) < $< > $@ || rm $@
+
+src/load-fragment-gperf-nulstr.c: src/load-fragment-gperf.gperf
+       $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
+        $(AWK) 'BEGIN{ keywords=0 ; FS="," ; print "extern const char load_fragment_gperf_nulstr[];" ; print "const char load_fragment_gperf_nulstr[] ="} ; keyword==1 { print "\"" $$1 "\\0\"" } ; /%%/ { keyword=1} ; END { print ";" }' < $< > $@ || rm $@
+
 M4_PROCESS_SYSTEM = \
        $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
-       $(M4) -P $(M4_DISTRO_FLAG) -DFOR_SYSTEM=1 < $< > $@ || rm $@
+       $(M4) -P $(M4_DEFINES) -DFOR_SYSTEM=1 < $< > $@ || rm $@
 
 M4_PROCESS_USER = \
        $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
-       $(M4) -P $(M4_DISTRO_FLAG) -DFOR_USER=1 < $< > $@ || rm $@
+       $(M4) -P $(M4_DEFINES) -DFOR_USER=1 < $< > $@ || rm $@
 
 units/%: units/%.m4 Makefile
        $(M4_PROCESS_SYSTEM)
@@ -1200,7 +1589,14 @@ CLEANFILES = \
        $(nodist_man_MANS) \
        ${XML_IN_FILES:.xml.in=.html} \
        $(pkgconfigdata_DATA) \
-       src/org.freedesktop.systemd1.policy
+       $(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 \
+        src/logind-gperf.c
 
 if HAVE_VALAC
 CLEANFILES += \
@@ -1276,7 +1672,22 @@ endif
 DBUS_PREPROCESS = $(CPP) -P $(DBUS_CFLAGS) -imacros dbus/dbus-protocol.h
 
 org.freedesktop.systemd1.%.xml: systemd
-       $(AM_V_GEN)$(OBJCOPY) -O binary -j introspect.$* $< $@.tmp && \
+       $(AM_V_GEN)$(LIBTOOL) --mode=execute $(OBJCOPY) -O binary -j introspect.$* $< $@.tmp && \
+               $(STRINGS) $@.tmp | $(AWK) -f $(srcdir)/introspect.awk | \
+               $(DBUS_PREPROCESS) -o $@ - && rm $@.tmp
+
+org.freedesktop.hostname1.xml: systemd-hostnamed
+       $(AM_V_GEN)$(LIBTOOL) --mode=execute $(OBJCOPY) -O binary -j introspect.hostname1 $< $@.tmp && \
+               $(STRINGS) $@.tmp | $(AWK) -f $(srcdir)/introspect.awk | \
+               $(DBUS_PREPROCESS) -o $@ - && rm $@.tmp
+
+org.freedesktop.locale1.xml: systemd-localed
+       $(AM_V_GEN)$(LIBTOOL) --mode=execute $(OBJCOPY) -O binary -j introspect.locale1 $< $@.tmp && \
+               $(STRINGS) $@.tmp | $(AWK) -f $(srcdir)/introspect.awk | \
+               $(DBUS_PREPROCESS) -o $@ - && rm $@.tmp
+
+org.freedesktop.timedate1.xml: systemd-timedated
+       $(AM_V_GEN)$(LIBTOOL) --mode=execute $(OBJCOPY) -O binary -j introspect.timedate1 $< $@.tmp && \
                $(STRINGS) $@.tmp | $(AWK) -f $(srcdir)/introspect.awk | \
                $(DBUS_PREPROCESS) -o $@ - && rm $@.tmp
 
@@ -1286,15 +1697,19 @@ CLEANFILES += \
 install-data-hook:
        $(MKDIR_P) -m 0755 \
                $(DESTDIR)$(tmpfilesdir) \
-               $(DESTDIR)$(sysconfdir)/modules-load.d \
+               $(DESTDIR)$(sysconfdir)/tmpfiles.d \
                $(DESTDIR)$(prefix)/lib/modules-load.d \
-               $(DESTDIR)$(sysconfdir)/sysctl.d \
+               $(DESTDIR)$(sysconfdir)/modules-load.d \
                $(DESTDIR)$(prefix)/lib/sysctl.d \
-               $(DESTDIR)$(sysconfdir)/binfmt.d \
-               $(DESTDIR)$(prefix)/lib/binfmt.d \
+               $(DESTDIR)$(sysconfdir)/sysctl.d \
                $(DESTDIR)$(systemshutdowndir) \
                $(DESTDIR)$(systemgeneratordir) \
                $(DESTDIR)$(usergeneratordir)
+if ENABLE_BINFMT
+       $(MKDIR_P) -m 0755 \
+               $(DESTDIR)$(prefix)/lib/binfmt.d \
+               $(DESTDIR)$(sysconfdir)/binfmt.d
+endif
        $(MKDIR_P) -m 0755 \
                $(DESTDIR)$(systemunitdir) \
                $(DESTDIR)$(userunitdir) \
@@ -1316,6 +1731,7 @@ install-data-hook:
                $(DESTDIR)$(pkgsysconfdir)/system/multi-user.target.wants \
                $(DESTDIR)$(pkgsysconfdir)/system/getty.target.wants \
                $(DESTDIR)$(pkgsysconfdir)/user \
+               $(DESTDIR)$(dbussessionservicedir) \
                $(DESTDIR)$(sysconfdir)/xdg/systemd
        ( cd $(DESTDIR)$(sysconfdir)/xdg/systemd/ && \
                rm -f user && \
@@ -1343,10 +1759,8 @@ install-data-hook:
                $(LN_S) ../systemd-update-utmp-runlevel.service systemd-update-utmp-runlevel.service )
        ( cd $(DESTDIR)$(systemunitdir)/shutdown.target.wants && \
                rm -f systemd-update-utmp-shutdown.service \
-                       hwclock-save.service \
                        systemd-random-seed-save.service && \
                $(LN_S) ../systemd-update-utmp-shutdown.service systemd-update-utmp-shutdown.service && \
-               $(LN_S) ../hwclock-save.service hwclock-save.service && \
                $(LN_S) ../systemd-random-seed-save.service systemd-random-seed-save.service )
        ( cd $(DESTDIR)$(systemunitdir)/local-fs.target.wants && \
                rm -f systemd-remount-api-vfs.service \
@@ -1360,11 +1774,9 @@ install-data-hook:
                $(LN_S) ../var-run.mount var-run.mount && \
                $(LN_S) ../media.mount media.mount )
        ( cd $(DESTDIR)$(userunitdir) && \
-               rm -f shutdown.target sockets.target local-fs.target swap.target bluetooth.target printer.target sound.target && \
+               rm -f shutdown.target sockets.target bluetooth.target printer.target sound.target && \
                $(LN_S) $(systemunitdir)/shutdown.target shutdown.target && \
                $(LN_S) $(systemunitdir)/sockets.target sockets.target && \
-               $(LN_S) $(systemunitdir)/local-fs.target local-fs.target && \
-               $(LN_S) $(systemunitdir)/swap.target swap.target && \
                $(LN_S) $(systemunitdir)/bluetooth.target bluetooth.target && \
                $(LN_S) $(systemunitdir)/printer.target printer.target && \
                $(LN_S) $(systemunitdir)/sound.target sound.target )
@@ -1378,33 +1790,27 @@ install-data-hook:
                $(LN_S) graphical.target runlevel5.target && \
                $(LN_S) reboot.target runlevel6.target )
        ( cd $(DESTDIR)$(systemunitdir) && \
-               rm -f default.target ctrl-alt-del.target dbus-org.freedesktop.hostname1.service && \
+               rm -f default.target ctrl-alt-del.target dbus-org.freedesktop.locale1.service dbus-org.freedesktop.login1.service autovt@.service && \
                $(LN_S) graphical.target default.target && \
                $(LN_S) reboot.target ctrl-alt-del.target && \
-                $(LN_S) systemd-hostnamed.service dbus-org.freedesktop.hostname1.service )
+                $(LN_S) systemd-localed.service dbus-org.freedesktop.locale1.service && \
+                $(LN_S) systemd-logind.service dbus-org.freedesktop.login1.service && \
+                $(LN_S) getty@.service autovt@.service )
        ( cd $(DESTDIR)$(systemunitdir)/multi-user.target.wants && \
-               rm -f getty.target systemd-user-sessions.service systemd-ask-password-wall.path && \
+               rm -f getty.target systemd-user-sessions.service systemd-ask-password-wall.path systemd-logind.service && \
                $(LN_S) ../getty.target getty.target && \
                $(LN_S) ../systemd-user-sessions.service systemd-user-sessions.service && \
-               $(LN_S) ../systemd-ask-password-wall.path systemd-ask-password-wall.path )
+               $(LN_S) ../systemd-ask-password-wall.path systemd-ask-password-wall.path && \
+                $(LN_S) ../systemd-logind.service systemd-logind.service )
        ( cd $(DESTDIR)$(pkgsysconfdir)/system/getty.target.wants && \
-               rm -f getty@tty1.service getty@tty2.service getty@tty3.service getty@tty4.service getty@tty5.service getty@tty6.service && \
-               $(LN_S) $(systemunitdir)/getty@.service getty@tty1.service && \
-               $(LN_S) $(systemunitdir)/getty@.service getty@tty2.service && \
-               $(LN_S) $(systemunitdir)/getty@.service getty@tty3.service && \
-               $(LN_S) $(systemunitdir)/getty@.service getty@tty4.service && \
-               $(LN_S) $(systemunitdir)/getty@.service getty@tty5.service && \
-               $(LN_S) $(systemunitdir)/getty@.service getty@tty6.service )
+               rm -f getty@tty1.service && \
+               $(LN_S) $(systemunitdir)/getty@.service getty@tty1.service )
        ( cd $(DESTDIR)$(pkgsysconfdir)/system/multi-user.target.wants && \
                rm -f remote-fs.target && \
                $(LN_S) $(systemunitdir)/remote-fs.target remote-fs.target )
-       ( cd $(DESTDIR)$(pkgsysconfdir)/system/sysinit.target.wants && \
-               rm -f hwclock-load.service && \
-               $(LN_S) $(systemunitdir)/hwclock-load.service hwclock-load.service )
        ( cd $(DESTDIR)$(systemunitdir)/sysinit.target.wants && \
                rm -f dev-hugepages.automount \
                        dev-mqueue.automount \
-                       proc-sys-fs-binfmt_misc.automount \
                        sys-kernel-debug.automount \
                        sys-kernel-security.automount \
                        systemd-vconsole-setup.service \
@@ -1412,13 +1818,11 @@ install-data-hook:
                        systemd-random-seed-load.service \
                        systemd-tmpfiles-setup.service \
                        systemd-sysctl.service \
-                       systemd-binfmt.service \
                        systemd-ask-password-console.path \
                        systemd-kmsg-syslogd.service \
                        cryptsetup.target && \
                $(LN_S) ../dev-hugepages.automount dev-hugepages.automount && \
                $(LN_S) ../dev-mqueue.automount dev-mqueue.automount && \
-               $(LN_S) ../proc-sys-fs-binfmt_misc.automount proc-sys-fs-binfmt_misc.automount && \
                $(LN_S) ../sys-kernel-debug.automount sys-kernel-debug.automount && \
                $(LN_S) ../sys-kernel-security.automount sys-kernel-security.automount && \
                $(LN_S) ../systemd-vconsole-setup.service systemd-vconsole-setup.service && \
@@ -1426,10 +1830,26 @@ install-data-hook:
                $(LN_S) ../systemd-random-seed-load.service systemd-random-seed-load.service && \
                $(LN_S) ../systemd-tmpfiles-setup.service systemd-tmpfiles-setup.service && \
                $(LN_S) ../systemd-sysctl.service systemd-sysctl.service && \
-               $(LN_S) ../systemd-binfmt.service systemd-binfmt.service && \
                $(LN_S) ../systemd-ask-password-console.path systemd-ask-password-console.path && \
                $(LN_S) ../systemd-kmsg-syslogd.service && \
                $(LN_S) ../cryptsetup.target cryptsetup.target )
+if ENABLE_BINFMT
+       ( cd $(DESTDIR)$(systemunitdir)/sysinit.target.wants && \
+               rm -f systemd-binfmt.service \
+                       proc-sys-fs-binfmt_misc.automount && \
+               $(LN_S) ../systemd-binfmt.service systemd-binfmt.service && \
+               $(LN_S) ../proc-sys-fs-binfmt_misc.automount proc-sys-fs-binfmt_misc.automount )
+endif
+if ENABLE_HOSTNAMED
+       ( cd $(DESTDIR)$(systemunitdir) && \
+               rm -f dbus-org.freedesktop.hostname1.service && \
+               $(LN_S) systemd-hostnamed.service dbus-org.freedesktop.hostname1.service )
+endif
+if ENABLE_TIMEDATED
+       ( cd $(DESTDIR)$(systemunitdir) && \
+               rm -f dbus-org.freedesktop.timedate1.service  && \
+                $(LN_S) systemd-timedated.service dbus-org.freedesktop.timedate1.service )
+endif
        ( cd $(DESTDIR)$(systemunitdir)/basic.target.wants && \
                rm -f systemd-tmpfiles-clean.timer && \
                $(LN_S) ../systemd-tmpfiles-clean.timer systemd-tmpfiles-clean.timer )
@@ -1520,12 +1940,29 @@ if TARGET_DEBIAN_OR_UBUNTU
                $(LN_S) multi-user.target runlevel5.target )
 endif
 
+if TARGET_SUSE
+       $(MKDIR_P) -m 0755 $(DESTDIR)$(systemunitdir)/final.target.wants
+       ( cd $(DESTDIR)$(systemunitdir)/multi-user.target.wants && \
+               rm -f rc-local.service && \
+               $(LN_S) $(systemunitdir)/rc-local.service rc-local.service )
+       ( cd $(DESTDIR)$(systemunitdir) && \
+               rm -f local.service && \
+               $(LN_S) rc-local.service local.service )
+       ( cd $(DESTDIR)$(systemunitdir)/final.target.wants && \
+               rm -f halt-local.service && \
+               $(LN_S) $(systemunitdir)/halt-local.service halt-local.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: libsystemd-daemon-install-hook libsystemd-login-install-hook
+
+uninstall-hook: libsystemd-daemon-uninstall-hook libsystemd-login-uninstall-hook
+
 DISTCHECK_CONFIGURE_FLAGS = \
        --with-dbuspolicydir=$$dc_install_base/$(dbuspolicydir) \
        --with-dbussessionservicedir=$$dc_install_base/$(dbussessionservicedir) \