man: for ExecStart= provide more details on env var substitution and how that turns...

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 56446b011f6d81f8b1b32fff13e0e1761c4c4219..f4a17aa7f53b6e1269a59eced2b89534e2f23e6d 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,7 +20,7 @@ ACLOCAL_AMFLAGS = -I m4
 SUBDIRS = po
 
 LIBSYSTEMD_LOGIN_CURRENT=0
-LIBSYSTEMD_LOGIN_REVISION=3
+LIBSYSTEMD_LOGIN_REVISION=5
 LIBSYSTEMD_LOGIN_AGE=0
 
 LIBSYSTEMD_DAEMON_CURRENT=0
@@ -76,6 +76,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
@@ -150,7 +151,7 @@ bin_PROGRAMS += \
 endif
 
 rootlibexec_PROGRAMS = \
-       systemd-logger \
+       systemd-stdout-syslog-bridge \
        systemd-cgroups-agent \
        systemd-initctl \
        systemd-update-utmp \
@@ -354,17 +355,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 \
@@ -395,7 +394,7 @@ 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-logind.service \
        units/systemd-kmsg-syslogd.service \
@@ -458,7 +457,7 @@ EXTRA_DIST = \
        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-logind.service.in \
        units/systemd-kmsg-syslogd.service.in \
@@ -615,6 +614,7 @@ noinst_LTLIBRARIES = \
 
 libsystemd_basic_la_SOURCES = \
        src/util.c \
+        src/virt.c \
        src/label.c \
        src/hashmap.c \
        src/set.c \
@@ -787,6 +787,7 @@ MANPAGES = \
        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 \
@@ -946,11 +947,11 @@ test_install_CFLAGS = \
 test_install_LDADD = \
        libsystemd-basic.la
 
-systemd_logger_SOURCES = \
-       src/logger.c \
+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)
@@ -1031,6 +1032,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 \
@@ -1766,8 +1773,8 @@ 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 && \
+               $(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 )
@@ -1837,10 +1844,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 \
@@ -1849,10 +1858,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 && \
@@ -2012,3 +2023,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