5 files changed, 23 insertions, 20 deletions
diff --git a/Makefile.am b/Makefile.am
index 09beac93d3..915526fec9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4460,12 +4460,13 @@ tests += \
 	test-compress-benchmark
 endif # HAVE_COMPRESSION
 
-#@src/libsystemd/src/Makefile
+#@src/libsystemd/Makefile
 pkginclude_HEADERS += \
 	src/systemd/sd-journal.h \
 	src/systemd/sd-messages.h \
 	src/systemd/_sd-common.h
 
+#@src/libsystemd/src/Makefile
 libsystemd_journal_internal_la_SOURCES = \
 	src/journal/sd-journal.c \
 	src/systemd/sd-journal.h \
@@ -5496,6 +5497,7 @@ EXTRA_DIST += \
 #@auto/systemd-resolved/Makefile -----------------------------------------------
 if ENABLE_RESOLVED
 
+#@src/grp-resolve/libbasic-dns/src/Makefile
 basic_dns_sources = \
 	src/resolve/resolved-dns-dnssec.c \
 	src/resolve/resolved-dns-dnssec.h \
@@ -5510,6 +5512,7 @@ basic_dns_sources = \
 	src/resolve/dns-type.c \
 	src/resolve/dns-type.h
 
+#@auto/systemd-resolved/Makefile
 systemd_resolved_SOURCES = \
 	src/resolve/resolved.c \
 	src/resolve/resolved-manager.c \
diff --git a/src/grp-resolve/libbasic-dns/src/Makefile b/src/grp-resolve/libbasic-dns/src/Makefile
index 667dedf6bc..d7f12fafd4 100644
--- a/src/grp-resolve/libbasic-dns/src/Makefile
+++ b/src/grp-resolve/libbasic-dns/src/Makefile
@@ -32,6 +32,20 @@ $(outdir)/dns_type-to-name.h: src/resolve/dns_type-list.txt
 $(outdir)/dns_type-from-name.gperf: src/resolve/dns_type-list.txt
 	$(AM_V_GEN)$(AWK) 'BEGIN{ print "struct dns_type_name { const char* name; int id; };"; print "%null-strings"; print "%%";} { s=$$1; sub(/_/, "-", s); printf "%s, ", $$s; printf "DNS_TYPE_%s\n", $$1 }' <$< >$@
 
+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
+
 gperf_txt_sources += \
 	src/resolve/dns_type-list.txt
 
diff --git a/src/grp-resolve/systemd-resolved/Makefile b/src/grp-resolve/systemd-resolved/Makefile
index 78b352b76f..e8ae8ccc28 100644
--- a/src/grp-resolve/systemd-resolved/Makefile
+++ b/src/grp-resolve/systemd-resolved/Makefile
@@ -25,20 +25,6 @@ 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
-
 systemd_resolved_SOURCES = \
 	src/resolve/resolved.c \
 	src/resolve/resolved-manager.c \
diff --git a/src/libsystemd/Makefile b/src/libsystemd/Makefile
index 599a872f58..258ff73f9d 100644
--- a/src/libsystemd/Makefile
+++ b/src/libsystemd/Makefile
@@ -81,6 +81,11 @@ tests += \
 	test-local-addresses \
 	test-resolve
 
+pkginclude_HEADERS += \
+	src/systemd/sd-journal.h \
+	src/systemd/sd-messages.h \
+	src/systemd/_sd-common.h
+
 test-libsystemd-sym.c: \
 		$(top_builddir)/src/libsystemd/libsystemd.sym \
 		src/systemd/sd-journal.h \
diff --git a/src/libsystemd/src/Makefile b/src/libsystemd/src/Makefile
index afcbf8d4e6..a7c1b4789a 100644
--- a/src/libsystemd/src/Makefile
+++ b/src/libsystemd/src/Makefile
@@ -121,11 +121,6 @@ libsystemd_internal_la_LIBADD = \
 noinst_LTLIBRARIES += \
 	libsystemd-internal.la
 
-pkginclude_HEADERS += \
-	src/systemd/sd-journal.h \
-	src/systemd/sd-messages.h \
-	src/systemd/_sd-common.h
-
 libsystemd_journal_internal_la_SOURCES = \
 	src/journal/sd-journal.c \
 	src/systemd/sd-journal.h \