Allow NULL session parameter for manager_get_session_by_pid()

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 6e8805898aa6d564b3a6a6e56015c8b29f17285f..0d2f986575dbad649e9bb3f86c59d40ab9a1f908 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -55,6 +55,9 @@ 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
 pkgincludedir=$(includedir)/elogind
@@ -66,9 +69,11 @@ 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 =
 INSTALL_EXEC_HOOKS =
@@ -117,10 +122,11 @@ CLEANFILES = $(BUILT_SOURCES) \
 AM_CPPFLAGS = \
        -include $(top_builddir)/config.h \
        -DPKGSYSCONFDIR=\"$(pkgsysconfdir)\" \
+       -DELOGIND_CGROUP_CONTROLLER=\"$(CGROUP_CONTROLLER)\" \
        -DELOGIND_CGROUP_AGENT_PATH=\"$(rootlibexecdir)/elogind-cgroups-agent\" \
        -DROOTPREFIX=\"$(rootprefix)\" \
        -DUDEVLIBEXECDIR=\"$(udevlibexecdir)\" \
-       -DPOLKIT_AGENT_BINARY_PATH=\"$(bindir)/pkttyagent\" \
+       -DPOLKIT_AGENT_BINARY_PATH=\"$(PKTTYAGENT)\" \
        -DSYSTEM_SLEEP_PATH=\"$(systemsleepdir)\" \
        -DSYSTEM_SHUTDOWN_PATH=\"$(systemshutdowndir)\" \
        -DHALT=\"$(HALT)\" \
@@ -375,6 +381,9 @@ libbasic_la_CFLAGS = \
        $(CAP_CFLAGS) \
        -pthread
 
+libbasic_la_LDFLAGS = \
+       $(CAP_LDFLAGS)
+
 libbasic_la_LIBADD = \
        $(SELINUX_LIBS) \
        $(CAP_LIBS) \
@@ -730,7 +739,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
@@ -791,9 +800,6 @@ sysctl.d/%: sysctl.d/%.in
 %.pc: %.pc.in
        $(SED_PROCESS)
 
-%.conf: %.conf.in
-       $(SED_PROCESS)
-
 shell-completion/%: shell-completion/%.in
        $(SED_PROCESS)