X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=c288ad4c2909dc0a54d2014c190326336e19d12b;hb=ac2dcbb2155fa421b826cfd45ec98d4237b1c9fe;hp=0439957ee6b8b38efca4fcbcee2b5689b79878f9;hpb=f401e48c2db22ff9d1a05885b5599bebf19c2707;p=elogind.git diff --git a/Makefile.am b/Makefile.am index 0439957ee..c288ad4c2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -197,21 +197,28 @@ 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.locale1.conf \ - src/org.freedesktop.timedate1.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.locale1.service \ - src/org.freedesktop.timedate1.service + src/org.freedesktop.timedate1.service \ + src/org.freedesktop.login1.service dist_udevrules_DATA = \ + src/70-uaccess.rules \ + src/71-seat.rules \ + src/73-seat-late.rules \ src/99-systemd.rules dbusinterface_DATA = \ @@ -227,7 +234,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 @@ -316,6 +326,7 @@ nodist_systemunit_DATA = \ 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 \ @@ -365,6 +376,7 @@ EXTRA_DIST = \ 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 \ @@ -455,7 +467,8 @@ nodist_polkitpolicy_DATA = \ dist_polkitpolicy_DATA = \ src/org.freedesktop.hostname1.policy \ src/org.freedesktop.locale1.policy \ - src/org.freedesktop.timedate1.policy + src/org.freedesktop.timedate1.policy \ + src/org.freedesktop.login1.policy noinst_LTLIBRARIES = \ libsystemd-basic.la \ @@ -862,7 +875,8 @@ systemd_logind_SOURCES = \ 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) \ @@ -1240,10 +1254,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 = \ @@ -1256,7 +1272,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 $@) && \ @@ -1388,6 +1405,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) @@ -1487,25 +1519,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-localed.service dbus-org.freedesktop.locale1.service && \ - $(LN_S) systemd-timedate.service dbus-org.freedesktop.timedate1.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 )