X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=66a64fd4faded31e55114159329c40d424b97baa;hp=ef3bd846c6a99e87c0829097c1c112d85ae81c43;hb=7c83341a593160e2b4739bdb8a1ad76b21bbdf9e;hpb=f47cd184c0ff80e025428e9e385e61bda1ef3d69

diff --git a/Makefile.am b/Makefile.am
index ef3bd846c..66a64fd4f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,7 +20,7 @@ ACLOCAL_AMFLAGS = -I m4
 SUBDIRS = po
 
 LIBSYSTEMD_LOGIN_CURRENT=0
-LIBSYSTEMD_LOGIN_REVISION=2
+LIBSYSTEMD_LOGIN_REVISION=5
 LIBSYSTEMD_LOGIN_AGE=0
 
 LIBSYSTEMD_DAEMON_CURRENT=0
@@ -150,7 +150,7 @@ bin_PROGRAMS += \
 endif
 
 rootlibexec_PROGRAMS = \
-	systemd-logger \
+	systemd-stdout-syslog-bridge \
 	systemd-cgroups-agent \
 	systemd-initctl \
 	systemd-update-utmp \
@@ -171,7 +171,6 @@ rootlibexec_PROGRAMS = \
 	systemd-ac-power \
 	systemd-detect-virt \
 	systemd-sysctl \
-        systemd-localed \
         systemd-logind \
         systemd-uaccess
 
@@ -190,6 +189,11 @@ rootlibexec_PROGRAMS += \
 	systemd-timedated
 endif
 
+if ENABLE_LOCALED
+rootlibexec_PROGRAMS += \
+	systemd-localed
+endif
+
 systemgenerator_PROGRAMS = \
 	systemd-getty-generator
 
@@ -234,7 +238,6 @@ dist_pkgsysconf_DATA = \
 
 dist_dbuspolicy_DATA = \
 	src/org.freedesktop.systemd1.conf \
-        src/org.freedesktop.locale1.conf \
         src/org.freedesktop.login1.conf
 
 if ENABLE_HOSTNAMED
@@ -247,9 +250,13 @@ dist_dbuspolicy_DATA += \
 	src/org.freedesktop.timedate1.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.locale1.service \
         src/org.freedesktop.login1.service
 
 if ENABLE_HOSTNAMED
@@ -262,6 +269,11 @@ dist_dbussystemservice_DATA += \
 	src/org.freedesktop.timedate1.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
@@ -283,8 +295,7 @@ dbusinterface_DATA = \
 	org.freedesktop.systemd1.Automount.xml \
 	org.freedesktop.systemd1.Snapshot.xml \
 	org.freedesktop.systemd1.Swap.xml \
-	org.freedesktop.systemd1.Path.xml \
-        org.freedesktop.locale1.xml
+	org.freedesktop.systemd1.Path.xml
 
 if ENABLE_HOSTNAMED
 dbusinterface_DATA += \
@@ -296,11 +307,17 @@ dbusinterface_DATA += \
 	org.freedesktop.timedate1.xml
 endif
 
+if ENABLE_LOCALED
+dbusinterface_DATA += \
+	org.freedesktop.locale1.xml
+endif
+
 dist_bashcompletion_DATA = \
 	src/systemctl-bash-completion.sh
 
 dist_tmpfiles_DATA = \
 	tmpfiles.d/systemd.conf \
+	tmpfiles.d/tmp.conf \
 	tmpfiles.d/x11.conf
 
 if HAVE_SYSV_COMPAT
@@ -337,17 +354,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 \
@@ -378,9 +393,8 @@ 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-localed.service \
 	units/systemd-logind.service \
 	units/systemd-kmsg-syslogd.service \
 	units/systemd-modules-load.service \
@@ -424,6 +438,11 @@ nodist_systemunit_DATA += \
 	units/systemd-timedated.service
 endif
 
+if ENABLE_LOCALED
+nodist_systemunit_DATA += \
+	units/systemd-localed.service
+endif
+
 dist_userunit_DATA = \
 	units/user/default.target \
 	units/user/exit.target
@@ -437,9 +456,8 @@ 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-localed.service.in \
 	units/systemd-logind.service.in \
 	units/systemd-kmsg-syslogd.service.in \
 	units/systemd-modules-load.service.in \
@@ -491,6 +509,11 @@ EXTRA_DIST += \
 	units/systemd-timedated.service.in
 endif
 
+if ENABLE_LOCALED
+EXTRA_DIST += \
+	units/systemd-localed.service.in
+endif
+
 if TARGET_FEDORA
 dist_systemunit_DATA += \
 	units/fedora/prefdm.service \
@@ -553,7 +576,6 @@ pkgconfiglib_DATA = \
 
 # Passed through intltool only
 polkitpolicy_in_files = \
-        src/org.freedesktop.locale1.policy.in \
         src/org.freedesktop.login1.policy.in
 
 if ENABLE_HOSTNAMED
@@ -566,6 +588,11 @@ polkitpolicy_in_files += \
 	src/org.freedesktop.timedate1.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
@@ -586,6 +613,7 @@ noinst_LTLIBRARIES = \
 
 libsystemd_basic_la_SOURCES = \
 	src/util.c \
+        src/virt.c \
 	src/label.c \
 	src/hashmap.c \
 	src/set.c \
@@ -758,6 +786,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 \
@@ -917,11 +946,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)
@@ -1737,8 +1766,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 )
@@ -1790,10 +1819,9 @@ 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.locale1.service dbus-org.freedesktop.login1.service autovt@.service && \
+		rm -f default.target ctrl-alt-del.target dbus-org.freedesktop.login1.service autovt@.service && \
 		$(LN_S) graphical.target default.target && \
 		$(LN_S) reboot.target ctrl-alt-del.target && \
-                $(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 && \
@@ -1809,10 +1837,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 \
@@ -1821,10 +1851,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 && \
@@ -1849,6 +1881,11 @@ if ENABLE_TIMEDATED
 	( cd $(DESTDIR)$(systemunitdir) && \
 		rm -f dbus-org.freedesktop.timedate1.service  && \
                 $(LN_S) systemd-timedated.service dbus-org.freedesktop.timedate1.service )
+endif
+if ENABLE_LOCALED
+	( cd $(DESTDIR)$(systemunitdir) && \
+		rm -f dbus-org.freedesktop.locale1.service && \
+                $(LN_S) systemd-localed.service dbus-org.freedesktop.locale1.service )
 endif
 	( cd $(DESTDIR)$(systemunitdir)/basic.target.wants && \
 		rm -f systemd-tmpfiles-clean.timer && \