X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=fe4b811c734758d48c62398226e364d6d9d09087;hp=2f9ec71f5e9124ceec8b364fa682ec818afca749;hb=19cf13aa8ca2bcb9a4c895a55774e95ecc2b2aee;hpb=35ed426f81eb72dc23ce2dcc625ea88be1c95990

diff --git a/Makefile.am b/Makefile.am
index 2f9ec71f5..fe4b811c7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -52,6 +52,11 @@ pkgconfiglibdir=$(libdir)/pkgconfig
 polkitpolicydir=$(datadir)/polkit-1/actions
 bashcompletiondir=@bashcompletiondir@
 zshcompletiondir=@zshcompletiondir@
+systemsleepdir=$(pkglibexecdir)/sleep.d
+systemshutdowndir=$(pkglibexecdir)/shutdown.d
+
+CGROUP_CONTROLLER=@cgroup_controller@
+PKTTYAGENT=$(bindir)/pkttyagent
 
 # Our own, non-special dirs
 pkgsysconfdir=$(sysconfdir)/elogind
@@ -64,8 +69,9 @@ factory_pamdir = $(datadir)/factory/etc/pam.d
 
 # And these are the special ones for /
 rootprefix=@rootprefix@
+rootlibdir=@rootlibdir@
 rootbindir=$(rootprefix)/bin
-rootlibexecdir=$(rootprefix)/lib/elogind
+
 
 EXTRA_DIST =
 BUILT_SOURCES =
@@ -115,18 +121,21 @@ CLEANFILES = $(BUILT_SOURCES) \
 AM_CPPFLAGS = \
 	-include $(top_builddir)/config.h \
 	-DPKGSYSCONFDIR=\"$(pkgsysconfdir)\" \
-	-DELOGIND_CGROUP_AGENT_PATH=\"$(rootlibexecdir)/elogind-cgroups-agent\" \
-	-DROOTPREFIX=\"$(rootprefix)\" \
+	-DELOGIND_CGROUP_CONTROLLER=\"$(CGROUP_CONTROLLER)\" \
+	-DELOGIND_CGROUP_AGENT_PATH=\"$(pkglibexecdir)/elogind-cgroups-agent\" \
 	-DUDEVLIBEXECDIR=\"$(udevlibexecdir)\" \
-	-DPOLKIT_AGENT_BINARY_PATH=\"$(bindir)/pkttyagent\" \
+	-DPOLKIT_AGENT_BINARY_PATH=\"$(PKTTYAGENT)\" \
+	-DSYSTEM_SLEEP_PATH=\"$(systemsleepdir)\" \
+	-DSYSTEM_SHUTDOWN_PATH=\"$(systemshutdowndir)\" \
+	-DHALT=\"$(HALT)\" \
+	-DREBOOT=\"$(REBOOT)\" \
 	-DKEXEC=\"$(KEXEC)\" \
 	-DLIBDIR=\"$(libdir)\" \
-	-DROOTLIBDIR=\"$(rootlibdir)\" \
-	-DROOTLIBEXECDIR=\"$(rootlibexecdir)\" \
 	-DTEST_DIR=\"$(abs_top_srcdir)/test\" \
 	-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 \
@@ -180,8 +189,7 @@ AM_V_RM_0 = @echo "  RM      " $@;
 
 # ------------------------------------------------------------------------------
 rootbin_PROGRAMS =
-bin_PROGRAMS =
-rootlibexec_PROGRAMS =
+pkglibexec_PROGRAMS =
 
 dist_doc_DATA = \
 	README \
@@ -368,6 +376,9 @@ libbasic_la_CFLAGS = \
 	$(CAP_CFLAGS) \
 	-pthread
 
+libbasic_la_LDFLAGS = \
+	$(CAP_LDFLAGS)
+
 libbasic_la_LIBADD = \
 	$(SELINUX_LIBS) \
 	$(CAP_LIBS) \
@@ -458,7 +469,7 @@ dist_factory_pam_DATA = \
 endif
 
 # ------------------------------------------------------------------------------
-rootlibexec_PROGRAMS += \
+pkglibexec_PROGRAMS += \
        elogind-cgroups-agent
 
 elogind_cgroups_agent_SOURCES = \
@@ -606,7 +617,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
@@ -619,7 +632,7 @@ endif
 noinst_LTLIBRARIES += \
 	libelogind-core.la
 
-rootlibexec_PROGRAMS += \
+pkglibexec_PROGRAMS += \
 	elogind
 
 loginctl_SOURCES = \
@@ -721,7 +734,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
@@ -746,7 +759,6 @@ EXTRA_DIST += \
 
 # ------------------------------------------------------------------------------
 substitutions = \
-       '|rootlibexecdir=$(rootlibexecdir)|' \
        '|rootbindir=$(rootbindir)|' \
        '|bindir=$(bindir)|' \
        '|pkgsysconfdir=$(pkgsysconfdir)|' \
@@ -782,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)
 
@@ -918,7 +927,7 @@ endif
 
 .PHONY: dist-check-help
 
-dist-check-help: $(rootbin_PROGRAMS) $(bin_PROGRAMS)
+dist-check-help: $(rootbin_PROGRAMS)
 	for i in $(abspath $^); do                                             \
             if $$i  --help | grep -v 'default:' | grep -E -q '.{80}.' ; then   \
 		echo "$(basename $$i) --help output is too wide:";             \