X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=54f414a7508894859793956c5a393d92d07f8250;hp=7ca0ae858f993182c1dbb3a96e245819da88ea48;hb=ae446765eb0605d2451bb4dd7c336672bcc7ab0c;hpb=835c60f50c861bce2c4bbcd35d51307a5443b5cf diff --git a/Makefile.am b/Makefile.am index 7ca0ae858..54f414a75 100644 --- a/Makefile.am +++ b/Makefile.am @@ -17,6 +17,16 @@ ACLOCAL_AMFLAGS = -I m4 +SUBDIRS = po + +LIBSYSTEMD_LOGIN_CURRENT=0 +LIBSYSTEMD_LOGIN_REVISION=0 +LIBSYSTEMD_LOGIN_AGE=0 + +LIBSYSTEMD_DAEMON_CURRENT=0 +LIBSYSTEMD_DAEMON_REVISION=0 +LIBSYSTEMD_DAEMON_AGE=0 + # Dirs of external packages dbuspolicydir=@dbuspolicydir@ dbussessionservicedir=@dbussessionservicedir@ @@ -33,6 +43,7 @@ pkgsysconfdir=$(sysconfdir)/systemd userunitdir=$(prefix)/lib/systemd/user tmpfilesdir=$(prefix)/lib/tmpfiles.d usergeneratordir=$(pkglibexecdir)/user-generators +pkgincludedir=$(includedir)/systemd # And these are the special ones for / rootdir=@rootdir@ @@ -116,6 +127,7 @@ endif rootbin_PROGRAMS = \ systemd \ systemctl \ + systemd-loginctl \ systemd-notify \ systemd-ask-password \ systemd-tty-ask-password-agent \ @@ -158,7 +170,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 += \ @@ -176,6 +192,14 @@ systemgenerator_PROGRAMS += \ systemd-cryptsetup-generator endif +lib_LTLIBRARIES = \ + libsystemd-daemon.la \ + libsystemd-login.la + +pkginclude_HEADERS = \ + src/sd-daemon.h \ + src/sd-login.h + noinst_PROGRAMS = \ test-engine \ test-job-type \ @@ -185,7 +209,8 @@ noinst_PROGRAMS = \ test-daemon \ test-cgroup \ test-env-replace \ - test-strv + test-strv \ + test-login if HAVE_PAM pamlib_LTLIBRARIES = \ @@ -193,19 +218,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 +257,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 @@ -306,6 +347,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 \ @@ -330,7 +374,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 += \ @@ -353,6 +398,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 \ @@ -378,9 +426,12 @@ EXTRA_DIST = \ units/fsck@.service.in \ units/fsck-root.service.in \ units/quotacheck.service.in \ + units/user@.service.in \ systemd.pc.in \ + libsystemd-daemon.pc.in \ + libsystemd-login.pc.in \ introspect.awk \ - src/org.freedesktop.systemd1.policy.in + src/73-seat-late.rules.in if ENABLE_BINFMT EXTRA_DIST += \ @@ -406,6 +457,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 \ @@ -435,18 +492,34 @@ dist_doc_DATA = \ src/sd-readahead.c pkgconfigdata_DATA = \ - systemd.pc + systemd.pc \ + libsystemd-daemon.pc \ + libsystemd-login.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 +@INTLTOOL_POLICY_RULE@ noinst_LTLIBRARIES = \ libsystemd-basic.la \ - libsystemd-core.la \ - libsystemd-daemon.la + libsystemd-core.la libsystemd_basic_la_SOURCES = \ src/util.c \ @@ -516,7 +589,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) \ @@ -534,9 +608,6 @@ libsystemd_core_la_LIBADD = \ $(PAM_LIBS) \ $(AUDIT_LIBS) -libsystemd_daemon_la_SOURCES = \ - src/sd-daemon.c - # This is needed because automake is buggy in how it generates the # rules for C programs, but not Vala programs. We therefore can't # list the .h files as dependencies if we want make dist to work. @@ -563,7 +634,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 \ @@ -599,6 +680,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 \ @@ -608,7 +690,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 += \ @@ -736,6 +819,16 @@ test_strv_CFLAGS = \ test_strv_LDADD = \ libsystemd-basic.la +test_login_SOURCES = \ + src/test-login.c + +test_login_CFLAGS = \ + $(AM_CFLAGS) + +test_login_LDADD = \ + libsystemd-basic.la \ + libsystemd-login.la + systemd_logger_SOURCES = \ src/logger.c \ src/tcpwrap.c @@ -795,7 +888,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) \ @@ -806,6 +900,84 @@ 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/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 + +if HAVE_ACL +systemd_logind_SOURCES += \ + src/logind-acl.c + +systemd_uaccess_SOURCES += \ + src/logind-acl.c +endif + +systemd_uaccess_CFLAGS = \ + $(AM_CFLAGS) \ + $(UDEV_CFLAGS) \ + $(ACL_CFLAGS) + +systemd_uaccess_LDADD = \ + libsystemd-basic.la \ + libsystemd-daemon.la \ + $(UDEV_LIBS) \ + $(ACL_LIBS) + systemd_shutdown_SOURCES = \ src/mount-setup.c \ src/umount.c \ @@ -1012,7 +1184,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) \ @@ -1023,6 +1196,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 @@ -1071,7 +1262,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) @@ -1155,10 +1347,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 = \ @@ -1171,7 +1365,50 @@ pam_systemd_la_LDFLAGS = \ pam_systemd_la_LIBADD = \ libsystemd-basic.la \ libsystemd-daemon.la \ - $(PAM_LIBS) + $(PAM_LIBS) \ + $(DBUS_LIBS) + +libsystemd_daemon_la_SOURCES = \ + src/sd-daemon.c + +libsystemd_daemon_la_CFLAGS = \ + $(AM_CFLAGS) \ + -fvisibility=hidden \ + -DSD_EXPORT_SYMBOLS + +libsystemd_daemon_la_LDFLAGS = \ + -shared \ + -version-info $(LIBSYSTEMD_DAEMON_CURRENT):$(LIBSYSTEMD_DAEMON_REVISION):$(LIBSYSTEMD_DAEMON_AGE) \ + -Wl,--version-script=$(top_srcdir)/src/libsystemd-daemon.sym + +# move lib from $(libdir) to $(rootlibdir) and update devel link, if needed +libsystemd-daemon-install-hook: + if test "$(libdir)" != "$(rootlibdir)"; then \ + mkdir -p $(DESTDIR)$(rootlibdir) && \ + so_img_name=$$(readlink $(DESTDIR)$(libdir)/libsystemd-daemon.so) && \ + so_img_rel_target_prefix=$$(echo $(libdir) | sed 's,\(^/\|\)[^/][^/]*,..,g') && \ + ln -sf $$so_img_rel_target_prefix$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/libsystemd-daemon.so && \ + mv $(DESTDIR)$(libdir)/libsystemd-daemon.so.* $(DESTDIR)$(rootlibdir); \ + fi + +libsystemd-daemon-uninstall-hook: + rm -f $(DESTDIR)$(rootlibdir)/libsystemd-daemon.so* + +libsystemd_login_la_SOURCES = \ + src/sd-login.c \ + src/cgroup-util.c + +libsystemd_login_la_CFLAGS = \ + $(AM_CFLAGS) \ + -fvisibility=hidden + +libsystemd_login_la_LDFLAGS = \ + -shared \ + -version-info $(LIBSYSTEMD_LOGIN_CURRENT):$(LIBSYSTEMD_LOGIN_REVISION):$(LIBSYSTEMD_LOGIN_AGE) \ + -Wl,--version-script=$(top_srcdir)/src/libsystemd-login.sym + +libsystemd_login_la_LIBADD = \ + libsystemd-basic.la SED_PROCESS = \ $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \ @@ -1189,6 +1426,9 @@ SED_PROCESS = \ -e 's,@PACKAGE_NAME\@,$(PACKAGE_NAME),g' \ -e 's,@PACKAGE_URL\@,$(PACKAGE_URL),g' \ -e 's,@prefix\@,$(prefix),g' \ + -e 's,@exec_prefix\@,$(exec_prefix),g' \ + -e 's,@libdir\@,$(libdir),g' \ + -e 's,@includedir\@,$(includedir),g' \ < $< > $@ || rm $@ units/%: units/%.in Makefile @@ -1200,7 +1440,10 @@ 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 $(SED_PROCESS) M4_PROCESS_SYSTEM = \ @@ -1223,7 +1466,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 += \ @@ -1299,7 +1543,22 @@ endif DBUS_PREPROCESS = $(CPP) -P $(DBUS_CFLAGS) -imacros dbus/dbus-protocol.h org.freedesktop.systemd1.%.xml: systemd - $(AM_V_GEN)$(OBJCOPY) -O binary -j introspect.$* $< $@.tmp && \ + $(AM_V_GEN)$(LIBTOOL) --mode=execute $(OBJCOPY) -O binary -j introspect.$* $< $@.tmp && \ + $(STRINGS) $@.tmp | $(AWK) -f $(srcdir)/introspect.awk | \ + $(DBUS_PREPROCESS) -o $@ - && rm $@.tmp + +org.freedesktop.hostname1.xml: systemd-hostnamed + $(AM_V_GEN)$(LIBTOOL) --mode=execute $(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)$(LIBTOOL) --mode=execute $(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)$(LIBTOOL) --mode=execute $(OBJCOPY) -O binary -j introspect.timedate1 $< $@.tmp && \ $(STRINGS) $@.tmp | $(AWK) -f $(srcdir)/introspect.awk | \ $(DBUS_PREPROCESS) -o $@ - && rm $@.tmp @@ -1402,23 +1661,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 ) @@ -1544,12 +1803,29 @@ 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 && \ $(LN_S) ../var-lock.mount var-lock.mount ) endif +install-exec-hook: libsystemd-daemon-install-hook + +uninstall-hook: libsystemd-daemon-uninstall-hook + DISTCHECK_CONFIGURE_FLAGS = \ --with-dbuspolicydir=$$dc_install_base/$(dbuspolicydir) \ --with-dbussessionservicedir=$$dc_install_base/$(dbussessionservicedir) \