log: fix build

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index f2d20c7db327c25e7ab5066589f794f8a7e17043..8c92256d7f8aced9e03530484a0bf896ff1398c1 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -26,12 +26,13 @@ udevrulesdir=@udevrulesdir@
 pamlibdir=@pamlibdir@
 pkgconfigdatadir=$(datadir)/pkgconfig
 polkitpolicydir=$(datadir)/polkit-1/actions
-bashcompletiondir=${sysconfdir}/bash_completion.d
+bashcompletiondir=$(sysconfdir)/bash_completion.d
 
 # Our own, non-special dirs
 pkgsysconfdir=$(sysconfdir)/systemd
 sessionunitdir=$(pkgdatadir)/session
 tmpfilesdir=$(sysconfdir)/tmpfiles.d
+sessiongeneratordir=$(pkglibexecdir)/session-generators
 
 # And these are the special ones for /
 rootdir=@rootdir@
@@ -39,6 +40,7 @@ rootbindir=$(rootdir)/bin
 rootsbindir=$(rootdir)/sbin
 rootlibexecdir=$(rootdir)/lib/systemd
 systemunitdir=$(rootdir)/lib/systemd/system
+systemgeneratordir=$(rootdir)/lib/systemd/system-generators
 
 AM_CPPFLAGS = \
        -include $(top_builddir)/config.h \
@@ -50,15 +52,16 @@ AM_CPPFLAGS = \
        -DSESSION_CONFIG_FILE=\"$(pkgsysconfdir)/session.conf\" \
        -DSESSION_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/session\" \
        -DSESSION_DATA_UNIT_PATH=\"$(sessionunitdir)\" \
-       -DCGROUP_AGENT_PATH=\"$(rootlibexecdir)/systemd-cgroups-agent\" \
+       -DSYSTEMD_CGROUP_AGENT_PATH=\"$(rootlibexecdir)/systemd-cgroups-agent\" \
        -DSYSTEMD_BINARY_PATH=\"$(rootbindir)/systemd\" \
        -DSYSTEMD_SHUTDOWN_BINARY_PATH=\"$(rootlibexecdir)/systemd-shutdown\" \
        -DSYSTEMCTL_BINARY_PATH=\"$(rootbindir)/systemctl\" \
        -DSYSTEMD_TTY_ASK_PASSWORD_AGENT_BINARY_PATH=\"$(rootbindir)/systemd-tty-ask-password-agent\" \
        -DRUNTIME_DIR=\"$(localstatedir)/run\" \
        -DRANDOM_SEED=\"$(localstatedir)/lib/random-seed\" \
-       -DKEXEC_BINARY_PATH=\"/sbin/kexec\" \
        -DSYSTEMD_CRYPTSETUP_PATH=\"$(rootlibexecdir)/systemd-cryptsetup\" \
+       -DSYSTEM_GENERATOR_PATH=\"$(systemgeneratordir)\" \
+       -DSESSION_GENERATOR_PATH=\"$(sessiongeneratordir)\" \
        -I $(top_srcdir)/src
 
 if TARGET_GENTOO
@@ -115,11 +118,17 @@ rootlibexec_PROGRAMS = \
        systemd-user-sessions \
        systemd-fsck \
        systemd-quotacheck \
-       systemd-cryptsetup \
-       systemd-cryptsetup-generator \
        systemd-timestamp \
        systemd-ac-power
 
+if HAVE_LIBCRYPTSETUP
+rootlibexec_PROGRAMS += \
+       systemd-cryptsetup
+
+systemgenerator_PROGRAMS = \
+       systemd-cryptsetup-generator
+endif
+
 noinst_PROGRAMS = \
        test-engine \
        test-job-type \
@@ -462,7 +471,8 @@ EXTRA_DIST += \
        src/build.h \
        src/shutdownd.h \
        src/umount.h \
-       src/readahead-common.h
+       src/readahead-common.h \
+       src/ask-password-api.h
 
 MANPAGES = \
        man/systemd.1 \
@@ -741,12 +751,15 @@ systemd_ac_power_LDADD = \
        $(UDEV_LIBS)
 
 systemd_cryptsetup_SOURCES = \
-       src/cryptsetup.c
+       src/cryptsetup.c \
+       src/ask-password-api.c
 
 systemd_cryptsetup_CFLAGS = \
+       $(LIBCRYPTSETUP_CFLAGS) \
        $(AM_CFLAGS)
 
 systemd_cryptsetup_LDADD = \
+       $(LIBCRYPTSETUP_LIBS) \
        libsystemd-basic.la
 
 systemd_cryptsetup_generator_SOURCES = \
@@ -839,7 +852,8 @@ systemd_notify_LDADD = \
        libsystemd-basic.la
 
 systemd_ask_password_SOURCES = \
-       src/ask-password.c
+       src/ask-password.c \
+       src/ask-password-api.c
 
 systemd_ask_password_LDADD = \
        libsystemd-basic.la
@@ -935,6 +949,7 @@ systemd_gnome_ask_password_agent_LDADD = \
 
 systemd_tty_ask_password_agent_SOURCES = \
        src/tty-ask-password-agent.c \
+       src/ask-password-api.c \
        src/utmp-wtmp.c
 
 systemd_tty_ask_password_agent_LDADD = \