chiark / gitweb /
~ianmdlvl / elogind.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
update fixme
[elogind.git] / Makefile.am
diff --git a/Makefile.am b/Makefile.am
index 5fcf24f5de75c821a508958bd48e9c5e670dcc19..e079ac89e3a3e5042d7db53a7d2e41c1bb30d1b0 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -53,9 +53,10 @@ AM_CPPFLAGS = \
        -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=\"$(rootsbindir)/kexec\" \
+       -DKEXEC_BINARY_PATH=\"/sbin/kexec\" \
        -I $(top_srcdir)/src
 
 if TARGET_GENTOO
@@ -81,7 +82,8 @@ rootbin_PROGRAMS = \
        systemd \
        systemctl \
        systemd-notify \
-       systemd-ask-password
+       systemd-ask-password \
+       systemd-tty-ask-password-agent
 
 bin_PROGRAMS = \
        systemd-cgls
@@ -89,7 +91,7 @@ bin_PROGRAMS = \
 if HAVE_GTK
 bin_PROGRAMS += \
        systemadm \
-       systemd-ask-password-agent
+       systemd-gnome-ask-password-agent
 endif
 
 rootlibexec_PROGRAMS = \
@@ -208,7 +210,9 @@ dist_systemunit_DATA = \
        units/smartcard.target \
        units/systemd-readahead-done.timer \
        units/systemd-tmpfiles-clean.timer \
-       units/quotaon.service
+       units/quotaon.service \
+       units/systemd-ask-password-wall.path \
+       units/systemd-ask-password-plymouth.path
 
 nodist_systemunit_DATA = \
        units/sysinit.target \
@@ -234,6 +238,8 @@ nodist_systemunit_DATA = \
        units/systemd-tmpfiles-setup.service \
        units/systemd-tmpfiles-clean.service \
        units/systemd-user-sessions.service \
+       units/systemd-ask-password-wall.service \
+       units/systemd-ask-password-plymouth.service \
        units/syslog.target \
        units/halt.service \
        units/poweroff.service \
@@ -275,6 +281,8 @@ EXTRA_DIST = \
        units/systemd-tmpfiles-setup.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/syslog.target.in \
        units/halt.service.in \
        units/poweroff.service.in \
@@ -299,19 +307,13 @@ dist_systemunit_DATA += \
        units/fedora/plymouth-halt.service
 endif
 
-if TARGET_DEBIAN
+if TARGET_DEBIAN_OR_UBUNTU
 dist_systemunit_DATA += \
-       units/debian/fsck.target \
        units/debian/umountfs.service \
        units/debian/umountnfs.service \
        units/debian/umountroot.service
 endif
 
-if TARGET_SUSE
-dist_systemunit_DATA += \
-       units/suse/fsck.target
-endif
-
 if TARGET_GENTOO
 dist_systemunit_DATA += \
        units/gentoo/xdm.service
@@ -319,7 +321,6 @@ endif
 
 if TARGET_ARCH
 dist_systemunit_DATA += \
-       units/arch/sysinit.service \
        units/arch/rc-local.service
 endif
 
@@ -398,6 +399,7 @@ libsystemd_core_la_SOURCES = \
        src/cgroup.c \
        src/mount-setup.c \
        src/hostname-setup.c \
+       src/selinux-setup.c \
        src/loopback-setup.c \
        src/kmod-setup.c \
        src/locale-setup.c \
@@ -855,10 +857,10 @@ systemadm_LDADD = \
        $(DBUSGLIB_LIBS) \
        $(GTK_LIBS)
 
-systemd_ask_password_agent_SOURCES = \
-       src/ask-password-agent.vala
+systemd_gnome_ask_password_agent_SOURCES = \
+       src/gnome-ask-password-agent.vala
 
-systemd_ask_password_agent_CFLAGS = \
+systemd_gnome_ask_password_agent_CFLAGS = \
        $(AM_CFLAGS) \
        $(DBUSGLIB_CFLAGS) \
        $(GTK_CFLAGS) \
@@ -867,7 +869,7 @@ systemd_ask_password_agent_CFLAGS = \
        -Wno-shadow \
        -Wno-format-nonliteral
 
-systemd_ask_password_agent_VALAFLAGS = \
+systemd_gnome_ask_password_agent_VALAFLAGS = \
        --pkg=dbus-glib-1 \
        --pkg=posix \
        --pkg=gtk+-2.0 \
