chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
general: unify error code we generate on timeout
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index 537050437ba86ca6eee02d13098f3fe828ea127e..1841ad5c5a734371b3a998762c5c9f652a758505 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-41,6
+41,7
@@
rootsbindir=$(rootdir)/sbin
rootlibexecdir=$(rootdir)/lib/systemd
systemunitdir=$(rootdir)/lib/systemd/system
systemgeneratordir=$(rootdir)/lib/systemd/system-generators
rootlibexecdir=$(rootdir)/lib/systemd
systemunitdir=$(rootdir)/lib/systemd/system
systemgeneratordir=$(rootdir)/lib/systemd/system-generators
+systemshutdowndir=$(rootdir)/lib/systemd/system-shutdown
AM_CPPFLAGS = \
-include $(top_builddir)/config.h \
AM_CPPFLAGS = \
-include $(top_builddir)/config.h \
@@
-62,6
+63,7
@@
AM_CPPFLAGS = \
-DSYSTEMD_CRYPTSETUP_PATH=\"$(rootlibexecdir)/systemd-cryptsetup\" \
-DSYSTEM_GENERATOR_PATH=\"$(systemgeneratordir)\" \
-DUSER_GENERATOR_PATH=\"$(usergeneratordir)\" \
-DSYSTEMD_CRYPTSETUP_PATH=\"$(rootlibexecdir)/systemd-cryptsetup\" \
-DSYSTEM_GENERATOR_PATH=\"$(systemgeneratordir)\" \
-DUSER_GENERATOR_PATH=\"$(usergeneratordir)\" \
+ -DSYSTEM_SHUTDOWN_PATH=\"$(systemshutdowndir)\" \
-I $(top_srcdir)/src
if TARGET_GENTOO
-I $(top_srcdir)/src
if TARGET_GENTOO
@@
-95,7
+97,8
@@
rootbin_PROGRAMS = \
systemctl \
systemd-notify \
systemd-ask-password \
systemctl \
systemd-notify \
systemd-ask-password \
- systemd-tty-ask-password-agent
+ systemd-tty-ask-password-agent \
+ systemd-tmpfiles
bin_PROGRAMS = \
systemd-cgls
bin_PROGRAMS = \
systemd-cgls
@@
-121,12
+124,12
@@
rootlibexec_PROGRAMS = \
systemd-reply-password \
systemd-readahead-collect \
systemd-readahead-replay \
systemd-reply-password \
systemd-readahead-collect \
systemd-readahead-replay \
- systemd-tmpfiles \
systemd-user-sessions \
systemd-fsck \
systemd-quotacheck \
systemd-timestamp \
systemd-ac-power \
systemd-user-sessions \
systemd-fsck \
systemd-quotacheck \
systemd-timestamp \
systemd-ac-power \
+ systemd-detect-virt \
systemd-sysctl
if HAVE_LIBCRYPTSETUP
systemd-sysctl
if HAVE_LIBCRYPTSETUP
@@
-240,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 = \
@@
-267,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 \
@@
-313,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 \
@@
-340,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 = \
@@
-375,7
+383,8
@@
libsystemd_basic_la_SOURCES = \
src/conf-parser.c \
src/socket-util.c \
src/log.c \
src/conf-parser.c \
src/socket-util.c \
src/log.c \
- src/ratelimit.c
+ src/ratelimit.c \
+ src/exit-status.c
libsystemd_basic_la_CFLAGS = \
$(AM_CFLAGS) \
libsystemd_basic_la_CFLAGS = \
$(AM_CFLAGS) \
@@
-403,7
+412,6
@@
libsystemd_core_la_SOURCES = \
src/load-dropin.c \
src/execute.c \
src/utmp-wtmp.c \
src/load-dropin.c \
src/execute.c \
src/utmp-wtmp.c \
- src/exit-status.c \
src/dbus.c \
src/dbus-manager.c \
src/dbus-unit.c \
src/dbus.c \
src/dbus-manager.c \
src/dbus-unit.c \
@@
-485,6
+493,7
@@
MANPAGES = \
man/systemctl.1 \
man/systemadm.1 \
man/systemd-cgls.1 \
man/systemctl.1 \
man/systemadm.1 \
man/systemd-cgls.1 \
+ man/systemd-tmpfiles.8 \
man/systemd-notify.1 \
man/sd_notify.3 \
man/sd_readahead.3 \
man/systemd-notify.1 \
man/sd_notify.3 \
man/sd_readahead.3 \
@@
-780,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
@@
-1289,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 )