diff options
| author | Lennart Poettering <lennart@poettering.net> | 2015-06-10 20:43:06 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2015-06-10 20:43:06 +0200 |
| commit | ad091530b30bfbbc94159c17f3ea434a835ad3c9 (patch) | |
| tree | a22b274eae94d3edfbe262c91a047a723ac29947 /Makefile.am | |
| parent | 4061eed4d91226f1f75e79350c5e1bdd4529d578 (diff) | |
| parent | 37de250906222211d2bf1755c41191a06d2126dd (diff) | |
Merge pull request #151 from mischief/dns-shared-3
move dns code from resolve to shared v3
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 42 |
1 files changed, 20 insertions, 22 deletions
diff --git a/Makefile.am b/Makefile.am index e98e8b821a..8fa43f50ba 100644 --- a/Makefile.am +++ b/Makefile.am @@ -762,6 +762,8 @@ libsystemd_shared_la_SOURCES = \ src/shared/udev-util.h \ src/shared/device-nodes.c \ src/shared/device-nodes.h \ + src/shared/dns-domain.c \ + src/shared/dns-domain.h \ src/shared/util.c \ src/shared/util.h \ src/shared/virt.c \ @@ -978,6 +980,7 @@ libsystemd_shared_la_CFLAGS = \ libsystemd_shared_la_LIBADD = \ $(SELINUX_LIBS) \ $(CAP_LIBS) \ + $(LIBIDN_LIBS) \ -lm # ----------------------------------------------------------------------------- @@ -1446,7 +1449,8 @@ tests += \ test-copy \ test-cap-list \ test-sigbus \ - test-verbs + test-verbs \ + test-dns-domain EXTRA_DIST += \ test/a.service \ @@ -1577,6 +1581,15 @@ test_hostname_SOURCES = \ test_hostname_LDADD = \ libsystemd-core.la +test_dns_domain_SOURCES = \ + src/test/test-dns-domain.c + +test_dns_domain_LDADD = \ + libsystemd-network.la \ + libsystemd-internal.la \ + libsystemd-shared.la \ + $(LIBIDN_LIBS) + if ENABLE_EFI manual_tests += \ test-boot-timestamp @@ -3382,7 +3395,8 @@ test_dhcp_client_SOURCES = \ test_dhcp_client_LDADD = \ libsystemd-network.la \ libsystemd-internal.la \ - libsystemd-shared.la + libsystemd-shared.la \ + $(LIBIDN_LIBS) test_dhcp_server_SOURCES = \ src/libsystemd-network/test-dhcp-server.c @@ -5408,8 +5422,6 @@ systemd_resolved_SOURCES = \ 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 \ src/resolve/resolved-dns-rr.c \ src/resolve/resolved-dns-question.h \ @@ -5479,20 +5491,6 @@ GENERAL_ALIASES += \ nodist_pkgsysconf_DATA += \ src/resolve/resolved.conf -tests += \ - test-dns-domain - -test_dns_domain_SOURCES = \ - src/resolve/resolved-dns-domain.h \ - src/resolve/resolved-dns-domain.c \ - src/resolve/test-dns-domain.c - -test_dns_domain_LDADD = \ - libsystemd-network.la \ - libsystemd-internal.la \ - libsystemd-shared.la \ - $(LIBIDN_LIBS) - libnss_resolve_la_SOURCES = \ src/nss-resolve/nss-resolve.sym \ src/nss-resolve/nss-resolve.c @@ -5523,8 +5521,6 @@ systemd_resolve_host_SOURCES = \ src/resolve/resolved-dns-answer.h \ src/resolve/resolved-dns-question.c \ src/resolve/resolved-dns-question.h \ - src/resolve/resolved-dns-domain.c \ - src/resolve/resolved-dns-domain.h \ src/resolve/dns-type.c \ src/resolve/dns-type.h @@ -5554,7 +5550,8 @@ systemd_networkd_SOURCES = \ src/network/networkd.c systemd_networkd_LDADD = \ - libsystemd-networkd-core.la + libsystemd-networkd-core.la \ + $(LIBIDN_LIBS) if HAVE_LIBIPTC systemd_networkd_LDADD += \ @@ -5653,7 +5650,8 @@ test_network_SOURCES = \ src/network/test-network.c test_network_LDADD = \ - libsystemd-networkd-core.la + libsystemd-networkd-core.la \ + $(LIBIDN_LIBS) if HAVE_LIBIPTC test_network_LDADD += \ |