X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=9a67505623453154005872dd149008ad2edea2ec;hp=f455f2110957fa443ca952693f0ae332f920d310;hb=f8788303929c27d0b7f7e4b8ffe22767a3d0ff67;hpb=5eda94dda25bccda928c4b33c790dbe748573a22 diff --git a/Makefile.am b/Makefile.am index f455f2110..9a6750562 100644 --- a/Makefile.am +++ b/Makefile.am @@ -159,6 +159,8 @@ rootlibexec_PROGRAMS = \ systemd-detect-virt \ systemd-sysctl \ systemd-hostnamed \ + systemd-localed \ + systemd-timedated \ systemd-logind \ systemd-uaccess @@ -195,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 \ @@ -221,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 @@ -308,6 +326,9 @@ nodist_systemunit_DATA = \ 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 += \ @@ -355,6 +377,9 @@ EXTRA_DIST = \ 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 \ @@ -380,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 += \ @@ -443,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 \ @@ -518,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) \ @@ -601,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 \ @@ -797,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) \ @@ -808,16 +841,49 @@ 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/cgroup-util.c \ + src/polkit.c systemd_logind_CFLAGS = \ $(AM_CFLAGS) \ @@ -1195,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 = \ @@ -1211,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 $@) && \ @@ -1243,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 $@ @@ -1343,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) @@ -1442,23 +1529,23 @@ 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 )