From bb97a3d43c2b7f2a5b4f05069e3bb12383a9e20d Mon Sep 17 00:00:00 2001 From: bdrewery Date: Fri, 4 Dec 2015 03:17:47 +0000 Subject: Fix LDADD/DPADD that should be LIBADD. Sponsored by: EMC / Isilon Storage Division --- tests/sys/aio/Makefile | 3 +-- tests/sys/file/Makefile | 9 +++------ tests/sys/kern/Makefile | 7 +++---- tests/sys/mqueue/Makefile | 3 +-- 4 files changed, 8 insertions(+), 14 deletions(-) (limited to 'tests') diff --git a/tests/sys/aio/Makefile b/tests/sys/aio/Makefile index 851252d..766d9b0 100644 --- a/tests/sys/aio/Makefile +++ b/tests/sys/aio/Makefile @@ -6,8 +6,7 @@ PLAIN_TESTS_C+= aio_kqueue_test PLAIN_TESTS_C+= lio_kqueue_test ATF_TESTS_C+= aio_test -DPADD.aio_test+= ${LIBUTIL} -LDADD.aio_test+= -lutil +LIBADD.aio_test+= util CFLAGS+= -I${.CURDIR:H:H} diff --git a/tests/sys/file/Makefile b/tests/sys/file/Makefile index 6151c9f..ed2d2c4 100644 --- a/tests/sys/file/Makefile +++ b/tests/sys/file/Makefile @@ -13,13 +13,10 @@ PLAIN_TESTS_C+= newfileops_on_fork_test PROGS+= flock_helper -DPADD.closefrom_test= ${LIBUTIL} -LDADD.closefrom_test= -lutil +LIBADD.closefrom_test= util -DPADD.flock_helper= ${LIBPTHREAD} -LDADD.flock_helper= -lpthread +LIBADD.flock_helper= pthread -DPADD.newfileops_on_fork_test= ${LIBPTHREAD} -LDADD.newfileops_on_fork_test= -lpthread +LIBADD.newfileops_on_fork_test= pthread .include diff --git a/tests/sys/kern/Makefile b/tests/sys/kern/Makefile index b3d2453..a38b1f2 100644 --- a/tests/sys/kern/Makefile +++ b/tests/sys/kern/Makefile @@ -10,15 +10,14 @@ ATF_TESTS_C+= ptrace_test ATF_TESTS_C+= unix_seqpacket_test TEST_METADATA.unix_seqpacket_test+= timeout="15" -LDADD.ptrace_test+= -lpthread -LDADD.unix_seqpacket_test+= -lpthread +LIBADD.ptrace_test+= pthread +LIBADD.unix_seqpacket_test+= pthread NETBSD_ATF_TESTS_C+= lockf_test NETBSD_ATF_TESTS_C+= mqueue_test CFLAGS.mqueue_test+= -I${SRCTOP}/tests -DPADD.mqueue_test+= ${LIBRT} -LDADD.mqueue_test+= -lrt +LIBADD.mqueue_test+= rt WARNS?= 5 diff --git a/tests/sys/mqueue/Makefile b/tests/sys/mqueue/Makefile index 952cb67..ce5033c 100644 --- a/tests/sys/mqueue/Makefile +++ b/tests/sys/mqueue/Makefile @@ -14,8 +14,7 @@ PROGS+= mqtest2 #PROGS+= mqtest4 PROGS+= mqtest5 -LDADD+= -lrt -DPADD+= ${LIBRT} +LIBADD+= rt WARNS?= 6 -- cgit v1.1