chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
units: get rid of distro-specific shutdown scripts, replace them by systemd-shutdown...
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index 0a33c0635b150a1948bb4f4820bcfc4824d90839..8b2248f1f767fb415291f1f02e3c3255f28eee02 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-35,6
+35,7
@@
tmpfilesdir=$(sysconfdir)/tmpfiles.d
# And these are the special ones for /
rootdir=@rootdir@
rootbindir=$(rootdir)/bin
# And these are the special ones for /
rootdir=@rootdir@
rootbindir=$(rootdir)/bin
+rootsbindir=$(rootdir)/sbin
rootlibexecdir=$(rootdir)/lib/systemd
systemunitdir=$(rootdir)/lib/systemd/system
rootlibexecdir=$(rootdir)/lib/systemd
systemunitdir=$(rootdir)/lib/systemd/system
@@
-50,9
+51,11
@@
AM_CPPFLAGS = \
-DSESSION_DATA_UNIT_PATH=\"$(sessionunitdir)\" \
-DCGROUP_AGENT_PATH=\"$(rootlibexecdir)/systemd-cgroups-agent\" \
-DSYSTEMD_BINARY_PATH=\"$(rootbindir)/systemd\" \
-DSESSION_DATA_UNIT_PATH=\"$(sessionunitdir)\" \
-DCGROUP_AGENT_PATH=\"$(rootlibexecdir)/systemd-cgroups-agent\" \
-DSYSTEMD_BINARY_PATH=\"$(rootbindir)/systemd\" \
+ -DSYSTEMD_SHUTDOWN_BINARY_PATH=\"$(rootlibexecdir)/systemd-shutdown\" \
-DSYSTEMCTL_BINARY_PATH=\"$(rootbindir)/systemctl\" \
-DRUNTIME_DIR=\"$(localstatedir)/run\" \
-DRANDOM_SEED=\"$(localstatedir)/lib/random-seed\" \
-DSYSTEMCTL_BINARY_PATH=\"$(rootbindir)/systemctl\" \
-DRUNTIME_DIR=\"$(localstatedir)/run\" \
-DRANDOM_SEED=\"$(localstatedir)/lib/random-seed\" \
+ -DKEXEC_BINARY_PATH=\"$(rootsbindir)/kexec\" \
-I $(top_srcdir)/src
if TARGET_GENTOO
-I $(top_srcdir)/src
if TARGET_GENTOO
@@
-61,11
+64,18
@@
AM_CPPFLAGS += \
-DKBD_SETFONT=\"/usr/bin/setfont\" \
-DDEFAULT_FONT=\"LatArCyrHeb-16\"
else
-DKBD_SETFONT=\"/usr/bin/setfont\" \
-DDEFAULT_FONT=\"LatArCyrHeb-16\"
else
+if TARGET_ARCH
+AM_CPPFLAGS += \
+ -DKBD_LOADKEYS=\"/usr/bin/loadkeys\" \
+ -DKBD_SETFONT=\"/usr/bin/setfont\" \
+ -DDEFAULT_FONT=\"LatArCyrHeb-16\"
+else
AM_CPPFLAGS += \
-DKBD_LOADKEYS=\"/bin/loadkeys\" \
-DKBD_SETFONT=\"/bin/setfont\" \
-DDEFAULT_FONT=\"latarcyrheb-sun16\"
endif
AM_CPPFLAGS += \
-DKBD_LOADKEYS=\"/bin/loadkeys\" \
-DKBD_SETFONT=\"/bin/setfont\" \
-DDEFAULT_FONT=\"latarcyrheb-sun16\"
endif
+endif
rootbin_PROGRAMS = \
systemd \
rootbin_PROGRAMS = \
systemd \
@@
-89,6
+99,7
@@
rootlibexec_PROGRAMS = \
systemd-update-utmp \
systemd-random-seed \
systemd-shutdownd \
systemd-update-utmp \
systemd-random-seed \
systemd-shutdownd \
+ systemd-shutdown \
systemd-modules-load \
systemd-remount-api-vfs \
systemd-kmsg-syslogd \
systemd-modules-load \
systemd-remount-api-vfs \
systemd-kmsg-syslogd \
@@
-96,7
+107,8
@@
rootlibexec_PROGRAMS = \
systemd-reply-password \
systemd-readahead-collect \
systemd-readahead-replay \
systemd-reply-password \
systemd-readahead-collect \
systemd-readahead-replay \
- systemd-tmpfiles
+ systemd-tmpfiles \
+ systemd-user-sessions
noinst_PROGRAMS = \
test-engine \
noinst_PROGRAMS = \
test-engine \
@@
-150,6
+162,7
@@
dist_systemunit_DATA = \
units/basic.target \
units/getty.target \
units/halt.target \
units/basic.target \
units/getty.target \
units/halt.target \
+ units/kexec.target \
units/local-fs.target \
units/network.target \
units/nss-lookup.target \
units/local-fs.target \
units/network.target \
units/nss-lookup.target \
@@
-216,10
+229,16
@@
nodist_systemunit_DATA = \
units/systemd-readahead-replay.service \
units/systemd-readahead-done.service \
units/systemd-tmpfiles.service \
units/systemd-readahead-replay.service \
units/systemd-readahead-done.service \
units/systemd-tmpfiles.service \
- units/syslog.target
+ units/systemd-user-sessions.service \
+ units/syslog.target \
+ units/halt.service \
+ units/poweroff.service \
+ units/reboot.service \
+ units/kexec.service
dist_sessionunit_DATA = \
dist_sessionunit_DATA = \
- units/session/default.target
+ units/session/default.target \
+ units/session/exit.target
nodist_sessionunit_DATA = \
units/session/remote-fs.target \
nodist_sessionunit_DATA = \
units/session/remote-fs.target \
@@
-247,18
+266,19
@@
EXTRA_DIST = \
units/systemd-readahead-replay.service.in \
units/systemd-readahead-done.service.in \
units/systemd-tmpfiles.service.in \
units/systemd-readahead-replay.service.in \
units/systemd-readahead-done.service.in \
units/systemd-tmpfiles.service.in \
+ units/systemd-user-sessions.service.in \
units/syslog.target.in \
units/syslog.target.in \
+ units/halt.service.in \
+ units/poweroff.service.in \
+ units/reboot.service.in \
+ units/kexec.service.in \
units/session/exit.service.in \
systemd.pc.in
if TARGET_FEDORA
dist_systemunit_DATA += \
units/session/exit.service.in \
systemd.pc.in
if TARGET_FEDORA
dist_systemunit_DATA += \
- units/fedora/halt.service \
- units/fedora/killall.service \
- units/fedora/poweroff.service \
units/fedora/prefdm.service \
units/fedora/rc-local.service \
units/fedora/prefdm.service \
units/fedora/rc-local.service \
- units/fedora/reboot.service \
units/fedora/sysinit.service \
units/fedora/single.service \
units/fedora/plymouth-quit.service \
units/fedora/sysinit.service \
units/fedora/single.service \
units/fedora/plymouth-quit.service \
@@
-269,10
+289,6
@@
endif
if TARGET_DEBIAN
dist_systemunit_DATA += \
if TARGET_DEBIAN
dist_systemunit_DATA += \
- units/debian/halt.service \
- units/debian/killall.service \
- units/debian/poweroff.service \
- units/debian/reboot.service \
units/debian/fsck.target \
units/debian/umountfs.service \
units/debian/umountnfs.service \
units/debian/fsck.target \
units/debian/umountfs.service \
units/debian/umountnfs.service \
@@
-281,28
+297,18
@@
endif
if TARGET_SUSE
dist_systemunit_DATA += \
if TARGET_SUSE
dist_systemunit_DATA += \
- units/suse/halt.service \
- units/suse/poweroff.service \
- units/suse/reboot.service \
units/suse/fsck.target
endif
if TARGET_GENTOO
dist_systemunit_DATA += \
units/suse/fsck.target
endif
if TARGET_GENTOO
dist_systemunit_DATA += \
- units/gentoo/halt.service \
- units/gentoo/killall.service \
- units/gentoo/poweroff.service \
- units/gentoo/reboot.service \
units/gentoo/xdm.service
endif
if TARGET_ARCH
dist_systemunit_DATA += \
units/arch/sysinit.service \
units/gentoo/xdm.service
endif
if TARGET_ARCH
dist_systemunit_DATA += \
units/arch/sysinit.service \
- units/arch/rc-local.service \
- units/arch/halt.service \
- units/arch/poweroff.service \
- units/arch/reboot.service
+ units/arch/rc-local.service
endif
dist_doc_DATA = \
endif
dist_doc_DATA = \
@@
-310,7
+316,9
@@
dist_doc_DATA = \
LICENSE \
DISTRO_PORTING \
src/sd-daemon.h \
LICENSE \
DISTRO_PORTING \
src/sd-daemon.h \
- src/sd-daemon.c
+ src/sd-daemon.c \
+ src/sd-readahead.h \
+ src/sd-readahead.c
pkgconfigdata_DATA = \
systemd.pc
pkgconfigdata_DATA = \
systemd.pc
@@
-358,6
+366,7
@@
libsystemd_core_la_SOURCES = \
src/path.c \
src/load-dropin.c \
src/execute.c \
src/path.c \
src/load-dropin.c \
src/execute.c \
+ src/utmp-wtmp.c \
src/exit-status.c \
src/dbus.c \
src/dbus-manager.c \
src/exit-status.c \
src/dbus.c \
src/dbus-manager.c \
@@
-385,7
+394,8
@@
libsystemd_core_la_SOURCES = \
src/fdset.c \
src/namespace.c \
src/tcpwrap.c \
src/fdset.c \
src/namespace.c \
src/tcpwrap.c \
- src/cgroup-util.c
+ src/cgroup-util.c \
+ src/condition.c
libsystemd_core_la_CFLAGS = \
$(AM_CFLAGS) \
libsystemd_core_la_CFLAGS = \
$(AM_CFLAGS) \
@@
-419,13
+429,14
@@
EXTRA_DIST += \
src/linux/fanotify.h \
src/initreq.h \
src/sd-daemon.h \
src/linux/fanotify.h \
src/initreq.h \
src/sd-daemon.h \
+ src/sd-readahead.h \
src/special.h \
src/dbus-common.h \
src/bus-errors.h \
src/cgroup-show.h \
src/special.h \
src/dbus-common.h \
src/bus-errors.h \
src/cgroup-show.h \
- src/utmp-wtmp.h \
src/build.h \
src/shutdownd.h \
src/build.h \
src/shutdownd.h \
+ src/umount.h \
src/readahead-common.h
MANPAGES = \
src/readahead-common.h
MANPAGES = \
@@
-453,6
+464,7
@@
MANPAGES = \
man/systemd.exec.5 \
man/daemon.7 \
man/sd-daemon.7 \
man/systemd.exec.5 \
man/daemon.7 \
man/sd-daemon.7 \
+ man/sd-readahead.7 \
man/runlevel.8 \
man/telinit.8 \
man/halt.8 \
man/runlevel.8 \
man/telinit.8 \
man/halt.8 \
@@
-628,6
+640,19
@@
systemd_shutdownd_CFLAGS = \
systemd_shutdownd_LDADD = \
libsystemd-basic.la
systemd_shutdownd_LDADD = \
libsystemd-basic.la
+systemd_shutdown_SOURCES = \
+ src/mount-setup.c \
+ src/umount.c \
+ src/shutdown.c
+
+systemd_shutdown_CFLAGS = \
+ $(AM_CFLAGS) \
+ $(UDEV_CFLAGS)
+
+systemd_shutdown_LDADD = \
+ libsystemd-basic.la \
+ $(UDEV_LIBS)
+
systemd_modules_load_SOURCES = \
src/modules-load.c
systemd_modules_load_SOURCES = \
src/modules-load.c
@@
-643,6
+668,16
@@
systemd_tmpfiles_SOURCES = \
systemd_tmpfiles_CFLAGS = \
$(AM_CFLAGS)
systemd_tmpfiles_CFLAGS = \
$(AM_CFLAGS)
+systemd_user_sessions_LDADD = \
+ libsystemd-basic.la
+
+systemd_user_sessions_SOURCES = \
+ src/user-sessions.c \
+ src/cgroup-util.c
+
+systemd_user_sessions_CFLAGS = \
+ $(AM_CFLAGS)
+
systemd_modules_load_LDADD = \
libsystemd-basic.la
systemd_modules_load_LDADD = \
libsystemd-basic.la
@@
-696,7
+731,8
@@
systemctl_SOURCES = \
src/sd-daemon.c \
src/cgroup-show.c \
src/cgroup-util.c \
src/sd-daemon.c \
src/cgroup-show.c \
src/cgroup-util.c \
- src/exit-status.c
+ src/exit-status.c \
+ src/unit-name.c
systemctl_CFLAGS = \
$(AM_CFLAGS) \
systemctl_CFLAGS = \
$(AM_CFLAGS) \
@@
-708,7
+744,8
@@
systemctl_LDADD = \
systemd_notify_SOURCES = \
src/notify.c \
systemd_notify_SOURCES = \
src/notify.c \
- src/sd-daemon.c
+ src/sd-daemon.c \
+ src/sd-readahead.c
systemd_notify_LDADD = \
libsystemd-basic.la
systemd_notify_LDADD = \
libsystemd-basic.la
@@
-1031,8
+1068,9
@@
install-data-hook:
$(LN_S) graphical.target default.target && \
$(LN_S) reboot.target ctrl-alt-del.target )
( cd $(DESTDIR)$(systemunitdir)/multi-user.target.wants && \
$(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 && \
- $(LN_S) ../getty.target getty.target )
+ rm -f getty.target systemd-user-sessions.service && \
+ $(LN_S) ../getty.target getty.target && \
+ $(LN_S) ../systemd-user-sessions.service systemd-user-sessions.service )
( 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 && \
( 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 && \