# 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
-udevrulesdir=$(rootprefix)/lib/udev/rules.d
-factory_etcdir = $(prefix)/share/factory/etc
-factory_pamdir = $(prefix)/share/factory/etc/pam.d
-
-# And these are the special ones for /
-rootprefix=@rootprefix@
-rootbindir=$(rootprefix)/bin
-rootlibexecdir=$(rootprefix)/lib/elogind
+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)\" \
- -DROOTLIBEXECDIR=\"$(rootlibexecdir)\" \
-DTEST_DIR=\"$(abs_top_srcdir)/test\" \
-I $(top_srcdir)/src \
-I $(top_builddir)/src/shared \
AM_LDFLAGS = $(OUR_LDFLAGS)
# ------------------------------------------------------------------------------
-define move-to-rootlibdir
- if test "$(libdir)" != "$(rootlibdir)"; then \
- $(MKDIR_P) $(DESTDIR)$(rootlibdir) && \
- so_img_name=$$(readlink $(DESTDIR)$(libdir)/$$libname) && \
- rm -f $(DESTDIR)$(libdir)/$$libname && \
- $(LN_S) --relative -f $(DESTDIR)$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/$$libname && \
- mv $(DESTDIR)$(libdir)/$$libname.* $(DESTDIR)$(rootlibdir); \
- fi
-endef
-
-INSTALL_DIRS =
-
SHUTDOWN_TARGET_WANTS =
LOCAL_FS_TARGET_WANTS =
MULTI_USER_TARGET_WANTS =
for i in $$what; do $(LN_S) ../$$i . || exit $$? ; done )
endef
-install-directories-hook:
- $(MKDIR_P) $(addprefix $(DESTDIR),$(INSTALL_DIRS))
-
install-aliases-hook:
set -- $(GENERAL_ALIASES) && \
dir= && $(install-relative-aliases)
INSTALL_EXEC_HOOKS += \
install-target-wants-hook \
- install-directories-hook \
install-aliases-hook \
install-touch-usr-hook
AM_V_RM_0 = @echo " RM " $@;
# ------------------------------------------------------------------------------
-rootbin_PROGRAMS =
bin_PROGRAMS =
-rootlibexec_PROGRAMS =
+pkglibexec_PROGRAMS =
dist_bashcompletion_DATA =
dist_zshcompletion_DATA =
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-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-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
libelogind_la_LIBADD = \
libelogind-internal.la
-libelogind-install-hook:
- libname=libelogind.so && $(move-to-rootlibdir)
-
-libelogind-uninstall-hook:
- rm -f $(DESTDIR)$(rootlibdir)/libelogind.so*
-
-INSTALL_EXEC_HOOKS += libelogind-install-hook
-UNINSTALL_EXEC_HOOKS += libelogind-uninstall-hook
-
pkgconfiglib_DATA += \
src/libelogind/libelogind.pc
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 = \
noinst_LTLIBRARIES += \
libelogind-core.la
-rootlibexec_PROGRAMS += \
- elogind
+pkglibexec_PROGRAMS += elogind
loginctl_SOURCES = \
src/login/loginctl.c \
libelogind-internal.la \
libelogind-shared.la
-rootbin_PROGRAMS += \
+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
libelogind-internal.la \
libelogind-shared.la
-rootbin_PROGRAMS += \
+bin_PROGRAMS += \
systemd-inhibit
test_login_SOURCES = \
polkitpolicy_files += \
src/login/org.freedesktop.login1.policy
-INSTALL_DIRS += \
- $(elogindstatedir)
-
SYSTEM_UNIT_ALIASES += \
elogind.service dbus-org.freedesktop.login1.service
# ------------------------------------------------------------------------------
substitutions = \
- '|rootlibexecdir=$(rootlibexecdir)|' \
- '|rootbindir=$(rootbindir)|' \
'|bindir=$(bindir)|' \
+ '|udevbindir=$(udevbindir)|' \
'|pkgsysconfdir=$(pkgsysconfdir)|' \
'|pkgdatadir=$(pkgdatadir)|' \
- '|udevrulesdir=$(udevrulesdir)|' \
'|PACKAGE_VERSION=$(PACKAGE_VERSION)|' \
'|PACKAGE_NAME=$(PACKAGE_NAME)|' \
'|PACKAGE_URL=$(PACKAGE_URL)|' \
'|VERSION=$(VERSION)|' \
'|rootprefix=$(rootprefix)|' \
'|MKDIR_P=$(MKDIR_P)|' \
- '|VARLOGDIR=$(varlogdir)|' \
'|systemuidmax=$(SYSTEM_UID_MAX)|' \
'|systemgidmax=$(SYSTEM_GID_MAX)|'
--with-zshcompletiondir=$$dc_install_base/$(zshcompletiondir) \
--with-pamlibdir=$$dc_install_base/$(pamlibdir) \
--with-pamconfdir=$$dc_install_base/$(pamconfdir) \
- --with-rootprefix=$$dc_install_base \
- --disable-split-usr \
- --enable-kdbus
+ --enable-kdbus \
+ --with-udevrulesdir=$$dc_install_base/$(udevrulesdir)
if ENABLE_GTK_DOC
DISTCHECK_CONFIGURE_FLAGS += \