Stop talking about the "XDG" version of basename()

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 8012620fd9e1fe37605f2dba0a64a09764faff94..bd2bc927f6a8bc894decdd781daa728e30a4819e 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -54,10 +54,14 @@ bashcompletiondir=@bashcompletiondir@
 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
@@ -113,18 +117,20 @@ CLEANFILES = $(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)\" \
        -DKEXEC=\"$(KEXEC)\" \
        -DLIBDIR=\"$(libdir)\" \
        -DTEST_DIR=\"$(abs_top_srcdir)/test\" \
@@ -498,6 +504,9 @@ libelogind_shared_la_LIBADD = \
        $(CAP_LIBS) \
        -lm
 
+libelogind_shared_la_LDFLAGS = \
+       $(CAP_LDFLAGS)
+
 # ------------------------------------------------------------------------------
 if HAVE_ACL
 noinst_LTLIBRARIES += \
@@ -798,6 +807,16 @@ loginctl_LDADD = \
 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