chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
getty: move automatic serial getty logic into generator
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index 872bcc255c69177c48d8ac42a833aa8ff0a11060..52a8c475e2e38122bb3d0e66c8b93713559e8843 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 += \
@@
-144,11
+143,14
@@
rootlibexec_PROGRAMS = \
systemd-detect-virt \
systemd-sysctl
systemd-detect-virt \
systemd-sysctl
+systemgenerator_PROGRAMS = \
+ systemd-getty-generator
+
if HAVE_LIBCRYPTSETUP
rootlibexec_PROGRAMS += \
systemd-cryptsetup
if HAVE_LIBCRYPTSETUP
rootlibexec_PROGRAMS += \
systemd-cryptsetup
-systemgenerator_PROGRAMS = \
+systemgenerator_PROGRAMS
+
= \
systemd-cryptsetup-generator
endif
systemd-cryptsetup-generator
endif
@@
-261,6
+263,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
+308,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 \
@@
-855,6
+859,16
@@
systemd_cryptsetup_generator_CFLAGS = \
systemd_cryptsetup_generator_LDADD = \
libsystemd-basic.la
systemd_cryptsetup_generator_LDADD = \
libsystemd-basic.la
+systemd_getty_generator_SOURCES = \
+ src/getty-generator.c \
+ src/unit-name.c
+
+systemd_getty_generator_CFLAGS = \
+ $(AM_CFLAGS)
+
+systemd_getty_generator_LDADD = \
+ libsystemd-basic.la
+
systemd_user_sessions_SOURCES = \
src/user-sessions.c \
src/cgroup-util.c
systemd_user_sessions_SOURCES = \
src/user-sessions.c \
src/cgroup-util.c
@@
-983,6
+997,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