X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=fb59c77f70ce57b27b67295dca3e7528d6c75b99;hp=988173d8c8c82f571e2c4832f97356b5f7f481f8;hb=09e75d32a30c7527df7dace0f80327817cc23bb6;hpb=bceb7d6de7ddef3c2f3528eb76717cf6a2690cd6

diff --git a/Makefile.am b/Makefile.am
index 988173d8c..fb59c77f7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -52,6 +52,8 @@ pkgconfiglibdir=$(libdir)/pkgconfig
 polkitpolicydir=$(datadir)/polkit-1/actions
 bashcompletiondir=@bashcompletiondir@
 zshcompletiondir=@zshcompletiondir@
+systemsleepdir=$(pkglibexecdir)/sleep.d
+systemshutdowndir=$(pkglibexecdir)/shutdown.d
 
 # Our own, non-special dirs
 pkgsysconfdir=$(sysconfdir)/elogind
@@ -115,9 +117,14 @@ CLEANFILES = $(BUILT_SOURCES) \
 AM_CPPFLAGS = \
 	-include $(top_builddir)/config.h \
 	-DPKGSYSCONFDIR=\"$(pkgsysconfdir)\" \
+	-DELOGIND_CGROUP_AGENT_PATH=\"$(rootlibexecdir)/elogind-cgroups-agent\" \
 	-DROOTPREFIX=\"$(rootprefix)\" \
 	-DUDEVLIBEXECDIR=\"$(udevlibexecdir)\" \
 	-DPOLKIT_AGENT_BINARY_PATH=\"$(bindir)/pkttyagent\" \
+	-DSYSTEM_SLEEP_PATH=\"$(systemsleepdir)\" \
+	-DSYSTEM_SHUTDOWN_PATH=\"$(systemshutdowndir)\" \
+	-DHALT=\"$(HALT)\" \
+	-DREBOOT=\"$(REBOOT)\" \
 	-DKEXEC=\"$(KEXEC)\" \
 	-DLIBDIR=\"$(libdir)\" \
 	-DROOTLIBDIR=\"$(rootlibdir)\" \
@@ -126,18 +133,14 @@ AM_CPPFLAGS = \
 	-I $(top_srcdir)/src \
 	-I $(top_builddir)/src/basic \
 	-I $(top_srcdir)/src/basic \
+	-I $(top_srcdir)/src/core \
 	-I $(top_srcdir)/src/shared \
 	-I $(top_builddir)/src/shared \
 	-I $(top_srcdir)/src/login \
 	-I $(top_srcdir)/src/systemd \
-	-I $(top_builddir)/src/core \
-	-I $(top_srcdir)/src/libudev \
-	-I $(top_srcdir)/src/udev \
-	-I $(top_srcdir)/src/core \
 	-I $(top_srcdir)/src/libelogind/sd-bus \
 	-I $(top_srcdir)/src/libelogind/sd-event \
 	-I $(top_srcdir)/src/libelogind/sd-login \
-	-I $(top_srcdir)/src/libelogind/sd-netlink \
 	$(OUR_CPPFLAGS)
 
 AM_CFLAGS = $(OUR_CFLAGS)
@@ -278,7 +281,7 @@ endif
 endif
 
 EXTRA_DIST += \
-	$(filter-out man/systemd.directives.xml,$(XML_FILES)) \
+	$(filter-out man/elogind.directives.xml,$(XML_FILES)) \
 	$(HTML_FILES) \
 	$(HTML_ALIAS) \
 	$(man_MANS) \
@@ -372,11 +375,13 @@ libbasic_la_CFLAGS = \
 	$(CAP_CFLAGS) \
 	-pthread
 
+libbasic_la_LDFLAGS = \
+	$(CAP_LDFLAGS)
+
 libbasic_la_LIBADD = \
 	$(SELINUX_LIBS) \
 	$(CAP_LIBS) \
 	-ldl \
