chiark / gitweb /
localed: move sources to subdirectory
[elogind.git] / Makefile.am
index 9a67505623453154005872dd149008ad2edea2ec..cc28e2abb5b2aa7cc78da0af61df00d817d167a1 100644 (file)
@@ -1,6 +1,7 @@
 #  This file is part of systemd.
 #
-#  Copyright 2010 Lennart Poettering
+#  Copyright 2011 Lennart Poettering
+#  Copyright 2011 Kay Sievers
 #
 #  systemd is free software; you can redistribute it and/or modify it
 #  under the terms of the GNU General Public License as published by
 
 ACLOCAL_AMFLAGS = -I m4
 
+SUBDIRS = po
+
+LIBSYSTEMD_LOGIN_CURRENT=0
+LIBSYSTEMD_LOGIN_REVISION=6
+LIBSYSTEMD_LOGIN_AGE=0
+
+LIBSYSTEMD_DAEMON_CURRENT=0
+LIBSYSTEMD_DAEMON_REVISION=0
+LIBSYSTEMD_DAEMON_AGE=0
+
+LIBSYSTEMD_ID128_CURRENT=0
+LIBSYSTEMD_ID128_REVISION=0
+LIBSYSTEMD_ID128_AGE=0
+
+LIBSYSTEMD_JOURNAL_CURRENT=0
+LIBSYSTEMD_JOURNAL_REVISION=0
+LIBSYSTEMD_JOURNAL_AGE=0
+
 # Dirs of external packages
 dbuspolicydir=@dbuspolicydir@
 dbussessionservicedir=@dbussessionservicedir@
@@ -25,6 +44,7 @@ dbusinterfacedir=@dbusinterfacedir@
 udevrulesdir=@udevrulesdir@
 pamlibdir=@pamlibdir@
 pkgconfigdatadir=$(datadir)/pkgconfig
+pkgconfiglibdir=$(libdir)/pkgconfig
 polkitpolicydir=$(datadir)/polkit-1/actions
 bashcompletiondir=$(sysconfdir)/bash_completion.d
 
@@ -33,6 +53,7 @@ pkgsysconfdir=$(sysconfdir)/systemd
 userunitdir=$(prefix)/lib/systemd/user
 tmpfilesdir=$(prefix)/lib/tmpfiles.d
 usergeneratordir=$(pkglibexecdir)/user-generators
+pkgincludedir=$(includedir)/systemd
 
 # And these are the special ones for /
 rootdir=@rootdir@
@@ -42,6 +63,13 @@ systemgeneratordir=$(rootlibexecdir)/system-generators
 systemshutdowndir=$(rootlibexecdir)/system-shutdown
 systemunitdir=$(rootdir)/lib/systemd/system
 
+CLEANFILES =
+EXTRA_DIST =
+INSTALL_EXEC_HOOKS =
+UNINSTALL_EXEC_HOOKS =
+INSTALL_DATA_HOOKS =
+polkitpolicy_in_files =
+
 AM_CPPFLAGS = \
        -include $(top_builddir)/config.h \
        -DSYSTEM_CONFIG_FILE=\"$(pkgsysconfdir)/system.conf\" \
@@ -64,6 +92,7 @@ AM_CPPFLAGS = \
        -DSYSTEM_GENERATOR_PATH=\"$(systemgeneratordir)\" \
        -DUSER_GENERATOR_PATH=\"$(usergeneratordir)\" \
        -DSYSTEM_SHUTDOWN_PATH=\"$(systemshutdowndir)\" \
+       -DSYSTEMD_KBD_MODEL_MAP=\"$(pkgdatadir)/kbd-model-map\" \
        -I $(top_srcdir)/src
 
 if TARGET_GENTOO
@@ -106,6 +135,13 @@ AM_CPPFLAGS += \
        -DKBD_LOADKEYS=\"/bin/loadkeys\" \
        -DKBD_SETFONT=\"/bin/setfont\" \
        -DDEFAULT_FONT=\"latarcyrheb-sun16\"
+else
+if TARGET_MAGEIA
+AM_CPPFLAGS += \
+       -DKBD_LOADKEYS=\"/bin/loadkeys\" \
+       -DKBD_SETFONT=\"/bin/setfont\" \
+       -DDEFAULT_FONT=\"LatArCyrHeb-16\"
+endif
 endif
 endif
 endif
@@ -120,7 +156,8 @@ rootbin_PROGRAMS = \
        systemd-ask-password \
        systemd-tty-ask-password-agent \
        systemd-tmpfiles \
-       systemd-machine-id-setup
+       systemd-machine-id-setup \
+       systemd-journalctl
 
 bin_PROGRAMS = \
        systemd-cgls \
@@ -137,7 +174,7 @@ bin_PROGRAMS += \
 endif
 
 rootlibexec_PROGRAMS = \
-       systemd-logger \
+       systemd-stdout-syslog-bridge \
        systemd-cgroups-agent \
        systemd-initctl \
        systemd-update-utmp \
@@ -158,17 +195,18 @@ rootlibexec_PROGRAMS = \
        systemd-ac-power \
        systemd-detect-virt \
        systemd-sysctl \
-        systemd-hostnamed \
-        systemd-localed \
-        systemd-timedated \
-        systemd-logind \
-        systemd-uaccess
+       systemd-journald
 
 if ENABLE_BINFMT
 rootlibexec_PROGRAMS += \
        systemd-binfmt
 endif
 
+if ENABLE_HOSTNAMED
+rootlibexec_PROGRAMS += \
+       systemd-hostnamed
+endif
+
 systemgenerator_PROGRAMS = \
        systemd-getty-generator
 
@@ -180,6 +218,16 @@ systemgenerator_PROGRAMS += \
        systemd-cryptsetup-generator
 endif
 
+lib_LTLIBRARIES = \
+       libsystemd-daemon.la \
+       libsystemd-id128.la \
+       libsystemd-journal.la
+
+pkginclude_HEADERS = \
+       src/sd-daemon.h \
+       src/sd-id128.h \
+       src/journal/sd-journal.h
+
 noinst_PROGRAMS = \
        test-engine \
        test-job-type \
@@ -189,7 +237,10 @@ noinst_PROGRAMS = \
        test-daemon \
        test-cgroup \
        test-env-replace \
-       test-strv
+       test-strv \
+       test-install \
+       test-id128 \
+       test-journal
 
 if HAVE_PAM
 pamlib_LTLIBRARIES = \
@@ -198,30 +249,40 @@ endif
 
 dist_pkgsysconf_DATA = \
        src/system.conf \
-        src/user.conf \
-        src/systemd-logind.conf
+       src/user.conf
 
 dist_dbuspolicy_DATA = \
-       src/org.freedesktop.systemd1.conf \
-        src/org.freedesktop.hostname1.conf \
-        src/org.freedesktop.locale1.conf \
-        src/org.freedesktop.timedate1.conf \
-        src/org.freedesktop.login1.conf
+       src/org.freedesktop.systemd1.conf
+
+if ENABLE_HOSTNAMED
+dist_dbuspolicy_DATA += \
+       src/org.freedesktop.hostname1.conf
+endif
+
+if ENABLE_LOCALED
+dist_dbuspolicy_DATA += \
+       src/org.freedesktop.locale1.conf
+endif
 
 dist_dbussystemservice_DATA = \
-       src/org.freedesktop.systemd1.service \
-        src/org.freedesktop.hostname1.service \
-        src/org.freedesktop.locale1.service \
-        src/org.freedesktop.timedate1.service \
-        src/org.freedesktop.login1.service
+       src/org.freedesktop.systemd1.service
+
+if ENABLE_HOSTNAMED
+dist_dbussystemservice_DATA += \
+       src/org.freedesktop.hostname1.service
+endif
+
+if ENABLE_LOCALED
+dist_dbussystemservice_DATA += \
+       src/org.freedesktop.locale1.service
+endif
 
 dist_udevrules_DATA = \
-        src/70-uaccess.rules \
-        src/71-seat.rules \
-       src/99-systemd.rules
+       src/71-seat.rules
 
 nodist_udevrules_DATA = \
-        src/73-seat-late.rules
+       src/73-seat-late.rules \
+       src/99-systemd.rules
 
 dbusinterface_DATA = \
        org.freedesktop.systemd1.Manager.xml \
@@ -236,16 +297,24 @@ dbusinterface_DATA = \
        org.freedesktop.systemd1.Automount.xml \
        org.freedesktop.systemd1.Snapshot.xml \
        org.freedesktop.systemd1.Swap.xml \
-       org.freedesktop.systemd1.Path.xml \
-        org.freedesktop.hostname1.xml \
-        org.freedesktop.locale1.xml \
-        org.freedesktop.timedate1.xml
+       org.freedesktop.systemd1.Path.xml
+
+if ENABLE_HOSTNAMED
+dbusinterface_DATA += \
+       org.freedesktop.hostname1.xml
+endif
+
+if ENABLE_LOCALED
+dbusinterface_DATA += \
+       org.freedesktop.locale1.xml
+endif
 
 dist_bashcompletion_DATA = \
-       src/systemctl-bash-completion.sh
+       src/systemd-bash-completion.sh
 
 dist_tmpfiles_DATA = \
        tmpfiles.d/systemd.conf \
+       tmpfiles.d/tmp.conf \
        tmpfiles.d/x11.conf
 
 if HAVE_SYSV_COMPAT
@@ -264,7 +333,9 @@ dist_systemunit_DATA = \
        units/halt.target \
        units/kexec.target \
        units/local-fs.target \
+       units/local-fs-pre.target \
        units/remote-fs.target \
+       units/remote-fs-pre.target \
        units/cryptsetup.target \
        units/network.target \
        units/nss-lookup.target \
@@ -282,17 +353,15 @@ dist_systemunit_DATA = \
        units/sockets.target \
        units/swap.target \
        units/systemd-initctl.socket \
-       units/systemd-logger.socket \
+       units/systemd-stdout-syslog-bridge.socket \
        units/systemd-shutdownd.socket \
        units/syslog.socket \
-       units/dev-hugepages.automount \
        units/dev-hugepages.mount \
-       units/dev-mqueue.automount \
        units/dev-mqueue.mount \
-       units/sys-kernel-debug.automount \
+       units/sys-kernel-config.mount \
        units/sys-kernel-debug.mount \
-       units/sys-kernel-security.automount \
        units/sys-kernel-security.mount \
+       units/sys-fs-fuse-connections.mount \
        units/var-run.mount \
        units/media.mount \
        units/remount-rootfs.service \
@@ -305,7 +374,8 @@ dist_systemunit_DATA = \
        units/quotaon.service \
        units/systemd-ask-password-wall.path \
        units/systemd-ask-password-console.path \
-       units/syslog.target
+       units/syslog.target \
+       units/systemd-journald.socket
 
 if HAVE_SYSV_COMPAT
 dist_systemunit_DATA += \
@@ -323,12 +393,9 @@ nodist_systemunit_DATA = \
        units/serial-getty@.service \
        units/console-shell.service \
        units/systemd-initctl.service \
