X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=81b5c50199ee13668e350c6c514e3db5f3c9b54e;hp=d30d626ebfa3ef34c6d73ae0983c9dfe92c97795;hb=0d43c6944bbca30d5692d4b02885f007a0c630c8;hpb=263653e10353d8ad155f1faba01981816a2bb712 diff --git a/Makefile.am b/Makefile.am index d30d626eb..81b5c5019 100644 --- a/Makefile.am +++ b/Makefile.am @@ -141,7 +141,8 @@ rootbin_PROGRAMS = \ systemd-ask-password \ systemd-tty-ask-password-agent \ systemd-tmpfiles \ - systemd-machine-id-setup + systemd-machine-id-setup \ + systemd-journalctl bin_PROGRAMS = \ systemd-cgls \ @@ -180,7 +181,8 @@ rootlibexec_PROGRAMS = \ systemd-detect-virt \ systemd-sysctl \ systemd-logind \ - systemd-uaccess + systemd-uaccess \ + systemd-journald if ENABLE_BINFMT rootlibexec_PROGRAMS += \ @@ -232,7 +234,9 @@ noinst_PROGRAMS = \ test-env-replace \ test-strv \ test-login \ - test-install + test-install \ + test-id128 \ + test-journal if HAVE_PAM pamlib_LTLIBRARIES = \ @@ -502,7 +506,8 @@ EXTRA_DIST = \ src/libsystemd-login.sym \ introspect.awk \ src/73-seat-late.rules.in \ - src/99-systemd.rules.in + src/99-systemd.rules.in \ + man/custom-html.xsl if ENABLE_BINFMT EXTRA_DIST += \ @@ -701,7 +706,8 @@ libsystemd_core_la_SOURCES = \ src/dbus-common.c \ src/sd-daemon.c \ src/install.c \ - src/cgroup-attr.c + src/cgroup-attr.c \ + src/sd-id128.c nodist_libsystemd_core_la_SOURCES = \ src/load-fragment-gperf.c \ @@ -794,6 +800,7 @@ MANPAGES = \ man/daemon.7 \ man/sd-daemon.7 \ man/sd-readahead.7 \ + man/sd-login.7 \ man/runlevel.8 \ man/telinit.8 \ man/halt.8 \ @@ -812,7 +819,13 @@ MANPAGES = \ man/modules-load.d.5 \ man/sysctl.d.5 \ man/systemd-ask-password.1 \ - man/systemd-loginctl.1 + man/systemd-loginctl.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/sd_login_monitor_new.3 if ENABLE_BINFMT MANPAGES += \ @@ -825,16 +838,44 @@ 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/init.1 + 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/sd_login_monitor_unref.3 \ + man/sd_login_monitor_flush.3 \ + man/sd_login_monitor_get_fd.3 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 +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 dist_man_MANS = \ $(MANPAGES) \ @@ -963,6 +1004,89 @@ test_install_CFLAGS = \ test_install_LDADD = \ libsystemd-basic.la +test_id128_SOURCES = \ + src/test-id128.c \ + src/sd-id128.c + +test_id128_CFLAGS = \ + $(AM_CFLAGS) + +test_id128_LDADD = \ + libsystemd-basic.la + +test_journal_SOURCES = \ + src/journal/test-journal.c \ + src/journal/sd-journal.c \ + src/journal/journal-file.c \ + src/journal/lookup3.c \ + src/journal/journal-send.c \ + src/sd-id128.c + +test_journal_CFLAGS = \ + $(AM_CFLAGS) + +test_journal_LDADD = \ + libsystemd-basic.la + +if HAVE_XZ +test_journal_SOURCES += \ + src/journal/compress.c +test_journal_CFLAGS += \ + $(XZ_CFLAGS) +test_journal_LDADD += \ + $(XZ_LIBS) +endif + +systemd_journald_SOURCES = \ + src/journal/journald.c \ + src/journal/sd-journal.c \ + src/journal/journal-file.c \ + src/journal/lookup3.c \ + src/sd-id128.c \ + src/acl-util.c \ + src/cgroup-util.c + +systemd_journald_CFLAGS = \ + $(AM_CFLAGS) \ + $(ACL_CFLAGS) + +systemd_journald_LDADD = \ + libsystemd-basic.la \ + libsystemd-daemon.la \ + $(ACL_LIBS) + +if HAVE_XZ +systemd_journald_SOURCES += \ + src/journal/compress.c +systemd_journald_CFLAGS += \ + $(XZ_CFLAGS) +systemd_journald_LDADD += \ + $(XZ_LIBS) +endif + +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 + +systemd_journalctl_CFLAGS = \ + $(AM_CFLAGS) + +systemd_journalctl_LDADD = \ + libsystemd-basic.la + +if HAVE_XZ +systemd_journalctl_SOURCES += \ + src/journal/compress.c +systemd_journalctl_CFLAGS += \ + $(XZ_CFLAGS) +systemd_journalctl_LDADD += \ + $(XZ_LIBS) +endif + systemd_stdout_syslog_bridge_SOURCES = \ src/stdout-syslog-bridge.c \ src/tcpwrap.c @@ -1107,10 +1231,12 @@ systemd_uaccess_SOURCES = \ if HAVE_ACL systemd_logind_SOURCES += \ - src/logind-acl.c + src/logind-acl.c \ + src/acl-util.c systemd_uaccess_SOURCES += \ - src/logind-acl.c + src/logind-acl.c \ + src/acl-util.c endif systemd_uaccess_CFLAGS = \ @@ -1158,7 +1284,8 @@ systemd_tmpfiles_LDADD = \ systemd_machine_id_setup_SOURCES = \ src/machine-id-setup.c \ - src/machine-id-main.c + src/machine-id-main.c \ + src/sd-id128.c systemd_machine_id_setup_CFLAGS = \ $(AM_CFLAGS) @@ -1660,7 +1787,7 @@ endif if HAVE_XSLTPROC XSLTPROC_FLAGS = \ --nonet \ - --param funcsynopsis.style "'ansi'" + --stringparam funcsynopsis.style ansi XSLTPROC_PROCESS_MAN = \ $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \ @@ -1673,11 +1800,11 @@ XSLTPROC_PROCESS_MAN_IN = \ XSLTPROC_PROCESS_HTML = \ $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \ - $(XSLTPROC) -o $@ $(XSLTPROC_FLAGS) http://docbook.sourceforge.net/release/xsl/current/xhtml-1_1/docbook.xsl $< + $(XSLTPROC) -o $@ $(XSLTPROC_FLAGS) man/custom-html.xsl $< XSLTPROC_PROCESS_HTML_IN = \ $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \ - $(XSLTPROC) -o ${@:.in=} $(XSLTPROC_FLAGS) http://docbook.sourceforge.net/release/xsl/current/xhtml-1_1/docbook.xsl $< && \ + $(XSLTPROC) -o ${@:.in=} $(XSLTPROC_FLAGS) man/custom-html.xsl $< && \ mv ${@:.in=} $@ man/%.1: man/%.xml