chiark / gitweb /
logind: move logind into its own subdirectory
[elogind.git] / Makefile.am
index ad21f681e4d9277e62b1caf2110c0591e0ced036..f8735dee82bcf158014c8ba7af6b0c0d115117f0 100644 (file)
@@ -20,13 +20,21 @@ ACLOCAL_AMFLAGS = -I m4
 SUBDIRS = po
 
 LIBSYSTEMD_LOGIN_CURRENT=0
-LIBSYSTEMD_LOGIN_REVISION=4
+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@
@@ -76,6 +84,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
@@ -118,6 +127,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
@@ -133,7 +149,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 \
@@ -172,7 +189,8 @@ rootlibexec_PROGRAMS = \
        systemd-detect-virt \
        systemd-sysctl \
         systemd-logind \
-        systemd-uaccess
+        systemd-uaccess \
+        systemd-journald
 
 if ENABLE_BINFMT
 rootlibexec_PROGRAMS += \
@@ -207,11 +225,15 @@ endif
 
 lib_LTLIBRARIES = \
        libsystemd-daemon.la \
-       libsystemd-login.la
+       libsystemd-login.la \
+        libsystemd-id128.la \
+        libsystemd-journal.la
 
 pkginclude_HEADERS = \
        src/sd-daemon.h \
-       src/sd-login.h
+       src/login/sd-login.h \
+        src/sd-id128.h \
+        src/journal/sd-journal.h
 
 noinst_PROGRAMS = \
        test-engine \
@@ -224,7 +246,9 @@ noinst_PROGRAMS = \
        test-env-replace \
        test-strv \
         test-login \
-        test-install
+        test-install \
+        test-id128 \
+        test-journal
 
 if HAVE_PAM
 pamlib_LTLIBRARIES = \
@@ -313,7 +337,7 @@ dbusinterface_DATA += \
 endif
 
 dist_bashcompletion_DATA = \
-       src/systemctl-bash-completion.sh
+       src/systemd-bash-completion.sh
 
 dist_tmpfiles_DATA = \
        tmpfiles.d/systemd.conf \
@@ -336,7 +360,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 \
@@ -357,14 +383,12 @@ dist_systemunit_DATA = \
        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-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 \
@@ -377,7 +401,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 += \
@@ -398,6 +423,7 @@ nodist_systemunit_DATA = \
        units/systemd-stdout-syslog-bridge.service \
        units/systemd-shutdownd.service \
        units/systemd-logind.service \
+        units/systemd-journald.service \
        units/systemd-kmsg-syslogd.service \
        units/systemd-modules-load.service \
        units/systemd-vconsole-setup.service \
@@ -461,7 +487,8 @@ EXTRA_DIST = \
        units/systemd-stdout-syslog-bridge.service.in \
        units/systemd-shutdownd.service.in \
        units/systemd-logind.service.in \
-       units/systemd-kmsg-syslogd.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 \
        units/systemd-remount-api-vfs.service.in \
@@ -490,11 +517,16 @@ EXTRA_DIST = \
        systemd.pc.in \
        libsystemd-daemon.pc.in \
        libsystemd-login.pc.in \
+        libsystemd-id128.pc.in \
+        libsystemd-journal.pc.in \
        src/libsystemd-daemon.sym \
        src/libsystemd-login.sym \
+       src/libsystemd-id128.sym \
+       src/libsystemd-journal.sym \
        introspect.awk \
        src/73-seat-late.rules.in \
-        src/99-systemd.rules.in
+        src/99-systemd.rules.in \
+        man/custom-html.xsl
 
 if ENABLE_BINFMT
 EXTRA_DIST += \
@@ -521,6 +553,8 @@ 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
@@ -528,6 +562,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
@@ -539,6 +575,17 @@ 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
@@ -574,7 +621,9 @@ pkgconfigdata_DATA = \
 
 pkgconfiglib_DATA = \
         libsystemd-daemon.pc \
-        libsystemd-login.pc
+        libsystemd-login.pc \
+        libsystemd-id128.pc \
+        libsystemd-journal.pc
 
 # Passed through intltool only
 polkitpolicy_in_files = \
@@ -615,6 +664,7 @@ noinst_LTLIBRARIES = \
 
 libsystemd_basic_la_SOURCES = \
        src/util.c \
+        src/virt.c \
        src/label.c \
        src/hashmap.c \
        src/set.c \
@@ -685,7 +735,8 @@ libsystemd_core_la_SOURCES = \
         src/dbus-common.c \
         src/sd-daemon.c \
         src/install.c \
-        src/cgroup-attr.c
+        src/cgroup-attr.c \
+        src/sd-id128.c
 
 nodist_libsystemd_core_la_SOURCES = \
         src/load-fragment-gperf.c \
@@ -741,14 +792,21 @@ EXTRA_DIST += \
         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/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 \
         src/dbus-loop.h \
-        src/spawn-agent.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 \
@@ -778,6 +836,7 @@ MANPAGES = \
        man/daemon.7 \
        man/sd-daemon.7 \
        man/sd-readahead.7 \
+       man/sd-login.7 \
        man/runlevel.8 \
        man/telinit.8 \
        man/halt.8 \
@@ -796,7 +855,13 @@ MANPAGES = \
        man/modules-load.d.5 \
        man/sysctl.d.5 \
         man/systemd-ask-password.1 \
-        man/systemd-loginctl.1
+        man/systemd-loginctl.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 \
+        man/sd_login_monitor_new.3
 
 if ENABLE_BINFMT
 MANPAGES += \
@@ -809,16 +874,44 @@ 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/sd_login_monitor_unref.3 \
+        man/sd_login_monitor_flush.3 \
+        man/sd_login_monitor_get_fd.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
+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
 
 dist_man_MANS = \
        $(MANPAGES) \
@@ -925,7 +1018,7 @@ test_strv_LDADD = \
        libsystemd-basic.la
 
 test_login_SOURCES = \
-       src/test-login.c
+       src/login/test-login.c
 
 test_login_CFLAGS = \
        $(AM_CFLAGS)
@@ -947,6 +1040,90 @@ test_install_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
@@ -1032,6 +1209,12 @@ systemd_localed_LDADD = \
        libsystemd-daemon.la \
        $(DBUS_LIBS)
 
+dist_pkgdata_DATA = \
+        src/kbd-model-map
+
+dist_noinst_SCRIPT = \
+        src/generate-kbd-model-map
+
 systemd_timedated_SOURCES = \
        src/timedated.c \
         src/dbus-common.c \
@@ -1047,25 +1230,25 @@ systemd_timedated_LDADD = \
        $(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/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/logind-gperf.c
+        src/login/logind-gperf.c
 
 EXTRA_DIST += \
-        src/logind-gperf.gperf
+        src/login/logind-gperf.gperf
 
 systemd_logind_CFLAGS = \
        $(AM_CFLAGS) \
@@ -1081,14 +1264,16 @@ systemd_logind_LDADD = \
         $(ACL_LIBS)
 
 systemd_uaccess_SOURCES = \
-       src/uaccess.c
+       src/login/uaccess.c
 
 if HAVE_ACL
 systemd_logind_SOURCES += \
-       src/logind-acl.c
+       src/login/logind-acl.c \
+        src/acl-util.c
 
 systemd_uaccess_SOURCES += \
-       src/logind-acl.c
+       src/login/logind-acl.c \
+        src/acl-util.c
 endif
 
 systemd_uaccess_CFLAGS = \
@@ -1136,7 +1321,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)
@@ -1248,6 +1434,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
@@ -1324,7 +1519,7 @@ systemctl_LDADD = \
        $(DBUS_LIBS)
 
 systemd_loginctl_SOURCES = \
-       src/loginctl.c \
+       src/login/loginctl.c \
        src/dbus-common.c \
        src/cgroup-show.c \
        src/cgroup-util.c \
@@ -1418,7 +1613,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) \
@@ -1431,6 +1627,7 @@ systemadm_CFLAGS = \
 systemadm_VALAFLAGS = \
        --pkg=posix \
        --pkg=gtk+-2.0 \
+       --pkg=gee-1.0 \
        -g
 
 systemadm_LDADD = \
@@ -1523,7 +1720,7 @@ libsystemd-daemon-uninstall-hook:
        rm -f $(DESTDIR)$(rootlibdir)/libsystemd-daemon.so*
 
 libsystemd_login_la_SOURCES = \
-        src/sd-login.c \
+        src/login/sd-login.c \
         src/cgroup-util.c
 
 libsystemd_login_la_CFLAGS = \
@@ -1551,6 +1748,69 @@ libsystemd-login-install-hook:
 libsystemd-login-uninstall-hook:
        rm -f $(DESTDIR)$(rootlibdir)/libsystemd-login.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/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 $@) && \
        $(SED)  -e 's,@rootlibexecdir\@,$(rootlibexecdir),g' \
@@ -1626,7 +1886,7 @@ CLEANFILES = \
         src/load-fragment-gperf.gperf \
         src/load-fragment-gperf.c \
         src/load-fragment-gperf-nulstr.c \
-        src/logind-gperf.c
+        src/login/logind-gperf.c
 
 if HAVE_VALAC
 CLEANFILES += \
@@ -1636,7 +1896,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 $@) && \
@@ -1649,11 +1909,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
@@ -1767,11 +2027,12 @@ endif
                rm -f user && \
                $(LN_S) $(pkgsysconfdir)/user user )
        ( cd $(DESTDIR)$(systemunitdir)/sockets.target.wants && \
-               rm -f systemd-initctl.socket systemd-stdout-syslog-bridge.socket systemd-shutdownd.socket syslog.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 )
@@ -1838,11 +2099,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 \
+               rm -f dev-hugepages.mount \
+                       dev-mqueue.mount \
                         sys-kernel-config.mount \
                        sys-kernel-debug.mount \
-                       sys-kernel-security.automount \
+                       sys-kernel-security.mount \
+                       sys-fs-fuse-connections.mount \
                        systemd-vconsole-setup.service \
                        systemd-modules-load.service \
                        systemd-random-seed-load.service \
@@ -1851,11 +2113,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) ../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.automount sys-kernel-security.automount && \
+               $(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 && \
@@ -1937,9 +2200,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 )
@@ -1954,9 +2214,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 )
@@ -1978,9 +2235,6 @@ 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 )
@@ -1989,6 +2243,20 @@ if TARGET_SUSE
                $(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 && \
@@ -2015,3 +2283,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