X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=d2bd3404ce4c29f7e448264674945f3ac90e7bf1;hp=2279ff48c05f07ba7ef9ef3a156765bd48b02376;hb=34a35eced40860181757abe5ec00ac0e5d8d0225;hpb=118ca5966f21c07ae8561f33da45b3810b32889a diff --git a/Makefile.am b/Makefile.am index 2279ff48c..d2bd3404c 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=0 -LIBSYSTEMD_LOGIN_AGE=1 +LIBSYSTEMD_LOGIN_AGE=2 LIBSYSTEMD_DAEMON_CURRENT=0 -LIBSYSTEMD_DAEMON_REVISION=0 +LIBSYSTEMD_DAEMON_REVISION=1 LIBSYSTEMD_DAEMON_AGE=0 LIBSYSTEMD_ID128_CURRENT=0 -LIBSYSTEMD_ID128_REVISION=0 +LIBSYSTEMD_ID128_REVISION=2 LIBSYSTEMD_ID128_AGE=0 LIBSYSTEMD_JOURNAL_CURRENT=0 -LIBSYSTEMD_JOURNAL_REVISION=0 +LIBSYSTEMD_JOURNAL_REVISION=2 LIBSYSTEMD_JOURNAL_AGE=0 # Dirs of external packages @@ -52,6 +52,7 @@ bashcompletiondir=$(sysconfdir)/bash_completion.d pkgsysconfdir=$(sysconfdir)/systemd userunitdir=$(prefix)/lib/systemd/user tmpfilesdir=$(prefix)/lib/tmpfiles.d +sysctldir=$(prefix)/lib/sysctl.d usergeneratordir=$(pkglibexecdir)/user-generators pkgincludedir=$(includedir)/systemd @@ -72,6 +73,7 @@ pkginclude_HEADERS = lib_LTLIBRARIES = pkgconfiglib_DATA = polkitpolicy_in_files = +dist_udevrules_DATA = AM_CPPFLAGS = \ -include $(top_builddir)/config.h \ @@ -84,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\" \ @@ -97,6 +99,7 @@ AM_CPPFLAGS = \ -DUSER_GENERATOR_PATH=\"$(usergeneratordir)\" \ -DSYSTEM_SHUTDOWN_PATH=\"$(systemshutdowndir)\" \ -DSYSTEMD_KBD_MODEL_MAP=\"$(pkgdatadir)/kbd-model-map\" \ + -DX_SERVER=\"$(bindir)/X\" \ -I $(top_srcdir)/src \ -I $(top_srcdir)/src/readahead \ -I $(top_srcdir)/src/login \ @@ -158,7 +161,6 @@ endif endif rootbin_PROGRAMS = \ - systemd \ systemctl \ systemd-notify \ systemd-ask-password \ @@ -168,6 +170,7 @@ rootbin_PROGRAMS = \ bin_PROGRAMS = \ systemd-cgls \ + systemd-cgtop \ systemd-stdio-bridge \ systemd-nspawn @@ -181,6 +184,7 @@ bin_PROGRAMS += \ endif rootlibexec_PROGRAMS = \ + systemd \ systemd-cgroups-agent \ systemd-initctl \ systemd-update-utmp \ @@ -220,11 +224,7 @@ dist_dbuspolicy_DATA = \ dist_dbussystemservice_DATA = \ src/org.freedesktop.systemd1.service -dist_udevrules_DATA = \ - src/71-seat.rules - nodist_udevrules_DATA = \ - src/73-seat-late.rules \ src/99-systemd.rules dbusinterface_DATA = \ @@ -368,7 +368,6 @@ EXTRA_DIST += \ units/user@.service.in \ src/systemd.pc.in \ introspect.awk \ - src/73-seat-late.rules.in \ src/99-systemd.rules.in \ man/custom-html.xsl @@ -433,6 +432,7 @@ endif dist_doc_DATA = \ README \ + NEWS \ LICENSE \ DISTRO_PORTING @@ -468,7 +468,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) \ @@ -546,7 +547,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 +557,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,13 +650,15 @@ 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 \ man/systemd-tmpfiles.8 \ man/systemd-notify.1 \ @@ -669,6 +674,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 \ @@ -696,30 +702,20 @@ man/reboot.8: man/halt.8 man/poweroff.8: man/halt.8 man/init.1: man/systemd.1 +if ENABLE_MANPAGES 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)}}}}} - dist_noinst_DATA = \ ${XML_FILES:.xml=.html} -nodist_noinst_DATA = \ - ${XML_IN_FILES:.xml.in=.html} - EXTRA_DIST += \ - $(XML_FILES) \ - $(XML_IN_FILES) \ - ${nodist_man_MANS:=.in} \ - ${XML_IN_FILES:.xml.in=.html.in} + $(XML_FILES) +endif systemd_SOURCES = \ src/main.c @@ -859,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 @@ -1007,6 +1007,13 @@ systemd_cgls_SOURCES = \ systemd_cgls_LDADD = \ libsystemd-basic.la +systemd_cgtop_SOURCES = \ + src/cgtop.c \ + src/cgroup-util.c + +systemd_cgtop_LDADD = \ + libsystemd-basic.la + systemd_nspawn_SOURCES = \ src/nspawn.c \ src/cgroup-util.c \ @@ -1116,7 +1123,7 @@ lib_LTLIBRARIES += \ libsystemd-daemon.la pkgconfiglib_DATA += \ - src/libsystemd-daemon.pc + src/libsystemd-daemon.pc MANPAGES += \ man/sd-daemon.7 \ @@ -1208,9 +1215,13 @@ 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 @@ -1233,6 +1244,13 @@ 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/pager.c \ @@ -1330,7 +1348,7 @@ noinst_PROGRAMS += \ pkginclude_HEADERS += \ src/systemd/sd-journal.h \ - src/systemd/sd-messages.h + src/systemd/sd-messages.h lib_LTLIBRARIES += \ libsystemd-journal.la @@ -1341,6 +1359,9 @@ rootlibexec_PROGRAMS += \ rootbin_PROGRAMS += \ systemd-journalctl +bin_PROGRAMS += \ + systemd-cat + dist_systemunit_DATA += \ units/systemd-journald.socket @@ -1383,6 +1404,29 @@ EXTRA_DIST += \ CLEANFILES += \ src/journal/journald-gperf.c +# ------------------------------------------------------------------------------ +if ENABLE_COREDUMP +systemd_coredump_SOURCES = \ + src/journal/coredump.c + +systemd_coredump_LDADD = \ + libsystemd-basic.la \ + libsystemd-journal.la \ + libsystemd-login.la + +rootlibexec_PROGRAMS += \ + systemd-coredump + +sysctl_DATA = \ + sysctl.d/coredump.conf + +EXTRA_DIST += \ + sysctl.d/coredump.conf.in + +CLEANFILES += \ + sysctl.d/coredump.conf +endif + # ------------------------------------------------------------------------------ if ENABLE_BINFMT systemd_binfmt_SOURCES = \ @@ -1815,11 +1859,11 @@ rootlibexec_PROGRAMS += \ systemd_loginctl_SOURCES = \ src/login/loginctl.c \ + src/login/sysfs-show.c \ src/dbus-common.c \ src/cgroup-show.c \ src/cgroup-util.c \ - src/pager.c \ - src/sysfs-show.c + src/pager.c systemd_loginctl_CFLAGS = \ $(AM_CFLAGS) \ @@ -1934,7 +1978,8 @@ polkitpolicy_in_files += \ logind-install-data-hook: $(MKDIR_P) -m 0755 \ - $(DESTDIR)$(systemunitdir)/multi-user.target.wants + $(DESTDIR)$(systemunitdir)/multi-user.target.wants \ + $(DESTDIR)$(localstatedir)/lib/systemd ( cd $(DESTDIR)$(systemunitdir) && \ rm -f dbus-org.freedesktop.login1.service && \ $(LN_S) systemd-logind.service dbus-org.freedesktop.login1.service) @@ -1946,6 +1991,20 @@ logind-install-data-hook: INSTALL_DATA_HOOKS += \ logind-install-data-hook +systemd_multi_seat_x_SOURCES = \ + src/login/multi-seat-x.c + +systemd_multi_seat_x_CFLAGS = \ + $(AM_CFLAGS) \ + $(UDEV_CFLAGS) + +systemd_multi_seat_x_LDADD = \ + libsystemd-basic.la \ + $(UDEV_LIBS) + +rootlibexec_PROGRAMS += \ + systemd-multi-seat-x + systemd_uaccess_SOURCES = \ src/login/uaccess.c @@ -1971,7 +2030,13 @@ rootlibexec_PROGRAMS += \ systemd-uaccess dist_udevrules_DATA += \ - src/70-uaccess.rules + src/login/70-uaccess.rules + +dist_udevrules_DATA += \ + src/login/71-seat.rules + +nodist_udevrules_DATA += \ + src/login/73-seat-late.rules MANPAGES += \ man/systemd-logind.conf.5 \ @@ -1990,6 +2055,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 \ @@ -2005,6 +2074,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 @@ -2017,8 +2090,6 @@ 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 \ @@ -2026,10 +2097,14 @@ EXTRA_DIST += \ src/login/logind-seat.h \ src/login/logind-session.h \ src/login/logind-user.h \ - src/login/logind-acl.h + src/login/logind-acl.h \ + src/login/73-seat-late.rules.in \ + units/systemd-logind.service.in \ + units/systemd-user-sessions.service.in CLEANFILES += \ - src/login/logind-gperf.c + src/login/logind-gperf.c \ + src/login/73-seat-late.rules endif # ------------------------------------------------------------------------------ @@ -2060,6 +2135,9 @@ units/%: units/%.in Makefile man/%: man/%.in Makefile $(SED_PROCESS) +sysctl.d/%: sysctl.d/%.in Makefile + $(SED_PROCESS) + %.pc: %.pc.in Makefile $(SED_PROCESS) @@ -2099,15 +2177,13 @@ CLEANFILES += \ $(nodist_systemunit_DATA) \ $(nodist_userunit_DATA) \ $(nodist_man_MANS) \ - ${XML_IN_FILES:.xml.in=.html} \ $(pkgconfigdata_DATA) \ $(pkgconfiglib_DATA) \ $(nodist_polkitpolicy_DATA) \ - src/73-seat-late.rules \ - src/99-systemd.rules \ src/load-fragment-gperf.gperf \ src/load-fragment-gperf.c \ - src/load-fragment-gperf-nulstr.c + src/load-fragment-gperf-nulstr.c \ + src/99-systemd.rules if HAVE_VALAC CLEANFILES += \ @@ -2123,61 +2199,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 @@ -2439,11 +2485,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/$(prefix) + 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 fdo:/srv/www.freedesktop.org/www/software/systemd/man/ scp man/*.html tango:public/systemd-man/ git-tag: