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 7d6cfd12d87bb2de1df465b83ea108e291d3db6a..6104c809d3e8e548609e7f458b59d412c4e22977 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-106,16
+106,12
@@
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
-
-sbin_PROGRAMS = \
+ systemd-stdio-bridge \
systemd-nspawn
if HAVE_GTK
systemd-nspawn
if HAVE_GTK
@@
-264,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 \
@@
-308,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 \
@@
-987,13
+985,15
@@
systemd_cgls_LDADD = \
libsystemd-basic.la
systemd_nspawn_SOURCES = \
libsystemd-basic.la
systemd_nspawn_SOURCES = \
- src/nspawn.c
+ src/nspawn.c \
+ src/cgroup-util.c
systemd_nspawn_CFLAGS = \
$(AM_CFLAGS)
systemd_nspawn_LDADD = \
systemd_nspawn_CFLAGS = \
$(AM_CFLAGS)
systemd_nspawn_LDADD = \
- libsystemd-basic.la
+ libsystemd-basic.la \
+ libsystemd-daemon.la
systemd_stdio_bridge_SOURCES = \
src/bridge.c
systemd_stdio_bridge_SOURCES = \
src/bridge.c