13 files changed, 27 insertions, 52 deletions
diff --git a/lib/libc/tests/gen/Makefile b/lib/libc/tests/gen/Makefile
index 476b5b7..b700312 100644
--- a/lib/libc/tests/gen/Makefile
+++ b/lib/libc/tests/gen/Makefile
@@ -45,20 +45,14 @@ NETBSD_ATF_TESTS_C+=	vis_test
 
 .include "../Makefile.netbsd-tests"
 
-LDADD.humanize_number_test+=	-lutil
-DPADD.humanize_number_test+=	${LIBUTIL}
+LIBADD.humanize_number_test+=	util
 
-LDADD.fpclassify_test+=	-lm
-DPADD.fpclassify_test+=	${LIBM}
-LDADD.fpsetround_test+=	-lm
-DPADD.fpsetround_test+=	${LIBM}
-LDADD.siginfo_test+=	-lm
-DPADD.siginfo_test+=	${LIBM}
+LIBADD.fpclassify_test+=m
+LIBADD.fpsetround_test+=m
+LIBADD.siginfo_test+=	m
 
-LDADD.nice_test+=	-lpthread
-DPADD.nice_test+=	${LIBPTHREAD}
-LDADD.syslog_test+=	-lpthread
-DPADD.syslog_test+=	${LIBPTHREAD}
+LIBADD.nice_test+=	pthread
+LIBADD.syslog_test+=	pthread
 
 CFLAGS+=		-I${.CURDIR}
 
diff --git a/lib/libc/tests/hash/Makefile b/lib/libc/tests/hash/Makefile
index 6887253..6facb5a 100644
--- a/lib/libc/tests/hash/Makefile
+++ b/lib/libc/tests/hash/Makefile
@@ -22,10 +22,8 @@ FILES+=		data/sha1test-in
 FILES+=		data/sha1test-out
 FILES+=		data/sha1test2-out
 
-DPADD+=		${LIBMD}
-LDADD+=		-lmd
-DPADD.sha2_test+=	${LIBCRYPTO}
-LDADD.sha2_test+=	-lcrypto
+LIBADD+=		md
+LIBADD.sha2_test+=	crypto
 
 CFLAGS.sha2_test+=	-I${SRCTOP}/crypto/openssh/openbsd-compat
 CFLAGS.sha2_test+=	-I${SRCTOP}/crypto/openssh
diff --git a/lib/libc/tests/net/Makefile b/lib/libc/tests/net/Makefile
index 3e437a0..e126848 100644
--- a/lib/libc/tests/net/Makefile
+++ b/lib/libc/tests/net/Makefile
@@ -23,8 +23,7 @@ PROGS+=		h_protoent
 PROGS+=		h_servent
 PROGS+=		h_dns_server
 
-DPADD.h_nsd_recurse+=	${LIBPTHREAD}
-LDADD.h_nsd_recurse+=	-lpthread
+LIBADD.h_nsd_recurse+=	pthread
 
 CLEANFILES+=	aton_ether_subr.c
 aton_ether_subr.c: gen_ether_subr ${SRCTOP}/sys/net/if_ethersubr.c
diff --git a/lib/libc/tests/regex/Makefile b/lib/libc/tests/regex/Makefile
index fa60f6e..946bc44 100644
--- a/lib/libc/tests/regex/Makefile
+++ b/lib/libc/tests/regex/Makefile
@@ -51,7 +51,6 @@ CFLAGS.$t+=	-I${TESTSRC} ${IMPLEMENTATION}
 
 .include "../Makefile.netbsd-tests"
 
-DPADD.regex_att_test+=	${LIBUTIL}
-LDADD.regex_att_test+=	-lutil
+LIBADD.regex_att_test+=	util
 
 .include <bsd.test.mk>
diff --git a/lib/libc/tests/rpc/Makefile b/lib/libc/tests/rpc/Makefile
index f9819d3..d7780ef 100644
--- a/lib/libc/tests/rpc/Makefile
+++ b/lib/libc/tests/rpc/Makefile
@@ -18,8 +18,7 @@ h_testbits_xdr.c: ${RPCSRC} h_testbits.h
 CLEANFILES+=	${RPCSRC:.x=.h} ${RPCSRC:.x=.c} h_testbits_xdr.c
 CFLAGS+=	-I${.OBJDIR}
 
-LDADD+=		-lrpcsvc -lutil
-DPADD+=		${LIBRPCSVC} ${LIBUTIL}
+LIBADD+=	rpcsvc util
 
 .include "../Makefile.netbsd-tests"
 
diff --git a/lib/libc/tests/setjmp/Makefile b/lib/libc/tests/setjmp/Makefile
index ac962c2..39b0a96 100644
--- a/lib/libc/tests/setjmp/Makefile
+++ b/lib/libc/tests/setjmp/Makefile
@@ -3,8 +3,7 @@
 NETBSD_ATF_TESTS_C=	setjmp_test
 NETBSD_ATF_TESTS_C+=	threadjmp_test
 
-DPADD.threadjmp_test+= ${LIBPTHREAD}
-LDADD.threadjmp_test+= -lpthread
+LIBADD.t_threadjmp+=	pthread
 
 WARNS?=	4
 
diff --git a/lib/libc/tests/ssp/Makefile b/lib/libc/tests/ssp/Makefile
index dff1578..6055251 100644
--- a/lib/libc/tests/ssp/Makefile
+++ b/lib/libc/tests/ssp/Makefile
@@ -10,8 +10,7 @@ CFLAGS.h_raw+=	-fstack-protector-all -Wstack-protector
 CFLAGS.h_raw+=	-fsanitize=bounds
 .elif ${COMPILER_TYPE} == "gcc"
 CFLAGS.h_raw+=	--param ssp-buffer-size=1
-DPADD+=		${LIBSSP}
-LDADD+=		-lssp
+LIBADD+=	ssp
 .endif
 
 NETBSD_ATF_TESTS_SH=	ssp_test
diff --git a/lib/libc/tests/stdio/Makefile b/lib/libc/tests/stdio/Makefile
index 7896422..72685e0 100644
--- a/lib/libc/tests/stdio/Makefile
+++ b/lib/libc/tests/stdio/Makefile
@@ -28,11 +28,8 @@ NETBSD_ATF_TESTS_C+=	popen_test
 NETBSD_ATF_TESTS_C+=	printf_test
 NETBSD_ATF_TESTS_C+=	scanf_test
 
-DPADD.printfloat_test+=	${LIBM}
-LDADD.printfloat_test+=	-lm
-
-DPADD.scanfloat_test+=	${LIBM}
-LDADD.scanfloat_test+=	-lm
+LIBADD.printfloat_test+= m
+LIBADD.scanfloat_test+=  m
 
 .if ${COMPILER_TYPE} == "gcc"
 # 90: use of assignment suppression and length modifier together in scanf format
diff --git a/lib/libc/tests/stdlib/Makefile b/lib/libc/tests/stdlib/Makefile
index cd2c06e..4bc1354 100644
--- a/lib/libc/tests/stdlib/Makefile
+++ b/lib/libc/tests/stdlib/Makefile
@@ -36,11 +36,9 @@ CFLAGS+=	-I${.CURDIR}
 CFLAGS.$t+=	-I${LIBNETBSD_SRCDIR} -I${SRCTOP}/contrib/netbsd-tests
 LDFLAGS.$t+=	-L${LIBNETBSD_OBJDIR}
 
-DPADD.$t+=	${LIBNETBSD} ${LIBUTIL}
-LDADD.$t+=	-lnetbsd -lutil
+LIBADD.${t}+=	netbsd util
 .endfor
 
-DPADD.strtod_test+=		${LIBM}
-LDADD.strtod_test+=		-lm
+LIBADD.strtod_test+=		m
 
 .include <bsd.test.mk>
