From 4edbbb28e4419fc473d5675abd6abd0c450ca82c Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Thu, 27 Oct 2016 00:43:18 -0400 Subject: `git diff`-guided cleanup --- src/grp-resolve/systemd-resolve/Makefile | 3 +-- src/grp-resolve/systemd-resolved/Makefile | 6 +----- 2 files changed, 2 insertions(+), 7 deletions(-) (limited to 'src/grp-resolve') diff --git a/src/grp-resolve/systemd-resolve/Makefile b/src/grp-resolve/systemd-resolve/Makefile index 2f1ad43208..ef8b1785dc 100644 --- a/src/grp-resolve/systemd-resolve/Makefile +++ b/src/grp-resolve/systemd-resolve/Makefile @@ -39,6 +39,7 @@ systemd_resolve_CFLAGS = \ systemd_resolve_LDADD = \ libsystemd-internal.la \ libsystemd-gcrypt.la \ + libbasic-dns.la \ libsystemd-shared.la \ $(GCRYPT_LIBS) \ -lm @@ -52,6 +53,4 @@ dist_bashcompletion_data += \ dist_zshcompletion_data += \ shell-completion/zsh/_systemd-resolve -systemd_resolve_LDADD += libbasic-dns.la - include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/grp-resolve/systemd-resolved/Makefile b/src/grp-resolve/systemd-resolved/Makefile index 768c30bf97..f1cd91483e 100644 --- a/src/grp-resolve/systemd-resolved/Makefile +++ b/src/grp-resolve/systemd-resolved/Makefile @@ -79,6 +79,7 @@ systemd_resolved_CFLAGS = \ $(GCRYPT_CFLAGS) systemd_resolved_LDADD = \ + libbasic-dns.la \ libsystemd-internal.la \ libsystemd-network.la \ libsystemd-shared.la \ @@ -112,9 +113,6 @@ GENERAL_ALIASES += \ nodist_pkgsysconf_DATA += \ src/resolve/resolved.conf -gperf_txt_sources += \ - src/resolve/dns_type-list.txt - gperf_gperf_sources += \ src/resolve/resolved-gperf.gperf @@ -125,8 +123,6 @@ EXTRA_DIST += \ dist_rootlibexec_DATA += \ src/resolve/resolv.conf -systemd_resolved_LDADD += libbasic-dns.la - sd.CPPFLAGS += -DPKGSYSCONFDIR=\"$(pkgsysconfdir)\" include $(topsrcdir)/build-aux/Makefile.tail.mk -- cgit v1.2.3-54-g00ecf