chiark / gitweb /
~ianmdlvl / elogind.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
log: fix build
[elogind.git] / Makefile.am
diff --git a/Makefile.am b/Makefile.am
index 1fa4a7df2b63eb17d937d7a8e03551e35da91c81..8c92256d7f8aced9e03530484a0bf896ff1398c1 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -26,11 +26,13 @@ udevrulesdir=@udevrulesdir@
 pamlibdir=@pamlibdir@
 pkgconfigdatadir=$(datadir)/pkgconfig
 polkitpolicydir=$(datadir)/polkit-1/actions
+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@
@@ -38,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 \
@@ -49,14 +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
@@ -112,7 +117,17 @@ rootlibexec_PROGRAMS = \
        systemd-tmpfiles \
        systemd-user-sessions \
        systemd-fsck \
-       systemd-quotacheck
+       systemd-quotacheck \
+       systemd-timestamp \
+       systemd-ac-power
+
+if HAVE_LIBCRYPTSETUP
+rootlibexec_PROGRAMS += \
+       systemd-cryptsetup
+
+systemgenerator_PROGRAMS = \
+       systemd-cryptsetup-generator
+endif
 
 noinst_PROGRAMS = \
        test-engine \
@@ -156,6 +171,9 @@ dbusinterface_DATA = \
        org.freedesktop.systemd1.Swap.xml \
        org.freedesktop.systemd1.Path.xml
 
+dist_bashcompletion_DATA = \
+        src/systemctl-bash-completion.sh
+
 dist_tmpfiles_DATA = \
        tmpfiles.d/systemd.conf \
        tmpfiles.d/x11.conf
@@ -301,6 +319,7 @@ dist_systemunit_DATA += \
        units/fedora/rc-local.service \
        units/fedora/halt-local.service \
        units/fedora/plymouth-start.service \
+       units/fedora/plymouth-read-write.service \
        units/fedora/plymouth-quit.service \
        units/fedora/plymouth-reboot.service \
        units/fedora/plymouth-kexec.service \
@@ -452,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 \
@@ -485,7 +505,8 @@ MANPAGES = \
        man/halt.8 \
        man/shutdown.8 \
        man/pam_systemd.8 \
-       man/systemd.conf.5
+       man/systemd.conf.5 \
+       man/tmpfiles.d.5
 
 MANPAGES_ALIAS = \
        man/reboot.8 \
@@ -709,6 +730,48 @@ systemd_quotacheck_CFLAGS = \
 systemd_quotacheck_LDADD = \
        libsystemd-basic.la
 
+systemd_timestamp_SOURCES = \
+       src/timestamp.c
+
+systemd_timestamp_CFLAGS = \
+       $(AM_CFLAGS)
+
+systemd_timestamp_LDADD = \
+       libsystemd-basic.la
+
+systemd_ac_power_SOURCES = \
+       src/ac-power.c
+
+systemd_ac_power_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(UDEV_CFLAGS)
+
+systemd_ac_power_LDADD = \
+       libsystemd-basic.la \
+       $(UDEV_LIBS)
+
+systemd_cryptsetup_SOURCES = \
+       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 = \
+       src/cryptsetup-generator.c \
+       src/unit-name.c
+
+systemd_cryptsetup_generator_CFLAGS = \
+       $(AM_CFLAGS)
+
+systemd_cryptsetup_generator_LDADD = \
+       libsystemd-basic.la
+
 systemd_user_sessions_SOURCES = \
        src/user-sessions.c \
        src/cgroup-util.c
@@ -789,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
@@ -885,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 = \
@@ -1176,7 +1241,6 @@ if TARGET_FEDORA
                $(DESTDIR)$(systemunitdir)/kexec.target.wants \
                $(DESTDIR)$(systemunitdir)/poweroff.target.wants \
                $(DESTDIR)$(systemunitdir)/halt.target.wants \
-               $(DESTDIR)$(systemunitdir)/rescue.target.wants \
                $(DESTDIR)$(systemunitdir)/final.target.wants
        ( cd $(DESTDIR)$(systemunitdir)/multi-user.target.wants && \
                rm -f rc-local.service && \
@@ -1184,13 +1248,14 @@ if TARGET_FEDORA
        ( cd $(DESTDIR)$(systemunitdir)/final.target.wants && \
                rm -f halt-local.service && \
                $(LN_S) $(systemunitdir)/halt-local.service halt-local.service )
-       ( cd $(DESTDIR)$(systemunitdir)/multi-user.target.wants && \
-               rm -f plymouth-quit.service  && \
-               $(LN_S) ../plymouth-quit.service plymouth-quit.service )
        ( cd $(DESTDIR)$(systemunitdir)/sysinit.target.wants && \
-               rm -f plymouth-start.service systemd-ask-password-plymouth.path && \
+               rm -f plymouth-start.service systemd-ask-password-plymouth.path plymouth-read-write.service && \
                $(LN_S) ../plymouth-start.service plymouth-start.service && \
+               $(LN_S) ../plymouth-read-write.service plymouth-read-write.service && \
                $(LN_S) ../systemd-ask-password-plymouth.path systemd-ask-password-plymouth.path )
+       ( cd $(DESTDIR)$(systemunitdir)/multi-user.target.wants && \
+               rm -f plymouth-quit.service  && \
+               $(LN_S) ../plymouth-quit.service plymouth-quit.service )
        ( cd $(DESTDIR)$(systemunitdir)/reboot.target.wants && \
                rm -f plymouth-reboot.service && \
                $(LN_S) ../plymouth-reboot.service plymouth-reboot.service )
@@ -1252,5 +1317,3 @@ git-tag:
 fedora: install
        rm $(DESTDIR)/lib/systemd/system/local-fs.target.wants/var-run.mount
        rm $(DESTDIR)/lib/systemd/system/local-fs.target.wants/var-lock.mount
-       sed -i -e 's/^#MountAuto=yes$$/MountAuto=no/' \
-               -e 's/^#SwapAuto=yes$$/SwapAuto=no/' $(DESTDIR)/etc/systemd/system.conf
Unnamed repository; edit this file 'description' to name the repository.