SUBDIRS = po
-LIBSYSTEMD_LOGIN_CURRENT=1
-LIBSYSTEMD_LOGIN_REVISION=0
-LIBSYSTEMD_LOGIN_AGE=1
+LIBSYSTEMD_LOGIN_CURRENT=2
+LIBSYSTEMD_LOGIN_REVISION=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=3
LIBSYSTEMD_ID128_AGE=0
LIBSYSTEMD_JOURNAL_CURRENT=0
-LIBSYSTEMD_JOURNAL_REVISION=0
+LIBSYSTEMD_JOURNAL_REVISION=3
LIBSYSTEMD_JOURNAL_AGE=0
# Dirs of external packages
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
lib_LTLIBRARIES =
pkgconfiglib_DATA =
polkitpolicy_in_files =
+dist_udevrules_DATA =
AM_CPPFLAGS = \
-include $(top_builddir)/config.h \
-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\" \
-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 \
endif
rootbin_PROGRAMS = \
- systemd \
systemctl \
systemd-notify \
systemd-ask-password \
bin_PROGRAMS = \
systemd-cgls \
+ systemd-cgtop \
systemd-stdio-bridge \
systemd-nspawn
dist_bin_SCRIPTS = \
src/systemd-analyze
-if HAVE_GTK
-bin_PROGRAMS += \
- systemadm \
- systemd-gnome-ask-password-agent
-endif
-
rootlibexec_PROGRAMS = \
+ systemd \
systemd-cgroups-agent \
systemd-initctl \
systemd-update-utmp \
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 = \
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
dist_doc_DATA = \
README \
+ NEWS \
LICENSE \
DISTRO_PORTING
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) \
$(UDEV_CFLAGS) \
$(LIBWRAP_CFLAGS) \
$(PAM_CFLAGS) \
- $(AUDIT_CFLAGS)
+ $(AUDIT_CFLAGS) \
+ $(KMOD_CFLAGS)
libsystemd_core_la_LIBADD = \
libsystemd-basic.la \
$(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
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 \
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 \
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 \
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
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
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 \
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 \
libsystemd-daemon.la
pkgconfiglib_DATA += \
- src/libsystemd-daemon.pc
+ src/libsystemd-daemon.pc
MANPAGES += \
man/sd-daemon.7 \
$(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 \
pkginclude_HEADERS += \
src/systemd/sd-journal.h \
- src/systemd/sd-messages.h
+ src/systemd/sd-messages.h
lib_LTLIBRARIES += \
libsystemd-journal.la
rootbin_PROGRAMS += \
systemd-journalctl
+bin_PROGRAMS += \
+ systemd-cat
+
dist_systemunit_DATA += \
units/systemd-journald.socket
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 = \
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) \
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)
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
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 \
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 \
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
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 \
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
# ------------------------------------------------------------------------------
man/%: man/%.in Makefile
$(SED_PROCESS)
+sysctl.d/%: sysctl.d/%.in Makefile
+ $(SED_PROCESS)
+
%.pc: %.pc.in Makefile
$(SED_PROCESS)
$(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
-
-if HAVE_VALAC
-CLEANFILES += \
- ${systemadm_SOURCES:.vala=.c}
-endif
+ src/load-fragment-gperf-nulstr.c \
+ src/99-systemd.rules
if HAVE_XSLTPROC
XSLTPROC_FLAGS = \
$(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
--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:
~ianmdlvl / elogind.git / blobdiff