X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=df5d73bf87f6d2672ccc40f8ab151805af89b4df;hb=7e63dd1015c9ac6fc2042e45b0a87a3f9f8b9336;hp=e52db1793bb6d83ba5da6a0b6a3054a7fdf15e83;hpb=2355af60dc0c0ec2b7fbe69f15a77d980b017b3f;p=elogind.git

diff --git a/Makefile.am b/Makefile.am
index e52db1793..df5d73bf8 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
@@ -740,7 +740,6 @@ noinst_LTLIBRARIES += \
 
 libsystemd_shared_la_SOURCES = \
 	src/shared/linux/auto_dev-ioctl.h \
-	src/shared/linux/fanotify.h \
 	src/shared/ioprio.h \
 	src/shared/missing.h \
 	src/shared/initreq.h \
@@ -769,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 \
@@ -1570,8 +1571,27 @@ test_namespace_SOURCES = \
 test_namespace_LDADD = \
 	libsystemd-core.la
 
+CLEANFILES += \
+	src/test/test-hashmap-ordered.c
+
+BUILT_SOURCES += \
+	src/test/test-hashmap-ordered.c
+
+src/test/test-hashmap-ordered.c: src/test/test-hashmap-plain.c
+	$(AM_V_at)$(MKDIR_P) $(dir $@)
+	$(AM_V_GEN)$(AWK) 'BEGIN { print "/* GENERATED FILE */\n#define ORDERED" } \
+	                   { if (!match($$0, "^#include"))          \
+	                         gsub(/hashmap/, "ordered_hashmap"); \
+	                     gsub(/HASHMAP/, "ORDERED_HASHMAP");     \
+	                     gsub(/Hashmap/, "OrderedHashmap");      \
+	                     print }' <$< >$@
+
+nodist_test_hashmap_SOURCES = \
+	src/test/test-hashmap-ordered.c
+
 test_hashmap_SOURCES = \
-	src/test/test-hashmap.c
+	src/test/test-hashmap.c \
+	src/test/test-hashmap-plain.c
 
 test_hashmap_LDADD = \
 	libsystemd-core.la
@@ -5380,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