chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
main: add link to wiki page with longer explanation of the /usr madness
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index f508163d5b493120e9605d9008ae53989e338ab7..1841ad5c5a734371b3a998762c5c9f652a758505 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-129,6
+129,7
@@
rootlibexec_PROGRAMS = \
systemd-quotacheck \
systemd-timestamp \
systemd-ac-power \
systemd-quotacheck \
systemd-timestamp \
systemd-ac-power \
+ systemd-detect-virt \
systemd-sysctl
if HAVE_LIBCRYPTSETUP
systemd-sysctl
if HAVE_LIBCRYPTSETUP
@@
-242,7
+243,6
@@
dist_systemunit_DATA = \
units/systemd-tmpfiles-clean.timer \
units/quotaon.service \
units/systemd-ask-password-wall.path \
units/systemd-tmpfiles-clean.timer \
units/quotaon.service \
units/systemd-ask-password-wall.path \
- units/systemd-ask-password-plymouth.path \
units/systemd-ask-password-console.path
nodist_systemunit_DATA = \
units/systemd-ask-password-console.path
nodist_systemunit_DATA = \
@@
-269,7
+269,6
@@
nodist_systemunit_DATA = \
units/systemd-tmpfiles-clean.service \
units/systemd-user-sessions.service \
units/systemd-ask-password-wall.service \
units/systemd-tmpfiles-clean.service \
units/systemd-user-sessions.service \
units/systemd-ask-password-wall.service \
- units/systemd-ask-password-plymouth.service \
units/systemd-ask-password-console.service \
units/systemd-sysctl.service \
units/syslog.target \
units/systemd-ask-password-console.service \
units/systemd-sysctl.service \
units/syslog.target \
@@
-315,7
+314,6
@@
EXTRA_DIST = \
units/systemd-tmpfiles-clean.service.in \
units/systemd-user-sessions.service.in \
units/systemd-ask-password-wall.service.in \
units/systemd-tmpfiles-clean.service.in \
units/systemd-user-sessions.service.in \
units/systemd-ask-password-wall.service.in \
- units/systemd-ask-password-plymouth.service.in \
units/systemd-ask-password-console.service.in \
units/systemd-sysctl.service.in \
units/syslog.target.in \
units/systemd-ask-password-console.service.in \
units/systemd-sysctl.service.in \
units/syslog.target.in \
@@
-342,10
+340,18
@@
dist_systemunit_DATA += \
units/plymouth-start.service \
units/plymouth-read-write.service \
units/plymouth-quit.service \
units/plymouth-start.service \
units/plymouth-read-write.service \
units/plymouth-quit.service \
+ units/plymouth-quit-wait.service \
units/plymouth-reboot.service \
units/plymouth-kexec.service \
units/plymouth-poweroff.service \
units/plymouth-reboot.service \
units/plymouth-kexec.service \
units/plymouth-poweroff.service \
- units/plymouth-halt.service
+ units/plymouth-halt.service \
+ units/systemd-ask-password-plymouth.path
+
+nodist_systemunit_DATA += \
+ units/systemd-ask-password-plymouth.service
+
+EXTRA_DIST += \
+ units/systemd-ask-password-plymouth.service.in
endif
dist_doc_DATA = \
endif
dist_doc_DATA = \
@@
-783,6
+789,15
@@
systemd_ac_power_LDADD = \
libsystemd-basic.la \
$(UDEV_LIBS)
libsystemd-basic.la \
$(UDEV_LIBS)
+systemd_detect_virt_SOURCES = \
+ src/detect-virt.c
+
+systemd_detect_virt_CFLAGS = \
+ $(AM_CFLAGS)
+
+systemd_detect_virt_LDADD = \
+ libsystemd-basic.la
+
systemd_cryptsetup_SOURCES = \
src/cryptsetup.c \
src/ask-password-api.c
systemd_cryptsetup_SOURCES = \
src/cryptsetup.c \
src/ask-password-api.c
@@
-1292,8
+1307,9
@@
if HAVE_PLYMOUTH
$(LN_S) ../plymouth-start.service plymouth-start.service && \
$(LN_S) ../plymouth-read-write.service plymouth-read-write.service )
( cd $(DESTDIR)$(systemunitdir)/multi-user.target.wants && \
$(LN_S) ../plymouth-start.service plymouth-start.service && \
$(LN_S) ../plymouth-read-write.service plymouth-read-write.service )
( cd $(DESTDIR)$(systemunitdir)/multi-user.target.wants && \
- rm -f plymouth-quit.service && \
- $(LN_S) ../plymouth-quit.service plymouth-quit.service )
+ rm -f plymouth-quit.service plymouth-quit-wait.service && \
+ $(LN_S) ../plymouth-quit.service plymouth-quit.service && \
+ $(LN_S) ../plymouth-quit-wait.service plymouth-quit-wait.service )
( cd $(DESTDIR)$(systemunitdir)/reboot.target.wants && \
rm -f plymouth-reboot.service && \
$(LN_S) ../plymouth-reboot.service plymouth-reboot.service )
( cd $(DESTDIR)$(systemunitdir)/reboot.target.wants && \
rm -f plymouth-reboot.service && \
$(LN_S) ../plymouth-reboot.service plymouth-reboot.service )