chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
main: properly queue default.target after switched root
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index e1501aecf059f8c4ac842c8cc2c8b370a123cad9..e9ac82c049427c3dc6ce9581cc19d43945a38ec5 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-23,9
+23,9
@@
AM_MAKEFLAGS = --no-print-directory
SUBDIRS = . po
SUBDIRS = . po
-LIBUDEV_CURRENT=1
3
-LIBUDEV_REVISION=
3
-LIBUDEV_AGE=
13
+LIBUDEV_CURRENT=1
+LIBUDEV_REVISION=
0
+LIBUDEV_AGE=
0
LIBGUDEV_CURRENT=1
LIBGUDEV_REVISION=1
LIBGUDEV_CURRENT=1
LIBGUDEV_REVISION=1
@@
-67,6
+67,7
@@
usergeneratordir=$(pkglibexecdir)/user-generators
pkgincludedir=$(includedir)/systemd
systemgeneratordir=$(rootlibexecdir)/system-generators
systemshutdowndir=$(rootlibexecdir)/system-shutdown
pkgincludedir=$(includedir)/systemd
systemgeneratordir=$(rootlibexecdir)/system-generators
systemshutdowndir=$(rootlibexecdir)/system-shutdown
+systemsleepdir=$(rootlibexecdir)/system-sleep
systemunitdir=$(rootprefix)/lib/systemd/system
udevlibexecdir=$(rootprefix)/lib/udev
udevhomedir = $(libexecdir)/udev
systemunitdir=$(rootprefix)/lib/systemd/system
udevlibexecdir=$(rootprefix)/lib/udev
udevhomedir = $(libexecdir)/udev
@@
-117,6
+118,7
@@
AM_CPPFLAGS = \
-DSYSTEMD_CGROUP_AGENT_PATH=\"$(rootlibexecdir)/systemd-cgroups-agent\" \
-DSYSTEMD_BINARY_PATH=\"$(rootlibexecdir)/systemd\" \
-DSYSTEMD_SHUTDOWN_BINARY_PATH=\"$(rootlibexecdir)/systemd-shutdown\" \
-DSYSTEMD_CGROUP_AGENT_PATH=\"$(rootlibexecdir)/systemd-cgroups-agent\" \
-DSYSTEMD_BINARY_PATH=\"$(rootlibexecdir)/systemd\" \
-DSYSTEMD_SHUTDOWN_BINARY_PATH=\"$(rootlibexecdir)/systemd-shutdown\" \
+ -DSYSTEMD_SLEEP_BINARY_PATH=\"$(rootlibexecdir)/systemd-sleep\" \
-DSYSTEMCTL_BINARY_PATH=\"$(rootbindir)/systemctl\" \
-DSYSTEMD_TTY_ASK_PASSWORD_AGENT_BINARY_PATH=\"$(rootbindir)/systemd-tty-ask-password-agent\" \
-DSYSTEMD_STDIO_BRIDGE_BINARY_PATH=\"$(bindir)/systemd-stdio-bridge\" \
-DSYSTEMCTL_BINARY_PATH=\"$(rootbindir)/systemctl\" \
-DSYSTEMD_TTY_ASK_PASSWORD_AGENT_BINARY_PATH=\"$(rootbindir)/systemd-tty-ask-password-agent\" \
-DSYSTEMD_STDIO_BRIDGE_BINARY_PATH=\"$(bindir)/systemd-stdio-bridge\" \
@@
-212,7
+214,8
@@
bin_PROGRAMS = \
systemd-cgtop \
systemd-stdio-bridge \
systemd-nspawn \
systemd-cgtop \
systemd-stdio-bridge \
systemd-nspawn \
- systemd-detect-virt
+ systemd-detect-virt \
+ systemd-delta
dist_bin_SCRIPTS = \
src/analyze/systemd-analyze
dist_bin_SCRIPTS = \
src/analyze/systemd-analyze
@@
-230,7
+233,8
@@
rootlibexec_PROGRAMS = \
systemd-fsck \
systemd-timestamp \
systemd-ac-power \
systemd-fsck \
systemd-timestamp \
systemd-ac-power \
- systemd-sysctl
+ systemd-sysctl \
+ systemd-sleep
systemgenerator_PROGRAMS = \
systemd-getty-generator
systemgenerator_PROGRAMS = \
systemd-getty-generator
@@
-266,6
+270,7
@@
dist_systemunit_DATA = \
units/nss-lookup.target \
units/nss-user-lookup.target \
units/mail-transfer-agent.target \
units/nss-lookup.target \
units/nss-user-lookup.target \
units/mail-transfer-agent.target \
+ units/hibernate.target \
units/http-daemon.target \
units/poweroff.target \
units/reboot.target \
units/http-daemon.target \
units/poweroff.target \
units/reboot.target \
@@
-276,7
+281,9
@@
dist_systemunit_DATA = \
units/final.target \
units/umount.target \
units/sigpwr.target \
units/final.target \
units/umount.target \
units/sigpwr.target \
+ units/sleep.target \
units/sockets.target \
units/sockets.target \
+ units/suspend.target \
units/swap.target \
units/systemd-initctl.socket \
units/systemd-shutdownd.socket \
units/swap.target \
units/systemd-initctl.socket \
units/systemd-shutdownd.socket \
@@
-318,12
+325,14
@@
nodist_systemunit_DATA = \
units/systemd-sysctl.service \
units/halt.service \
units/emergency.service \
units/systemd-sysctl.service \
units/halt.service \
units/emergency.service \
+ units/hibernate.service \
units/poweroff.service \
units/reboot.service \
units/kexec.service \
units/fsck@.service \
units/fsck-root.service \
units/rescue.service \
units/poweroff.service \
units/reboot.service \
units/kexec.service \
units/fsck@.service \
units/fsck-root.service \
units/rescue.service \
+ units/suspend.service \
units/user@.service \
units/systemd-udev.service \
units/systemd-udev-trigger.service \
units/user@.service \
units/systemd-udev.service \
units/systemd-udev-trigger.service \
@@
-365,6
+374,8
@@
EXTRA_DIST += \
units/systemd-udev.service \
units/systemd-udev-trigger.service \
units/systemd-udev-settle.service \
units/systemd-udev.service \
units/systemd-udev-trigger.service \
units/systemd-udev-settle.service \
+ units/hibernate.service.in \
+ units/suspend.service.in \
introspect.awk \
man/custom-html.xsl
introspect.awk \
man/custom-html.xsl
@@
-442,6
+453,7
@@
MANPAGES = \
man/systemd.1 \
man/systemctl.1 \
man/systemd-cgls.1 \
man/systemd.1 \
man/systemctl.1 \
man/systemd-cgls.1 \
+ man/systemd-delta.1 \
man/systemd-cgtop.1 \
man/systemd-nspawn.1 \
man/systemd-tmpfiles.8 \
man/systemd-cgtop.1 \
man/systemd-nspawn.1 \
man/systemd-tmpfiles.8 \
@@
-481,7
+493,8
@@
MANPAGES = \
man/systemd-machine-id-setup.1 \
man/systemd-detect-virt.1 \
man/journald.conf.5 \
man/systemd-machine-id-setup.1 \
man/systemd-detect-virt.1 \
man/journald.conf.5 \
- man/journalctl.1
+ man/journalctl.1 \
+ man/systemd-inhibit.1
MANPAGES_ALIAS = \
man/reboot.8 \
MANPAGES_ALIAS = \
man/reboot.8 \
@@
-525,6
+538,8
@@
libsystemd_shared_la_SOURCES = \
src/shared/util.h \
src/shared/virt.c \
src/shared/virt.h \
src/shared/util.h \
src/shared/virt.c \
src/shared/virt.h \
+ src/shared/path-util.c \
+ src/shared/path-util.h \
src/shared/hashmap.c \
src/shared/hashmap.h \
src/shared/set.c \
src/shared/hashmap.c \
src/shared/hashmap.h \
src/shared/set.c \
@@
-546,6
+561,8
@@
libsystemd_shared_la_SOURCES = \
src/shared/ioprio.h \
src/shared/socket-util.c \
src/shared/socket-util.h \
src/shared/ioprio.h \
src/shared/socket-util.c \
src/shared/socket-util.h \
+ src/shared/conf-files.c \
+ src/shared/conf-files.h \
src/shared/cgroup-util.c \
src/shared/cgroup-util.h \
src/shared/cgroup-show.c \
src/shared/cgroup-util.c \
src/shared/cgroup-util.h \
src/shared/cgroup-show.c \
@@
-561,11
+578,9
@@
libsystemd_shared_la_SOURCES = \
src/shared/specifier.c \
src/shared/specifier.h \
src/shared/spawn-polkit-agent.c \
src/shared/specifier.c \
src/shared/specifier.h \
src/shared/spawn-polkit-agent.c \
- src/shared/spawn-polkit-agent.h
-
-libsystemd_shared_la_CFLAGS = \
- $(AM_CFLAGS) \
- $(DBUS_CFLAGS)
+ src/shared/spawn-polkit-agent.h \
+ src/shared/hwclock.c \
+ src/shared/hwclock.h
#-------------------------------------------------------------------------------
noinst_LTLIBRARIES += \
#-------------------------------------------------------------------------------
noinst_LTLIBRARIES += \
@@
-774,7
+789,9
@@
libsystemd_core_la_SOURCES = \
src/core/special.h \
src/core/bus-errors.h \
src/core/build.h \
src/core/special.h \
src/core/bus-errors.h \
src/core/build.h \
- src/core/sysfs-show.h
+ src/core/sysfs-show.h \
+ src/core/switch-root.h \
+ src/core/switch-root.c
nodist_libsystemd_core_la_SOURCES = \
src/core/load-fragment-gperf.c \
nodist_libsystemd_core_la_SOURCES = \
src/core/load-fragment-gperf.c \
@@
-1059,6
+1076,13
@@
systemd_sysctl_SOURCES = \
systemd_sysctl_LDADD = \
libsystemd-shared.la
systemd_sysctl_LDADD = \
libsystemd-shared.la
+# ------------------------------------------------------------------------------
+systemd_sleep_SOURCES = \
+ src/sleep/sleep.c
+
+systemd_sleep_LDADD = \
+ libsystemd-shared.la
+
# ------------------------------------------------------------------------------
systemd_fsck_SOURCES = \
src/fsck/fsck.c
# ------------------------------------------------------------------------------
systemd_fsck_SOURCES = \
src/fsck/fsck.c
@@
-1094,6
+1118,13
@@
systemd_detect_virt_SOURCES = \
systemd_detect_virt_LDADD = \
libsystemd-shared.la
systemd_detect_virt_LDADD = \
libsystemd-shared.la
+# ------------------------------------------------------------------------------
+systemd_delta_SOURCES = \
+ src/delta/delta.c
+
+systemd_delta_LDADD = \
+ libsystemd-shared.la
+
# ------------------------------------------------------------------------------
systemd_getty_generator_SOURCES = \
src/getty-generator/getty-generator.c
# ------------------------------------------------------------------------------
systemd_getty_generator_SOURCES = \
src/getty-generator/getty-generator.c
@@
-1310,7
+1341,8
@@
libudev_la_CFLAGS = \
libudev_la_LDFLAGS = \
$(AM_LDFLAGS) \
libudev_la_LDFLAGS = \
$(AM_LDFLAGS) \
- -version-info $(LIBUDEV_CURRENT):$(LIBUDEV_REVISION):$(LIBUDEV_AGE)
+ -version-info $(LIBUDEV_CURRENT):$(LIBUDEV_REVISION):$(LIBUDEV_AGE) \
+ -Wl,--version-script=$(top_srcdir)/src/libudev/libudev.sym
libudev_la_LIBADD = \
libsystemd-shared.la
libudev_la_LIBADD = \
libsystemd-shared.la
@@
-1319,7
+1351,8
@@
pkgconfiglib_DATA += \
src/libudev/libudev.pc
EXTRA_DIST += \
src/libudev/libudev.pc
EXTRA_DIST += \
- src/libudev/libudev.pc.in
+ src/libudev/libudev.pc.in \
+ src/libudev/libudev.sym
CLEANFILES += \
src/libudev/libudev.pc
CLEANFILES += \
src/libudev/libudev.pc
@@
-2666,6
+2699,20
@@
loginctl_LDADD = \
rootbin_PROGRAMS += \
loginctl
rootbin_PROGRAMS += \
loginctl
+systemd_inhibit_SOURCES = \
+ src/login/inhibit.c
+
+systemd_inhibit_CFLAGS = \
+ $(AM_CFLAGS) \
+ $(DBUS_CFLAGS)
+
+systemd_inhibit_LDADD = \
+ libsystemd-shared.la \
+ libsystemd-dbus.la
+
+rootbin_PROGRAMS += \
+ systemd-inhibit
+
test_login_SOURCES = \
src/login/test-login.c
test_login_SOURCES = \
src/login/test-login.c
@@
-3010,6
+3057,7
@@
systemd-install-data-hook:
$(DESTDIR)$(prefix)/lib/sysctl.d \
$(DESTDIR)$(sysconfdir)/sysctl.d \
$(DESTDIR)$(systemshutdowndir) \
$(DESTDIR)$(prefix)/lib/sysctl.d \
$(DESTDIR)$(sysconfdir)/sysctl.d \
$(DESTDIR)$(systemshutdowndir) \
+ $(DESTDIR)$(systemsleepdir) \
$(DESTDIR)$(systemgeneratordir) \
$(DESTDIR)$(usergeneratordir)
$(MKDIR_P) -m 0755 \
$(DESTDIR)$(systemgeneratordir) \
$(DESTDIR)$(usergeneratordir)
$(MKDIR_P) -m 0755 \
@@
-3166,10
+3214,6
@@
if TARGET_MEEGO
endif
if TARGET_FEDORA
endif
if TARGET_FEDORA
- $(MKDIR_P) -m 0755 $(DESTDIR)$(systemunitdir)/final.target.wants
- ( cd $(DESTDIR)$(systemunitdir)/final.target.wants && \
- rm -f halt-local.service && \
- $(LN_S) $(systemunitdir)/halt-local.service halt-local.service )
( cd $(DESTDIR)$(systemunitdir) && \
rm -f display-manager.service single.service && \
$(LN_S) prefdm.service display-manager.service && \
( cd $(DESTDIR)$(systemunitdir) && \
rm -f display-manager.service single.service && \
$(LN_S) prefdm.service display-manager.service && \
@@
-3180,10
+3224,6
@@
if TARGET_FEDORA
endif
if TARGET_MANDRIVA
endif
if TARGET_MANDRIVA
- $(MKDIR_P) -m 0755 $(DESTDIR)$(systemunitdir)/final.target.wants
- ( cd $(DESTDIR)$(systemunitdir)/final.target.wants && \
- rm -f halt-local.service && \
- $(LN_S) $(systemunitdir)/halt-local.service halt-local.service )
( cd $(DESTDIR)$(systemunitdir) && \
rm -f display-manager.service dm.service single.service && \
$(LN_S) prefdm.service display-manager.service && \
( cd $(DESTDIR)$(systemunitdir) && \
rm -f display-manager.service dm.service single.service && \
$(LN_S) prefdm.service display-manager.service && \
@@
-3201,20
+3241,12
@@
if TARGET_DEBIAN_OR_UBUNTU
endif
if TARGET_SUSE
endif
if TARGET_SUSE
- $(MKDIR_P) -m 0755 $(DESTDIR)$(systemunitdir)/final.target.wants
( cd $(DESTDIR)$(systemunitdir) && \
rm -f local.service && \
$(LN_S) rc-local.service local.service )
( cd $(DESTDIR)$(systemunitdir) && \
rm -f local.service && \
$(LN_S) rc-local.service local.service )
- ( cd $(DESTDIR)$(systemunitdir)/final.target.wants && \
- rm -f halt-local.service && \
- $(LN_S) $(systemunitdir)/halt-local.service halt-local.service )
endif
if TARGET_MAGEIA
endif
if TARGET_MAGEIA
- $(MKDIR_P) -m 0755 $(DESTDIR)$(systemunitdir)/final.target.wants
- ( cd $(DESTDIR)$(systemunitdir)/final.target.wants && \
- rm -f halt-local.service && \
- $(LN_S) $(systemunitdir)/halt-local.service halt-local.service )
( cd $(DESTDIR)$(systemunitdir) && \
rm -f display-manager.service && \
$(LN_S) prefdm.service display-manager.service && \
( cd $(DESTDIR)$(systemunitdir) && \
rm -f display-manager.service && \
$(LN_S) prefdm.service display-manager.service && \