pam: determine user cgroup tree from cgroup of PID 1

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 7120636d9f369e415015c19bf064a99dd54e2e3b..6104c809d3e8e548609e7f458b59d412c4e22977 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -106,14 +106,13 @@ rootbin_PROGRAMS = \
        systemd-notify \
        systemd-ask-password \
        systemd-tty-ask-password-agent \
-       systemd-tmpfiles
-
-rootsbin_PROGRAMS = \
+       systemd-tmpfiles \
        systemd-machine-id-setup
 
 bin_PROGRAMS = \
        systemd-cgls \
-       systemd-stdio-bridge
+       systemd-stdio-bridge \
+        systemd-nspawn
 
 if HAVE_GTK
 bin_PROGRAMS += \
@@ -261,6 +260,7 @@ dist_systemunit_DATA = \
 nodist_systemunit_DATA = \
        units/getty@.service \
        units/serial-getty@.service \
+        units/console-shell.service \
        units/graphical.target \
        units/remote-fs.target \
        units/multi-user.target \
@@ -305,6 +305,7 @@ nodist_userunit_DATA = \
 EXTRA_DIST = \
        units/getty@.service.m4 \
        units/serial-getty@.service.m4 \
+        units/console-shell.service.m4 \
        units/graphical.target.m4 \
        units/multi-user.target.m4 \
        units/remote-fs.target.m4 \
@@ -339,7 +340,8 @@ EXTRA_DIST = \
        units/fsck-root.service.in \
        units/quotacheck.service.in \
        systemd.pc.in \
-       introspect.awk
+       introspect.awk \
+       src/org.freedesktop.systemd1.policy.in
 
 if TARGET_FEDORA
 dist_systemunit_DATA += \
@@ -386,7 +388,7 @@ dist_doc_DATA = \
 pkgconfigdata_DATA = \
        systemd.pc
 
-dist_polkitpolicy_DATA = \
+polkitpolicy_DATA = \
        src/org.freedesktop.systemd1.policy
 
 noinst_LTLIBRARIES = \
@@ -982,6 +984,17 @@ systemd_cgls_CFLAGS = \
 systemd_cgls_LDADD = \
        libsystemd-basic.la
 
+systemd_nspawn_SOURCES = \
+       src/nspawn.c \
+       src/cgroup-util.c
+
+systemd_nspawn_CFLAGS = \
+       $(AM_CFLAGS)
+
+systemd_nspawn_LDADD = \
+       libsystemd-basic.la \
+       libsystemd-daemon.la
+
 systemd_stdio_bridge_SOURCES = \
        src/bridge.c
 
@@ -1069,6 +1082,7 @@ SED_PROCESS = \
        $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
        $(SED)  -e 's,@rootlibexecdir\@,$(rootlibexecdir),g' \
                 -e 's,@rootbindir\@,$(rootbindir),g' \
+                -e 's,@bindir\@,$(bindir),g' \
                -e 's,@SPECIAL_SYSLOG_SERVICE\@,$(SPECIAL_SYSLOG_SERVICE),g' \
                -e 's,@SYSTEMCTL\@,$(rootbindir)/systemctl,g' \
                -e 's,@SYSTEMD_NOTIFY\@,$(rootbindir)/systemd-notify,g' \
@@ -1090,6 +1104,9 @@ man/%: man/%.in Makefile
 %.pc: %.pc.in Makefile
        $(SED_PROCESS)
 
+src/%.policy: src/%.policy.in Makefile
+       $(SED_PROCESS)
+
 M4_PROCESS_SYSTEM = \
        $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
        $(M4) -P $(M4_DISTRO_FLAG) -DFOR_SYSTEM=1 < $< > $@ || rm $@
@@ -1109,7 +1126,8 @@ CLEANFILES = \
        $(nodist_userunit_DATA) \
        $(nodist_man_MANS) \
        ${XML_IN_FILES:.xml.in=.html} \
-       $(pkgconfigdata_DATA)
+       $(pkgconfigdata_DATA) \
+       src/org.freedesktop.systemd1.policy
 
 if HAVE_VALAC
 CLEANFILES += \