X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=53167ff20ee31ad650ee9c27418f269b4b7870e4;hb=a61933adac8cd9361df5121ecd182bb7f0d2d511;hp=8da2e1bbeed2d164afff5bb45a0883908c9ca3c3;hpb=0b191e603cc31ef0aff435fe20d49c7df39dfb8c;p=elogind.git diff --git a/Makefile.am b/Makefile.am index 8da2e1bbe..53167ff20 100644 --- a/Makefile.am +++ b/Makefile.am @@ -17,6 +17,8 @@ ACLOCAL_AMFLAGS = -I m4 +SUBDIRS = po + # Dirs of external packages dbuspolicydir=@dbuspolicydir@ dbussessionservicedir=@dbussessionservicedir@ @@ -116,6 +118,7 @@ endif rootbin_PROGRAMS = \ systemd \ systemctl \ + systemd-loginctl \ systemd-notify \ systemd-ask-password \ systemd-tty-ask-password-agent \ @@ -353,7 +356,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 += \ @@ -404,9 +408,9 @@ 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/73-seat-late.rules.in if ENABLE_BINFMT @@ -433,6 +437,12 @@ dist_systemunit_DATA += \ units/frugalware/display-manager.service endif +if TARGET_SUSE +dist_systemunit_DATA += \ + units/suse/rc-local.service \ + units/suse/halt-local.service +endif + if HAVE_PLYMOUTH dist_systemunit_DATA += \ units/plymouth-start.service \ @@ -464,14 +474,26 @@ dist_doc_DATA = \ pkgconfigdata_DATA = \ systemd.pc +# Passed through intltool only +polkitpolicy_in_files = \ + src/org.freedesktop.hostname1.policy.in \ + src/org.freedesktop.locale1.policy.in \ + src/org.freedesktop.timedate1.policy.in \ + src/org.freedesktop.login1.policy.in + +# First passed through sed, followed by intltool +polkitpolicy_in_in_files = \ + src/org.freedesktop.systemd1.policy.in.in + nodist_polkitpolicy_DATA = \ - src/org.freedesktop.systemd1.policy + $(polkitpolicy_in_files:.policy.in=.policy) \ + $(polkitpolicy_in_in_files:.policy.in.in=.policy) + +EXTRA_DIST += \ + $(polkitpolicy_in_files) \ + $(polkitpolicy_in_in_files) -dist_polkitpolicy_DATA = \ - src/org.freedesktop.hostname1.policy \ - src/org.freedesktop.locale1.policy \ - src/org.freedesktop.timedate1.policy \ - src/org.freedesktop.login1.policy +@INTLTOOL_POLICY_RULE@ noinst_LTLIBRARIES = \ libsystemd-basic.la \ @@ -546,7 +568,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) \ @@ -593,7 +616,17 @@ EXTRA_DIST += \ src/shutdownd.h \ src/umount.h \ src/readahead-common.h \ - src/ask-password-api.h + src/ask-password-api.h \ + src/pager.h \ + src/sysfs-show.h \ + src/polkit.h \ + src/logind.h \ + src/logind-device.h \ + src/logind-seat.h \ + src/logind-session.h \ + src/logind-user.h \ + src/logind-acl.h \ + src/dbus-loop.h MANPAGES = \ man/systemd.1 \ @@ -639,7 +672,8 @@ MANPAGES = \ man/machine-info.5 \ man/modules-load.d.5 \ man/sysctl.d.5 \ - man/systemd-ask-password.1 + man/systemd-ask-password.1 \ + man/systemd-loginctl.1 if ENABLE_BINFMT MANPAGES += \ @@ -876,7 +910,6 @@ systemd_logind_SOURCES = \ 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 \ @@ -896,8 +929,15 @@ systemd_logind_LDADD = \ $(ACL_LIBS) systemd_uaccess_SOURCES = \ - src/uaccess.c \ - src/logind-acl.c + src/uaccess.c + +if HAVE_ACL +systemd_logind_SOURCES += \ + src/logind-acl.c + +systemd_uaccess_SOURCES += \ + src/logind-acl.c +endif systemd_uaccess_CFLAGS = \ $(AM_CFLAGS) \ @@ -1115,7 +1155,8 @@ systemctl_SOURCES = \ src/cgroup-show.c \ src/cgroup-util.c \ src/exit-status.c \ - src/unit-name.c + src/unit-name.c \ + src/pager.c systemctl_CFLAGS = \ $(AM_CFLAGS) \ @@ -1126,6 +1167,24 @@ systemctl_LDADD = \ libsystemd-daemon.la \ $(DBUS_LIBS) +systemd_loginctl_SOURCES = \ + src/loginctl.c \ + src/dbus-common.c \ + src/cgroup-show.c \ + src/cgroup-util.c \ + src/pager.c \ + src/sysfs-show.c + +systemd_loginctl_CFLAGS = \ + $(AM_CFLAGS) \ + $(DBUS_CFLAGS) \ + $(UDEV_CFLAGS) + +systemd_loginctl_LDADD = \ + libsystemd-basic.la \ + $(DBUS_LIBS) \ + $(UDEV_LIBS) + systemd_notify_SOURCES = \ src/notify.c \ src/sd-readahead.c @@ -1174,7 +1233,8 @@ systemd_readahead_replay_LDADD = \ systemd_cgls_SOURCES = \ src/cgls.c \ src/cgroup-show.c \ - src/cgroup-util.c + src/cgroup-util.c \ + src/pager.c systemd_cgls_CFLAGS = \ $(AM_CFLAGS) @@ -1306,7 +1366,7 @@ man/%: man/%.in Makefile %.pc: %.pc.in Makefile $(SED_PROCESS) -src/%.policy: src/%.policy.in Makefile +src/%.policy.in: src/%.policy.in.in Makefile $(SED_PROCESS) src/%.rules: src/%.rules.in Makefile @@ -1332,7 +1392,8 @@ CLEANFILES = \ $(nodist_man_MANS) \ ${XML_IN_FILES:.xml.in=.html} \ $(pkgconfigdata_DATA) \ - src/org.freedesktop.systemd1.policy + $(nodist_polkitpolicy_DATA) \ + src/73-seat-late.rules if HAVE_VALAC CLEANFILES += \ @@ -1668,6 +1729,19 @@ if TARGET_DEBIAN_OR_UBUNTU $(LN_S) multi-user.target runlevel5.target ) endif +if TARGET_SUSE + $(MKDIR_P) -m 0755 $(DESTDIR)$(systemunitdir)/final.target.wants + ( cd $(DESTDIR)$(systemunitdir)/multi-user.target.wants && \ + rm -f rc-local.service && \ + $(LN_S) $(systemunitdir)/rc-local.service rc-local.service ) + ( cd $(DESTDIR)$(systemunitdir) && \ + rm -f local.service && \ + $(LN_S) rc-local.service local.service ) + ( cd $(DESTDIR)$(systemunitdir)/final.target.wants && \ + rm -f halt-local.service && \ + $(LN_S) $(systemunitdir)/halt-local.service halt-local.service ) +endif + if HAVE_SYSV_COMPAT ( cd $(DESTDIR)$(systemunitdir)/local-fs.target.wants && \ rm -f var-lock.mount && \