-	-lrt \
 	-lm
 
 # -----------------------------------------------------------------------------
@@ -408,16 +413,12 @@ endif
 
 libshared_la_CFLAGS = \
 	$(AM_CFLAGS) \
-	$(ACL_CFLAGS) \
-	$(LIBIDN_CFLAGS) \
-	$(SECCOMP_CFLAGS)
+	$(ACL_CFLAGS)
 
 libshared_la_LIBADD = \
 	libelogind-internal.la \
 	$(UDEV_LIBS) \
-	$(ACL_LIBS) \
-	$(LIBIDN_LIBS) \
-	$(SECCOMP_LIBS)
+	$(ACL_LIBS)
 
 gperf_txt_sources = \
 	src/basic/errno-list.txt
@@ -466,13 +467,22 @@ dist_factory_pam_DATA = \
 	factory/etc/pam.d/other
 endif
 
+# ------------------------------------------------------------------------------
+rootlibexec_PROGRAMS += \
+       elogind-cgroups-agent
+
+elogind_cgroups_agent_SOURCES = \
+       src/cgroups-agent/cgroups-agent.c
+
+elogind_cgroups_agent_LDADD = \
+       libshared.la
+
 # ------------------------------------------------------------------------------
 libelogind_internal_la_SOURCES = \
 	src/systemd/sd-bus.h \
 	src/systemd/sd-bus-protocol.h \
 	src/systemd/sd-bus-vtable.h \
 	src/systemd/sd-event.h \
-	src/systemd/sd-netlink.h \
 	src/systemd/sd-login.h \
 	src/systemd/sd-id128.h \
 	src/systemd/sd-daemon.h \
@@ -517,7 +527,6 @@ libelogind_internal_la_SOURCES = \
 	src/libelogind/sd-bus/bus-slot.h \
 	src/libelogind/sd-bus/bus-protocol.h \
 	src/libelogind/sd-event/sd-event.c \
-	src/libelogind/sd-event/event-util.h \
 	src/libelogind/sd-id128/sd-id128.c \
 	src/libelogind/sd-daemon/sd-daemon.c \
 	src/libelogind/sd-login/sd-login.c
@@ -564,13 +573,11 @@ pkgconfiglib_DATA += \
 	src/libelogind/libelogind.pc
 
 pkginclude_HEADERS += \
-	src/systemd/sd-bus.h \
-	src/systemd/sd-bus-protocol.h \
-	src/systemd/sd-bus-vtable.h \
-	src/systemd/sd-event.h \
 	src/systemd/sd-login.h \
+	src/systemd/sd-messages.h \
 	src/systemd/sd-id128.h \
-	src/systemd/sd-daemon.h
+	src/systemd/_sd-common.h
+
 
 lib_LTLIBRARIES += \
 	libelogind.la
@@ -609,7 +616,9 @@ libelogind_core_la_SOURCES = \
 	src/login/logind-seat-dbus.c \
 	src/login/logind-user-dbus.c \
 	src/login/logind-utmp.c \
-	src/login/logind-acl.h
+	src/login/logind-acl.h \
+	src/core/cgroup.h \
+	src/core/cgroup.c
 
 libelogind_core_la_LIBADD = \
 	libshared.la
@@ -724,7 +733,7 @@ dist_dbuspolicy_DATA += \
 	src/login/org.freedesktop.login1.conf
 
 dist_pkgsysconf_DATA += \
-	src/login/elogind.conf
+	src/login/logind.conf
 
 polkitpolicy_files += \
 	src/login/org.freedesktop.login1.policy
@@ -785,9 +794,6 @@ sysctl.d/%: sysctl.d/%.in
 %.pc: %.pc.in
 	$(SED_PROCESS)
 
-%.conf: %.conf.in
-	$(SED_PROCESS)
-
 shell-completion/%: shell-completion/%.in
 	$(SED_PROCESS)