X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=99ad9c03098cc3c89dd2d87f4920eae6440c6363;hb=169c4f65131fbc7bcb51e7d5487a715cdcd0e0eb;hp=5d987147b30732884221b80a4a7e63e0d20ae759;hpb=5ee9f21e86bb6a06d3eb956546f85338e81395e6;p=elogind.git diff --git a/Makefile.am b/Makefile.am index 5d987147b..99ad9c030 100644 --- a/Makefile.am +++ b/Makefile.am @@ -21,7 +21,7 @@ ACLOCAL_AMFLAGS = -I m4 SUBDIRS = po LIBSYSTEMD_LOGIN_CURRENT=2 -LIBSYSTEMD_LOGIN_REVISION=0 +LIBSYSTEMD_LOGIN_REVISION=1 LIBSYSTEMD_LOGIN_AGE=2 LIBSYSTEMD_DAEMON_CURRENT=0 @@ -29,11 +29,11 @@ LIBSYSTEMD_DAEMON_REVISION=1 LIBSYSTEMD_DAEMON_AGE=0 LIBSYSTEMD_ID128_CURRENT=0 -LIBSYSTEMD_ID128_REVISION=2 +LIBSYSTEMD_ID128_REVISION=3 LIBSYSTEMD_ID128_AGE=0 LIBSYSTEMD_JOURNAL_CURRENT=0 -LIBSYSTEMD_JOURNAL_REVISION=2 +LIBSYSTEMD_JOURNAL_REVISION=3 LIBSYSTEMD_JOURNAL_AGE=0 # Dirs of external packages @@ -177,12 +177,6 @@ bin_PROGRAMS = \ dist_bin_SCRIPTS = \ src/systemd-analyze -if HAVE_GTK -bin_PROGRAMS += \ - systemadm \ - systemd-gnome-ask-password-agent -endif - rootlibexec_PROGRAMS = \ systemd \ systemd-cgroups-agent \ @@ -291,7 +285,6 @@ dist_systemunit_DATA = \ units/dev-mqueue.mount \ units/sys-kernel-config.mount \ units/sys-kernel-debug.mount \ - units/sys-kernel-security.mount \ units/sys-fs-fuse-connections.mount \ units/var-run.mount \ units/media.mount \ @@ -517,6 +510,7 @@ libsystemd_core_la_SOURCES = \ src/mount-setup.c \ src/hostname-setup.c \ src/selinux-setup.c \ + src/ima-setup.c \ src/loopback-setup.c \ src/kmod-setup.c \ src/locale-setup.c \ @@ -651,12 +645,13 @@ EXTRA_DIST += \ src/spawn-agent.h \ src/acl-util.h \ src/logs-show.h \ - src/utf8.h + src/utf8.h \ + src/journal/sparse-endian.h \ + src/ima-setup.h MANPAGES = \ man/systemd.1 \ man/systemctl.1 \ - man/systemadm.1 \ man/systemd-cgls.1 \ man/systemd-cgtop.1 \ man/systemd-nspawn.1 \ @@ -695,16 +690,22 @@ MANPAGES = \ man/systemd-cat.1 \ man/systemd-machine-id-setup.1 \ man/systemd-journald.conf.5 \ - man/systemd-journalctl.1 + man/journalctl.1 MANPAGES_ALIAS = \ man/reboot.8 \ man/poweroff.8 \ - man/init.1 + man/init.1 \ + man/systemd-systemctl.1 \ + man/systemd-loginctl.1 \ + man/systemd-journalctl.1 man/reboot.8: man/halt.8 man/poweroff.8: man/halt.8 man/init.1: man/systemd.1 +man/systemd-systemctl.1: man/systemctl.1 +man/systemd-loginctl.1: man/loginctl.1 +man/systemd-journalctl.1: man/journalctl.1 XML_FILES = \ ${patsubst %.1,%.xml,${patsubst %.3,%.xml,${patsubst %.5,%.xml,${patsubst %.7,%.xml,${patsubst %.8,%.xml,$(MANPAGES)}}}}} @@ -984,6 +985,14 @@ systemctl_LDADD = \ libsystemd-id128.la \ $(DBUS_LIBS) +systemctl-install-hook: + cd $(DESTDIR)$(rootbindir) && \ + rm -f systemd-systemctl && \ + $(LN_S) systemctl systemd-systemctl + +INSTALL_EXEC_HOOKS += \ + systemctl-install-hook + systemd_notify_SOURCES = \ src/notify.c \ src/readahead/sd-readahead.c @@ -1036,52 +1045,6 @@ systemd_stdio_bridge_SOURCES = \ systemd_stdio_bridge_LDADD = \ libsystemd-basic.la -systemadm_SOURCES = \ - src/systemadm.vala \ - src/systemd-interfaces.vala \ - src/wraplabel.vala - -systemadm_CFLAGS = \ - $(AM_CFLAGS) \ - $(GTK_CFLAGS) \ - -Wno-unused-variable \ - -Wno-unused-function \ - -Wno-shadow \ - -Wno-format-nonliteral - -systemadm_VALAFLAGS = \ - --pkg=posix \ - --pkg=gtk+-2.0 \ - --pkg=gee-1.0 \ - -g - -systemadm_LDADD = \ - $(GTK_LIBS) - -systemd_gnome_ask_password_agent_SOURCES = \ - src/gnome-ask-password-agent.vala - -systemd_gnome_ask_password_agent_CFLAGS = \ - $(AM_CFLAGS) \ - $(LIBNOTIFY_CFLAGS) \ - $(GTK_CFLAGS) \ - -Wno-unused-variable \ - -Wno-unused-function \ - -Wno-shadow \ - -Wno-format-nonliteral - -systemd_gnome_ask_password_agent_VALAFLAGS = \ - --pkg=posix \ - --pkg=gtk+-2.0 \ - --pkg=linux \ - --pkg=gio-unix-2.0 \ - --pkg=libnotify \ - -g - -systemd_gnome_ask_password_agent_LDADD = \ - $(LIBNOTIFY_LIBS) \ - $(GTK_LIBS) - systemd_tty_ask_password_agent_SOURCES = \ src/tty-ask-password-agent.c \ src/ask-password-api.c \ @@ -1258,26 +1221,34 @@ systemd_cat_LDADD = \ libsystemd-basic.la \ libsystemd-journal.la -systemd_journalctl_SOURCES = \ +journalctl_SOURCES = \ src/journal/journalctl.c \ src/pager.c \ src/logs-show.c -systemd_journalctl_LDADD = \ +journalctl_LDADD = \ libsystemd-basic.la \ libsystemd-journal.la \ libsystemd-id128.la if HAVE_XZ -systemd_journalctl_SOURCES += \ +journalctl_SOURCES += \ src/journal/compress.c -systemd_journalctl_CFLAGS = \ +journalctl_CFLAGS = \ $(AM_CFLAGS) \ $(XZ_CFLAGS) -systemd_journalctl_LDADD += \ +journalctl_LDADD += \ $(XZ_LIBS) endif +journalctl-install-hook: + cd $(DESTDIR)$(rootbindir) && \ + rm -f systemd-journalctl && \ + $(LN_S) journalctl systemd-journalctl + +INSTALL_EXEC_HOOKS += \ + journalctl-install-hook + test_journal_SOURCES = \ src/journal/test-journal.c \ src/journal/sd-journal.c \ @@ -1364,7 +1335,7 @@ rootlibexec_PROGRAMS += \ systemd-journald rootbin_PROGRAMS += \ - systemd-journalctl + journalctl bin_PROGRAMS += \ systemd-cat @@ -1864,7 +1835,7 @@ rootlibexec_PROGRAMS += \ systemd-logind \ systemd-user-sessions -systemd_loginctl_SOURCES = \ +loginctl_SOURCES = \ src/login/loginctl.c \ src/login/sysfs-show.c \ src/dbus-common.c \ @@ -1872,18 +1843,26 @@ systemd_loginctl_SOURCES = \ src/cgroup-util.c \ src/pager.c -systemd_loginctl_CFLAGS = \ +loginctl_CFLAGS = \ $(AM_CFLAGS) \ $(DBUS_CFLAGS) \ $(UDEV_CFLAGS) -systemd_loginctl_LDADD = \ +loginctl_LDADD = \ libsystemd-basic.la \ $(DBUS_LIBS) \ $(UDEV_LIBS) rootbin_PROGRAMS += \ - systemd-loginctl + loginctl + +loginctl-install-hook: + cd $(DESTDIR)$(rootbindir) && \ + rm -f systemd-loginctl && \ + $(LN_S) loginctl systemd-loginctl + +INSTALL_EXEC_HOOKS += \ + loginctl-install-hook test_login_SOURCES = \ src/login/test-login.c @@ -2048,7 +2027,7 @@ nodist_udevrules_DATA += \ MANPAGES += \ man/systemd-logind.conf.5 \ man/sd-login.7 \ - man/systemd-loginctl.1 \ + man/loginctl.1 \ man/sd_login_monitor_new.3 \ man/sd_pid_get_session.3 \ man/sd_uid_get_state.3 \ @@ -2192,11 +2171,6 @@ CLEANFILES += \ src/load-fragment-gperf-nulstr.c \ src/99-systemd.rules -if HAVE_VALAC -CLEANFILES += \ - ${systemadm_SOURCES:.vala=.c} -endif - if HAVE_XSLTPROC XSLTPROC_FLAGS = \ --nonet \ @@ -2349,7 +2323,6 @@ systemd-install-data-hook: dev-mqueue.mount \ sys-kernel-config.mount \ sys-kernel-debug.mount \ - sys-kernel-security.mount \ sys-fs-fuse-connections.mount \ systemd-modules-load.service \ systemd-tmpfiles-setup.service \ @@ -2359,7 +2332,6 @@ systemd-install-data-hook: $(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-modules-load.service systemd-modules-load.service && \ $(LN_S) ../systemd-tmpfiles-setup.service systemd-tmpfiles-setup.service && \