SUBDIRS = po
LIBSYSTEMD_LOGIN_CURRENT=0
-LIBSYSTEMD_LOGIN_REVISION=3
+LIBSYSTEMD_LOGIN_REVISION=6
LIBSYSTEMD_LOGIN_AGE=0
LIBSYSTEMD_DAEMON_CURRENT=0
-DSYSTEM_GENERATOR_PATH=\"$(systemgeneratordir)\" \
-DUSER_GENERATOR_PATH=\"$(usergeneratordir)\" \
-DSYSTEM_SHUTDOWN_PATH=\"$(systemshutdowndir)\" \
+ -DSYSTEMD_KBD_MODEL_MAP=\"$(pkgdatadir)/kbd-model-map\" \
-I $(top_srcdir)/src
if TARGET_GENTOO
-DKBD_LOADKEYS=\"/bin/loadkeys\" \
-DKBD_SETFONT=\"/bin/setfont\" \
-DDEFAULT_FONT=\"latarcyrheb-sun16\"
+else
+if TARGET_MAGEIA
+AM_CPPFLAGS += \
+ -DKBD_LOADKEYS=\"/bin/loadkeys\" \
+ -DKBD_SETFONT=\"/bin/setfont\" \
+ -DDEFAULT_FONT=\"LatArCyrHeb-16\"
+endif
endif
endif
endif
systemd-ask-password \
systemd-tty-ask-password-agent \
systemd-tmpfiles \
- systemd-machine-id-setup
+ systemd-machine-id-setup \
+ systemd-journalctl
bin_PROGRAMS = \
systemd-cgls \
systemd-detect-virt \
systemd-sysctl \
systemd-logind \
- systemd-uaccess
+ systemd-uaccess \
+ systemd-journald
if ENABLE_BINFMT
rootlibexec_PROGRAMS += \
test-env-replace \
test-strv \
test-login \
- test-install
+ test-install \
+ test-id128 \
+ test-journal
if HAVE_PAM
pamlib_LTLIBRARIES = \
endif
dist_bashcompletion_DATA = \
- src/systemctl-bash-completion.sh
+ src/systemd-bash-completion.sh
dist_tmpfiles_DATA = \
tmpfiles.d/systemd.conf \
units/halt.target \
units/kexec.target \
units/local-fs.target \
+ units/local-fs-pre.target \
units/remote-fs.target \
+ units/remote-fs-pre.target \
units/cryptsetup.target \
units/network.target \
units/nss-lookup.target \
units/systemd-stdout-syslog-bridge.socket \
units/systemd-shutdownd.socket \
units/syslog.socket \
- units/dev-hugepages.automount \
units/dev-hugepages.mount \
- units/dev-mqueue.automount \
units/dev-mqueue.mount \
- units/sys-kernel-debug.automount \
+ units/sys-kernel-config.mount \
units/sys-kernel-debug.mount \
- units/sys-kernel-security.automount \
units/sys-kernel-security.mount \
+ units/sys-fs-fuse-connections.mount \
units/var-run.mount \
units/media.mount \
units/remount-rootfs.service \
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 += \
units/suse/halt-local.service
endif
+if TARGET_MAGEIA
+dist_systemunit_DATA += \
+ units/mageia/prefdm.service \
+ units/fedora/rc-local.service \
+ units/fedora/halt-local.service
+endif
+
if HAVE_PLYMOUTH
dist_systemunit_DATA += \
units/plymouth-start.service \
libsystemd_basic_la_SOURCES = \
src/util.c \
+ src/virt.c \
src/label.c \
src/hashmap.c \
src/set.c \
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 \
man/daemon.7 \
man/sd-daemon.7 \
man/sd-readahead.7 \
+ man/sd-login.7 \
man/runlevel.8 \
man/telinit.8 \
man/halt.8 \
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 += \
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) \
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/journal/journal-rate-limit.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
libsystemd-daemon.la \
$(DBUS_LIBS)
+dist_pkgdata_DATA = \
+ src/kbd-model-map
+
+dist_noinst_SCRIPT = \
+ src/generate-kbd-model-map
+
systemd_timedated_SOURCES = \
src/timedated.c \
src/dbus-common.c \
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 = \
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)
systemadm_SOURCES = \
src/systemadm.vala \
- src/systemd-interfaces.vala
+ src/systemd-interfaces.vala \
+ src/wraplabel.vala
systemadm_CFLAGS = \
$(AM_CFLAGS) \
systemadm_VALAFLAGS = \
--pkg=posix \
--pkg=gtk+-2.0 \
+ --pkg=gee-1.0 \
-g
systemadm_LDADD = \
if HAVE_XSLTPROC
XSLTPROC_FLAGS = \
--nonet \
- --param funcsynopsis.style "'ansi'"
+ --stringparam funcsynopsis.style ansi
XSLTPROC_PROCESS_MAN = \
$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
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
rm -f remote-fs.target && \
$(LN_S) $(systemunitdir)/remote-fs.target remote-fs.target )
( cd $(DESTDIR)$(systemunitdir)/sysinit.target.wants && \
- rm -f dev-hugepages.automount \
- dev-mqueue.automount \
- sys-kernel-debug.automount \
- sys-kernel-security.automount \
+ rm -f dev-hugepages.mount \
+ dev-mqueue.mount \
+ sys-kernel-config.mount \
+ sys-kernel-debug.mount \
+ sys-kernel-security.mount \
+ sys-fs-fuse-connections.mount \
systemd-vconsole-setup.service \
systemd-modules-load.service \
systemd-random-seed-load.service \
systemd-ask-password-console.path \
systemd-kmsg-syslogd.service \
cryptsetup.target && \
- $(LN_S) ../dev-hugepages.automount dev-hugepages.automount && \
- $(LN_S) ../dev-mqueue.automount dev-mqueue.automount && \
- $(LN_S) ../sys-kernel-debug.automount sys-kernel-debug.automount && \
- $(LN_S) ../sys-kernel-security.automount sys-kernel-security.automount && \
+ $(LN_S) ../dev-hugepages.mount dev-hugepages.mount && \
+ $(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-vconsole-setup.service systemd-vconsole-setup.service && \
$(LN_S) ../systemd-modules-load.service systemd-modules-load.service && \
$(LN_S) ../systemd-random-seed-load.service systemd-random-seed-load.service && \
$(LN_S) $(systemunitdir)/halt-local.service halt-local.service )
endif
+if TARGET_MAGEIA
+ $(MKDIR_P) -m 0755 $(DESTDIR)$(systemunitdir)/final.target.wants
+ ( cd $(DESTDIR)$(systemunitdir)/multi-user.target.wants && \
+ rm -f rc-local.service && \
+ $(LN_S) $(systemunitdir)/rc-local.service rc-local.service )
+ ( cd $(DESTDIR)$(systemunitdir)/final.target.wants && \
+ rm -f halt-local.service && \
+ $(LN_S) $(systemunitdir)/halt-local.service halt-local.service )
+ ( cd $(DESTDIR)$(systemunitdir) && \
+ rm -f display-manager.service && \
+ $(LN_S) prefdm.service display-manager.service && \
+ $(LN_S) prefdm.service dm.service )
+ ( cd $(DESTDIR)$(systemunitdir)/graphical.target.wants && \
+ rm -f display-manager.service && \
+ $(LN_S) $(systemunitdir)/display-manager.service display-manager.service )
+endif
+
if HAVE_SYSV_COMPAT
( cd $(DESTDIR)$(systemunitdir)/local-fs.target.wants && \
rm -f var-lock.mount && \
git-tag:
git tag "v$(VERSION)" -m "systemd $(VERSION)"
+
+update-kbd-model-map:
+ src/generate-kbd-model-map > src/kbd-model-map