chiark / gitweb /
logind: add service for per-user shared systemd daemon
[elogind.git] / Makefile.am
index 120c6034e23dece1a7456aeda700731073a4db5b..9a67505623453154005872dd149008ad2edea2ec 100644 (file)
@@ -158,7 +158,11 @@ rootlibexec_PROGRAMS = \
        systemd-ac-power \
        systemd-detect-virt \
        systemd-sysctl \
-        systemd-hostnamed
+        systemd-hostnamed \
+        systemd-localed \
+        systemd-timedated \
+        systemd-logind \
+        systemd-uaccess
 
 if ENABLE_BINFMT
 rootlibexec_PROGRAMS += \
@@ -193,19 +197,32 @@ 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.hostname1.conf \
+        src/org.freedesktop.locale1.conf \
+        src/org.freedesktop.timedate1.conf \
+        src/org.freedesktop.login1.conf
 
 dist_dbussystemservice_DATA = \
        src/org.freedesktop.systemd1.service \
-        src/org.freedesktop.hostname1.service
+        src/org.freedesktop.hostname1.service \
+        src/org.freedesktop.locale1.service \
+        src/org.freedesktop.timedate1.service \
+        src/org.freedesktop.login1.service
 
 dist_udevrules_DATA = \
+        src/70-uaccess.rules \
+        src/71-seat.rules \
        src/99-systemd.rules
 
+nodist_udevrules_DATA = \
+        src/73-seat-late.rules
+
 dbusinterface_DATA = \
        org.freedesktop.systemd1.Manager.xml \
        org.freedesktop.systemd1.Job.xml \
@@ -219,7 +236,10 @@ 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.hostname1.xml \
+        org.freedesktop.locale1.xml \
+        org.freedesktop.timedate1.xml
 
 dist_bashcompletion_DATA = \
        src/systemctl-bash-completion.sh
@@ -244,6 +264,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 \
@@ -274,8 +295,6 @@ dist_systemunit_DATA = \
        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 \
@@ -303,11 +322,13 @@ 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-timedated.service \
+       units/systemd-logind.service \
        units/systemd-kmsg-syslogd.service \
        units/systemd-modules-load.service \
        units/systemd-vconsole-setup.service \
@@ -332,7 +353,8 @@ 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 += \
@@ -344,19 +366,20 @@ dist_userunit_DATA = \
        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-timedated.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 \
@@ -382,9 +405,11 @@ EXTRA_DIST = \
        units/fsck@.service.in \
        units/fsck-root.service.in \
        units/quotacheck.service.in \
+        units/user@.service.in \
        systemd.pc.in \
        introspect.awk \
-       src/org.freedesktop.systemd1.policy.in
+       src/org.freedesktop.systemd1.policy.in \
+        src/73-seat-late.rules.in
 
 if ENABLE_BINFMT
 EXTRA_DIST += \
@@ -445,7 +470,10 @@ nodist_polkitpolicy_DATA = \
        src/org.freedesktop.systemd1.policy
 
 dist_polkitpolicy_DATA = \
-        src/org.freedesktop.hostname1.policy
+        src/org.freedesktop.hostname1.policy \
+        src/org.freedesktop.locale1.policy \
+        src/org.freedesktop.timedate1.policy \
+        src/org.freedesktop.login1.policy
 
 noinst_LTLIBRARIES = \
        libsystemd-basic.la \
@@ -520,7 +548,8 @@ 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
 
 libsystemd_core_la_CFLAGS = \
        $(AM_CFLAGS) \
@@ -603,6 +632,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 \
@@ -799,7 +829,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) \
@@ -810,6 +841,77 @@ 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/logind-acl.c \
+        src/dbus-common.c \
+        src/dbus-loop.c \
+        src/cgroup-util.c \
+        src/polkit.c
+
+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 \
+        src/logind-acl.c
+
+systemd_uaccess_CFLAGS = \
+       $(AM_CFLAGS) \
+        $(UDEV_CFLAGS) \
+        $(ACL_CFLAGS)
+
+systemd_uaccess_LDADD = \
+       libsystemd-basic.la \
+        $(UDEV_LIBS) \
+        $(ACL_LIBS)
+
 systemd_shutdown_SOURCES = \
        src/mount-setup.c \
        src/umount.c \
@@ -1159,10 +1261,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 = \
@@ -1175,7 +1279,8 @@ pam_systemd_la_LDFLAGS = \
 pam_systemd_la_LIBADD = \
        libsystemd-basic.la \
        libsystemd-daemon.la \
-       $(PAM_LIBS)
+       $(PAM_LIBS) \
+        $(DBUS_LIBS)
 
 SED_PROCESS = \
        $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
@@ -1207,6 +1312,9 @@ man/%: man/%.in Makefile
 src/%.policy: src/%.policy.in Makefile
        $(SED_PROCESS)
 
+src/%.rules: src/%.rules.in Makefile
+       $(SED_PROCESS)
+
 M4_PROCESS_SYSTEM = \
        $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
        $(M4) -P $(M4_DISTRO_FLAG) -DFOR_SYSTEM=1 < $< > $@ || rm $@
@@ -1307,6 +1415,21 @@ org.freedesktop.systemd1.%.xml: systemd
                $(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 && \
+               $(STRINGS) $@.tmp | $(AWK) -f $(srcdir)/introspect.awk | \
+               $(DBUS_PREPROCESS) -o $@ - && rm $@.tmp
+
 CLEANFILES += \
        $(dbusinterface_DATA)
 
@@ -1375,10 +1498,8 @@ endif
                $(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 \
@@ -1392,11 +1513,9 @@ endif
                $(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 )
@@ -1410,29 +1529,26 @@ 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 && \
+               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 && \
                $(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-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 )
        ( 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 \