ask-password: fix handling of timeouts when waiting for password

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index dd872f885163ee2d325f55191dbd61b38284abce..7e5d6d876460300a20a6eac473e0d5f9f5adbad8 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
+systemshutdowndir=$(rootdir)/lib/systemd/system-shutdown
 
 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)\" \
+       -DSYSTEM_SHUTDOWN_PATH=\"$(systemshutdowndir)\" \
        -I $(top_srcdir)/src
 
 if TARGET_GENTOO
@@ -127,6 +129,7 @@ rootlibexec_PROGRAMS = \
        systemd-quotacheck \
        systemd-timestamp \
        systemd-ac-power \
+       systemd-detect-virt \
        systemd-sysctl
 
 if HAVE_LIBCRYPTSETUP
@@ -375,7 +378,8 @@ libsystemd_basic_la_SOURCES = \
        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) \
@@ -403,7 +407,6 @@ libsystemd_core_la_SOURCES = \
        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 \
@@ -781,6 +784,15 @@ systemd_ac_power_LDADD = \
        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