chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cgls: by default start with group of PID 1
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index bb6485792aea13e1b0a60eec66220d7825f66a84..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-notify \
systemd-ask-password \
systemd-tty-ask-password-agent \
- systemd-tmpfiles
-
-rootsbin_PROGRAMS = \
+ systemd-tmpfiles \
systemd-machine-id-setup
bin_PROGRAMS = \
systemd-cgls \
systemd-machine-id-setup
bin_PROGRAMS = \
systemd-cgls \
- systemd-stdio-bridge
+ systemd-stdio-bridge \
+ systemd-nspawn
if HAVE_GTK
bin_PROGRAMS += \
if HAVE_GTK
bin_PROGRAMS += \
@@
-261,6
+260,7
@@
dist_systemunit_DATA = \
nodist_systemunit_DATA = \
units/getty@.service \
units/serial-getty@.service \
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 \
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 \
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 \
units/graphical.target.m4 \
units/multi-user.target.m4 \
units/remote-fs.target.m4 \
@@
-340,7
+341,7
@@
EXTRA_DIST = \
units/quotacheck.service.in \
systemd.pc.in \
introspect.awk \
units/quotacheck.service.in \
systemd.pc.in \
introspect.awk \
-
src/org.freedesktop.systemd1.policy.in
+ src/org.freedesktop.systemd1.policy.in
if TARGET_FEDORA
dist_systemunit_DATA += \
if TARGET_FEDORA
dist_systemunit_DATA += \
@@
-983,6
+984,17
@@
systemd_cgls_CFLAGS = \
systemd_cgls_LDADD = \
libsystemd-basic.la
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
systemd_stdio_bridge_SOURCES = \
src/bridge.c
@@
-1114,7
+1126,8
@@
CLEANFILES = \
$(nodist_userunit_DATA) \
$(nodist_man_MANS) \
${XML_IN_FILES:.xml.in=.html} \
$(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 += \
if HAVE_VALAC
CLEANFILES += \