@@ -876,10 +878,17 @@ systemd_ask_password_agent_VALAFLAGS = \
        --pkg=libnotify \
        -g
 
-systemd_ask_password_agent_LDADD = \
+systemd_gnome_ask_password_agent_LDADD = \
        $(DBUSGLIB_LIBS) \
        $(GTK_LIBS)
 
+systemd_tty_ask_password_agent_SOURCES = \
+       src/tty-ask-password-agent.c \
+       src/utmp-wtmp.c
+
+systemd_tty_ask_password_agent_LDADD = \
+       libsystemd-basic.la
+
 pam_systemd_la_SOURCES = \
        src/pam-module.c \
        src/cgroup-util.c \
@@ -903,6 +912,7 @@ pam_systemd_la_LIBADD = \
 SED_PROCESS = \
        $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
        $(SED)  -e 's,@rootlibexecdir\@,$(rootlibexecdir),g' \
+                -e 's,@rootbindir\@,$(rootbindir),g' \
                -e 's,@SPECIAL_SYSLOG_SERVICE\@,$(SPECIAL_SYSLOG_SERVICE),g' \
                -e 's,@SYSTEMCTL\@,$(rootbindir)/systemctl,g' \
                -e 's,@SYSTEMD_NOTIFY\@,$(rootbindir)/systemd-notify,g' \
@@ -1108,9 +1118,10 @@ install-data-hook:
                $(LN_S) graphical.target default.target && \
                $(LN_S) reboot.target ctrl-alt-del.target )
        ( cd $(DESTDIR)$(systemunitdir)/multi-user.target.wants && \
-               rm -f getty.target systemd-user-sessions.service && \
+               rm -f getty.target systemd-user-sessions.service systemd-ask-password-wall.path && \
                $(LN_S) ../getty.target getty.target && \
-               $(LN_S) ../systemd-user-sessions.service systemd-user-sessions.service )
+               $(LN_S) ../systemd-user-sessions.service systemd-user-sessions.service && \
+               $(LN_S) ../systemd-ask-password-wall.path systemd-ask-password-wall.path )
        ( cd $(DESTDIR)$(pkgsysconfdir)/system/getty.target.wants && \
                rm -f getty@tty1.service getty@tty2.service getty@tty3.service getty@tty4.service getty@tty5.service getty@tty6.service && \
                $(LN_S) $(systemunitdir)/getty@.service getty@tty1.service && \
@@ -1180,8 +1191,9 @@ if TARGET_FEDORA
                rm -f single.service && \
                $(LN_S) $(systemunitdir)/single.service single.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 systemd-ask-password-plymouth.path && \
+               $(LN_S) ../plymouth-quit.service plymouth-quit.service && \
+               $(LN_S) ../systemd-ask-password-plymouth.path systemd-ask-password-plymouth.path )
        ( cd $(DESTDIR)$(systemunitdir)/reboot.target.wants && \
                rm -f plymouth-reboot.service && \
                $(LN_S) ../plymouth-reboot.service plymouth-reboot.service )
@@ -1205,7 +1217,7 @@ if TARGET_GENTOO
                rm -f xdm.service && \
                $(LN_S) $(systemunitdir)/xdm.service xdm.service )
 endif
-if TARGET_DEBIAN
+if TARGET_DEBIAN_OR_UBUNTU
        $(MKDIR_P) -m 0755 \
                $(DESTDIR)$(systemunitdir)/umount.target.wants
        ( cd $(DESTDIR)$(systemunitdir)/umount.target.wants && \
@@ -1217,13 +1229,6 @@ if TARGET_DEBIAN
                rm -f runlevel5.target && \
                $(LN_S) multi-user.target runlevel5.target )
 endif
-if !TARGET_SUSE
-if !TARGET_DEBIAN
-       ( cd $(DESTDIR)$(systemunitdir) && \
-               rm -f fsck.target && \
-               $(LN_S) sysinit.target fsck.target )
-endif
-endif
 
 DISTCHECK_CONFIGURE_FLAGS = \
        --with-dbuspolicydir=$$dc_install_base/$(dbuspolicydir) \
@@ -1244,5 +1249,7 @@ git-tag:
 
 # Opt out from a few services on Fedora for now, as long as rc.sysinit does this job
 fedora: install
-       rm /lib/systemd/system/local-fs.target.wants/var-run.mount
-       rm /lib/systemd/system/local-fs.target.wants/var-lock.mount
+       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.