Fix LDADD/DPADD that should be LIBADD.

Sponsored by:	EMC / Isilon Storage Division

cddl/usr.sbin/dtrace/tests/common/proc/Makefile

@@ -24,7 +24,6 @@ CFILES= \
      tst.sigwait.c  \
 
 
-LDADD.tst.sigwait.exe+= -lrt
-DPADD.tst.sigwait.exe+= ${LIBRT}
+LIBADD.tst.sigwait.exe=rt
 
 .include "../../dtrace.test.mk"

cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh

@@ -36,8 +36,7 @@ genmakefile()
     local special
     if [ "$basedir" = proc ]; then
         special="
-LDADD.tst.sigwait.exe+= -lrt
-DPADD.tst.sigwait.exe+= \${LIBRT}
+LIBADD.tst.sigwait.exe+= rt
 "
     elif [ "$basedir" = uctf ]; then
         special="

cddl/usr.sbin/zdb/Makefile

@@ -24,9 +24,7 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs
 CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head
 CFLAGS+= -I${.CURDIR}/../../lib/libumem
 
-DPADD=	${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBPTHREAD} ${LIBUMEM} \
-	${LIBUUTIL} ${LIBZFS_CORE} ${LIBZFS} ${LIBZPOOL}
-LDADD=	-lgeom -lm -lnvpair -lpthread -lumem -luutil -lzfs_core -lzfs -lzpool
+LIBADD=	geom m nvpair pthread umem uutil zfs_core zfs zpool
 
 # Since there are many asserts in this program, it makes no sense to compile
 # it without debugging.

cddl/usr.sbin/zhack/Makefile

@@ -23,9 +23,7 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs
 CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head
 CFLAGS+= -I${.CURDIR}/../../lib/libumem
 
-DPADD=	${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBPTHREAD} ${LIBUMEM} \
-	${LIBUUTIL} ${LIBZFS_CORE} ${LIBZFS} ${LIBZPOOL}
-LDADD=	-lgeom -lm -lnvpair -lpthread -lumem -luutil -lzfs_core -lzfs -lzpool
+LIBADD=	geom m nvpair pthread umem uutil zfs_core zfs zpool
 
 CFLAGS+=	-DDEBUG=1
 #DEBUG_FLAGS+=	-g