X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=3ef9c243130b1a04398af6dfd5ca6e91dd0169ef;hp=513c8526551b649746f722fca54be62cb23b917d;hb=8aa209ee141b2314e9f1bb502a08c5129bcca3b1;hpb=12e34d9d58ed4d97e7bdf8c23494c51ee5ec388e

diff --git a/Makefile.am b/Makefile.am
index 513c85265..3ef9c2431 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -860,6 +860,8 @@ libsystemd_shared_la_SOURCES = \
 	src/shared/copy.h \
 	src/shared/base-filesystem.c \
 	src/shared/base-filesystem.h \
+	src/shared/memfd.c \
+	src/shared/memfd.h \
 	src/shared/nss-util.h
 
 nodist_libsystemd_shared_la_SOURCES = \
@@ -1319,7 +1321,8 @@ tests += \
 	test-conf-files \
 	test-capability \
 	test-async \
-	test-ratelimit
+	test-ratelimit \
+	test-condition-util
 
 EXTRA_DIST += \
 	test/a.service \
@@ -1458,6 +1461,14 @@ test_async_SOURCES = \
 test_async_LDADD = \
 	libsystemd-shared.la
 
+test_condition_util_SOURCES = \
+	src/test/test-condition-util.c
+
+test_condition_util_LDADD = \
+	libsystemd-shared.la \
+	libsystemd-internal.la
+
+
 test_fdset_SOURCES = \
 	src/test/test-fdset.c
 
@@ -2382,7 +2393,6 @@ libsystemd_internal_la_SOURCES = \
 	src/systemd/sd-bus.h \
 	src/systemd/sd-bus-protocol.h \
 	src/systemd/sd-bus-vtable.h \
-	src/systemd/sd-memfd.h \
 	src/systemd/sd-utf8.h \
 	src/systemd/sd-event.h \
 	src/systemd/sd-rtnl.h \
@@ -2432,7 +2442,6 @@ libsystemd_internal_la_SOURCES = \
 	src/libsystemd/sd-bus/bus-slot.h \
 	src/libsystemd/sd-bus/bus-protocol.h \
 	src/libsystemd/sd-bus/kdbus.h \
-	src/libsystemd/sd-bus/sd-memfd.c \
 	src/libsystemd/sd-utf8/sd-utf8.c \
 	src/libsystemd/sd-event/sd-event.c \
 	src/libsystemd/sd-event/event-util.h \
@@ -2550,7 +2559,6 @@ pkginclude_HEADERS += \
 	src/systemd/sd-bus.h \
 	src/systemd/sd-bus-protocol.h \
 	src/systemd/sd-bus-vtable.h \
-	src/systemd/sd-memfd.h \
 	src/systemd/sd-utf8.h \
 	src/systemd/sd-event.h \
 	src/systemd/sd-rtnl.h \
@@ -2571,7 +2579,6 @@ tests += \
 	test-bus-kernel \
 	test-bus-kernel-bloom \
 	test-bus-kernel-benchmark \
-	test-bus-memfd \
 	test-bus-zero-copy \
 	test-bus-introspect \
 	test-bus-objects \
@@ -2725,13 +2732,6 @@ test_bus_kernel_benchmark_LDADD = \
 	libsystemd-internal.la \
 	libsystemd-shared.la
 
-test_bus_memfd_SOURCES = \
-	src/libsystemd/sd-bus/test-bus-memfd.c
-
-test_bus_memfd_LDADD = \
-	libsystemd-internal.la \
-	libsystemd-shared.la
-
 test_bus_zero_copy_SOURCES = \
 	src/libsystemd/sd-bus/test-bus-zero-copy.c
 
@@ -4781,6 +4781,7 @@ systemd_resolved_SOURCES = \
 	src/resolve/resolved-bus.h \
 	src/resolve/resolved-link.h \
 	src/resolve/resolved-link.c \
+	src/resolve/resolved-def.h \
 	src/resolve/resolved-dns-domain.h \
 	src/resolve/resolved-dns-domain.c \
 	src/resolve/resolved-dns-rr.h \