X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=6d0b51a0903389372e73be322c9870c75ad8f383;hp=e4e3510ddf9d9f255f3d1064fe10b6fc98143b41;hb=816115863962548a9a0d9fbfe429c7f8e685beac;hpb=e0d25329b23a43332ea340f9907721873a316f4e diff --git a/Makefile.am b/Makefile.am index e4e3510dd..6d0b51a09 100644 --- a/Makefile.am +++ b/Makefile.am @@ -20,20 +20,20 @@ ACLOCAL_AMFLAGS = -I m4 SUBDIRS = po -LIBSYSTEMD_LOGIN_CURRENT=1 +LIBSYSTEMD_LOGIN_CURRENT=2 LIBSYSTEMD_LOGIN_REVISION=1 -LIBSYSTEMD_LOGIN_AGE=1 +LIBSYSTEMD_LOGIN_AGE=2 LIBSYSTEMD_DAEMON_CURRENT=0 LIBSYSTEMD_DAEMON_REVISION=1 LIBSYSTEMD_DAEMON_AGE=0 LIBSYSTEMD_ID128_CURRENT=0 -LIBSYSTEMD_ID128_REVISION=1 +LIBSYSTEMD_ID128_REVISION=3 LIBSYSTEMD_ID128_AGE=0 LIBSYSTEMD_JOURNAL_CURRENT=0 -LIBSYSTEMD_JOURNAL_REVISION=1 +LIBSYSTEMD_JOURNAL_REVISION=3 LIBSYSTEMD_JOURNAL_AGE=0 # Dirs of external packages @@ -86,7 +86,7 @@ AM_CPPFLAGS = \ -DUSER_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/user\" \ -DUSER_DATA_UNIT_PATH=\"$(userunitdir)\" \ -DSYSTEMD_CGROUP_AGENT_PATH=\"$(rootlibexecdir)/systemd-cgroups-agent\" \ - -DSYSTEMD_BINARY_PATH=\"$(rootbindir)/systemd\" \ + -DSYSTEMD_BINARY_PATH=\"$(rootlibexecdir)/systemd\" \ -DSYSTEMD_SHUTDOWN_BINARY_PATH=\"$(rootlibexecdir)/systemd-shutdown\" \ -DSYSTEMCTL_BINARY_PATH=\"$(rootbindir)/systemctl\" \ -DSYSTEMD_TTY_ASK_PASSWORD_AGENT_BINARY_PATH=\"$(rootbindir)/systemd-tty-ask-password-agent\" \ @@ -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 \ @@ -468,7 +461,8 @@ libsystemd_basic_la_SOURCES = \ src/socket-util.c \ src/log.c \ src/ratelimit.c \ - src/exit-status.c + src/exit-status.c \ + src/utf8.c libsystemd_basic_la_CFLAGS = \ $(AM_CFLAGS) \ @@ -516,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 \ @@ -546,7 +541,8 @@ libsystemd_core_la_CFLAGS = \ $(UDEV_CFLAGS) \ $(LIBWRAP_CFLAGS) \ $(PAM_CFLAGS) \ - $(AUDIT_CFLAGS) + $(AUDIT_CFLAGS) \ + $(KMOD_CFLAGS) libsystemd_core_la_LIBADD = \ libsystemd-basic.la \ @@ -555,7 +551,8 @@ libsystemd_core_la_LIBADD = \ $(LIBWRAP_LIBS) \ $(PAM_LIBS) \ $(AUDIT_LIBS) \ - $(CAP_LIBS) + $(CAP_LIBS) \ + $(KMOD_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 @@ -647,12 +644,12 @@ EXTRA_DIST += \ src/dbus-loop.h \ src/spawn-agent.h \ src/acl-util.h \ - src/logs-show.h + src/logs-show.h \ + src/utf8.h MANPAGES = \ man/systemd.1 \ man/systemctl.1 \ - man/systemadm.1 \ man/systemd-cgls.1 \ man/systemd-cgtop.1 \ man/systemd-nspawn.1 \ @@ -670,6 +667,7 @@ MANPAGES = \ man/systemd.device.5 \ man/systemd.snapshot.5 \ man/systemd.exec.5 \ + man/systemd.special.7 \ man/daemon.7 \ man/runlevel.8 \ man/telinit.8 \ @@ -686,7 +684,11 @@ 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-cat.1 \ + man/systemd-machine-id-setup.1 \ + man/systemd-journald.conf.5 \ + man/systemd-journalctl.1 MANPAGES_ALIAS = \ man/reboot.8 \ @@ -697,30 +699,23 @@ man/reboot.8: man/halt.8 man/poweroff.8: man/halt.8 man/init.1: man/systemd.1 -dist_man_MANS = \ - $(MANPAGES) \ - $(MANPAGES_ALIAS) - -nodist_man_MANS = \ - man/systemd.special.7 - XML_FILES = \ ${patsubst %.1,%.xml,${patsubst %.3,%.xml,${patsubst %.5,%.xml,${patsubst %.7,%.xml,${patsubst %.8,%.xml,$(MANPAGES)}}}}} -XML_IN_FILES = \ - ${patsubst %.1,%.xml.in,${patsubst %.3,%.xml.in,${patsubst %.5,%.xml.in,${patsubst %.7,%.xml.in,${patsubst %.8,%.xml.in,$(nodist_man_MANS)}}}}} +if ENABLE_MANPAGES +man_MANS = \ + $(MANPAGES) \ + $(MANPAGES_ALIAS) -dist_noinst_DATA = \ +noinst_DATA = \ ${XML_FILES:.xml=.html} - -nodist_noinst_DATA = \ - ${XML_IN_FILES:.xml.in=.html} +endif EXTRA_DIST += \ $(XML_FILES) \ - $(XML_IN_FILES) \ - ${nodist_man_MANS:=.in} \ - ${XML_IN_FILES:.xml.in=.html.in} + ${XML_FILES:.xml=.html} \ + $(MANPAGES) \ + $(MANPAGES_ALIAS) systemd_SOURCES = \ src/main.c @@ -860,8 +855,12 @@ systemd_shutdown_LDADD = \ systemd_modules_load_SOURCES = \ src/modules-load.c +systemd_modules_load_CFLAGS = \ + $(KMOD_CFLAGS) + systemd_modules_load_LDADD = \ - libsystemd-basic.la + libsystemd-basic.la \ + $(KMOD_LIBS) systemd_tmpfiles_SOURCES = \ src/tmpfiles.c @@ -1030,52 +1029,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 \ @@ -2056,6 +2009,10 @@ MANPAGES_ALIAS += \ man/sd_login_monitor_get_fd.3 \ man/sd_session_get_uid.3 \ man/sd_session_get_seat.3 \ + man/sd_session_get_service.3 \ + man/sd_session_get_type.3 \ + man/sd_session_get_class.3 \ + man/sd_session_get_display.3 \ man/sd_pid_get_owner_uid.3 \ man/sd_pid_get_unit.3 \ man/sd_uid_is_on_seat.3 \ @@ -2071,6 +2028,10 @@ 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_session_get_service.3: man/sd_session_is_active.3 +man/sd_session_get_type.3: man/sd_session_is_active.3 +man/sd_session_get_class.3: man/sd_session_is_active.3 +man/sd_session_get_display.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 @@ -2170,7 +2131,6 @@ CLEANFILES += \ $(nodist_systemunit_DATA) \ $(nodist_userunit_DATA) \ $(nodist_man_MANS) \ - ${XML_IN_FILES:.xml.in=.html} \ $(pkgconfigdata_DATA) \ $(pkgconfiglib_DATA) \ $(nodist_polkitpolicy_DATA) \ @@ -2179,11 +2139,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 \ @@ -2193,61 +2148,31 @@ XSLTPROC_PROCESS_MAN = \ $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \ $(XSLTPROC) -o $@ $(XSLTPROC_FLAGS) http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $< -XSLTPROC_PROCESS_MAN_IN = \ - $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \ - $(XSLTPROC) -o ${@:.in=} $(XSLTPROC_FLAGS) http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $< && \ - mv ${@:.in=} $@ - XSLTPROC_PROCESS_HTML = \ $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \ $(XSLTPROC) -o $@ $(XSLTPROC_FLAGS) $(srcdir)/man/custom-html.xsl $< -XSLTPROC_PROCESS_HTML_IN = \ - $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \ - $(XSLTPROC) -o ${@:.in=} $(XSLTPROC_FLAGS) $(srcdir)/man/custom-html.xsl $< && \ - mv ${@:.in=} $@ - man/%.1: man/%.xml $(XSLTPROC_PROCESS_MAN) -man/%.1.in: man/%.xml.in - $(XSLTPROC_PROCESS_MAN) - man/%.3: man/%.xml $(XSLTPROC_PROCESS_MAN) -man/%.3.in: man/%.xml.in - $(XSLTPROC_PROCESS_MAN) - man/%.5: man/%.xml $(XSLTPROC_PROCESS_MAN) -man/%.5.in: man/%.xml.in - $(XSLTPROC_PROCESS_MAN) - man/%.7: man/%.xml $(XSLTPROC_PROCESS_MAN) -man/%.7.in: man/%.xml.in - $(XSLTPROC_PROCESS_MAN_IN) - man/%.8: man/%.xml $(XSLTPROC_PROCESS_MAN) -man/%.8.in: man/%.xml.in - $(XSLTPROC_PROCESS_MAN_IN) - man/%.html: man/%.xml $(XSLTPROC_PROCESS_HTML) -man/%.html.in: man/%.xml.in - $(XSLTPROC_PROCESS_HTML_IN) - CLEANFILES += \ $(dist_man_MANS) \ - ${nodist_man_MANS:=.in} \ - ${XML_FILES:.xml=.html} \ - ${XML_IN_FILES:.xml.in=.html.in} + ${XML_FILES:.xml=.html} endif DBUS_PREPROCESS = $(CPP) -P $(DBUS_CFLAGS) -imacros dbus/dbus-protocol.h @@ -2366,7 +2291,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 \ @@ -2376,7 +2300,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 && \ @@ -2509,11 +2432,13 @@ DISTCHECK_CONFIGURE_FLAGS = \ --with-dbusinterfacedir=$$dc_install_base/$(dbusinterfacedir) \ --with-udevrulesdir=$$dc_install_base/$(udevrulesdir) \ --with-pamlibdir=$$dc_install_base/$(pamlibdir) \ - --with-rootprefix=$$dc_install_base/$(rootprefix) + --with-rootprefix=$$dc_install_base \ + --disable-split-usr upload: all distcheck 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 fdo:/srv/www.freedesktop.org/www/software/systemd/man/ scp man/*.html tango:public/systemd-man/ git-tag: