X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=d0b3f62ba009c6722f3b3b44b4b456368a07d3d5;hb=927f62bd54ee1c70b1c855b7def84169b950b5d0;hp=0d34fb31bbe05b0942b95fcee563c8cceec514be;hpb=bb765041af1ac01b822a08609598d1af901e87f7;p=elogind.git diff --git a/Makefile.am b/Makefile.am index 0d34fb31b..d0b3f62ba 100644 --- a/Makefile.am +++ b/Makefile.am @@ -96,7 +96,9 @@ AM_CPPFLAGS = \ -DUSER_GENERATOR_PATH=\"$(usergeneratordir)\" \ -DSYSTEM_SHUTDOWN_PATH=\"$(systemshutdowndir)\" \ -DSYSTEMD_KBD_MODEL_MAP=\"$(pkgdatadir)/kbd-model-map\" \ - -I $(top_srcdir)/src + -I $(top_srcdir)/src \ + -I $(top_srcdir)/src/readahead \ + -I $(top_srcdir)/src/login if TARGET_GENTOO AM_CPPFLAGS += \ @@ -186,9 +188,7 @@ rootlibexec_PROGRAMS = \ systemd-modules-load \ systemd-remount-api-vfs \ systemd-kmsg-syslogd \ - systemd-vconsole-setup \ systemd-reply-password \ - systemd-user-sessions \ systemd-fsck \ systemd-quotacheck \ systemd-timestamp \ @@ -331,7 +331,6 @@ nodist_systemunit_DATA = \ units/systemd-shutdownd.service \ units/systemd-kmsg-syslogd.service \ units/systemd-modules-load.service \ - units/systemd-vconsole-setup.service \ units/systemd-remount-api-vfs.service \ units/systemd-update-utmp-runlevel.service \ units/systemd-update-utmp-shutdown.service \ @@ -339,7 +338,6 @@ nodist_systemunit_DATA = \ units/systemd-random-seed-load.service \ units/systemd-tmpfiles-setup.service \ units/systemd-tmpfiles-clean.service \ - units/systemd-user-sessions.service \ units/systemd-ask-password-wall.service \ units/systemd-ask-password-console.service \ units/systemd-sysctl.service \ @@ -370,7 +368,6 @@ EXTRA_DIST += \ units/systemd-shutdownd.service.in \ units/systemd-kmsg-syslogd.service.in \ units/systemd-modules-load.service.in \ - units/systemd-vconsole-setup.service.in \ units/systemd-remount-api-vfs.service.in \ units/systemd-update-utmp-runlevel.service.in \ units/systemd-update-utmp-shutdown.service.in \ @@ -378,7 +375,6 @@ EXTRA_DIST += \ units/systemd-random-seed-load.service.in \ units/systemd-tmpfiles-setup.service.in \ units/systemd-tmpfiles-clean.service.in \ - units/systemd-user-sessions.service.in \ units/systemd-ask-password-wall.service.in \ units/systemd-ask-password-console.service.in \ units/systemd-sysctl.service.in \ @@ -644,7 +640,6 @@ MANPAGES = \ man/hostname.5 \ man/timezone.5 \ man/machine-id.5 \ - man/vconsole.conf.5 \ man/locale.conf.5 \ man/os-release.5 \ man/machine-info.5 \ @@ -945,19 +940,6 @@ systemd_rc_local_generator_SOURCES = \ systemd_rc_local_generator_LDADD = \ libsystemd-basic.la -systemd_user_sessions_SOURCES = \ - src/user-sessions.c \ - src/cgroup-util.c - -systemd_user_sessions_LDADD = \ - libsystemd-basic.la - -systemd_vconsole_setup_SOURCES = \ - src/vconsole-setup.c - -systemd_vconsole_setup_LDADD = \ - libsystemd-basic.la - systemd_remount_api_vfs_SOURCES = \ src/remount-api-vfs.c \ src/mount-setup.c \ @@ -1010,7 +992,7 @@ systemctl_LDADD = \ systemd_notify_SOURCES = \ src/notify.c \ - src/sd-readahead.c + src/readahead/sd-readahead.c systemd_notify_LDADD = \ libsystemd-basic.la \ @@ -1107,56 +1089,6 @@ systemd_tty_ask_password_agent_SOURCES = \ systemd_tty_ask_password_agent_LDADD = \ libsystemd-basic.la -# ------------------------------------------------------------------------------ -systemd_readahead_collect_SOURCES = \ - src/readahead-collect.c \ - src/readahead-common.c - -systemd_readahead_collect_LDADD = \ - libsystemd-basic.la \ - libsystemd-daemon.la \ - $(UDEV_LIBS) - -systemd_readahead_replay_SOURCES = \ - src/readahead-replay.c \ - src/readahead-common.c - -systemd_readahead_replay_CFLAGS = \ - $(AM_CFLAGS) \ - $(UDEV_CFLAGS) - -systemd_readahead_replay_LDADD = \ - libsystemd-basic.la \ - libsystemd-daemon.la \ - $(UDEV_LIBS) - -rootlibexec_PROGRAMS += \ - systemd-readahead-collect \ - systemd-readahead-replay - -dist_systemunit_DATA += \ - units/systemd-readahead-done.timer - -nodist_systemunit_DATA += \ - units/systemd-readahead-collect.service \ - units/systemd-readahead-replay.service \ - units/systemd-readahead-done.service - -EXTRA_DIST += \ - src/sd-readahead.h \ - src/readahead-common.h \ - units/systemd-readahead-collect.service.in \ - units/systemd-readahead-replay.service.in \ - units/systemd-readahead-done.service.in - -dist_doc_DATA += \ - src/sd-readahead.h \ - src/sd-readahead.c - -MANPAGES += \ - man/sd_readahead.3 \ - man/sd-readahead.7 - # ------------------------------------------------------------------------------ libsystemd_daemon_la_SOURCES = \ src/sd-daemon.c @@ -1479,6 +1411,91 @@ EXTRA_DIST += \ units/systemd-binfmt.service.in endif +# ------------------------------------------------------------------------------ +if ENABLE_VCONSOLE +systemd_vconsole_setup_SOURCES = \ + src/vconsole/vconsole-setup.c + +systemd_vconsole_setup_LDADD = \ + libsystemd-basic.la + +rootlibexec_PROGRAMS += \ + systemd-vconsole-setup + +nodist_systemunit_DATA += \ + units/systemd-vconsole-setup.service + +vconsole-install-data-hook: + ( cd $(DESTDIR)$(systemunitdir)/sysinit.target.wants && \ + rm -f systemd-vconsole-setup.service && \ + $(LN_S) ../systemd-vconsole-setup.service systemd-vconsole-setup.service ) + +INSTALL_DATA_HOOKS += \ + vconsole-install-data-hook + +MANPAGES += \ + man/vconsole.conf.5 + +EXTRA_DIST += \ + units/systemd-vconsole-setup.service.in +endif + +# ------------------------------------------------------------------------------ +if ENABLE_READAHEAD +systemd_readahead_collect_SOURCES = \ + src/readahead/readahead-collect.c \ + src/readahead/readahead-common.c + +systemd_readahead_collect_LDADD = \ + libsystemd-basic.la \ + libsystemd-daemon.la \ + $(UDEV_LIBS) + +systemd_readahead_collect_CFLAGS = \ + $(AM_CFLAGS) \ + $(UDEV_CFLAGS) + +systemd_readahead_replay_SOURCES = \ + src/readahead/readahead-replay.c \ + src/readahead/readahead-common.c + +systemd_readahead_replay_CFLAGS = \ + $(AM_CFLAGS) \ + $(UDEV_CFLAGS) + +systemd_readahead_replay_LDADD = \ + libsystemd-basic.la \ + libsystemd-daemon.la \ + $(UDEV_LIBS) + +rootlibexec_PROGRAMS += \ + systemd-readahead-collect \ + systemd-readahead-replay + +dist_systemunit_DATA += \ + units/systemd-readahead-done.timer + +nodist_systemunit_DATA += \ + units/systemd-readahead-collect.service \ + units/systemd-readahead-replay.service \ + units/systemd-readahead-done.service + +EXTRA_DIST += \ + src/readahead/sd-readahead.h \ + src/readahead/readahead-common.h \ + units/systemd-readahead-collect.service.in \ + units/systemd-readahead-replay.service.in \ + units/systemd-readahead-done.service.in + +dist_doc_DATA += \ + src/readahead/sd-readahead.h \ + src/readahead/sd-readahead.c + +MANPAGES += \ + man/sd_readahead.3 \ + man/sd-readahead.7 +endif + # ------------------------------------------------------------------------------ if ENABLE_HOSTNAMED systemd_hostnamed_SOURCES = \ @@ -1675,8 +1692,16 @@ systemd_logind_LDADD = \ $(UDEV_LIBS) \ $(ACL_LIBS) +systemd_user_sessions_SOURCES = \ + src/login/user-sessions.c \ + src/cgroup-util.c + +systemd_user_sessions_LDADD = \ + libsystemd-basic.la + rootlibexec_PROGRAMS += \ - systemd-logind + systemd-logind \ + systemd-user-sessions systemd_loginctl_SOURCES = \ src/login/loginctl.c \ @@ -1773,7 +1798,8 @@ UNINSTALL_EXEC_HOOKS += \ libsystemd-login-uninstall-hook nodist_systemunit_DATA += \ - units/systemd-logind.service + units/systemd-logind.service \ + units/systemd-user-sessions.service dist_dbussystemservice_DATA += \ src/login/org.freedesktop.login1.service @@ -1801,8 +1827,9 @@ logind-install-data-hook: rm -f dbus-org.freedesktop.login1.service && \ $(LN_S) systemd-logind.service dbus-org.freedesktop.login1.service) ( cd $(DESTDIR)$(systemunitdir)/multi-user.target.wants && \ - rm -f systemd-logind.service && \ - $(LN_S) ../systemd-logind.service systemd-logind.service ) + rm -f systemd-logind.service systemd-user-sessions.service && \ + $(LN_S) ../systemd-logind.service systemd-logind.service && \ + $(LN_S) ../systemd-user-sessions.service systemd-user-sessions.service ) INSTALL_DATA_HOOKS += \ logind-install-data-hook @@ -1877,6 +1904,7 @@ man/sd_get_uids.3: man/sd_get_seats.3 EXTRA_DIST += \ src/login/logind-gperf.gperf \ units/systemd-logind.service.in \ + units/systemd-user-sessions.service.in \ src/login/libsystemd-login.pc.in \ src/login/libsystemd-login.sym \ src/login/logind.h \ @@ -2144,9 +2172,8 @@ systemd-install-data-hook: $(LN_S) reboot.target ctrl-alt-del.target && \ $(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-ask-password-wall.path && \ $(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) ( cd $(DESTDIR)$(pkgsysconfdir)/system/getty.target.wants && \ rm -f getty@tty1.service && \ @@ -2161,7 +2188,6 @@ systemd-install-data-hook: sys-kernel-debug.mount \ sys-kernel-security.mount \ sys-fs-fuse-connections.mount \ - systemd-vconsole-setup.service \ systemd-modules-load.service \ systemd-random-seed-load.service \ systemd-tmpfiles-setup.service \ @@ -2175,7 +2201,6 @@ systemd-install-data-hook: $(LN_S) ../sys-kernel-debug.mount sys-kernel-debug.mount && \ $(LN_S) ../sys-kernel-security.mount sys-kernel-security.mount && \ $(LN_S) ../sys-fs-fuse-connections.mount sys-fs-fuse-connections.mount && \ - $(LN_S) ../systemd-vconsole-setup.service systemd-vconsole-setup.service && \ $(LN_S) ../systemd-modules-load.service systemd-modules-load.service && \ $(LN_S) ../systemd-random-seed-load.service systemd-random-seed-load.service && \ $(LN_S) ../systemd-tmpfiles-setup.service systemd-tmpfiles-setup.service && \