X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=c80d25df29b0a62d73eff9ec57725baf3ecb14ff;hp=4d93304cb61c95bb53453aead7c3e5a72059dd40;hb=97768fc5746ea97cb2d3ac6854b4fc7ce1c14f24;hpb=32a4456cc252689f51f383d150d34ed636bfec4d

diff --git a/Makefile.am b/Makefile.am
index 4d93304cb..c80d25df2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -39,16 +39,16 @@ SUBDIRS = . po
 .PRECIOUS: $(TEST_SUITE_LOG) Makefile
 
 LIBUDEV_CURRENT=7
-LIBUDEV_REVISION=0
+LIBUDEV_REVISION=1
 LIBUDEV_AGE=6
 
 LIBGUDEV_CURRENT=2
 LIBGUDEV_REVISION=0
 LIBGUDEV_AGE=2
 
-LIBSYSTEMD_CURRENT=4
+LIBSYSTEMD_CURRENT=5
 LIBSYSTEMD_REVISION=0
-LIBSYSTEMD_AGE=4
+LIBSYSTEMD_AGE=5
 
 # The following four libraries only exist for compatibility reasons,
 # their version info should not be bumped anymore
@@ -768,6 +768,8 @@ libsystemd_shared_la_SOURCES = \
 	src/shared/time-util.h \
 	src/shared/locale-util.c \
 	src/shared/locale-util.h \
+	src/shared/mempool.c \
+	src/shared/mempool.h \
 	src/shared/hashmap.c \
 	src/shared/hashmap.h \
 	src/shared/siphash24.c \
@@ -883,8 +885,6 @@ libsystemd_shared_la_SOURCES = \
 	src/shared/memfd.h \
 	src/shared/uid-range.c \
 	src/shared/uid-range.h \
-	src/shared/switch-root.h \
-	src/shared/switch-root.c \
 	src/shared/nss-util.h
 
 if HAVE_UTMP
@@ -932,6 +932,8 @@ libsystemd_label_la_SOURCES = \
 	src/shared/mkdir-label.c \
 	src/shared/ask-password-api.c \
 	src/shared/ask-password-api.h \
+	src/shared/switch-root.h \
+	src/shared/switch-root.c \
 	src/shared/fileio-label.c \
 	src/shared/fileio-label.h \
 	src/shared/dev-setup.c \
@@ -5398,20 +5400,6 @@ SYSTEM_UNIT_ALIASES += \
 BUSNAMES_TARGET_WANTS += \
 	org.freedesktop.login1.busname
 
-if ENABLE_MULTI_SEAT_X
-
-systemd_multi_seat_x_SOURCES = \
-	src/login/multi-seat-x.c
-
-systemd_multi_seat_x_LDADD = \
-	libsystemd-label.la \
-	libsystemd-shared.la
-
-rootlibexec_PROGRAMS += \
-	systemd-multi-seat-x
-
-endif
-
 dist_udevrules_DATA += \
 	src/login/70-uaccess.rules \
 	src/login/70-power-switch.rules