-       units/systemd-logger.service \
+       units/systemd-stdout-syslog-bridge.service \
        units/systemd-shutdownd.service \
-       units/systemd-hostnamed.service \
-       units/systemd-localed.service \
-       units/systemd-timedated.service \
-       units/systemd-logind.service \
+       units/systemd-journald.service \
        units/systemd-kmsg-syslogd.service \
        units/systemd-modules-load.service \
        units/systemd-vconsole-setup.service \
@@ -354,13 +421,18 @@ nodist_systemunit_DATA = \
        units/fsck-root.service \
        units/quotacheck.service \
        units/rescue.service \
-        units/user@.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
+
 dist_userunit_DATA = \
        units/user/default.target \
        units/user/exit.target
@@ -368,18 +440,15 @@ dist_userunit_DATA = \
 nodist_userunit_DATA = \
        units/user/exit.service
 
-EXTRA_DIST = \
+EXTRA_DIST += \
        units/getty@.service.m4 \
        units/serial-getty@.service.m4 \
        units/console-shell.service.m4 \
        units/rescue.service.m4 \
        units/systemd-initctl.service.in \
-       units/systemd-logger.service.in \
+       units/systemd-stdout-syslog-bridge.service.in \
        units/systemd-shutdownd.service.in \
-       units/systemd-hostnamed.service.in \
-       units/systemd-localed.service.in \
-       units/systemd-timedated.service.in \
-       units/systemd-logind.service.in \
+       units/systemd-journald.service.in \
        units/systemd-kmsg-syslogd.service.in \
        units/systemd-modules-load.service.in \
        units/systemd-vconsole-setup.service.in \
@@ -405,22 +474,36 @@ EXTRA_DIST = \
        units/fsck@.service.in \
        units/fsck-root.service.in \
        units/quotacheck.service.in \
-        units/user@.service.in \
+       units/user@.service.in \
        systemd.pc.in \
+       libsystemd-daemon.pc.in \
+       libsystemd-id128.pc.in \
+       libsystemd-journal.pc.in \
+       src/libsystemd-daemon.sym \
+       src/libsystemd-id128.sym \
+       src/journal/libsystemd-journal.sym \
        introspect.awk \
-       src/org.freedesktop.systemd1.policy.in \
-        src/73-seat-late.rules.in
+       src/73-seat-late.rules.in \
+       src/99-systemd.rules.in \
+       man/custom-html.xsl
 
 if ENABLE_BINFMT
 EXTRA_DIST += \
        units/systemd-binfmt.service.in
 endif
 
+if ENABLE_HOSTNAMED
+EXTRA_DIST += \
+       units/systemd-hostnamed.service.in
+endif
+
 if TARGET_FEDORA
 dist_systemunit_DATA += \
        units/fedora/prefdm.service \
        units/fedora/rc-local.service \
        units/fedora/halt-local.service
+systemgenerator_PROGRAMS += \
+       systemd-rc-local-generator
 endif
 
 if TARGET_MANDRIVA
@@ -428,6 +511,8 @@ dist_systemunit_DATA += \
        units/mandriva/prefdm.service \
        units/fedora/rc-local.service \
        units/fedora/halt-local.service
+systemgenerator_PROGRAMS += \
+       systemd-rc-local-generator
 endif
 
 if TARGET_FRUGALWARE
@@ -435,6 +520,23 @@ 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
+systemgenerator_PROGRAMS += \
+       systemd-rc-local-generator
+endif
+
+if TARGET_MAGEIA
+dist_systemunit_DATA += \
+       units/mageia/prefdm.service \
+       units/fedora/rc-local.service \
+       units/fedora/halt-local.service
+systemgenerator_PROGRAMS += \
+       systemd-rc-local-generator
+endif
+
 if HAVE_PLYMOUTH
 dist_systemunit_DATA += \
        units/plymouth-start.service \
@@ -466,22 +568,42 @@ dist_doc_DATA = \
 pkgconfigdata_DATA = \
        systemd.pc
 
+pkgconfiglib_DATA = \
+       libsystemd-daemon.pc \
+       libsystemd-id128.pc \
+       libsystemd-journal.pc
+
+if ENABLE_HOSTNAMED
+polkitpolicy_in_files += \
+       src/org.freedesktop.hostname1.policy.in
+endif
+
+if ENABLE_LOCALED
+polkitpolicy_in_files += \
+       src/org.freedesktop.locale1.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 \
-        src/org.freedesktop.locale1.policy \
-        src/org.freedesktop.timedate1.policy \
-        src/org.freedesktop.login1.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 \
+       src/virt.c \
        src/label.c \
        src/hashmap.c \
        src/set.c \
@@ -497,7 +619,8 @@ libsystemd_basic_la_CFLAGS = \
        $(SELINUX_CFLAGS)
 
 libsystemd_basic_la_LIBADD = \
-       $(SELINUX_LIBS)
+       $(SELINUX_LIBS) \
+       $(CAP_LIBS)
 
 libsystemd_core_la_SOURCES = \
        src/unit.c \
@@ -548,8 +671,18 @@ libsystemd_core_la_SOURCES = \
        src/tcpwrap.c \
        src/cgroup-util.c \
        src/condition.c \
-        src/dbus-common.c \
-        src/sd-daemon.c
+       src/dbus-common.c \
+       src/sd-daemon.c \
+       src/install.c \
+       src/cgroup-attr.c \
+       src/sd-id128.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) \
@@ -565,10 +698,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
@@ -596,7 +727,19 @@ 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/dbus-loop.h \
+       src/spawn-agent.h \
+       src/journal/journal-def.h \
+       src/journal/journal-internal.h \
+       src/journal/journal-file.h \
+       src/journal/lookup3.h \
+       src/journal/compress.h \
+       src/journal/journal-rate-limit.h \
+       src/acl-util.h
 
 MANPAGES = \
        man/systemd.1 \
