X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=d94de56ff1d27d664e31f9f003c97c87940af59d;hp=d9cbebc7dbcafb57a4a0d768c6a322ebb56aefa6;hb=755a02c6800246e7e293897d0594fe7e7531ba59;hpb=3bb8894f4f9d9012a51b5ff993c3a05bdb575bdc diff --git a/Makefile.am b/Makefile.am index d9cbebc7d..d94de56ff 100644 --- a/Makefile.am +++ b/Makefile.am @@ -20,9 +20,9 @@ ACLOCAL_AMFLAGS = -I m4 SUBDIRS = po -LIBSYSTEMD_LOGIN_CURRENT=0 -LIBSYSTEMD_LOGIN_REVISION=6 -LIBSYSTEMD_LOGIN_AGE=0 +LIBSYSTEMD_LOGIN_CURRENT=1 +LIBSYSTEMD_LOGIN_REVISION=0 +LIBSYSTEMD_LOGIN_AGE=1 LIBSYSTEMD_DAEMON_CURRENT=0 LIBSYSTEMD_DAEMON_REVISION=0 @@ -56,12 +56,12 @@ usergeneratordir=$(pkglibexecdir)/user-generators pkgincludedir=$(includedir)/systemd # And these are the special ones for / -rootdir=@rootdir@ -rootbindir=$(rootdir)/bin -rootlibexecdir=$(rootdir)/lib/systemd +rootprefix=@rootprefix@ +rootbindir=$(rootprefix)/bin +rootlibexecdir=$(rootprefix)/lib/systemd systemgeneratordir=$(rootlibexecdir)/system-generators systemshutdowndir=$(rootlibexecdir)/system-shutdown -systemunitdir=$(rootdir)/lib/systemd/system +systemunitdir=$(rootprefix)/lib/systemd/system CLEANFILES = EXTRA_DIST = @@ -69,6 +69,8 @@ INSTALL_EXEC_HOOKS = UNINSTALL_EXEC_HOOKS = INSTALL_DATA_HOOKS = pkginclude_HEADERS = +lib_LTLIBRARIES = +pkgconfiglib_DATA = polkitpolicy_in_files = AM_CPPFLAGS = \ @@ -87,6 +89,7 @@ AM_CPPFLAGS = \ -DSYSTEMCTL_BINARY_PATH=\"$(rootbindir)/systemctl\" \ -DSYSTEMD_TTY_ASK_PASSWORD_AGENT_BINARY_PATH=\"$(rootbindir)/systemd-tty-ask-password-agent\" \ -DSYSTEMD_STDIO_BRIDGE_BINARY_PATH=\"$(bindir)/systemd-stdio-bridge\" \ + -DROOTPREFIX=\"$(rootprefix)\" \ -DRUNTIME_DIR=\"/run\" \ -DRANDOM_SEED=\"$(localstatedir)/lib/random-seed\" \ -DSYSTEMD_CRYPTSETUP_PATH=\"$(rootlibexecdir)/systemd-cryptsetup\" \ @@ -94,7 +97,11 @@ 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 \ + -I $(top_srcdir)/src/journal \ + -I $(top_srcdir)/src/systemd if TARGET_GENTOO AM_CPPFLAGS += \ @@ -132,16 +139,16 @@ AM_CPPFLAGS += \ -DKBD_SETFONT=\"/usr/bin/setfont\" \ -DDEFAULT_FONT=\"LatArCyrHeb-16\" else +if TARGET_MAGEIA AM_CPPFLAGS += \ -DKBD_LOADKEYS=\"/bin/loadkeys\" \ -DKBD_SETFONT=\"/bin/setfont\" \ - -DDEFAULT_FONT=\"latarcyrheb-sun16\" + -DDEFAULT_FONT=\"LatArCyrHeb-16\" else -if TARGET_MAGEIA AM_CPPFLAGS += \ -DKBD_LOADKEYS=\"/bin/loadkeys\" \ -DKBD_SETFONT=\"/bin/setfont\" \ - -DDEFAULT_FONT=\"LatArCyrHeb-16\" + -DDEFAULT_FONT=\"latarcyrheb-sun16\" endif endif endif @@ -174,23 +181,15 @@ bin_PROGRAMS += \ endif rootlibexec_PROGRAMS = \ - systemd-stdout-syslog-bridge \ systemd-cgroups-agent \ systemd-initctl \ systemd-update-utmp \ - systemd-random-seed \ systemd-shutdownd \ systemd-shutdown \ systemd-modules-load \ systemd-remount-api-vfs \ - systemd-kmsg-syslogd \ - systemd-vconsole-setup \ systemd-reply-password \ - systemd-readahead-collect \ - systemd-readahead-replay \ - systemd-user-sessions \ systemd-fsck \ - systemd-quotacheck \ systemd-timestamp \ systemd-ac-power \ systemd-detect-virt \ @@ -199,17 +198,6 @@ rootlibexec_PROGRAMS = \ systemgenerator_PROGRAMS = \ systemd-getty-generator -if HAVE_LIBCRYPTSETUP -rootlibexec_PROGRAMS += \ - systemd-cryptsetup - -systemgenerator_PROGRAMS += \ - systemd-cryptsetup-generator -endif - -lib_LTLIBRARIES = \ - libsystemd-daemon.la - noinst_PROGRAMS = \ test-engine \ test-job-type \ @@ -281,7 +269,6 @@ dist_systemunit_DATA = \ units/local-fs-pre.target \ units/remote-fs.target \ units/remote-fs-pre.target \ - units/cryptsetup.target \ units/network.target \ units/nss-lookup.target \ units/mail-transfer-agent.target \ @@ -298,7 +285,6 @@ dist_systemunit_DATA = \ units/sockets.target \ units/swap.target \ units/systemd-initctl.socket \ - units/systemd-stdout-syslog-bridge.socket \ units/systemd-shutdownd.socket \ units/syslog.socket \ units/dev-hugepages.mount \ @@ -314,7 +300,6 @@ dist_systemunit_DATA = \ units/sound.target \ units/bluetooth.target \ units/smartcard.target \ - units/systemd-readahead-done.timer \ units/systemd-tmpfiles-clean.timer \ units/quotaon.service \ units/systemd-ask-password-wall.path \ @@ -331,22 +316,13 @@ nodist_systemunit_DATA = \ units/serial-getty@.service \ units/console-shell.service \ units/systemd-initctl.service \ - units/systemd-stdout-syslog-bridge.service \ 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 \ - units/systemd-random-seed-save.service \ - units/systemd-random-seed-load.service \ - units/systemd-readahead-collect.service \ - units/systemd-readahead-replay.service \ - units/systemd-readahead-done.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 \ @@ -356,7 +332,6 @@ nodist_systemunit_DATA = \ units/kexec.service \ units/fsck@.service \ units/fsck-root.service \ - units/quotacheck.service \ units/rescue.service \ units/user@.service @@ -373,22 +348,13 @@ EXTRA_DIST += \ units/console-shell.service.m4 \ units/rescue.service.m4 \ units/systemd-initctl.service.in \ - units/systemd-stdout-syslog-bridge.service.in \ 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 \ - units/systemd-random-seed-save.service.in \ - units/systemd-random-seed-load.service.in \ - units/systemd-readahead-collect.service.in \ - units/systemd-readahead-replay.service.in \ - units/systemd-readahead-done.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 \ @@ -399,11 +365,8 @@ EXTRA_DIST += \ units/user/exit.service.in \ units/fsck@.service.in \ units/fsck-root.service.in \ - units/quotacheck.service.in \ units/user@.service.in \ - systemd.pc.in \ - libsystemd-daemon.pc.in \ - src/libsystemd-daemon.sym \ + src/systemd.pc.in \ introspect.awk \ src/73-seat-late.rules.in \ src/99-systemd.rules.in \ @@ -471,17 +434,10 @@ endif dist_doc_DATA = \ README \ LICENSE \ - DISTRO_PORTING \ - src/sd-daemon.h \ - src/sd-daemon.c \ - src/sd-readahead.h \ - src/sd-readahead.c + DISTRO_PORTING pkgconfigdata_DATA = \ - systemd.pc - -pkgconfiglib_DATA = \ - libsystemd-daemon.pc + src/systemd.pc # First passed through sed, followed by intltool polkitpolicy_in_in_files = \ @@ -602,12 +558,72 @@ libsystemd_core_la_LIBADD = \ $(CAP_LIBS) # This is needed because automake is buggy in how it generates the -# rules for C programs, but not Vala programs. We therefore can't +# 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. EXTRA_DIST += \ - ${libsystemd_basic_la_SOURCES:.c=.h} \ - ${libsystemd_core_la_SOURCES:.c=.h} \ + src/util.h \ + src/virt.h \ + src/label.h \ + src/hashmap.h \ + src/set.h \ + src/strv.h \ + src/conf-parser.h \ + src/socket-util.h \ + src/log.h \ + src/ratelimit.h \ + src/exit-status.h \ + src/unit.h \ + src/job.h \ + src/manager.h \ + src/path-lookup.h \ + src/load-fragment.h \ + src/service.h \ + src/automount.h \ + src/mount.h \ + src/swap.h \ + src/device.h \ + src/target.h \ + src/snapshot.h \ + src/socket.h \ + src/timer.h \ + src/path.h \ + src/load-dropin.h \ + src/execute.h \ + src/utmp-wtmp.h \ + src/dbus.h \ + src/dbus-manager.h \ + src/dbus-unit.h \ + src/dbus-job.h \ + src/dbus-service.h \ + src/dbus-socket.h \ + src/dbus-timer.h \ + src/dbus-target.h \ + src/dbus-mount.h \ + src/dbus-automount.h \ + src/dbus-swap.h \ + src/dbus-snapshot.h \ + src/dbus-device.h \ + src/dbus-execute.h \ + src/dbus-path.h \ + src/cgroup.h \ + src/mount-setup.h \ + src/hostname-setup.h \ + src/selinux-setup.h \ + src/loopback-setup.h \ + src/kmod-setup.h \ + src/locale-setup.h \ + src/machine-id-setup.h \ + src/specifier.h \ + src/unit-name.h \ + src/fdset.h \ + src/namespace.h \ + src/tcpwrap.h \ + src/cgroup-util.h \ + src/condition.h \ + src/dbus-common.h \ + src/install.h \ + src/cgroup-attr.h \ src/macro.h \ src/def.h \ src/ioprio.h \ @@ -617,7 +633,6 @@ EXTRA_DIST += \ src/linux/auto_dev-ioctl.h \ src/linux/fanotify.h \ src/initreq.h \ - src/sd-readahead.h \ src/special.h \ src/dbus-common.h \ src/bus-errors.h \ @@ -625,14 +640,14 @@ EXTRA_DIST += \ src/build.h \ src/shutdownd.h \ src/umount.h \ - src/readahead-common.h \ src/ask-password-api.h \ src/pager.h \ src/sysfs-show.h \ src/polkit.h \ src/dbus-loop.h \ src/spawn-agent.h \ - src/acl-util.h + src/acl-util.h \ + src/logs-show.h MANPAGES = \ man/systemd.1 \ @@ -642,11 +657,6 @@ MANPAGES = \ man/systemd-nspawn.1 \ man/systemd-tmpfiles.8 \ man/systemd-notify.1 \ - man/sd_notify.3 \ - man/sd_readahead.3 \ - man/sd_booted.3 \ - man/sd_listen_fds.3 \ - man/sd_is_fifo.3 \ man/systemd.unit.5 \ man/systemd.service.5 \ man/systemd.socket.5 \ @@ -660,8 +670,6 @@ MANPAGES = \ man/systemd.snapshot.5 \ man/systemd.exec.5 \ man/daemon.7 \ - man/sd-daemon.7 \ - man/sd-readahead.7 \ man/runlevel.8 \ man/telinit.8 \ man/halt.8 \ @@ -672,57 +680,21 @@ 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 \ man/modules-load.d.5 \ man/sysctl.d.5 \ - man/systemd-ask-password.1 \ - man/sd_pid_get_session.3 \ - man/sd_uid_get_state.3 \ - man/sd_session_is_active.3 \ - man/sd_seat_get_active.3 \ - man/sd_get_seats.3 + man/systemd-ask-password.1 MANPAGES_ALIAS = \ man/reboot.8 \ man/poweroff.8 \ - man/sd_is_socket.3 \ - man/sd_is_socket_unix.3 \ - man/sd_is_socket_inet.3 \ - man/sd_is_mq.3 \ - man/sd_notifyf.3 \ - man/init.1 \ - man/sd_session_get_uid.3 \ - man/sd_session_get_seat.3 \ - man/sd_pid_get_owner_uid.3 \ - man/sd_uid_is_on_seat.3 \ - man/sd_uid_get_sessions.3 \ - man/sd_uid_get_seats.3 \ - man/sd_seat_get_sessions.3 \ - man/sd_seat_can_multi_session.3 \ - man/sd_get_sessions.3 \ - man/sd_get_uids.3 + man/init.1 man/reboot.8: man/halt.8 man/poweroff.8: man/halt.8 -man/sd_is_socket.3: man/sd_is_fifo.3 -man/sd_is_socket_unix.3: man/sd_is_fifo.3 -man/sd_is_socket_inet.3: man/sd_is_fifo.3 -man/sd_is_mq.3: man/sd_is_fifo.3 -man/sd_notifyf.3: man/sd_notify.3 man/init.1: man/systemd.1 -man/sd_session_get_uid.3: man/sd_session_is_active.3 -man/sd_session_get_seat.3: man/sd_session_is_active.3 -man/sd_pid_get_owner_uid.3: man/sd_pid_get_session.3 -man/sd_uid_is_on_seat.3: man/sd_uid_get_state.3 -man/sd_uid_get_sessions.3: man/sd_uid_get_state.3 -man/sd_uid_get_seats.3: man/sd_uid_get_state.3 -man/sd_seat_get_sessions.3: man/sd_seat_get_active.3 -man/sd_seat_can_multi_session.3: man/sd_seat_get_active.3 -man/sd_get_sessions.3: man/sd_get_seats.3 -man/sd_get_uids.3: man/sd_get_seats.3 dist_man_MANS = \ $(MANPAGES) \ @@ -832,15 +804,6 @@ test_install_CFLAGS = \ test_install_LDADD = \ libsystemd-basic.la -systemd_stdout_syslog_bridge_SOURCES = \ - src/stdout-syslog-bridge.c \ - src/tcpwrap.c - -systemd_stdout_syslog_bridge_LDADD = \ - libsystemd-basic.la \ - libsystemd-daemon.la \ - $(LIBWRAP_LIBS) - systemd_initctl_SOURCES = \ src/initctl.c \ src/dbus-common.c @@ -869,12 +832,6 @@ systemd_update_utmp_LDADD = \ $(DBUS_LIBS) \ $(AUDIT_LIBS) -systemd_random_seed_SOURCES = \ - src/random-seed.c - -systemd_random_seed_LDADD = \ - libsystemd-basic.la - systemd_shutdownd_SOURCES = \ src/utmp-wtmp.c \ src/shutdownd.c @@ -886,12 +843,6 @@ systemd_shutdownd_LDADD = \ libsystemd-basic.la \ libsystemd-daemon.la -dist_pkgdata_DATA = \ - src/kbd-model-map - -dist_noinst_SCRIPT = \ - src/generate-kbd-model-map - systemd_shutdown_SOURCES = \ src/mount-setup.c \ src/umount.c \ @@ -945,12 +896,6 @@ systemd_fsck_LDADD = \ $(UDEV_LIBS) \ $(DBUS_LIBS) -systemd_quotacheck_SOURCES = \ - src/quotacheck.c - -systemd_quotacheck_LDADD = \ - libsystemd-basic.la - systemd_timestamp_SOURCES = \ src/timestamp.c @@ -974,27 +919,6 @@ systemd_detect_virt_SOURCES = \ systemd_detect_virt_LDADD = \ libsystemd-basic.la -systemd_cryptsetup_SOURCES = \ - src/cryptsetup.c \ - src/ask-password-api.c - -systemd_cryptsetup_CFLAGS = \ - $(AM_CFLAGS) \ - $(LIBCRYPTSETUP_CFLAGS) \ - $(UDEV_CFLAGS) - -systemd_cryptsetup_LDADD = \ - $(LIBCRYPTSETUP_LIBS) \ - $(UDEV_LIBS) \ - libsystemd-basic.la - -systemd_cryptsetup_generator_SOURCES = \ - src/cryptsetup-generator.c \ - src/unit-name.c - -systemd_cryptsetup_generator_LDADD = \ - libsystemd-basic.la - systemd_getty_generator_SOURCES = \ src/getty-generator.c \ src/unit-name.c @@ -1008,19 +932,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 \ @@ -1041,14 +952,6 @@ systemd_cgroups_agent_LDADD = \ libsystemd-basic.la \ $(DBUS_LIBS) -systemd_kmsg_syslogd_SOURCES = \ - src/kmsg-syslogd.c \ - src/fdset.c - -systemd_kmsg_syslogd_LDADD = \ - libsystemd-basic.la \ - libsystemd-daemon.la - systemctl_SOURCES = \ src/systemctl.c \ src/utmp-wtmp.c \ @@ -1060,7 +963,8 @@ systemctl_SOURCES = \ src/unit-name.c \ src/pager.c \ src/install.c \ - src/spawn-agent.c + src/spawn-agent.c \ + src/logs-show.c systemctl_CFLAGS = \ $(AM_CFLAGS) \ @@ -1069,11 +973,13 @@ systemctl_CFLAGS = \ systemctl_LDADD = \ libsystemd-basic.la \ libsystemd-daemon.la \ + libsystemd-journal.la \ + libsystemd-id128.la \ $(DBUS_LIBS) systemd_notify_SOURCES = \ src/notify.c \ - src/sd-readahead.c + src/readahead/sd-readahead.c systemd_notify_LDADD = \ libsystemd-basic.la \ @@ -1092,28 +998,6 @@ systemd_reply_password_SOURCES = \ systemd_reply_password_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) - systemd_cgls_SOURCES = \ src/cgls.c \ src/cgroup-show.c \ @@ -1177,12 +1061,7 @@ systemd_gnome_ask_password_agent_VALAFLAGS = \ --pkg=gtk+-2.0 \ --pkg=linux \ --pkg=gio-unix-2.0 \ - --pkg=libnotify -if LIBNOTIFY07 -systemd_gnome_ask_password_agent_VALAFLAGS += \ - -D LIBNOTIFY07 -endif -systemd_gnome_ask_password_agent_VALAFLAGS += \ + --pkg=libnotify \ -g systemd_gnome_ask_password_agent_LDADD = \ @@ -1212,7 +1091,7 @@ libsystemd_daemon_la_LDFLAGS = \ -Wl,--version-script=$(top_srcdir)/src/libsystemd-daemon.sym pkginclude_HEADERS += \ - src/sd-daemon.h + src/systemd/sd-daemon.h # move lib from $(libdir) to $(rootlibdir) and update devel link, if needed libsystemd-daemon-install-hook: @@ -1233,8 +1112,35 @@ libsystemd-daemon-uninstall-hook: UNINSTALL_EXEC_HOOKS += \ libsystemd-daemon-uninstall-hook +lib_LTLIBRARIES += \ + libsystemd-daemon.la + +pkgconfiglib_DATA += \ + src/libsystemd-daemon.pc + +MANPAGES += \ + man/sd-daemon.7 \ + man/sd_notify.3 \ + man/sd_listen_fds.3 \ + man/sd_is_fifo.3 \ + man/sd_booted.3 + +MANPAGES_ALIAS += \ + man/sd_is_socket.3 \ + man/sd_is_socket_unix.3 \ + man/sd_is_socket_inet.3 \ + man/sd_is_mq.3 \ + man/sd_notifyf.3 + +man/sd_is_socket.3: man/sd_is_fifo.3 +man/sd_is_socket_unix.3: man/sd_is_fifo.3 +man/sd_is_socket_inet.3: man/sd_is_fifo.3 +man/sd_is_mq.3: man/sd_is_fifo.3 +man/sd_notifyf.3: man/sd_notify.3 + EXTRA_DIST += \ - ${libsystemd_daemon_la_SOURCES:.c=.h} + src/libsystemd-daemon.pc.in \ + src/libsystemd-daemon.sym # ------------------------------------------------------------------------------ libsystemd_id128_la_SOURCES = \ @@ -1263,13 +1169,13 @@ noinst_PROGRAMS += \ test-id128 pkginclude_HEADERS += \ - src/sd-id128.h + src/systemd/sd-id128.h lib_LTLIBRARIES += \ libsystemd-id128.la pkgconfiglib_DATA += \ - libsystemd-id128.pc + src/libsystemd-id128.pc # move lib from $(libdir) to $(rootlibdir) and update devel link, if needed libsystemd-id128-install-hook: @@ -1291,7 +1197,7 @@ UNINSTALL_EXEC_HOOKS += \ libsystemd-id128-uninstall-hook EXTRA_DIST += \ - libsystemd-id128.pc.in \ + src/libsystemd-id128.pc.in \ src/libsystemd-id128.sym # ------------------------------------------------------------------------------ @@ -1302,9 +1208,16 @@ systemd_journald_SOURCES = \ src/journal/lookup3.c \ src/journal/journal-rate-limit.c \ src/sd-id128.c \ - src/acl-util.c \ src/cgroup-util.c +if HAVE_ACL +systemd_journald_SOURCES += \ + src/acl-util.c +endif + +nodist_systemd_journald_SOURCES = \ + src/journal/journald-gperf.c + systemd_journald_CFLAGS = \ $(AM_CFLAGS) \ $(ACL_CFLAGS) @@ -1312,6 +1225,7 @@ systemd_journald_CFLAGS = \ systemd_journald_LDADD = \ libsystemd-basic.la \ libsystemd-daemon.la \ + libsystemd-login.la \ $(ACL_LIBS) if HAVE_XZ @@ -1323,21 +1237,28 @@ systemd_journald_LDADD += \ $(XZ_LIBS) endif +systemd_cat_SOURCES = \ + src/journal/cat.c + +systemd_cat_LDADD = \ + libsystemd-basic.la \ + libsystemd-journal.la + systemd_journalctl_SOURCES = \ src/journal/journalctl.c \ - src/journal/sd-journal.c \ - src/journal/journal-file.c \ - src/journal/lookup3.c \ - src/sd-id128.c \ - src/pager.c + src/pager.c \ + src/logs-show.c systemd_journalctl_LDADD = \ - libsystemd-basic.la + libsystemd-basic.la \ + libsystemd-journal.la \ + libsystemd-id128.la if HAVE_XZ systemd_journalctl_SOURCES += \ src/journal/compress.c systemd_journalctl_CFLAGS = \ + $(AM_CFLAGS) \ $(XZ_CFLAGS) systemd_journalctl_LDADD += \ $(XZ_LIBS) @@ -1359,6 +1280,7 @@ test_journal_SOURCES += \ src/journal/compress.c test_journal_CFLAGS = \ + $(AM_CFLAGS) \ $(XZ_CFLAGS) test_journal_LDADD += \ @@ -1368,13 +1290,11 @@ endif libsystemd_journal_la_SOURCES = \ src/journal/sd-journal.c \ src/journal/journal-file.c \ - src/journal/compress.c \ src/journal/lookup3.c \ src/journal/journal-send.c libsystemd_journal_la_CFLAGS = \ $(AM_CFLAGS) \ - $(XZ_CFLAGS) \ -fvisibility=hidden libsystemd_journal_la_LDFLAGS = \ @@ -1384,8 +1304,18 @@ libsystemd_journal_la_LDFLAGS = \ libsystemd_journal_la_LIBADD = \ libsystemd-basic.la \ - libsystemd-id128.la \ + libsystemd-id128.la + +if HAVE_XZ +libsystemd_journal_la_SOURCES += \ + src/journal/compress.c + +libsystemd_journal_la_CFLAGS += \ + $(XZ_CFLAGS) + +libsystemd_journal_la_LIBADD += \ $(XZ_LIBS) +endif # move lib from $(libdir) to $(rootlibdir) and update devel link, if needed libsystemd-journal-install-hook: @@ -1410,7 +1340,8 @@ noinst_PROGRAMS += \ test-journal pkginclude_HEADERS += \ - src/journal/sd-journal.h + src/systemd/sd-journal.h \ + src/systemd/sd-messages.h lib_LTLIBRARIES += \ libsystemd-journal.la @@ -1421,24 +1352,37 @@ rootlibexec_PROGRAMS += \ rootbin_PROGRAMS += \ systemd-journalctl +bin_PROGRAMS += \ + systemd-cat + dist_systemunit_DATA += \ units/systemd-journald.socket nodist_systemunit_DATA += \ units/systemd-journald.service +dist_pkgsysconf_DATA += \ + src/journal/systemd-journald.conf + pkgconfiglib_DATA += \ src/journal/libsystemd-journal.pc journal-install-data-hook: + $(MKDIR_P) -m 0755 \ + $(DESTDIR)$(systemunitdir)/sockets.target.wants \ + $(DESTDIR)$(systemunitdir)/sysinit.target.wants ( cd $(DESTDIR)$(systemunitdir)/sockets.target.wants && \ rm -f systemd-journald.socket && \ $(LN_S) ../systemd-journald.socket ) + ( cd $(DESTDIR)$(systemunitdir)/sysinit.target.wants && \ + rm -f systemd-journald.service && \ + $(LN_S) ../systemd-journald.service ) INSTALL_DATA_HOOKS += \ journal-install-data-hook EXTRA_DIST += \ + src/journal/journald.h \ src/journal/journal-def.h \ src/journal/journal-internal.h \ src/journal/journal-file.h \ @@ -1447,7 +1391,11 @@ EXTRA_DIST += \ src/journal/journal-rate-limit.h \ src/journal/libsystemd-journal.pc.in \ src/journal/libsystemd-journal.sym \ - units/systemd-journald.service.in + units/systemd-journald.service.in \ + src/journal/journald-gperf.gperf + +CLEANFILES += \ + src/journal/journald-gperf.c # ------------------------------------------------------------------------------ if ENABLE_BINFMT @@ -1470,7 +1418,8 @@ nodist_systemunit_DATA += \ binfmt-install-data-hook: $(MKDIR_P) -m 0755 \ $(DESTDIR)$(prefix)/lib/binfmt.d \ - $(DESTDIR)$(sysconfdir)/binfmt.d + $(DESTDIR)$(sysconfdir)/binfmt.d \ + $(DESTDIR)$(systemunitdir)/sysinit.target.wants ( cd $(DESTDIR)$(systemunitdir)/sysinit.target.wants && \ rm -f systemd-binfmt.service \ proc-sys-fs-binfmt_misc.automount && \ @@ -1487,6 +1436,184 @@ 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: + $(MKDIR_P) -m 0755 \ + $(DESTDIR)$(systemunitdir)/sysinit.target.wants + ( 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/systemd/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 + +MANPAGES += \ + man/sd_readahead.3 \ + man/sd-readahead.7 +endif + +# ------------------------------------------------------------------------------ +if ENABLE_QUOTACHECK +rootlibexec_PROGRAMS += \ + systemd-quotacheck + +nodist_systemunit_DATA += \ + units/quotacheck.service + +EXTRA_DIST += \ + units/quotacheck.service.in + +systemd_quotacheck_SOURCES = \ + src/quotacheck.c + +systemd_quotacheck_LDADD = \ + libsystemd-basic.la +endif + +# ------------------------------------------------------------------------------ +if ENABLE_RANDOMSEED +rootlibexec_PROGRAMS += \ + systemd-random-seed + +nodist_systemunit_DATA += \ + units/systemd-random-seed-save.service \ + units/systemd-random-seed-load.service + +EXTRA_DIST += \ + units/systemd-random-seed-save.service.in \ + units/systemd-random-seed-load.service.in + +systemd_random_seed_SOURCES = \ + src/random-seed.c + +systemd_random_seed_LDADD = \ + libsystemd-basic.la + +randomseed-install-data-hook: + $(MKDIR_P) -m 0755 \ + $(DESTDIR)$(systemunitdir)/shutdown.target.wants \ + $(DESTDIR)$(systemunitdir)/sysinit.target.wants + ( cd $(DESTDIR)$(systemunitdir)/shutdown.target.wants && \ + rm -f systemd-random-seed-save.service && \ + $(LN_S) ../systemd-random-seed-save.service systemd-random-seed-save.service ) + ( cd $(DESTDIR)$(systemunitdir)/sysinit.target.wants && \ + rm -f systemd-random-seed-load.service && \ + $(LN_S) ../systemd-random-seed-load.service systemd-random-seed-load.service ) + +INSTALL_DATA_HOOKS += \ + randomseed-install-data-hook +endif + +# ------------------------------------------------------------------------------ +if HAVE_LIBCRYPTSETUP +rootlibexec_PROGRAMS += \ + systemd-cryptsetup + +systemgenerator_PROGRAMS += \ + systemd-cryptsetup-generator + +dist_systemunit_DATA += \ + units/cryptsetup.target + +systemd_cryptsetup_SOURCES = \ + src/cryptsetup/cryptsetup.c \ + src/ask-password-api.c + +systemd_cryptsetup_CFLAGS = \ + $(AM_CFLAGS) \ + $(LIBCRYPTSETUP_CFLAGS) \ + $(UDEV_CFLAGS) + +systemd_cryptsetup_LDADD = \ + $(LIBCRYPTSETUP_LIBS) \ + $(UDEV_LIBS) \ + libsystemd-basic.la + +systemd_cryptsetup_generator_SOURCES = \ + src/cryptsetup/cryptsetup-generator.c \ + src/unit-name.c + +systemd_cryptsetup_generator_LDADD = \ + libsystemd-basic.la + +cryptsetup-install-data-hook: + $(MKDIR_P) -m 0755 \ + $(DESTDIR)$(systemunitdir)/sysinit.target.wants + ( cd $(DESTDIR)$(systemunitdir)/sysinit.target.wants && \ + rm -f cryptsetup.target && \ + $(LN_S) ../cryptsetup.target cryptsetup.target ) + +INSTALL_DATA_HOOKS += \ + cryptsetup-install-data-hook +endif + # ------------------------------------------------------------------------------ if ENABLE_HOSTNAMED systemd_hostnamed_SOURCES = \ @@ -1587,6 +1714,16 @@ INSTALL_DATA_HOOKS += \ EXTRA_DIST += \ units/systemd-localed.service.in + +dist_pkgdata_DATA = \ + src/locale/kbd-model-map + +dist_noinst_SCRIPT = \ + src/locale/generate-kbd-model-map + +update-kbd-model-map: + src/locale/generate-kbd-model-map > src/locale/kbd-model-map + endif # ------------------------------------------------------------------------------ @@ -1666,10 +1803,6 @@ systemd_logind_SOURCES += \ src/acl-util.c endif -systemd_logind_CPPFLAGS = \ - $(AM_CPPFLAGS) \ - -I $(top_srcdir)/src/login - systemd_logind_CFLAGS = \ $(AM_CFLAGS) \ $(DBUS_CFLAGS) \ @@ -1683,8 +1816,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 \ @@ -1735,7 +1876,7 @@ libsystemd_login_la_LIBADD = \ if HAVE_PAM pam_systemd_la_SOURCES = \ - src/pam-module.c \ + src/login/pam-module.c \ src/dbus-common.c pam_systemd_la_CFLAGS = \ @@ -1781,7 +1922,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 @@ -1793,7 +1935,7 @@ dist_pkgsysconf_DATA += \ src/login/systemd-logind.conf pkginclude_HEADERS += \ - src/login/sd-login.h + src/systemd/sd-login.h lib_LTLIBRARIES += \ libsystemd-login.la @@ -1805,12 +1947,15 @@ polkitpolicy_in_files += \ src/login/org.freedesktop.login1.policy.in logind-install-data-hook: + $(MKDIR_P) -m 0755 \ + $(DESTDIR)$(systemunitdir)/multi-user.target.wants ( cd $(DESTDIR)$(systemunitdir) && \ 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 @@ -1846,20 +1991,48 @@ MANPAGES += \ man/systemd-logind.conf.5 \ man/sd-login.7 \ man/systemd-loginctl.1 \ - man/sd_login_monitor_new.3 + man/sd_login_monitor_new.3 \ + man/sd_pid_get_session.3 \ + man/sd_uid_get_state.3 \ + man/sd_session_is_active.3 \ + man/sd_seat_get_active.3 \ + man/sd_get_seats.3 MANPAGES_ALIAS += \ man/sd_login_monitor_unref.3 \ man/sd_login_monitor_flush.3 \ - man/sd_login_monitor_get_fd.3 + man/sd_login_monitor_get_fd.3 \ + man/sd_session_get_uid.3 \ + man/sd_session_get_seat.3 \ + man/sd_pid_get_owner_uid.3 \ + man/sd_pid_get_unit.3 \ + man/sd_uid_is_on_seat.3 \ + man/sd_uid_get_sessions.3 \ + man/sd_uid_get_seats.3 \ + man/sd_seat_get_sessions.3 \ + man/sd_seat_can_multi_session.3 \ + man/sd_get_sessions.3 \ + man/sd_get_uids.3 man/sd_login_monitor_unref.3: man/sd_login_monitor_new.3 man/sd_login_monitor_flush.3: man/sd_login_monitor_new.3 man/sd_login_monitor_get_fd.3: man/sd_login_monitor_new.3 +man/sd_session_get_uid.3: man/sd_session_is_active.3 +man/sd_session_get_seat.3: man/sd_session_is_active.3 +man/sd_pid_get_owner_uid.3: man/sd_pid_get_session.3 +man/sd_pid_get_unit.3: man/sd_pid_get_session.3 +man/sd_uid_is_on_seat.3: man/sd_uid_get_state.3 +man/sd_uid_get_sessions.3: man/sd_uid_get_state.3 +man/sd_uid_get_seats.3: man/sd_uid_get_state.3 +man/sd_seat_get_sessions.3: man/sd_seat_get_active.3 +man/sd_seat_can_multi_session.3: man/sd_seat_get_active.3 +man/sd_get_sessions.3: man/sd_get_seats.3 +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 \ @@ -1876,7 +2049,7 @@ endif SED_PROCESS = \ $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \ - $(SED) -e 's,@rootlibexecdir\@,$(rootlibexecdir),g' \ + $(SED) -e 's,@rootlibexecdir\@,$(rootlibexecdir),g' \ -e 's,@rootbindir\@,$(rootbindir),g' \ -e 's,@bindir\@,$(bindir),g' \ -e 's,@SYSTEMCTL\@,$(rootbindir)/systemctl,g' \ @@ -1971,11 +2144,11 @@ XSLTPROC_PROCESS_MAN_IN = \ XSLTPROC_PROCESS_HTML = \ $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \ - $(XSLTPROC) -o $@ $(XSLTPROC_FLAGS) man/custom-html.xsl $< + $(XSLTPROC) -o $@ $(XSLTPROC_FLAGS) $(srcdir)/man/custom-html.xsl $< XSLTPROC_PROCESS_HTML_IN = \ $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \ - $(XSLTPROC) -o ${@:.in=} $(XSLTPROC_FLAGS) man/custom-html.xsl $< && \ + $(XSLTPROC) -o ${@:.in=} $(XSLTPROC_FLAGS) $(srcdir)/man/custom-html.xsl $< && \ mv ${@:.in=} $@ man/%.1: man/%.xml @@ -2069,11 +2242,9 @@ systemd-install-data-hook: rm -f user && \ $(LN_S) $(pkgsysconfdir)/user user ) ( cd $(DESTDIR)$(systemunitdir)/sockets.target.wants && \ - rm -f systemd-initctl.socket systemd-stdout-syslog-bridge.socket systemd-shutdownd.socket syslog.socket && \ - $(LN_S) ../systemd-stdout-syslog-bridge.socket systemd-stdout-syslog-bridge.socket && \ + rm -f systemd-initctl.socket systemd-shutdownd.socket && \ $(LN_S) ../systemd-initctl.socket systemd-initctl.socket && \ - $(LN_S) ../systemd-shutdownd.socket systemd-shutdownd.socket && \ - $(LN_S) ../syslog.socket syslog.socket ) + $(LN_S) ../systemd-shutdownd.socket systemd-shutdownd.socket ) ( cd $(DESTDIR)$(systemunitdir)/runlevel1.target.wants && \ rm -f systemd-update-utmp-runlevel.service && \ $(LN_S) ../systemd-update-utmp-runlevel.service systemd-update-utmp-runlevel.service ) @@ -2090,10 +2261,8 @@ systemd-install-data-hook: rm -f systemd-update-utmp-runlevel.service && \ $(LN_S) ../systemd-update-utmp-runlevel.service systemd-update-utmp-runlevel.service ) ( cd $(DESTDIR)$(systemunitdir)/shutdown.target.wants && \ - rm -f systemd-update-utmp-shutdown.service \ - systemd-random-seed-save.service && \ - $(LN_S) ../systemd-update-utmp-shutdown.service systemd-update-utmp-shutdown.service && \ - $(LN_S) ../systemd-random-seed-save.service systemd-random-seed-save.service ) + rm -f systemd-update-utmp-shutdown.service && \ + $(LN_S) ../systemd-update-utmp-shutdown.service systemd-update-utmp-shutdown.service ) ( cd $(DESTDIR)$(systemunitdir)/local-fs.target.wants && \ rm -f systemd-remount-api-vfs.service \ fsck-root.service \ @@ -2127,9 +2296,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 && \ @@ -2144,28 +2312,20 @@ 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 \ systemd-sysctl.service \ - systemd-ask-password-console.path \ - systemd-kmsg-syslogd.service \ - cryptsetup.target && \ + systemd-ask-password-console.path && \ $(LN_S) ../dev-hugepages.mount dev-hugepages.mount && \ $(LN_S) ../dev-mqueue.mount dev-mqueue.mount && \ $(LN_S) ../sys-kernel-config.mount sys-kernel-config.mount && \ $(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 && \ $(LN_S) ../systemd-sysctl.service systemd-sysctl.service && \ - $(LN_S) ../systemd-ask-password-console.path systemd-ask-password-console.path && \ - $(LN_S) ../systemd-kmsg-syslogd.service && \ - $(LN_S) ../cryptsetup.target cryptsetup.target ) + $(LN_S) ../systemd-ask-password-console.path systemd-ask-password-console.path ) ( cd $(DESTDIR)$(systemunitdir)/basic.target.wants && \ rm -f systemd-tmpfiles-clean.timer && \ $(LN_S) ../systemd-tmpfiles-clean.timer systemd-tmpfiles-clean.timer ) @@ -2293,15 +2453,12 @@ DISTCHECK_CONFIGURE_FLAGS = \ --with-dbusinterfacedir=$$dc_install_base/$(dbusinterfacedir) \ --with-udevrulesdir=$$dc_install_base/$(udevrulesdir) \ --with-pamlibdir=$$dc_install_base/$(pamlibdir) \ - --with-rootdir=$$dc_install_base/$(rootdir) + --with-rootprefix=$$dc_install_base/$(rootprefix) upload: all distcheck - cp -v systemd-$(VERSION).tar.bz2 /home/lennart/git.fedora/systemd/ - scp systemd-$(VERSION).tar.bz2 fdo:/srv/www.freedesktop.org/www/software/systemd/ + cp -v systemd-$(VERSION).tar.xz /home/lennart/git.fedora/systemd/ + scp systemd-$(VERSION).tar.xz fdo:/srv/www.freedesktop.org/www/software/systemd/ scp man/*.html tango:public/systemd-man/ git-tag: git tag "v$(VERSION)" -m "systemd $(VERSION)" - -update-kbd-model-map: - src/generate-kbd-model-map > src/kbd-model-map