X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=bd2bc927f6a8bc894decdd781daa728e30a4819e;hp=84e15e9e520a58f4f94b34f3d389f25ff4e86362;hb=1c0f0483c0afbdde3eaf220eb4e0015533dba3b5;hpb=6c06c23c21d48a94febb03cbbfb4ef09dcddebc1

diff --git a/Makefile.am b/Makefile.am
index 84e15e9e5..bd2bc927f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -60,6 +60,8 @@ systemshutdowndir=$(pkglibexecdir)/shutdown.d
 udevrulesdir=@udevrulesdir@
 udevbindir=@udevbindir@
 
+PKTTYAGENT=$(bindir)/pkttyagent
+
 # Our own, non-special dirs
 pkgsysconfdir=$(sysconfdir)/elogind
 pkgincludedir=$(includedir)/elogind
@@ -115,14 +117,13 @@ 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)\" \
@@ -806,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