3 files changed, 73 insertions, 73 deletions
diff --git a/src/grp-resolve/libbasic-dns/Makefile b/src/grp-resolve/libbasic-dns/Makefile
index ab74e03f63..7c64e6af5f 100644
--- a/src/grp-resolve/libbasic-dns/Makefile
+++ b/src/grp-resolve/libbasic-dns/Makefile
@@ -23,9 +23,6 @@
 include $(dir $(lastword $(MAKEFILE_LIST)))/../../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
-gperf_txt_sources += \
-	src/resolve/dns_type-list.txt
-
 nested.subdirs += src
 nested.subdirs += test
 
diff --git a/src/grp-resolve/libbasic-dns/src/Makefile b/src/grp-resolve/libbasic-dns/src/Makefile
index b2532a81ab..667dedf6bc 100644
--- a/src/grp-resolve/libbasic-dns/src/Makefile
+++ b/src/grp-resolve/libbasic-dns/src/Makefile
@@ -32,75 +32,7 @@ $(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 }' <$< >$@
 
-tests += \
-	test-dns-packet \
-	test-resolve-tables \
-	test-dnssec
-
-manual_tests += \
-	test-dnssec-complex
-
-test_resolve_tables_SOURCES = \
-	src/resolve/test-resolve-tables.c \
-	src/resolve/dns_type-from-name.h \
-	src/resolve/dns_type-to-name.h \
-	$(basic_dns_sources) \
-	src/shared/test-tables.h
-
-test_resolve_tables_CFLAGS = \
-	$(GCRYPT_CFLAGS)
-
-test_resolve_tables_LDADD = \
-	libsystemd-shared.la \
-	$(GCRYPT_LIBS) \
-	-lm
-
-test_dns_packet_SOURCES = \
-	src/resolve/test-dns-packet.c \
-	$(basic_dns_sources)
-
-test_dns_packet_CPPFLAGS = \
-	-DRESOLVE_TEST_DIR=\"$(abs_top_srcdir)/src/resolve/test-data\"
-
-test_dns_packet_CFLAGS = \
-	$(GCRYPT_CFLAGS)
-
-test_dns_packet_LDADD = \
-	libsystemd-shared.la \
-	$(GCRYPT_LIBS) \
-	-lm
-
-EXTRA_DIST += \
-	src/resolve/test-data/_openpgpkey.fedoraproject.org.pkts \
-	src/resolve/test-data/fedoraproject.org.pkts \
-	src/resolve/test-data/gandi.net.pkts \
-	src/resolve/test-data/google.com.pkts \
-	src/resolve/test-data/root.pkts \
-	src/resolve/test-data/sw1a1aa-sw1a2aa-sw1a2ab-sw1a2ac.find.me.uk.pkts \
-	src/resolve/test-data/teamits.com.pkts \
-	src/resolve/test-data/zbyszek@fedoraproject.org.pkts \
-	src/resolve/test-data/_443._tcp.fedoraproject.org.pkts \
-	src/resolve/test-data/kyhwana.org.pkts \
-	src/resolve/test-data/fake-caa.pkts
-
-test_dnssec_SOURCES = \
-	src/resolve/test-dnssec.c \
-	$(basic_dns_sources)
-
-test_dnssec_CFLAGS = \
-	$(GCRYPT_CFLAGS)
-
-test_dnssec_LDADD = \
-	libsystemd-shared.la \
-	$(GCRYPT_LIBS) \
-	-lm
-
-test_dnssec_complex_SOURCES = \
-	src/resolve/test-dnssec-complex.c \
-	src/resolve/dns-type.c \
-	src/resolve/dns-type.h
-
-test_dnssec_complex_LDADD = \
-	libsystemd-shared.la
+gperf_txt_sources += \
+	src/resolve/dns_type-list.txt
 
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-resolve/libbasic-dns/test/Makefile b/src/grp-resolve/libbasic-dns/test/Makefile
index 60150788d8..165f401d26 100644
--- a/src/grp-resolve/libbasic-dns/test/Makefile
+++ b/src/grp-resolve/libbasic-dns/test/Makefile
@@ -23,4 +23,75 @@
 include $(dir $(lastword $(MAKEFILE_LIST)))/../../../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
+tests += \
+	test-dns-packet \
+	test-resolve-tables \
+	test-dnssec
+
+manual_tests += \
+	test-dnssec-complex
+
+test_resolve_tables_SOURCES = \
+	src/resolve/test-resolve-tables.c \
+	src/resolve/dns_type-from-name.h \
+	src/resolve/dns_type-to-name.h \
+	$(basic_dns_sources) \
+	src/shared/test-tables.h
+
+test_resolve_tables_CFLAGS = \
+	$(GCRYPT_CFLAGS)
+
+test_resolve_tables_LDADD = \
+	libsystemd-shared.la \
+	$(GCRYPT_LIBS) \
+	-lm
+
+test_dns_packet_SOURCES = \
+	src/resolve/test-dns-packet.c \
+	$(basic_dns_sources)
+
+test_dns_packet_CPPFLAGS = \
+	-DRESOLVE_TEST_DIR=\"$(abs_top_srcdir)/src/resolve/test-data\"
+
+test_dns_packet_CFLAGS = \
+	$(GCRYPT_CFLAGS)
+
+test_dns_packet_LDADD = \
+	libsystemd-shared.la \
+	$(GCRYPT_LIBS) \
+	-lm
+
+EXTRA_DIST += \
+	src/resolve/test-data/_openpgpkey.fedoraproject.org.pkts \
+	src/resolve/test-data/fedoraproject.org.pkts \
+	src/resolve/test-data/gandi.net.pkts \
+	src/resolve/test-data/google.com.pkts \
+	src/resolve/test-data/root.pkts \
+	src/resolve/test-data/sw1a1aa-sw1a2aa-sw1a2ab-sw1a2ac.find.me.uk.pkts \
+	src/resolve/test-data/teamits.com.pkts \
+	src/resolve/test-data/zbyszek@fedoraproject.org.pkts \
+	src/resolve/test-data/_443._tcp.fedoraproject.org.pkts \
+	src/resolve/test-data/kyhwana.org.pkts \
+	src/resolve/test-data/fake-caa.pkts
+
+test_dnssec_SOURCES = \
+	src/resolve/test-dnssec.c \
+	$(basic_dns_sources)
+
+test_dnssec_CFLAGS = \
+	$(GCRYPT_CFLAGS)
+
+test_dnssec_LDADD = \
+	libsystemd-shared.la \
+	$(GCRYPT_LIBS) \
+	-lm
+
+test_dnssec_complex_SOURCES = \
+	src/resolve/test-dnssec-complex.c \
+	src/resolve/dns-type.c \
+	src/resolve/dns-type.h
+
+test_dnssec_complex_LDADD = \
+	libsystemd-shared.la
+
 include $(topsrcdir)/build-aux/Makefile.tail.mk