login: remove multi-seat-x

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 3b0ba0ae36503338d171b6d32fb98bba289ee132..fc86b4596c0f4f06be9d0cb502aca664a65fa332 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -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 \
@@ -1569,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
@@ -5379,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