@@ -632,17 +775,22 @@ 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/timezone.5 \
        man/machine-id.5 \
        man/vconsole.conf.5 \
        man/locale.conf.5 \
        man/os-release.5 \
-        man/machine-info.5 \
+       man/machine-info.5 \
        man/modules-load.d.5 \
        man/sysctl.d.5 \
-        man/systemd-ask-password.1
+       man/systemd-ask-password.1 \
+       man/sd_pid_get_session.3 \
+       man/sd_uid_get_state.3 \
+       man/sd_session_is_active.3 \
+       man/sd_seat_get_active.3 \
+       man/sd_get_seats.3
 
 if ENABLE_BINFMT
 MANPAGES += \
@@ -655,16 +803,38 @@ MANPAGES_ALIAS = \
        man/sd_is_socket.3 \
        man/sd_is_socket_unix.3 \
        man/sd_is_socket_inet.3 \
+       man/sd_is_mq.3 \
        man/sd_notifyf.3 \
-       man/init.1
+       man/init.1 \
+       man/sd_session_get_uid.3 \
+       man/sd_session_get_seat.3 \
+       man/sd_pid_get_owner_uid.3 \
+       man/sd_uid_is_on_seat.3 \
+       man/sd_uid_get_sessions.3 \
+       man/sd_uid_get_seats.3 \
+       man/sd_seat_get_sessions.3 \
+       man/sd_seat_can_multi_session.3 \
+       man/sd_get_sessions.3 \
+       man/sd_get_uids.3
 
 man/reboot.8: man/halt.8
 man/poweroff.8: man/halt.8
 man/sd_is_socket.3: man/sd_is_fifo.3
 man/sd_is_socket_unix.3: man/sd_is_fifo.3
 man/sd_is_socket_inet.3: man/sd_is_fifo.3
+man/sd_is_mq.3: man/sd_is_fifo.3
 man/sd_notifyf.3: man/sd_notify.3
 man/init.1: man/systemd.1
+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_pid_get_owner_uid.3: man/sd_pid_get_session.3
+man/sd_uid_is_on_seat.3: man/sd_uid_get_state.3
+man/sd_uid_get_sessions.3: man/sd_uid_get_state.3
+man/sd_uid_get_seats.3: man/sd_uid_get_state.3
+man/sd_seat_get_sessions.3: man/sd_seat_get_active.3
+man/sd_seat_can_multi_session.3: man/sd_seat_get_active.3
+man/sd_get_sessions.3: man/sd_get_seats.3
+man/sd_get_uids.3: man/sd_get_seats.3
 
 dist_man_MANS = \
        $(MANPAGES) \
@@ -770,11 +940,108 @@ test_strv_CFLAGS = \
 test_strv_LDADD = \
        libsystemd-basic.la
 
-systemd_logger_SOURCES = \
-       src/logger.c \
+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
+
+test_id128_SOURCES = \
+       src/test-id128.c \
+       src/sd-id128.c
+
+test_id128_CFLAGS = \
+       $(AM_CFLAGS)
+
+test_id128_LDADD = \
+       libsystemd-basic.la
+
+test_journal_SOURCES = \
+       src/journal/test-journal.c \
+       src/journal/sd-journal.c \
+       src/journal/journal-file.c \
+       src/journal/lookup3.c \
+       src/journal/journal-send.c \
+       src/sd-id128.c
+
+test_journal_CFLAGS = \
+       $(AM_CFLAGS)
+
+test_journal_LDADD = \
+       libsystemd-basic.la
+
+if HAVE_XZ
+test_journal_SOURCES += \
+       src/journal/compress.c
+test_journal_CFLAGS += \
+       $(XZ_CFLAGS)
+test_journal_LDADD += \
+       $(XZ_LIBS)
+endif
+
+systemd_journald_SOURCES = \
+       src/journal/journald.c \
+       src/journal/sd-journal.c \
+       src/journal/journal-file.c \
+       src/journal/lookup3.c \
+       src/journal/journal-rate-limit.c \
+       src/sd-id128.c \
+       src/acl-util.c \
+       src/cgroup-util.c
+
+systemd_journald_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(ACL_CFLAGS)
+
+systemd_journald_LDADD = \
+       libsystemd-basic.la \
+       libsystemd-daemon.la \
+       $(ACL_LIBS)
+
+if HAVE_XZ
+systemd_journald_SOURCES += \
+       src/journal/compress.c
+systemd_journald_CFLAGS += \
+       $(XZ_CFLAGS)
+systemd_journald_LDADD += \
+       $(XZ_LIBS)
+endif
+
+systemd_journalctl_SOURCES = \
+       src/journal/journalctl.c \
+       src/journal/sd-journal.c \
+       src/journal/journal-file.c \
+       src/journal/lookup3.c \
+       src/sd-id128.c \
+       src/pager.c
+
+systemd_journalctl_CFLAGS = \
+       $(AM_CFLAGS)
+
+systemd_journalctl_LDADD = \
+       libsystemd-basic.la
+
+if HAVE_XZ
+systemd_journalctl_SOURCES += \
+       src/journal/compress.c
+systemd_journalctl_CFLAGS += \
+       $(XZ_CFLAGS)
+systemd_journalctl_LDADD += \
+       $(XZ_LIBS)
+endif
+
+systemd_stdout_syslog_bridge_SOURCES = \
+       src/stdout-syslog-bridge.c \
        src/tcpwrap.c
 
