# This file is part of systemd.
#
-# Copyright 2010 Lennart Poettering
+# Copyright 2011 Lennart Poettering
+# Copyright 2011 Kay Sievers
#
# systemd is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
SUBDIRS = po
LIBSYSTEMD_LOGIN_CURRENT=0
-LIBSYSTEMD_LOGIN_REVISION=4
+LIBSYSTEMD_LOGIN_REVISION=6
LIBSYSTEMD_LOGIN_AGE=0
LIBSYSTEMD_DAEMON_CURRENT=0
LIBSYSTEMD_DAEMON_REVISION=0
LIBSYSTEMD_DAEMON_AGE=0
+LIBSYSTEMD_ID128_CURRENT=0
+LIBSYSTEMD_ID128_REVISION=0
+LIBSYSTEMD_ID128_AGE=0
+
+LIBSYSTEMD_JOURNAL_CURRENT=0
+LIBSYSTEMD_JOURNAL_REVISION=0
+LIBSYSTEMD_JOURNAL_AGE=0
+
# Dirs of external packages
dbuspolicydir=@dbuspolicydir@
dbussessionservicedir=@dbussessionservicedir@
systemshutdowndir=$(rootlibexecdir)/system-shutdown
systemunitdir=$(rootdir)/lib/systemd/system
+CLEANFILES =
+EXTRA_DIST =
+INSTALL_EXEC_HOOKS =
+UNINSTALL_EXEC_HOOKS =
+INSTALL_DATA_HOOKS =
+polkitpolicy_in_files =
+
AM_CPPFLAGS = \
-include $(top_builddir)/config.h \
-DSYSTEM_CONFIG_FILE=\"$(pkgsysconfdir)/system.conf\" \
-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
rootbin_PROGRAMS = \
systemd \
systemctl \
- systemd-loginctl \
systemd-notify \
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-ac-power \
systemd-detect-virt \
systemd-sysctl \
- systemd-logind \
- systemd-uaccess
+ systemd-journald
if ENABLE_BINFMT
rootlibexec_PROGRAMS += \
systemd-hostnamed
endif
-if ENABLE_TIMEDATED
-rootlibexec_PROGRAMS += \
- systemd-timedated
-endif
-
-if ENABLE_LOCALED
-rootlibexec_PROGRAMS += \
- systemd-localed
-endif
-
systemgenerator_PROGRAMS = \
systemd-getty-generator
lib_LTLIBRARIES = \
libsystemd-daemon.la \
- libsystemd-login.la
+ libsystemd-id128.la \
+ libsystemd-journal.la
pkginclude_HEADERS = \
src/sd-daemon.h \
- src/sd-login.h
+ src/sd-id128.h \
+ src/journal/sd-journal.h
noinst_PROGRAMS = \
test-engine \
test-cgroup \
test-env-replace \
test-strv \
- test-login \
- test-install
+ test-install \
+ test-id128 \
+ test-journal
if HAVE_PAM
pamlib_LTLIBRARIES = \
dist_pkgsysconf_DATA = \
src/system.conf \
- src/user.conf \
- src/systemd-logind.conf
+ src/user.conf
dist_dbuspolicy_DATA = \
- src/org.freedesktop.systemd1.conf \
- src/org.freedesktop.login1.conf
+ src/org.freedesktop.systemd1.conf
if ENABLE_HOSTNAMED
dist_dbuspolicy_DATA += \
src/org.freedesktop.hostname1.conf
endif
-if ENABLE_TIMEDATED
-dist_dbuspolicy_DATA += \
- src/org.freedesktop.timedate1.conf
-endif
-
if ENABLE_LOCALED
dist_dbuspolicy_DATA += \
src/org.freedesktop.locale1.conf
endif
dist_dbussystemservice_DATA = \
- src/org.freedesktop.systemd1.service \
- src/org.freedesktop.login1.service
+ src/org.freedesktop.systemd1.service
if ENABLE_HOSTNAMED
dist_dbussystemservice_DATA += \
src/org.freedesktop.hostname1.service
endif
-if ENABLE_TIMEDATED
-dist_dbussystemservice_DATA += \
- src/org.freedesktop.timedate1.service
-endif
-
if ENABLE_LOCALED
dist_dbussystemservice_DATA += \
- src/org.freedesktop.locale1.service
+ src/org.freedesktop.locale1.service
endif
dist_udevrules_DATA = \
- src/70-uaccess.rules \
- src/71-seat.rules
+ src/71-seat.rules
nodist_udevrules_DATA = \
- src/73-seat-late.rules \
- src/99-systemd.rules
+ src/73-seat-late.rules \
+ src/99-systemd.rules
dbusinterface_DATA = \
org.freedesktop.systemd1.Manager.xml \
org.freedesktop.hostname1.xml
endif
-if ENABLE_TIMEDATED
-dbusinterface_DATA += \
- org.freedesktop.timedate1.xml
-endif
-
if ENABLE_LOCALED
dbusinterface_DATA += \
org.freedesktop.locale1.xml
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-config.automount \
units/sys-kernel-config.mount \
- units/sys-kernel-debug.automount \
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 \
units/quotaon.service \
units/systemd-ask-password-wall.path \
units/systemd-ask-password-console.path \
- units/syslog.target
+ units/syslog.target \
+ units/systemd-journald.socket
if HAVE_SYSV_COMPAT
dist_systemunit_DATA += \
units/systemd-initctl.service \
units/systemd-stdout-syslog-bridge.service \
units/systemd-shutdownd.service \
- units/systemd-logind.service \
+ units/systemd-journald.service \
units/systemd-kmsg-syslogd.service \
units/systemd-modules-load.service \
units/systemd-vconsole-setup.service \
units/fsck-root.service \
units/quotacheck.service \
units/rescue.service \
- units/user@.service
+ units/user@.service
if ENABLE_BINFMT
nodist_systemunit_DATA += \
units/systemd-hostnamed.service
endif
-if ENABLE_TIMEDATED
-nodist_systemunit_DATA += \
- units/systemd-timedated.service
-endif
-
-if ENABLE_LOCALED
-nodist_systemunit_DATA += \
- units/systemd-localed.service
-endif
-
dist_userunit_DATA = \
units/user/default.target \
units/user/exit.target
nodist_userunit_DATA = \
units/user/exit.service
-EXTRA_DIST = \
+EXTRA_DIST += \
units/getty@.service.m4 \
units/serial-getty@.service.m4 \
units/console-shell.service.m4 \
units/systemd-initctl.service.in \
units/systemd-stdout-syslog-bridge.service.in \
units/systemd-shutdownd.service.in \
- units/systemd-logind.service.in \
+ units/systemd-journald.service.in \
units/systemd-kmsg-syslogd.service.in \
units/systemd-modules-load.service.in \
units/systemd-vconsole-setup.service.in \
units/user@.service.in \
systemd.pc.in \
libsystemd-daemon.pc.in \
- libsystemd-login.pc.in \
+ libsystemd-id128.pc.in \
+ libsystemd-journal.pc.in \
src/libsystemd-daemon.sym \
- src/libsystemd-login.sym \
+ src/libsystemd-id128.sym \
+ src/journal/libsystemd-journal.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/systemd-hostnamed.service.in
endif
-if ENABLE_TIMEDATED
-EXTRA_DIST += \
- units/systemd-timedated.service.in
-endif
-
-if ENABLE_LOCALED
-EXTRA_DIST += \
- units/systemd-localed.service.in
-endif
-
if TARGET_FEDORA
dist_systemunit_DATA += \
units/fedora/prefdm.service \
units/fedora/rc-local.service \
units/fedora/halt-local.service
+systemgenerator_PROGRAMS += \
+ systemd-rc-local-generator
endif
if TARGET_MANDRIVA
units/mandriva/prefdm.service \
units/fedora/rc-local.service \
units/fedora/halt-local.service
+systemgenerator_PROGRAMS += \
+ systemd-rc-local-generator
endif
if TARGET_FRUGALWARE
dist_systemunit_DATA += \
units/suse/rc-local.service \
units/suse/halt-local.service
+systemgenerator_PROGRAMS += \
+ systemd-rc-local-generator
+endif
+
+if TARGET_MAGEIA
+dist_systemunit_DATA += \
+ units/mageia/prefdm.service \
+ units/fedora/rc-local.service \
+ units/fedora/halt-local.service
+systemgenerator_PROGRAMS += \
+ systemd-rc-local-generator
endif
if HAVE_PLYMOUTH
systemd.pc
pkgconfiglib_DATA = \
- libsystemd-daemon.pc \
- libsystemd-login.pc
-
-# Passed through intltool only
-polkitpolicy_in_files = \
- src/org.freedesktop.login1.policy.in
+ libsystemd-daemon.pc \
+ libsystemd-id128.pc \
+ libsystemd-journal.pc
if ENABLE_HOSTNAMED
polkitpolicy_in_files += \
src/org.freedesktop.hostname1.policy.in
endif
-if ENABLE_TIMEDATED
-polkitpolicy_in_files += \
- src/org.freedesktop.timedate1.policy.in
-endif
-
if ENABLE_LOCALED
polkitpolicy_in_files += \
- src/org.freedesktop.locale1.policy.in
+ src/org.freedesktop.locale1.policy.in
endif
# First passed through sed, followed by intltool
src/org.freedesktop.systemd1.policy.in.in
nodist_polkitpolicy_DATA = \
- $(polkitpolicy_in_files:.policy.in=.policy) \
- $(polkitpolicy_in_in_files:.policy.in.in=.policy)
+ $(polkitpolicy_in_files:.policy.in=.policy) \
+ $(polkitpolicy_in_in_files:.policy.in.in=.policy)
EXTRA_DIST += \
- $(polkitpolicy_in_files) \
- $(polkitpolicy_in_in_files)
+ $(polkitpolicy_in_files) \
+ $(polkitpolicy_in_in_files)
@INTLTOOL_POLICY_RULE@
libsystemd_basic_la_SOURCES = \
src/util.c \
+ src/virt.c \
src/label.c \
src/hashmap.c \
src/set.c \
src/tcpwrap.c \
src/cgroup-util.c \
src/condition.c \
- src/dbus-common.c \
- src/sd-daemon.c \
- src/install.c \
- src/cgroup-attr.c
+ src/dbus-common.c \
+ src/sd-daemon.c \
+ src/install.c \
+ src/cgroup-attr.c \
+ src/sd-id128.c
nodist_libsystemd_core_la_SOURCES = \
- src/load-fragment-gperf.c \
- src/load-fragment-gperf-nulstr.c
+ src/load-fragment-gperf.c \
+ src/load-fragment-gperf-nulstr.c
EXTRA_DIST += \
- src/load-fragment-gperf.gperf.m4
+ src/load-fragment-gperf.gperf.m4
libsystemd_core_la_CFLAGS = \
$(AM_CFLAGS) \
src/umount.h \
src/readahead-common.h \
src/ask-password-api.h \
- src/pager.h \
- src/sysfs-show.h \
- src/polkit.h \
- src/logind.h \
- src/logind-device.h \
- src/logind-seat.h \
- src/logind-session.h \
- src/logind-user.h \
- src/logind-acl.h \
- src/dbus-loop.h \
- src/spawn-agent.h
+ src/pager.h \
+ src/sysfs-show.h \
+ src/polkit.h \
+ src/dbus-loop.h \
+ src/spawn-agent.h \
+ src/journal/journal-def.h \
+ src/journal/journal-internal.h \
+ src/journal/journal-file.h \
+ src/journal/lookup3.h \
+ src/journal/compress.h \
+ src/journal/journal-rate-limit.h \
+ src/acl-util.h
MANPAGES = \
man/systemd.1 \
man/shutdown.8 \
man/pam_systemd.8 \
man/systemd.conf.5 \
- man/systemd-logind.conf.5 \
man/tmpfiles.d.5 \
man/hostname.5 \
- man/timezone.5 \
+ man/timezone.5 \
man/machine-id.5 \
man/vconsole.conf.5 \
man/locale.conf.5 \
man/os-release.5 \
- man/machine-info.5 \
+ man/machine-info.5 \
man/modules-load.d.5 \
man/sysctl.d.5 \
- man/systemd-ask-password.1 \
- man/systemd-loginctl.1
+ man/systemd-ask-password.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
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/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
dist_man_MANS = \
$(MANPAGES) \
test_strv_LDADD = \
libsystemd-basic.la
-test_login_SOURCES = \
- src/test-login.c
-
-test_login_CFLAGS = \
- $(AM_CFLAGS)
-
-test_login_LDADD = \
- libsystemd-basic.la \
- libsystemd-login.la
-
test_install_SOURCES = \
src/test-install.c \
- src/install.c \
- src/path-lookup.c \
- src/unit-name.c
+ src/install.c \
+ src/path-lookup.c \
+ src/unit-name.c
test_install_CFLAGS = \
$(AM_CFLAGS) \
- $(DBUS_CFLAGS)
+ $(DBUS_CFLAGS)
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-basic.la \
libsystemd-daemon.la
+dist_pkgdata_DATA = \
+ src/kbd-model-map
+
+dist_noinst_SCRIPT = \
+ src/generate-kbd-model-map
+
systemd_hostnamed_SOURCES = \
src/hostnamed.c \
- src/dbus-common.c \
- src/polkit.c
+ src/dbus-common.c \
+ src/polkit.c
systemd_hostnamed_CFLAGS = \
$(AM_CFLAGS) \
libsystemd-daemon.la \
$(DBUS_LIBS)
+# ------------------------------------------------------------------------------
+if ENABLE_LOCALED
systemd_localed_SOURCES = \
- src/localed.c \
- src/dbus-common.c \
- src/polkit.c
+ src/locale/localed.c \
+ src/dbus-common.c \
+ src/polkit.c
systemd_localed_CFLAGS = \
$(AM_CFLAGS) \
libsystemd-daemon.la \
$(DBUS_LIBS)
+nodist_systemunit_DATA += \
+ units/systemd-localed.service
+
+rootlibexec_PROGRAMS += \
+ systemd-localed
+
+org.freedesktop.locale1.xml: systemd-localed
+ $(AM_V_GEN)$(LIBTOOL) --mode=execute $(OBJCOPY) -O binary -j introspect.locale1 $< $@.tmp && \
+ $(STRINGS) $@.tmp | $(AWK) -f $(srcdir)/introspect.awk | \
+ $(DBUS_PREPROCESS) -o $@ - && rm $@.tmp
+
+localed-install-data-hook:
+ ( cd $(DESTDIR)$(systemunitdir) && \
+ rm -f dbus-org.freedesktop.locale1.service && \
+ $(LN_S) systemd-localed.service dbus-org.freedesktop.locale1.service )
+
+INSTALL_DATA_HOOKS += \
+ localed-install-data-hook
+
+EXTRA_DIST += \
+ units/systemd-localed.service.in
+endif
+
+# ------------------------------------------------------------------------------
+if ENABLE_TIMEDATED
systemd_timedated_SOURCES = \
- src/timedated.c \
- src/dbus-common.c \
- src/polkit.c
+ src/timedate/timedated.c \
+ src/dbus-common.c \
+ src/polkit.c
systemd_timedated_CFLAGS = \
$(AM_CFLAGS) \
libsystemd-daemon.la \
$(DBUS_LIBS)
+rootlibexec_PROGRAMS += \
+ systemd-timedated
+
+dist_dbussystemservice_DATA += \
+ src/timedate/org.freedesktop.timedate1.service
+
+dist_dbuspolicy_DATA += \
+ src/timedate/org.freedesktop.timedate1.conf
+
+nodist_systemunit_DATA += \
+ units/systemd-timedated.service
+
+polkitpolicy_in_files += \
+ src/timedate/org.freedesktop.timedate1.policy.in
+
+org.freedesktop.timedate1.xml: systemd-timedated
+ $(AM_V_GEN)$(LIBTOOL) --mode=execute $(OBJCOPY) -O binary -j introspect.timedate1 $< $@.tmp && \
+ $(STRINGS) $@.tmp | $(AWK) -f $(srcdir)/introspect.awk | \
+ $(DBUS_PREPROCESS) -o $@ - && rm $@.tmp
+
+dbusinterface_DATA += \
+ org.freedesktop.timedate1.xml
+
+timedated-install-data-hook:
+ ( cd $(DESTDIR)$(systemunitdir) && \
+ rm -f dbus-org.freedesktop.timedate1.service && \
+ $(LN_S) systemd-timedated.service dbus-org.freedesktop.timedate1.service )
+
+INSTALL_DATA_HOOKS += \
+ timedated-install-data-hook
+
+EXTRA_DIST += \
+ units/systemd-timedated.service.in
+endif
+
+# ------------------------------------------------------------------------------
+if ENABLE_LOGIND
systemd_logind_SOURCES = \
- src/logind.c \
- src/logind-dbus.c \
- src/logind-device.c \
- src/logind-seat.c \
- src/logind-seat-dbus.c \
- src/logind-session.c \
- src/logind-session-dbus.c \
- src/logind-user.c \
- src/logind-user-dbus.c \
- src/dbus-common.c \
- src/dbus-loop.c \
- src/cgroup-util.c \
- src/polkit.c
+ src/login/logind.c \
+ src/login/logind-dbus.c \
+ src/login/logind-device.c \
+ src/login/logind-seat.c \
+ src/login/logind-seat-dbus.c \
+ src/login/logind-session.c \
+ src/login/logind-session-dbus.c \
+ src/login/logind-user.c \
+ src/login/logind-user-dbus.c \
+ src/dbus-common.c \
+ src/dbus-loop.c \
+ src/cgroup-util.c \
+ src/polkit.c
nodist_systemd_logind_SOURCES = \
- src/logind-gperf.c
+ src/login/logind-gperf.c
-EXTRA_DIST += \
- src/logind-gperf.gperf
+if HAVE_ACL
+systemd_logind_SOURCES += \
+ src/login/logind-acl.c \
+ src/acl-util.c
+endif
+
+systemd_logind_CPPFLAGS = \
+ $(AM_CPPFLAGS) \
+ -I $(top_srcdir)/src/login
systemd_logind_CFLAGS = \
$(AM_CFLAGS) \
$(DBUS_CFLAGS) \
- $(UDEV_CFLAGS) \
- $(ACL_CFLAGS)
+ $(UDEV_CFLAGS) \
+ $(ACL_CFLAGS)
systemd_logind_LDADD = \
libsystemd-basic.la \
libsystemd-daemon.la \
$(DBUS_LIBS) \
- $(UDEV_LIBS) \
- $(ACL_LIBS)
+ $(UDEV_LIBS) \
+ $(ACL_LIBS)
+
+rootlibexec_PROGRAMS += \
+ systemd-logind
+
+systemd_loginctl_SOURCES = \
+ src/login/loginctl.c \
+ src/dbus-common.c \
+ src/cgroup-show.c \
+ src/cgroup-util.c \
+ src/pager.c \
+ src/sysfs-show.c
+
+systemd_loginctl_CFLAGS = \
+ $(AM_CFLAGS) \
+ $(DBUS_CFLAGS) \
+ $(UDEV_CFLAGS)
+
+systemd_loginctl_LDADD = \
+ libsystemd-basic.la \
+ $(DBUS_LIBS) \
+ $(UDEV_LIBS)
+
+rootbin_PROGRAMS += \
+ systemd-loginctl
+
+test_login_SOURCES = \
+ src/login/test-login.c
+
+test_login_LDADD = \
+ libsystemd-basic.la \
+ libsystemd-login.la
+
+noinst_PROGRAMS += \
+ test-login
+
+libsystemd_login_la_SOURCES = \
+ src/login/sd-login.c \
+ src/cgroup-util.c
+
+libsystemd_login_la_CFLAGS = \
+ $(AM_CFLAGS) \
+ -fvisibility=hidden
+
+libsystemd_login_la_LDFLAGS = \
+ -shared \
+ -version-info $(LIBSYSTEMD_LOGIN_CURRENT):$(LIBSYSTEMD_LOGIN_REVISION):$(LIBSYSTEMD_LOGIN_AGE) \
+ -Wl,--version-script=$(top_srcdir)/src/login/libsystemd-login.sym
+
+libsystemd_login_la_LIBADD = \
+ libsystemd-basic.la
+
+# move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
+libsystemd-login-install-hook:
+ if test "$(libdir)" != "$(rootlibdir)"; then \
+ mkdir -p $(DESTDIR)$(rootlibdir) && \
+ so_img_name=$$(readlink $(DESTDIR)$(libdir)/libsystemd-login.so) && \
+ so_img_rel_target_prefix=$$(echo $(libdir) | sed 's,\(^/\|\)[^/][^/]*,..,g') && \
+ ln -sf $$so_img_rel_target_prefix$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/libsystemd-login.so && \
+ mv $(DESTDIR)$(libdir)/libsystemd-login.so.* $(DESTDIR)$(rootlibdir); \
+ fi
+
+INSTALL_EXEC_HOOKS += \
+ libsystemd-login-install-hook
+
+libsystemd-login-uninstall-hook:
+ rm -f $(DESTDIR)$(rootlibdir)/libsystemd-login.so*
+
+UNINSTALL_EXEC_HOOKS += \
+ libsystemd-login-uninstall-hook
+
+nodist_systemunit_DATA += \
+ units/systemd-logind.service
+
+dist_dbussystemservice_DATA += \
+ src/login/org.freedesktop.login1.service
+
+dist_dbuspolicy_DATA += \
+ src/login/org.freedesktop.login1.conf
+
+dist_pkgsysconf_DATA += \
+ src/login/systemd-logind.conf
+
+pkginclude_HEADERS += \
+ src/login/sd-login.h
+
+lib_LTLIBRARIES += \
+ libsystemd-login.la
+
+pkgconfiglib_DATA += \
+ libsystemd-login.pc
+
+polkitpolicy_in_files += \
+ src/login/org.freedesktop.login1.policy.in
+
+logind-install-data-hook:
+ ( cd $(DESTDIR)$(systemunitdir) && \
+ rm -f dbus-org.freedesktop.login1.service && \
+ $(LN_S) systemd-logind.service dbus-org.freedesktop.login1.service)
+ ( cd $(DESTDIR)$(systemunitdir)/multi-user.target.wants && \
+ rm -f systemd-logind.service && \
+ $(LN_S) ../systemd-logind.service systemd-logind.service )
+
+INSTALL_DATA_HOOKS += \
+ logind-install-data-hook
systemd_uaccess_SOURCES = \
- src/uaccess.c
+ src/login/uaccess.c
if HAVE_ACL
-systemd_logind_SOURCES += \
- src/logind-acl.c
-
systemd_uaccess_SOURCES += \
- src/logind-acl.c
+ src/login/logind-acl.c \
+ src/acl-util.c
endif
systemd_uaccess_CFLAGS = \
$(AM_CFLAGS) \
- $(UDEV_CFLAGS) \
- $(ACL_CFLAGS)
+ $(UDEV_CFLAGS) \
+ $(ACL_CFLAGS)
systemd_uaccess_LDADD = \
libsystemd-basic.la \
libsystemd-daemon.la \
libsystemd-login.la \
- $(UDEV_LIBS) \
- $(ACL_LIBS)
+ $(UDEV_LIBS) \
+ $(ACL_LIBS)
+
+rootlibexec_PROGRAMS += \
+ systemd-uaccess
+
+dist_udevrules_DATA += \
+ src/70-uaccess.rules
+
+MANPAGES += \
+ man/systemd-logind.conf.5 \
+ man/sd-login.7 \
+ man/systemd-loginctl.1 \
+ man/sd_login_monitor_new.3
+
+MANPAGES_ALIAS += \
+ man/sd_login_monitor_unref.3 \
+ man/sd_login_monitor_flush.3 \
+ man/sd_login_monitor_get_fd.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
+
+EXTRA_DIST += \
+ src/login/logind-gperf.gperf \
+ units/systemd-logind.service.in \
+ libsystemd-login.pc.in \
+ src/login/libsystemd-login.sym \
+ src/login/logind.h \
+ src/login/logind-device.h \
+ src/login/logind-seat.h \
+ src/login/logind-session.h \
+ src/login/logind-user.h \
+ src/login/logind-acl.h
+
+CLEANFILES += \
+ src/login/logind-gperf.c
+endif
+# ------------------------------------------------------------------------------
systemd_shutdown_SOURCES = \
src/mount-setup.c \
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)
systemd_getty_generator_LDADD = \
libsystemd-basic.la
+systemd_rc_local_generator_SOURCES = \
+ src/rc-local-generator.c
+
+systemd_rc_local_generator_CFLAGS = \
+ $(AM_CFLAGS)
+
+systemd_rc_local_generator_LDADD = \
+ libsystemd-basic.la
+
systemd_user_sessions_SOURCES = \
src/user-sessions.c \
src/cgroup-util.c
src/cgroup-util.c \
src/exit-status.c \
src/unit-name.c \
- src/pager.c \
- src/install.c \
- src/spawn-agent.c
+ src/pager.c \
+ src/install.c \
+ src/spawn-agent.c
systemctl_CFLAGS = \
$(AM_CFLAGS) \
libsystemd-daemon.la \
$(DBUS_LIBS)
-systemd_loginctl_SOURCES = \
- src/loginctl.c \
- src/dbus-common.c \
- src/cgroup-show.c \
- src/cgroup-util.c \
- src/pager.c \
- src/sysfs-show.c
-
-systemd_loginctl_CFLAGS = \
- $(AM_CFLAGS) \
- $(DBUS_CFLAGS) \
- $(UDEV_CFLAGS)
-
-systemd_loginctl_LDADD = \
- libsystemd-basic.la \
- $(DBUS_LIBS) \
- $(UDEV_LIBS)
-
systemd_notify_SOURCES = \
src/notify.c \
src/sd-readahead.c
src/cgls.c \
src/cgroup-show.c \
src/cgroup-util.c \
- src/pager.c
+ src/pager.c
systemd_cgls_CFLAGS = \
$(AM_CFLAGS)
systemd_nspawn_SOURCES = \
src/nspawn.c \
src/cgroup-util.c \
- src/loopback-setup.c
+ src/loopback-setup.c
systemd_nspawn_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 = \
pam_systemd_la_SOURCES = \
src/pam-module.c \
- src/dbus-common.c
+ src/dbus-common.c
pam_systemd_la_CFLAGS = \
$(AM_CFLAGS) \
- $(PAM_CFLAGS) \
- $(DBUS_CFLAGS) \
+ $(PAM_CFLAGS) \
+ $(DBUS_CFLAGS) \
-fvisibility=hidden
pam_systemd_la_LDFLAGS = \
libsystemd-basic.la \
libsystemd-daemon.la \
$(PAM_LIBS) \
- $(DBUS_LIBS)
+ $(DBUS_LIBS)
libsystemd_daemon_la_SOURCES = \
src/sd-daemon.c
libsystemd_daemon_la_CFLAGS = \
- $(AM_CFLAGS) \
+ $(AM_CFLAGS) \
-fvisibility=hidden \
- -DSD_EXPORT_SYMBOLS
+ -DSD_EXPORT_SYMBOLS
libsystemd_daemon_la_LDFLAGS = \
- -shared \
- -version-info $(LIBSYSTEMD_DAEMON_CURRENT):$(LIBSYSTEMD_DAEMON_REVISION):$(LIBSYSTEMD_DAEMON_AGE) \
- -Wl,--version-script=$(top_srcdir)/src/libsystemd-daemon.sym
+ -shared \
+ -version-info $(LIBSYSTEMD_DAEMON_CURRENT):$(LIBSYSTEMD_DAEMON_REVISION):$(LIBSYSTEMD_DAEMON_AGE) \
+ -Wl,--version-script=$(top_srcdir)/src/libsystemd-daemon.sym
# move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
libsystemd-daemon-install-hook:
libsystemd-daemon-uninstall-hook:
rm -f $(DESTDIR)$(rootlibdir)/libsystemd-daemon.so*
-libsystemd_login_la_SOURCES = \
- src/sd-login.c \
- src/cgroup-util.c
+libsystemd_id128_la_SOURCES = \
+ src/sd-id128.c
-libsystemd_login_la_CFLAGS = \
- $(AM_CFLAGS) \
+libsystemd_id128_la_CFLAGS = \
+ $(AM_CFLAGS) \
-fvisibility=hidden
-libsystemd_login_la_LDFLAGS = \
- -shared \
- -version-info $(LIBSYSTEMD_LOGIN_CURRENT):$(LIBSYSTEMD_LOGIN_REVISION):$(LIBSYSTEMD_LOGIN_AGE) \
- -Wl,--version-script=$(top_srcdir)/src/libsystemd-login.sym
+libsystemd_id128_la_LDFLAGS = \
+ -shared \
+ -version-info $(LIBSYSTEMD_ID128_CURRENT):$(LIBSYSTEMD_ID128_REVISION):$(LIBSYSTEMD_ID128_AGE) \
+ -Wl,--version-script=$(top_srcdir)/src/libsystemd-id128.sym
-libsystemd_login_la_LIBADD = \
+libsystemd_id128_la_LIBADD = \
libsystemd-basic.la
# move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
-libsystemd-login-install-hook:
+libsystemd-id128-install-hook:
if test "$(libdir)" != "$(rootlibdir)"; then \
mkdir -p $(DESTDIR)$(rootlibdir) && \
- so_img_name=$$(readlink $(DESTDIR)$(libdir)/libsystemd-login.so) && \
+ so_img_name=$$(readlink $(DESTDIR)$(libdir)/libsystemd-id128.so) && \
so_img_rel_target_prefix=$$(echo $(libdir) | sed 's,\(^/\|\)[^/][^/]*,..,g') && \
- ln -sf $$so_img_rel_target_prefix$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/libsystemd-login.so && \
- mv $(DESTDIR)$(libdir)/libsystemd-login.so.* $(DESTDIR)$(rootlibdir); \
+ ln -sf $$so_img_rel_target_prefix$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/libsystemd-id128.so && \
+ mv $(DESTDIR)$(libdir)/libsystemd-id128.so.* $(DESTDIR)$(rootlibdir); \
fi
-libsystemd-login-uninstall-hook:
- rm -f $(DESTDIR)$(rootlibdir)/libsystemd-login.so*
+libsystemd-id128-uninstall-hook:
+ rm -f $(DESTDIR)$(rootlibdir)/libsystemd-id128.so*
+
+libsystemd_journal_la_SOURCES = \
+ src/journal/sd-journal.c \
+ src/journal/journal-file.c \
+ src/journal/compress.c \
+ src/journal/lookup3.c \
+ src/journal/journal-send.c
+
+libsystemd_journal_la_CFLAGS = \
+ $(AM_CFLAGS) \
+ $(XZ_CFLAGS) \
+ -fvisibility=hidden
+
+libsystemd_journal_la_LDFLAGS = \
+ -shared \
+ -version-info $(LIBSYSTEMD_JOURNAL_CURRENT):$(LIBSYSTEMD_JOURNAL_REVISION):$(LIBSYSTEMD_JOURNAL_AGE) \
+ -Wl,--version-script=$(top_srcdir)/src/journal/libsystemd-journal.sym
+
+libsystemd_journal_la_LIBADD = \
+ libsystemd-basic.la \
+ libsystemd-id128.la \
+ $(XZ_LIBS)
+
+# move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
+libsystemd-journal-install-hook:
+ if test "$(libdir)" != "$(rootlibdir)"; then \
+ mkdir -p $(DESTDIR)$(rootlibdir) && \
+ so_img_name=$$(readlink $(DESTDIR)$(libdir)/libsystemd-journal.so) && \
+ so_img_rel_target_prefix=$$(echo $(libdir) | sed 's,\(^/\|\)[^/][^/]*,..,g') && \
+ ln -sf $$so_img_rel_target_prefix$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/libsystemd-journal.so && \
+ mv $(DESTDIR)$(libdir)/libsystemd-journal.so.* $(DESTDIR)$(rootlibdir); \
+ fi
+
+libsystemd-journal-uninstall-hook:
+ rm -f $(DESTDIR)$(rootlibdir)/libsystemd-journal.so*
SED_PROCESS = \
$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
src/load-fragment-gperf-nulstr.c: src/load-fragment-gperf.gperf
$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
- $(AWK) 'BEGIN{ keywords=0 ; FS="," ; print "extern const char load_fragment_gperf_nulstr[];" ; print "const char load_fragment_gperf_nulstr[] ="} ; keyword==1 { print "\"" $$1 "\\0\"" } ; /%%/ { keyword=1} ; END { print ";" }' < $< > $@ || rm $@
+ $(AWK) 'BEGIN{ keywords=0 ; FS="," ; print "extern const char load_fragment_gperf_nulstr[];" ; print "const char load_fragment_gperf_nulstr[] ="} ; keyword==1 { print "\"" $$1 "\\0\"" } ; /%%/ { keyword=1} ; END { print ";" }' < $< > $@ || rm $@
M4_PROCESS_SYSTEM = \
$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
units/user/%: units/%.m4 Makefile
$(M4_PROCESS_USER)
-CLEANFILES = \
+CLEANFILES += \
$(nodist_systemunit_DATA) \
$(nodist_userunit_DATA) \
$(nodist_man_MANS) \
$(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/logind-gperf.c
+ 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 += \
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
$(STRINGS) $@.tmp | $(AWK) -f $(srcdir)/introspect.awk | \
$(DBUS_PREPROCESS) -o $@ - && rm $@.tmp
-org.freedesktop.locale1.xml: systemd-localed
- $(AM_V_GEN)$(LIBTOOL) --mode=execute $(OBJCOPY) -O binary -j introspect.locale1 $< $@.tmp && \
- $(STRINGS) $@.tmp | $(AWK) -f $(srcdir)/introspect.awk | \
- $(DBUS_PREPROCESS) -o $@ - && rm $@.tmp
-
-org.freedesktop.timedate1.xml: systemd-timedated
- $(AM_V_GEN)$(LIBTOOL) --mode=execute $(OBJCOPY) -O binary -j introspect.timedate1 $< $@.tmp && \
- $(STRINGS) $@.tmp | $(AWK) -f $(srcdir)/introspect.awk | \
- $(DBUS_PREPROCESS) -o $@ - && rm $@.tmp
-
CLEANFILES += \
$(dbusinterface_DATA)
-install-data-hook:
+systemd-install-data-hook:
$(MKDIR_P) -m 0755 \
$(DESTDIR)$(tmpfilesdir) \
$(DESTDIR)$(sysconfdir)/tmpfiles.d \
rm -f user && \
$(LN_S) $(pkgsysconfdir)/user user )
( cd $(DESTDIR)$(systemunitdir)/sockets.target.wants && \
- rm -f systemd-initctl.socket systemd-stdout-syslog-bridge.socket systemd-shutdownd.socket syslog.socket && \
+ rm -f systemd-initctl.socket systemd-stdout-syslog-bridge.socket systemd-shutdownd.socket syslog.socket systemd-journald.socket && \
$(LN_S) ../systemd-stdout-syslog-bridge.socket systemd-stdout-syslog-bridge.socket && \
$(LN_S) ../systemd-initctl.socket systemd-initctl.socket && \
$(LN_S) ../systemd-shutdownd.socket systemd-shutdownd.socket && \
- $(LN_S) ../syslog.socket syslog.socket )
+ $(LN_S) ../syslog.socket syslog.socket && \
+ $(LN_S) ../systemd-journald.socket )
( cd $(DESTDIR)$(systemunitdir)/runlevel1.target.wants && \
rm -f systemd-update-utmp-runlevel.service && \
$(LN_S) ../systemd-update-utmp-runlevel.service systemd-update-utmp-runlevel.service )
$(LN_S) graphical.target runlevel5.target && \
$(LN_S) reboot.target runlevel6.target )
( cd $(DESTDIR)$(systemunitdir) && \
- rm -f default.target ctrl-alt-del.target dbus-org.freedesktop.login1.service autovt@.service && \
+ rm -f default.target ctrl-alt-del.target autovt@.service && \
$(LN_S) graphical.target default.target && \
$(LN_S) reboot.target ctrl-alt-del.target && \
- $(LN_S) systemd-logind.service dbus-org.freedesktop.login1.service && \
- $(LN_S) getty@.service autovt@.service )
+ $(LN_S) getty@.service autovt@.service )
( cd $(DESTDIR)$(systemunitdir)/multi-user.target.wants && \
- rm -f getty.target systemd-user-sessions.service systemd-ask-password-wall.path systemd-logind.service && \
+ rm -f getty.target systemd-user-sessions.service systemd-ask-password-wall.path && \
$(LN_S) ../getty.target getty.target && \
$(LN_S) ../systemd-user-sessions.service systemd-user-sessions.service && \
- $(LN_S) ../systemd-ask-password-wall.path systemd-ask-password-wall.path && \
- $(LN_S) ../systemd-logind.service systemd-logind.service )
+ $(LN_S) ../systemd-ask-password-wall.path systemd-ask-password-wall.path)
( cd $(DESTDIR)$(pkgsysconfdir)/system/getty.target.wants && \
rm -f getty@tty1.service && \
$(LN_S) $(systemunitdir)/getty@.service getty@tty1.service )
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-config.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-config.automount sys-kernel-config.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 && \
( cd $(DESTDIR)$(systemunitdir) && \
rm -f dbus-org.freedesktop.hostname1.service && \
$(LN_S) systemd-hostnamed.service dbus-org.freedesktop.hostname1.service )
-endif
-if ENABLE_TIMEDATED
- ( cd $(DESTDIR)$(systemunitdir) && \
- rm -f dbus-org.freedesktop.timedate1.service && \
- $(LN_S) systemd-timedated.service dbus-org.freedesktop.timedate1.service )
-endif
-if ENABLE_LOCALED
- ( cd $(DESTDIR)$(systemunitdir) && \
- rm -f dbus-org.freedesktop.locale1.service && \
- $(LN_S) systemd-localed.service dbus-org.freedesktop.locale1.service )
endif
( cd $(DESTDIR)$(systemunitdir)/basic.target.wants && \
rm -f systemd-tmpfiles-clean.timer && \
if TARGET_FEDORA
$(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 )
if TARGET_MANDRIVA
$(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 )
if TARGET_SUSE
$(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) && \
rm -f local.service && \
$(LN_S) rc-local.service local.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)/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 && \
$(LN_S) ../var-lock.mount var-lock.mount )
endif
-install-exec-hook: libsystemd-daemon-install-hook libsystemd-login-install-hook
+install-exec-hook: libsystemd-daemon-install-hook $(INSTALL_EXEC_HOOKS)
-uninstall-hook: libsystemd-daemon-uninstall-hook libsystemd-login-uninstall-hook
+uninstall-hook: libsystemd-daemon-uninstall-hook $(UNINSTALL_EXEC_HOOKS)
+
+install-data-hook: systemd-install-data-hook $(INSTALL_DATA_HOOKS)
DISTCHECK_CONFIGURE_FLAGS = \
--with-dbuspolicydir=$$dc_install_base/$(dbuspolicydir) \
git-tag:
git tag "v$(VERSION)" -m "systemd $(VERSION)"
+
+update-kbd-model-map:
+ src/generate-kbd-model-map > src/kbd-model-map
~ianmdlvl / elogind.git / blobdiff