1 files changed, 10 insertions, 19 deletions
diff --git a/src/grp-resolve/systemd-resolved/Makefile b/src/grp-resolve/systemd-resolved/Makefile
index 78b352b76f..768c30bf97 100644
--- a/src/grp-resolve/systemd-resolved/Makefile
+++ b/src/grp-resolve/systemd-resolved/Makefile
@@ -23,21 +23,7 @@
 include $(dir $(lastword $(MAKEFILE_LIST)))/../../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
-ifneq ($(ENABLE_RESOLVED),)
-
-basic_dns_sources = \
-	src/resolve/resolved-dns-dnssec.c \
-	src/resolve/resolved-dns-dnssec.h \
-	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/dns-type.c \
-	src/resolve/dns-type.h
+basic_dns_sources =
 
 systemd_resolved_SOURCES = \
 	src/resolve/resolved.c \
@@ -82,9 +68,7 @@ systemd_resolved_SOURCES = \
 	src/resolve/resolved-dns-stub.h \
 	src/resolve/resolved-dns-stub.c \
 	src/resolve/resolved-etc-hosts.h \
-	src/resolve/resolved-etc-hosts.c \
-	src/shared/gcrypt-util.c \
-	src/shared/gcrypt-util.h
+	src/resolve/resolved-etc-hosts.c
 
 nodist_systemd_resolved_SOURCES = \
 	src/resolve/dns_type-from-name.h \
@@ -95,6 +79,7 @@ systemd_resolved_CFLAGS = \
 	$(GCRYPT_CFLAGS)
 
 systemd_resolved_LDADD = \
+	libsystemd-internal.la \
 	libsystemd-network.la \
 	libsystemd-shared.la \
 	$(GCRYPT_LIBS) \
@@ -127,7 +112,9 @@ GENERAL_ALIASES += \
 nodist_pkgsysconf_DATA += \
 	src/resolve/resolved.conf
 
-endif # ENABLE_RESOLVED
+gperf_txt_sources += \
+	src/resolve/dns_type-list.txt
+
 gperf_gperf_sources += \
 	src/resolve/resolved-gperf.gperf
 
@@ -138,4 +125,8 @@ 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