-systemd_logger_LDADD = \
+systemd_stdout_syslog_bridge_LDADD = \
        libsystemd-basic.la \
        libsystemd-daemon.la \
        $(LIBWRAP_LIBS)
@@ -827,10 +1094,16 @@ systemd_shutdownd_LDADD = \
        libsystemd-basic.la \
        libsystemd-daemon.la
 
+dist_pkgdata_DATA = \
+       src/kbd-model-map
+
+dist_noinst_SCRIPT = \
+       src/generate-kbd-model-map
+
 systemd_hostnamed_SOURCES = \
        src/hostnamed.c \
-        src/dbus-common.c \
-        src/polkit.c
+       src/dbus-common.c \
+       src/polkit.c
 
 systemd_hostnamed_CFLAGS = \
        $(AM_CFLAGS) \
@@ -841,10 +1114,12 @@ systemd_hostnamed_LDADD = \
        libsystemd-daemon.la \
        $(DBUS_LIBS)
 
+# ------------------------------------------------------------------------------
+if ENABLE_LOCALED
 systemd_localed_SOURCES = \
-       src/localed.c \
-        src/dbus-common.c \
-        src/polkit.c
+       src/locale/localed.c \
+       src/dbus-common.c \
+       src/polkit.c
 
 systemd_localed_CFLAGS = \
        $(AM_CFLAGS) \
@@ -855,10 +1130,35 @@ systemd_localed_LDADD = \
        libsystemd-daemon.la \
        $(DBUS_LIBS)
 
+nodist_systemunit_DATA += \
+       units/systemd-localed.service
+
+rootlibexec_PROGRAMS += \
+       systemd-localed
+
+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
+
+localed-install-data-hook:
+       ( cd $(DESTDIR)$(systemunitdir) && \
+               rm -f dbus-org.freedesktop.locale1.service && \
+               $(LN_S) systemd-localed.service dbus-org.freedesktop.locale1.service )
+
+INSTALL_DATA_HOOKS += \
+       localed-install-data-hook
+
+EXTRA_DIST += \
+       units/systemd-localed.service.in
+endif
+
+# ------------------------------------------------------------------------------
+if ENABLE_TIMEDATED
 systemd_timedated_SOURCES = \
-       src/timedated.c \
-        src/dbus-common.c \
-        src/polkit.c
+       src/timedate/timedated.c \
+       src/dbus-common.c \
+       src/polkit.c
 
 systemd_timedated_CFLAGS = \
        $(AM_CFLAGS) \
@@ -869,48 +1169,246 @@ systemd_timedated_LDADD = \
        libsystemd-daemon.la \
        $(DBUS_LIBS)
 
+rootlibexec_PROGRAMS += \
+       systemd-timedated
+
+dist_dbussystemservice_DATA += \
+       src/timedate/org.freedesktop.timedate1.service
+
+dist_dbuspolicy_DATA += \
+       src/timedate/org.freedesktop.timedate1.conf
+
+nodist_systemunit_DATA += \
+       units/systemd-timedated.service
+
+polkitpolicy_in_files += \
+       src/timedate/org.freedesktop.timedate1.policy.in
+
+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
+
+dbusinterface_DATA += \
+       org.freedesktop.timedate1.xml
+
+timedated-install-data-hook:
+       ( cd $(DESTDIR)$(systemunitdir) && \
+               rm -f dbus-org.freedesktop.timedate1.service  && \
+               $(LN_S) systemd-timedated.service dbus-org.freedesktop.timedate1.service )
+
+INSTALL_DATA_HOOKS += \
+       timedated-install-data-hook
+
+EXTRA_DIST += \
+       units/systemd-timedated.service.in
+endif
+
+# ------------------------------------------------------------------------------
+if ENABLE_LOGIND
 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/logind-acl.c \
-        src/dbus-common.c \
-        src/dbus-loop.c \
-        src/cgroup-util.c \
-        src/polkit.c
+       src/login/logind.c \
+       src/login/logind-dbus.c \
+       src/login/logind-device.c \
+       src/login/logind-seat.c \
+       src/login/logind-seat-dbus.c \
+       src/login/logind-session.c \
+       src/login/logind-session-dbus.c \
+       src/login/logind-user.c \
+       src/login/logind-user-dbus.c \
+       src/dbus-common.c \
+       src/dbus-loop.c \
+       src/cgroup-util.c \
+       src/polkit.c
+
+nodist_systemd_logind_SOURCES = \
+       src/login/logind-gperf.c
+
+if HAVE_ACL
+systemd_logind_SOURCES += \
+       src/login/logind-acl.c \
+       src/acl-util.c
+endif
+
+systemd_logind_CPPFLAGS = \
+       $(AM_CPPFLAGS) \
+       -I $(top_srcdir)/src/login
 
 systemd_logind_CFLAGS = \
        $(AM_CFLAGS) \
        $(DBUS_CFLAGS) \
-        $(UDEV_CFLAGS) \
-        $(ACL_CFLAGS)
+       $(UDEV_CFLAGS) \
+       $(ACL_CFLAGS)
 
 systemd_logind_LDADD = \
        libsystemd-basic.la \
        libsystemd-daemon.la \
        $(DBUS_LIBS) \
-        $(UDEV_LIBS) \
-        $(ACL_LIBS)
+       $(UDEV_LIBS) \
+       $(ACL_LIBS)
+
+rootlibexec_PROGRAMS += \
+       systemd-logind
+
+systemd_loginctl_SOURCES = \
+       src/login/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)
+
+rootbin_PROGRAMS += \
+       systemd-loginctl
+
+test_login_SOURCES = \
+       src/login/test-login.c
+
+test_login_LDADD = \
+       libsystemd-basic.la \
+       libsystemd-login.la
+
+noinst_PROGRAMS += \
+       test-login
+
+libsystemd_login_la_SOURCES = \
+       src/login/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/login/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
+
+INSTALL_EXEC_HOOKS += \
+       libsystemd-login-install-hook
+
+libsystemd-login-uninstall-hook:
+       rm -f $(DESTDIR)$(rootlibdir)/libsystemd-login.so*
+
+UNINSTALL_EXEC_HOOKS += \
+       libsystemd-login-uninstall-hook
+
+nodist_systemunit_DATA += \
+       units/systemd-logind.service
+
+dist_dbussystemservice_DATA += \
+       src/login/org.freedesktop.login1.service
+
+dist_dbuspolicy_DATA += \
+       src/login/org.freedesktop.login1.conf
+
+dist_pkgsysconf_DATA += \
+       src/login/systemd-logind.conf
+
+pkginclude_HEADERS += \
+       src/login/sd-login.h
+
+lib_LTLIBRARIES += \
+       libsystemd-login.la
+
+pkgconfiglib_DATA += \
+       libsystemd-login.pc
+
+polkitpolicy_in_files += \
+       src/login/org.freedesktop.login1.policy.in
+
+logind-install-data-hook:
+       ( cd $(DESTDIR)$(systemunitdir) && \
+               rm -f dbus-org.freedesktop.login1.service && \
+               $(LN_S) systemd-logind.service dbus-org.freedesktop.login1.service)
+       ( cd $(DESTDIR)$(systemunitdir)/multi-user.target.wants && \
+               rm -f systemd-logind.service && \
+               $(LN_S) ../systemd-logind.service systemd-logind.service )
+
+INSTALL_DATA_HOOKS += \
+       logind-install-data-hook
 
 systemd_uaccess_SOURCES = \
-       src/uaccess.c \
-        src/logind-acl.c
+       src/login/uaccess.c
+
+if HAVE_ACL
+systemd_uaccess_SOURCES += \
+       src/login/logind-acl.c \
+       src/acl-util.c
+endif
 
 systemd_uaccess_CFLAGS = \
        $(AM_CFLAGS) \
-        $(UDEV_CFLAGS) \
-        $(ACL_CFLAGS)
+       $(UDEV_CFLAGS) \
+       $(ACL_CFLAGS)
 
 systemd_uaccess_LDADD = \
        libsystemd-basic.la \
-        $(UDEV_LIBS) \
-        $(ACL_LIBS)
+       libsystemd-daemon.la \
+       libsystemd-login.la \
+       $(UDEV_LIBS) \
+       $(ACL_LIBS)
+
+rootlibexec_PROGRAMS += \
+       systemd-uaccess
+
+dist_udevrules_DATA += \
+       src/70-uaccess.rules
+
+MANPAGES += \
+       man/systemd-logind.conf.5 \
+       man/sd-login.7 \
+       man/systemd-loginctl.1 \
+       man/sd_login_monitor_new.3
+
+MANPAGES_ALIAS += \
+       man/sd_login_monitor_unref.3 \
+       man/sd_login_monitor_flush.3 \
+       man/sd_login_monitor_get_fd.3
+
+man/sd_login_monitor_unref.3: man/sd_login_monitor_new.3
+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
+
+EXTRA_DIST += \
+       src/login/logind-gperf.gperf \
+       units/systemd-logind.service.in \
+       libsystemd-login.pc.in \
+       src/login/libsystemd-login.sym \
+       src/login/logind.h \
+       src/login/logind-device.h \
+       src/login/logind-seat.h \
+       src/login/logind-session.h \
+       src/login/logind-user.h \
+       src/login/logind-acl.h
+
+CLEANFILES += \
+       src/login/logind-gperf.c
+endif
+# ------------------------------------------------------------------------------
 
 systemd_shutdown_SOURCES = \
        src/mount-setup.c \
@@ -945,7 +1443,8 @@ systemd_tmpfiles_LDADD = \
 
 systemd_machine_id_setup_SOURCES = \
        src/machine-id-setup.c \
-       src/machine-id-main.c
+       src/machine-id-main.c \
+       src/sd-id128.c
 
 systemd_machine_id_setup_CFLAGS = \
        $(AM_CFLAGS)
@@ -1057,6 +1556,15 @@ systemd_getty_generator_CFLAGS = \
 systemd_getty_generator_LDADD = \
        libsystemd-basic.la
 
+systemd_rc_local_generator_SOURCES = \
+       src/rc-local-generator.c
+
+systemd_rc_local_generator_CFLAGS = \
+       $(AM_CFLAGS)
+
+systemd_rc_local_generator_LDADD = \
+       libsystemd-basic.la
+
 systemd_user_sessions_SOURCES = \
        src/user-sessions.c \
        src/cgroup-util.c
@@ -1118,7 +1626,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) \
@@ -1177,7 +1688,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)
@@ -1187,7 +1699,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)
@@ -1204,7 +1717,8 @@ systemd_stdio_bridge_LDADD = \
 
 systemadm_SOURCES = \
        src/systemadm.vala \
-       src/systemd-interfaces.vala
+       src/systemd-interfaces.vala \
+       src/wraplabel.vala
 
 systemadm_CFLAGS = \
        $(AM_CFLAGS) \
