diff options
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 59 |
1 files changed, 47 insertions, 12 deletions
diff --git a/Makefile.am b/Makefile.am index 45330b2b1a..edae4a309b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -947,7 +947,8 @@ libbasic_la_SOURCES = \ src/basic/copy.h \ src/basic/alloc-util.h \ src/basic/alloc-util.c \ - src/basic/formats-util.h + src/basic/formats-util.h \ + src/basic/nss-util.h nodist_libbasic_la_SOURCES = \ src/basic/errno-from-name.h \ @@ -1007,7 +1008,6 @@ libshared_la_SOURCES = \ src/shared/base-filesystem.h \ src/shared/uid-range.c \ src/shared/uid-range.h \ - src/shared/nss-util.h \ src/shared/install.c \ src/shared/install.h \ src/shared/install-printf.c \ @@ -1499,6 +1499,11 @@ tests += \ test-dns-domain \ test-install-root +if HAVE_ACL +tests += \ + test-acl-util +endif + EXTRA_DIST += \ test/a.service \ test/basic.target \ @@ -1846,6 +1851,12 @@ test_install_root_SOURCES = \ test_install_root_LDADD = \ libshared.la +test_acl_util_SOURCES = \ + src/test/test-acl-util.c + +test_acl_util_LDADD = \ + libshared.la + test_namespace_LDADD = \ libcore.la @@ -3041,7 +3052,6 @@ libsystemd_internal_la_SOURCES = \ src/libsystemd/sd-bus/bus-dump.h \ src/libsystemd/sd-utf8/sd-utf8.c \ src/libsystemd/sd-event/sd-event.c \ - src/libsystemd/sd-event/event-util.h \ src/libsystemd/sd-netlink/sd-netlink.c \ src/libsystemd/sd-netlink/netlink-internal.h \ src/libsystemd/sd-netlink/netlink-message.c \ @@ -3070,8 +3080,7 @@ libsystemd_internal_la_SOURCES = \ src/libsystemd/sd-device/sd-device.c \ src/libsystemd/sd-device/device-private.c \ src/libsystemd/sd-device/device-private.h \ - src/libsystemd/sd-resolve/sd-resolve.c \ - src/libsystemd/sd-resolve/resolve-util.h + src/libsystemd/sd-resolve/sd-resolve.c libsystemd_internal_la_LIBADD = \ libbasic.la \ @@ -3353,7 +3362,6 @@ libsystemd_network_la_SOURCES = \ src/libsystemd-network/lldp-port.c \ src/libsystemd-network/lldp-internal.h \ src/libsystemd-network/lldp-internal.c \ - src/libsystemd-network/lldp-util.h \ src/libsystemd-network/sd-lldp.c libsystemd_network_la_LIBADD = \ @@ -5128,12 +5136,13 @@ polkitpolicy_in_files += \ src/import/org.freedesktop.import1.policy.in EXTRA_DIST += \ - units/systemd-importd.service.in \ - src/resolve/resolved.conf.in + units/systemd-importd.service.in # ------------------------------------------------------------------------------ if ENABLE_RESOLVED +if HAVE_GCRYPT + systemd_resolved_SOURCES = \ src/resolve/resolved.c \ src/resolve/resolved-manager.c \ @@ -5173,6 +5182,8 @@ systemd_resolved_SOURCES = \ src/resolve/resolved-dns-zone.c \ src/resolve/resolved-dns-stream.h \ src/resolve/resolved-dns-stream.c \ + src/resolve/resolved-dns-dnssec.h \ + src/resolve/resolved-dns-dnssec.c \ src/resolve/dns-type.c \ src/resolve/dns-type.h @@ -5218,9 +5229,6 @@ GENERAL_ALIASES += \ nodist_pkgsysconf_DATA += \ src/resolve/resolved.conf -tests += \ - test-dns-domain - libnss_resolve_la_SOURCES = \ src/nss-resolve/nss-resolve.sym \ src/nss-resolve/nss-resolve.c @@ -5264,10 +5272,34 @@ systemd_resolve_host_LDADD = \ rootlibexec_PROGRAMS += \ systemd-resolve-host +tests += \ + test-dns-domain \ + test-dnssec + +test_dnssec_SOURCES = \ + src/resolve/test-dnssec.c \ + src/resolve/resolved-dns-packet.c \ + src/resolve/resolved-dns-packet.h \ + src/resolve/resolved-dns-rr.c \ + src/resolve/resolved-dns-rr.h \ + src/resolve/resolved-dns-answer.c \ + src/resolve/resolved-dns-answer.h \ + src/resolve/resolved-dns-question.c \ + src/resolve/resolved-dns-question.h \ + src/resolve/resolved-dns-dnssec.c \ + src/resolve/resolved-dns-dnssec.h \ + src/resolve/dns-type.c \ + src/resolve/dns-type.h + +test_dnssec_LDADD = \ + libshared.la + +endif endif EXTRA_DIST += \ - units/systemd-resolved.service.m4.in + units/systemd-resolved.service.m4.in \ + src/resolve/resolved.conf.in # ------------------------------------------------------------------------------ if ENABLE_NETWORKD @@ -5681,6 +5713,9 @@ EXTRA_DIST += \ test/TEST-03-JOBS/Makefile \ test/TEST-03-JOBS/test-jobs.sh \ test/TEST-03-JOBS/test.sh \ + test/TEST-04-JOURNAL/Makefile \ + test/TEST-04-JOURNAL/test-journal.sh \ + test/TEST-04-JOURNAL/test.sh \ test/test-functions EXTRA_DIST += \ |