# Keep the test-suite.log
.PRECIOUS: $(TEST_SUITE_LOG) Makefile
-LIBELOGIND_CURRENT=6
+LIBELOGIND_CURRENT=7
LIBELOGIND_REVISION=0
-LIBELOGIND_AGE=6
+LIBELOGIND_AGE=7
# Dirs of external packages
dbuspolicydir=@dbuspolicydir@
zshcompletiondir=@zshcompletiondir@
varlogdir=$(localstatedir)/log
elogindstatedir=$(localstatedir)/lib/elogind
+systemsleepdir=$(pkglibexecdir)/sleep.d
+systemshutdowndir=$(pkglibexecdir)/shutdown.d
udevrulesdir=@udevrulesdir@
udevbindir=@udevbindir@
+PKTTYAGENT=$(bindir)/pkttyagent
+
# Our own, non-special dirs
pkgsysconfdir=$(sysconfdir)/elogind
pkgincludedir=$(includedir)/elogind
-factory_etcdir = $(prefix)/share/factory/etc
-factory_pamdir = $(prefix)/share/factory/etc/pam.d
+udevlibexecdir=$(udevbindir)
+udevhomedir=$(udevlibexecdir)
+udevhwdbdir=$(udevlibexecdir)/hwdb.d
+factory_etcdir = $(datadir)/factory/etc
+factory_pamdir = $(datadir)/factory/etc/pam.d
EXTRA_DIST =
BUILT_SOURCES =
$(INSTALL_DATA_HOOKS) $(UNINSTALL_DATA_HOOKS) \
$(DISTCLEAN_LOCAL_HOOKS) $(CLEAN_LOCAL_HOOKS)
-# FIXME a different pkttyagent path...
-
AM_CPPFLAGS = \
-include $(top_builddir)/config.h \
-DPKGSYSCONFDIR=\"$(pkgsysconfdir)\" \
- -DPOLKIT_AGENT_BINARY_PATH=\"$(bindir)/pkttyagent\" \
+ -DPOLKIT_AGENT_BINARY_PATH=\"$(PKTTYAGENT)\" \
-DSYSTEM_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/system\" \
-DSYSTEM_DATA_UNIT_PATH=\"$(systemunitdir)\" \
+ -DSYSTEMD_CGROUP_AGENT_PATH=\"$(pkglibexecdir)/logind-cgroups-agent\" \
-DUSER_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/user\" \
-DUSER_DATA_UNIT_PATH=\"$(userunitdir)\" \
-DROOTPREFIX=\"$(rootprefix)\" \
- -DPOLKIT_AGENT_BINARY_PATH=\"$(bindir)/pkttyagent\" \
+ -DSYSTEM_SLEEP_PATH=\"$(systemsleepdir)\" \
+ -DSYSTEM_SHUTDOWN_PATH=\"$(systemshutdowndir)\" \
+ -DHALT=\"$(HALT)\" \
+ -DREBOOT=\"$(REBOOT)\" \
+ -DUDEVLIBEXECDIR=\"$(udevlibexecdir)\" \
-DKEXEC=\"$(KEXEC)\" \
-DLIBDIR=\"$(libdir)\" \
+ -DROOTLIBDIR=\"$(rootlibdir)\" \
-DTEST_DIR=\"$(abs_top_srcdir)/test\" \
-I $(top_srcdir)/src \
-I $(top_builddir)/src/shared \
src/shared/base-filesystem.h \
src/shared/memfd-util.c \
src/shared/memfd-util.h \
+ src/shared/process-util.c \
+ src/shared/process-util.h \
+ src/shared/random-util.c \
+ src/shared/random-util.h \
+ src/shared/terminal-util.c \
+ src/shared/terminal-util.h \
src/shared/uid-range.c \
src/shared/uid-range.h \
src/shared/nss-util.h \
src/shared/import-util.c \
src/shared/import-util.h \
src/shared/sysctl-util.c \
- src/shared/sysctl-util.h
+ src/shared/sysctl-util.h \
+ src/shared/hostname-util.h \
+ src/shared/hostname-util.c
nodist_libelogind_shared_la_SOURCES = \
src/shared/errno-from-name.h \
$(CAP_LIBS) \
-lm
+libelogind_shared_la_LDFLAGS = \
+ $(CAP_LDFLAGS)
+
# ------------------------------------------------------------------------------
if HAVE_ACL
noinst_LTLIBRARIES += \
src/systemd/sd-login.h \
src/systemd/sd-id128.h \
src/systemd/sd-daemon.h \
+ src/systemd/sd-path.h \
src/systemd/sd-network.h \
+ src/systemd/sd-hwdb.h \
src/systemd/sd-device.h \
src/libelogind/sd-bus/sd-bus.c \
src/libelogind/sd-bus/bus-control.c \
src/libelogind/sd-id128/sd-id128.c \
src/libelogind/sd-daemon/sd-daemon.c \
src/libelogind/sd-login/sd-login.c \
+ src/libelogind/sd-path/sd-path.c \
src/libelogind/sd-network/sd-network.c \
src/libelogind/sd-network/network-util.h \
src/libelogind/sd-network/network-util.c \
+ src/libelogind/sd-hwdb/sd-hwdb.c \
+ src/libelogind/sd-hwdb/hwdb-util.h \
+ src/libelogind/sd-hwdb/hwdb-internal.h \
src/libelogind/sd-device/device-internal.h \
src/libelogind/sd-device/device-util.h \
+ src/libelogind/sd-device/device-enumerator.c \
+ src/libelogind/sd-device/device-enumerator-private.h \
src/libelogind/sd-device/sd-device.c \
src/libelogind/sd-device/device-private.c \
src/libelogind/sd-device/device-private.h
$(AM_CFLAGS) \
-pthread
-BUILT_SOURCES += \
- src/libelogind/libelogind.sym
-
-
libelogind_internal_la_LIBADD = \
libelogind-shared.la
src/libelogind/sd-bus/DIFFERENCES \
src/libelogind/sd-bus/GVARIANT-SERIALIZATION
-CLEANFILES += \
- src/libelogind/libelogind.sym
-
BUILT_SOURCES += \
- src/libelogind/libelogind.sym
-
+ src/libelogind/libelogind.sym
# ------------------------------------------------------------------------------
elogind_SOURCES = \
bin_PROGRAMS += \
loginctl
+logind_cgroups_agent_SOURCES = \
+ src/cgroups-agent/cgroups-agent.c
+
+logind_cgroups_agent_LDADD = \
+ libelogind-internal.la \
+ libelogind-shared.la
+
+pkglibexec_PROGRAMS += \
+ logind-cgroups-agent
+
dist_bashcompletion_DATA += \
shell-completion/bash/loginctl