@@ -1217,6 +1731,7 @@ systemadm_CFLAGS = \
 systemadm_VALAFLAGS = \
        --pkg=posix \
        --pkg=gtk+-2.0 \
+       --pkg=gee-1.0 \
        -g
 
 systemadm_LDADD = \
@@ -1261,12 +1776,12 @@ systemd_tty_ask_password_agent_LDADD = \
 
 pam_systemd_la_SOURCES = \
        src/pam-module.c \
-        src/dbus-common.c
+       src/dbus-common.c
 
 pam_systemd_la_CFLAGS = \
        $(AM_CFLAGS) \
-        $(PAM_CFLAGS) \
-        $(DBUS_CFLAGS) \
+       $(PAM_CFLAGS) \
+       $(DBUS_CFLAGS) \
        -fvisibility=hidden
 
 pam_systemd_la_LDFLAGS = \
@@ -1280,7 +1795,96 @@ pam_systemd_la_LIBADD = \
        libsystemd-basic.la \
        libsystemd-daemon.la \
        $(PAM_LIBS) \
-        $(DBUS_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_id128_la_SOURCES = \
+       src/sd-id128.c
+
+libsystemd_id128_la_CFLAGS = \
+       $(AM_CFLAGS) \
+       -fvisibility=hidden
+
+libsystemd_id128_la_LDFLAGS = \
+       -shared \
+       -version-info $(LIBSYSTEMD_ID128_CURRENT):$(LIBSYSTEMD_ID128_REVISION):$(LIBSYSTEMD_ID128_AGE) \
+       -Wl,--version-script=$(top_srcdir)/src/libsystemd-id128.sym
+
+libsystemd_id128_la_LIBADD = \
+       libsystemd-basic.la
+
+# move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
+libsystemd-id128-install-hook:
+       if test "$(libdir)" != "$(rootlibdir)"; then \
+               mkdir -p $(DESTDIR)$(rootlibdir) && \
+               so_img_name=$$(readlink $(DESTDIR)$(libdir)/libsystemd-id128.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-id128.so && \
+               mv $(DESTDIR)$(libdir)/libsystemd-id128.so.* $(DESTDIR)$(rootlibdir); \
+       fi
+
+libsystemd-id128-uninstall-hook:
+       rm -f $(DESTDIR)$(rootlibdir)/libsystemd-id128.so*
+
+libsystemd_journal_la_SOURCES = \
+       src/journal/sd-journal.c \
+       src/journal/journal-file.c \
+       src/journal/compress.c \
+       src/journal/lookup3.c \
+       src/journal/journal-send.c
+
+libsystemd_journal_la_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(XZ_CFLAGS) \
+       -fvisibility=hidden
+
+libsystemd_journal_la_LDFLAGS = \
+       -shared \
+       -version-info $(LIBSYSTEMD_JOURNAL_CURRENT):$(LIBSYSTEMD_JOURNAL_REVISION):$(LIBSYSTEMD_JOURNAL_AGE) \
+       -Wl,--version-script=$(top_srcdir)/src/journal/libsystemd-journal.sym
+
+libsystemd_journal_la_LIBADD = \
+       libsystemd-basic.la \
+       libsystemd-id128.la \
+       $(XZ_LIBS)
+
+# move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
+libsystemd-journal-install-hook:
+       if test "$(libdir)" != "$(rootlibdir)"; then \
+               mkdir -p $(DESTDIR)$(rootlibdir) && \
+               so_img_name=$$(readlink $(DESTDIR)$(libdir)/libsystemd-journal.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-journal.so && \
+               mv $(DESTDIR)$(libdir)/libsystemd-journal.so.* $(DESTDIR)$(rootlibdir); \
+       fi
+
+libsystemd-journal-uninstall-hook:
+       rm -f $(DESTDIR)$(rootlibdir)/libsystemd-journal.so*
 
 SED_PROCESS = \
        $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
@@ -1298,6 +1902,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
@@ -1309,19 +1916,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)
@@ -1329,13 +1948,19 @@ units/%: units/%.m4 Makefile
 units/user/%: units/%.m4 Makefile
        $(M4_PROCESS_USER)
 
-CLEANFILES = \
+CLEANFILES += \
        $(nodist_systemunit_DATA) \
        $(nodist_userunit_DATA) \
        $(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
 
 if HAVE_VALAC
 CLEANFILES += \
@@ -1345,7 +1970,7 @@ endif
 if HAVE_XSLTPROC
 XSLTPROC_FLAGS = \
        --nonet \
-       --param funcsynopsis.style "'ansi'"
+       --stringparam funcsynopsis.style ansi
 
 XSLTPROC_PROCESS_MAN = \
        $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
@@ -1358,11 +1983,11 @@ XSLTPROC_PROCESS_MAN_IN = \
 
 XSLTPROC_PROCESS_HTML = \
        $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
-       $(XSLTPROC) -o $@ $(XSLTPROC_FLAGS) http://docbook.sourceforge.net/release/xsl/current/xhtml-1_1/docbook.xsl $<
+       $(XSLTPROC) -o $@ $(XSLTPROC_FLAGS) man/custom-html.xsl $<
 
 XSLTPROC_PROCESS_HTML_IN = \
        $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
-       $(XSLTPROC) -o ${@:.in=} $(XSLTPROC_FLAGS) http://docbook.sourceforge.net/release/xsl/current/xhtml-1_1/docbook.xsl $< && \
+       $(XSLTPROC) -o ${@:.in=} $(XSLTPROC_FLAGS) man/custom-html.xsl $< && \
        mv ${@:.in=} $@
 
 man/%.1: man/%.xml
@@ -1411,29 +2036,19 @@ 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)$(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)$(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)$(OBJCOPY) -O binary -j introspect.timedate1 $< $@.tmp && \
+       $(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
 
 CLEANFILES += \
        $(dbusinterface_DATA)
 
-install-data-hook:
+systemd-install-data-hook:
        $(MKDIR_P) -m 0755 \
                $(DESTDIR)$(tmpfilesdir) \
                $(DESTDIR)$(sysconfdir)/tmpfiles.d \
@@ -1476,11 +2091,12 @@ endif
                rm -f user && \
                $(LN_S) $(pkgsysconfdir)/user user )
        ( cd $(DESTDIR)$(systemunitdir)/sockets.target.wants && \
-               rm -f systemd-initctl.socket systemd-logger.socket systemd-shutdownd.socket syslog.socket && \
-               $(LN_S) ../systemd-logger.socket systemd-logger.socket && \
+               rm -f systemd-initctl.socket systemd-stdout-syslog-bridge.socket systemd-shutdownd.socket syslog.socket systemd-journald.socket && \
+               $(LN_S) ../systemd-stdout-syslog-bridge.socket systemd-stdout-syslog-bridge.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) ../syslog.socket syslog.socket && \
+               $(LN_S) ../systemd-journald.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 )
@@ -1529,20 +2145,15 @@ endif
                $(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 dbus-org.freedesktop.locale1.service dbus-org.freedesktop.timedate1.service dbus-org.freedesktop.login1.service autovt@.service && \
+               rm -f default.target ctrl-alt-del.target 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-timedated.service dbus-org.freedesktop.timedate1.service && \
-                $(LN_S) systemd-logind.service dbus-org.freedesktop.login1.service && \
-                $(LN_S) getty@.service autovt@.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 systemd-logind.service && \
+               rm -f getty.target systemd-user-sessions.service systemd-ask-password-wall.path && \
                $(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-logind.service systemd-logind.service )
+               $(LN_S) ../systemd-ask-password-wall.path systemd-ask-password-wall.path)
        ( cd $(DESTDIR)$(pkgsysconfdir)/system/getty.target.wants && \
                rm -f getty@tty1.service && \
                $(LN_S) $(systemunitdir)/getty@.service getty@tty1.service )
@@ -1550,10 +2161,12 @@ endif
                rm -f remote-fs.target && \
                $(LN_S) $(systemunitdir)/remote-fs.target remote-fs.target )
        ( cd $(DESTDIR)$(systemunitdir)/sysinit.target.wants && \
-               rm -f dev-hugepages.automount \
-                       dev-mqueue.automount \
-                       sys-kernel-debug.automount \
-                       sys-kernel-security.automount \
+               rm -f dev-hugepages.mount \
+                       dev-mqueue.mount \
+                       sys-kernel-config.mount \
+                       sys-kernel-debug.mount \
+                       sys-kernel-security.mount \
+                       sys-fs-fuse-connections.mount \
                        systemd-vconsole-setup.service \
                        systemd-modules-load.service \
                        systemd-random-seed-load.service \
@@ -1562,10 +2175,12 @@ endif
                        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) ../sys-kernel-debug.automount sys-kernel-debug.automount && \
