X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=e9ac82c049427c3dc6ce9581cc19d43945a38ec5;hp=dbcfeb384f0fdd513447f15e20d623f0eabf8998;hb=927735238d1cfe9bd9d9db71025e801c391cb156;hpb=9eb977db5b89b44f254ab40c1876a76b7d7ea2d0

diff --git a/Makefile.am b/Makefile.am
index dbcfeb384..e9ac82c04 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -23,9 +23,9 @@ AM_MAKEFLAGS = --no-print-directory
 
 SUBDIRS = . po
 
-LIBUDEV_CURRENT=13
-LIBUDEV_REVISION=3
-LIBUDEV_AGE=13
+LIBUDEV_CURRENT=1
+LIBUDEV_REVISION=0
+LIBUDEV_AGE=0
 
 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
+systemsleepdir=$(rootlibexecdir)/system-sleep
 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_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\" \
@@ -212,7 +214,8 @@ bin_PROGRAMS = \
 	systemd-cgtop \
 	systemd-stdio-bridge \
 	systemd-nspawn \
-	systemd-detect-virt
+	systemd-detect-virt \
+	systemd-delta
 
 dist_bin_SCRIPTS = \
 	src/analyze/systemd-analyze
@@ -230,7 +233,8 @@ rootlibexec_PROGRAMS = \
 	systemd-fsck \
 	systemd-timestamp \
 	systemd-ac-power \
-	systemd-sysctl
+	systemd-sysctl \
+	systemd-sleep
 
 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/hibernate.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/sleep.target \
 	units/sockets.target \
+	units/suspend.target \
 	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/hibernate.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 \
@@ -365,6 +374,8 @@ EXTRA_DIST += \
 	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
 
@@ -442,6 +453,7 @@ MANPAGES = \
 	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 \
@@ -777,7 +789,9 @@ libsystemd_core_la_SOURCES = \
 	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 \
@@ -1062,6 +1076,13 @@ systemd_sysctl_SOURCES = \
 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
@@ -1097,6 +1118,13 @@ systemd_detect_virt_SOURCES = \
 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
@@ -1313,7 +1341,8 @@ libudev_la_CFLAGS = \
 
 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
@@ -1322,7 +1351,8 @@ pkgconfiglib_DATA += \
 	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
@@ -3027,6 +3057,7 @@ systemd-install-data-hook:
 		$(DESTDIR)$(prefix)/lib/sysctl.d \
 		$(DESTDIR)$(sysconfdir)/sysctl.d \
 		$(DESTDIR)$(systemshutdowndir) \
+		$(DESTDIR)$(systemsleepdir) \
 		$(DESTDIR)$(systemgeneratordir) \
 		$(DESTDIR)$(usergeneratordir)
 	$(MKDIR_P) -m 0755 \