diff --git a/lib/libc/tests/string/Makefile b/lib/libc/tests/string/Makefile
index 14044f4..9c677b7 100644
--- a/lib/libc/tests/string/Makefile
+++ b/lib/libc/tests/string/Makefile
@@ -27,10 +27,7 @@ SRCS.strerror2_test=	strerror_test.c
 
 .include "../Makefile.netbsd-tests"
 
-LDADD.memchr_test+=	-lmd
-DPADD.memchr_test+=	${LIBMD}
-
-LDADD.memcpy_test+=	-lmd
-DPADD.memcpy_test+=	${LIBMD}
+LIBADD.memchr_test+=	md
+LIBADD.memcpy_test+=	md
 
 .include <bsd.test.mk>
diff --git a/lib/libc/tests/sys/Makefile b/lib/libc/tests/sys/Makefile
index 816b962..efc892c 100644
--- a/lib/libc/tests/sys/Makefile
+++ b/lib/libc/tests/sys/Makefile
@@ -57,10 +57,8 @@ NETBSD_ATF_TESTS_C+=		umask_test
 NETBSD_ATF_TESTS_C+=		unlink_test
 NETBSD_ATF_TESTS_C+=		write_test
 
-DPADD.getpid_test+=	${LIBPTHREAD}
-LDADD.getpid_test+=	-lpthread
-DPADD.timer_create_test+=	${LIBRT}
-LDADD.timer_create_test+=	-lrt
+LIBADD.getpid_test+=		pthread
+LIBADD.timer_create_test+=	rt
 
 .include "../Makefile.netbsd-tests"
 
diff --git a/lib/libc/tests/tls/Makefile b/lib/libc/tests/tls/Makefile
index b6b6719..cbf441d 100644
--- a/lib/libc/tests/tls/Makefile
+++ b/lib/libc/tests/tls/Makefile
@@ -18,17 +18,16 @@ NETBSD_ATF_TESTS_C+=	tls_dynamic_test
 
 DSODIR=		${.OBJDIR}/../tls_dso
 
-DPADD.tls_static_test+=		${LIBPTHREAD}
-LDADD.tls_static_test+=		-lpthread
+LIBADD.tls_static_test+=	pthread
 LDFLAGS.tls_static_test+=	-static
 SRCS.tls_static_test=		t_tls_static.c t_tls_static_helper.c
 
-DPADD.tls_dynamic_test+=	${LIBPTHREAD} ${DSODIR}/libh_tls_dynamic.so
-LDADD.tls_dynamic_test+=	-lpthread -lh_tls_dynamic
+DPADD.tls_dynamic_test+=	${DSODIR}/libh_tls_dynamic.so
+LDADD.tls_dynamic_test+=	-lh_tls_dynamic
 LDFLAGS.tls_dynamic_test+=	-Wl,-rpath,${TESTSDIR} -L${DSODIR}
+LIBADD.tls_dynamic_test+=	pthread
 
-DPADD.tls_dlopen_test+=		${LIBPTHREAD}
-LDADD.tls_dlopen_test+=		-lpthread
+LIBADD.tls_dlopen_test+=	pthread
 LDFLAGS.tls_dlopen_test+=	-Wl,-rpath,${TESTSDIR} -Wl,-export-dynamic
 
 .include <bsd.test.mk>
diff --git a/lib/libc/tests/ttyio/Makefile b/lib/libc/tests/ttyio/Makefile
index 242f332..d5b8f01 100644
--- a/lib/libc/tests/ttyio/Makefile
+++ b/lib/libc/tests/ttyio/Makefile
@@ -5,8 +5,7 @@
 # TODO: ptm_test
 NETBSD_ATF_TESTS_C=	ttyio_test
 
-DPADD.ttyio_test+=	${LIBUTIL}
-LDADD.ttyio_test+=	-lutil
+LIBADD.ttyio_test+=	util
 
 .include "../Makefile.netbsd-tests"