-               $(LN_S) ../sys-kernel-security.automount sys-kernel-security.automount && \
+               $(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-vconsole-setup.service systemd-vconsole-setup.service && \
                $(LN_S) ../systemd-modules-load.service systemd-modules-load.service && \
                $(LN_S) ../systemd-random-seed-load.service systemd-random-seed-load.service && \
@@ -1580,6 +2195,11 @@ if ENABLE_BINFMT
                        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
        ( cd $(DESTDIR)$(systemunitdir)/basic.target.wants && \
                rm -f systemd-tmpfiles-clean.timer && \
@@ -1632,9 +2252,6 @@ endif
 
 if TARGET_FEDORA
        $(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)/final.target.wants && \
                rm -f halt-local.service && \
                $(LN_S) $(systemunitdir)/halt-local.service halt-local.service )
@@ -1649,9 +2266,6 @@ endif
 
 if TARGET_MANDRIVA
        $(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)/final.target.wants && \
                rm -f halt-local.service && \
                $(LN_S) $(systemunitdir)/halt-local.service halt-local.service )
@@ -1671,12 +2285,42 @@ 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) && \
+               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 TARGET_MAGEIA
+       $(MKDIR_P) -m 0755 $(DESTDIR)$(systemunitdir)/final.target.wants
+       ( cd $(DESTDIR)$(systemunitdir)/final.target.wants && \
+               rm -f halt-local.service && \
+               $(LN_S) $(systemunitdir)/halt-local.service halt-local.service )
+       ( cd $(DESTDIR)$(systemunitdir) && \
+               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
+
 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 $(INSTALL_EXEC_HOOKS)
+
+uninstall-hook: libsystemd-daemon-uninstall-hook $(UNINSTALL_EXEC_HOOKS)
+
+install-data-hook: systemd-install-data-hook $(INSTALL_DATA_HOOKS)
+
 DISTCHECK_CONFIGURE_FLAGS = \
        --with-dbuspolicydir=$$dc_install_base/$(dbuspolicydir) \
        --with-dbussessionservicedir=$$dc_install_base/$(dbussessionservicedir) \
@@ -1693,3 +2337,6 @@ upload: all distcheck
 
 git-tag:
        git tag "v$(VERSION)" -m "systemd $(VERSION)"
+
+update-kbd-model-map:
+       src/generate-kbd-model-map > src/kbd-model-map