Author: bdrewery
Date: Fri Dec 4 03:17:47 2015
New Revision: 291738
URL: https://svnweb.freebsd.org/changeset/base/291738
Log:
Fix LDADD/DPADD that should be LIBADD.
Sponsored by: EMC / Isilon Storage Division
Modified:
head/cddl/lib/libctf/Makefile
head/cddl/lib/libzfs/Makefile
head/cddl/lib/libzfs_core/Makefile
head/cddl/lib/libzpool/Makefile
head/cddl/sbin/zfs/Makefile
head/cddl/sbin/zpool/Makefile
head/cddl/usr.bin/zinject/Makefile
head/cddl/usr.bin/zstreamdump/Makefile
head/cddl/usr.bin/ztest/Makefile
head/cddl/usr.sbin/dtrace/tests/common/proc/Makefile
head/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh
head/cddl/usr.sbin/zdb/Makefile
head/cddl/usr.sbin/zhack/Makefile
head/contrib/ofed/usr.bin/osmtest/Makefile
head/gnu/usr.bin/gdb/kgdb/Makefile
head/gnu/usr.bin/groff/src/devices/grodvi/Makefile
head/gnu/usr.bin/groff/src/devices/grohtml/Makefile
head/gnu/usr.bin/groff/src/devices/grolbp/Makefile
head/gnu/usr.bin/groff/src/devices/grolj4/Makefile
head/gnu/usr.bin/groff/src/devices/grops/Makefile
head/gnu/usr.bin/groff/src/devices/grotty/Makefile
head/gnu/usr.bin/groff/src/preproc/grn/Makefile
head/gnu/usr.bin/groff/src/preproc/pic/Makefile
head/gnu/usr.bin/groff/src/preproc/refer/Makefile
head/gnu/usr.bin/groff/src/preproc/tbl/Makefile
head/gnu/usr.bin/groff/src/roff/groff/Makefile
head/gnu/usr.bin/groff/src/roff/troff/Makefile
head/gnu/usr.bin/groff/src/utils/hpftodit/Makefile
head/gnu/usr.bin/groff/src/utils/indxbib/Makefile
head/gnu/usr.bin/groff/src/utils/lkbib/Makefile
head/gnu/usr.bin/groff/src/utils/lookbib/Makefile
head/gnu/usr.bin/groff/src/utils/tfmtodit/Makefile
head/lib/libc/tests/gen/Makefile
head/lib/libc/tests/hash/Makefile
head/lib/libc/tests/net/Makefile
head/lib/libc/tests/regex/Makefile
head/lib/libc/tests/rpc/Makefile
head/lib/libc/tests/setjmp/Makefile
head/lib/libc/tests/ssp/Makefile
head/lib/libc/tests/stdio/Makefile
head/lib/libc/tests/stdlib/Makefile
head/lib/libc/tests/string/Makefile
head/lib/libc/tests/sys/Makefile
head/lib/libc/tests/tls/Makefile
head/lib/libc/tests/ttyio/Makefile
head/lib/libproc/tests/Makefile
head/lib/libthr/tests/Makefile
head/lib/libthr/tests/dlopen/Makefile
head/lib/libthr/tests/dlopen/dso/Makefile
head/libexec/rtld-elf/tests/libpythagoras/Makefile
head/sbin/dhclient/tests/Makefile
head/share/mk/netbsd-tests.test.mk
head/sys/dev/aic7xxx/aicasm/Makefile
head/sys/dev/patm/genrtab/Makefile
head/tests/sys/aio/Makefile
head/tests/sys/file/Makefile
head/tests/sys/kern/Makefile
head/tests/sys/mqueue/Makefile
head/tools/diag/dumpvfscache/Makefile
head/tools/regression/gaithrstress/Makefile
head/tools/regression/geom/ConfCmp/Makefile
head/tools/regression/geom/MdLoad/Makefile
head/tools/regression/kgssapi/Makefile
head/tools/regression/lib/libc/resolv/Makefile
head/tools/regression/mac/mac_bsdextended/Makefile
head/tools/regression/posixsem/Makefile
head/tools/regression/priv/Makefile
head/tools/regression/pthread/cv_cancel1/Makefile
head/tools/regression/pthread/mutex_isowned_np/Makefile
head/tools/regression/rpcsec_gss/Makefile
head/tools/regression/sockets/sendfile/Makefile
head/tools/regression/tls/ttls2/Makefile
head/tools/regression/tls/ttls4/Makefile
head/tools/tools/ath/athratestats/Makefile
head/tools/tools/atsectl/Makefile
head/tools/tools/ether_reflect/Makefile
head/tools/tools/ifpifa/Makefile
head/tools/tools/mctest/Makefile
head/tools/tools/ncpus/Makefile
head/tools/tools/net80211/stumbler/Makefile
head/tools/tools/net80211/wesside/dics/Makefile
head/tools/tools/net80211/wesside/udps/Makefile
head/tools/tools/net80211/wesside/wesside/Makefile
head/tools/tools/netrate/http/Makefile
head/tools/tools/netrate/httpd/Makefile
head/tools/tools/netrate/juggle/Makefile
head/tools/tools/tscdrift/Makefile
head/tools/tools/umastat/Makefile
head/tools/tools/usbtest/Makefile
head/tools/tools/vimage/Makefile
head/tools/tools/zfsboottest/Makefile
head/usr.bin/caesar/Makefile
head/usr.bin/clang/clang.prog.mk
head/usr.bin/clang/clang/Makefile
head/usr.bin/clang/llc/Makefile
head/usr.bin/clang/lli/Makefile
head/usr.bin/clang/llvm-ar/Makefile
head/usr.bin/clang/llvm-cxxdump/Makefile
head/usr.bin/clang/llvm-dwarfdump/Makefile
head/usr.bin/clang/llvm-lto/Makefile
head/usr.bin/clang/llvm-mc/Makefile
head/usr.bin/clang/llvm-nm/Makefile
head/usr.bin/clang/llvm-objdump/Makefile
head/usr.bin/clang/llvm-pdbdump/Makefile
head/usr.bin/clang/llvm-rtdyld/Makefile
head/usr.bin/clang/llvm-symbolizer/Makefile
head/usr.bin/clang/opt/Makefile
head/usr.bin/factor/Makefile
head/usr.bin/grdc/Makefile
head/usr.bin/pom/Makefile
head/usr.bin/primes/Makefile
head/usr.sbin/fstyp/Makefile
Modified: head/cddl/lib/libctf/Makefile
==============================================================================
--- head/cddl/lib/libctf/Makefile Fri Dec 4 03:17:24 2015
(r291737)
+++ head/cddl/lib/libctf/Makefile Fri Dec 4 03:17:47 2015
(r291738)
@@ -28,8 +28,6 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/
-I${OPENSOLARIS_USR_DISTDIR}/lib/libctf/common \
-I${OPENSOLARIS_SYS_DISTDIR}/uts/common
-DPADD= ${LIBZ}
-LDADD= -lz
+LIBADD+= z
.include <bsd.lib.mk>
-
Modified: head/cddl/lib/libzfs/Makefile
==============================================================================
--- head/cddl/lib/libzfs/Makefile Fri Dec 4 03:17:24 2015
(r291737)
+++ head/cddl/lib/libzfs/Makefile Fri Dec 4 03:17:47 2015
(r291738)
@@ -6,13 +6,7 @@
.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs/common
LIB= zfs
-DPADD= ${LIBMD} ${LIBPTHREAD} ${LIBUMEM} ${LIBUTIL} ${LIBM} ${LIBNVPAIR} \
- ${LIBAVL} ${LIBZFS_CORE} ${LIBUUTIL} ${LIBBSDXML} ${LIBGEOM} \
- ${LIBNVPAIR} ${LIBZ}
-
-LDADD= -lmd -lpthread -lumem -lutil -luutil -lm -lnvpair -lavl \
- -lbsdxml -lgeom -lnvpair -lz -lzfs_core
-
+LIBADD= md pthread umem util uutil m avl bsdxml geom nvpair z zfs_core
SRCS= deviceid.c \
fsshare.c \
mkdirp.c \
Modified: head/cddl/lib/libzfs_core/Makefile
==============================================================================
--- head/cddl/lib/libzfs_core/Makefile Fri Dec 4 03:17:24 2015
(r291737)
+++ head/cddl/lib/libzfs_core/Makefile Fri Dec 4 03:17:47 2015
(r291738)
@@ -7,8 +7,7 @@
.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs/common
LIB= zfs_core
-DPADD= ${LIBNVPAIR}
-LDADD= -lnvpair
+LIBADD= nvpair
SRCS= libzfs_core.c \
libzfs_core_compat.c \
Modified: head/cddl/lib/libzpool/Makefile
==============================================================================
--- head/cddl/lib/libzpool/Makefile Fri Dec 4 03:17:24 2015
(r291737)
+++ head/cddl/lib/libzpool/Makefile Fri Dec 4 03:17:47 2015
(r291738)
@@ -56,9 +56,7 @@ CFLAGS+= -I${.CURDIR}/../../../lib/libpt
CFLAGS+= -I${.CURDIR}/../../../lib/libpthread/sys
CFLAGS+= -I${.CURDIR}/../../../lib/libthr/arch/${MACHINE_CPUARCH}/include
-DPADD= ${LIBMD} ${LIBPTHREAD} ${LIBZ} ${LIBNVPAIR} \
- ${LIBAVL} ${LIBUMEM}
-LDADD= -lmd -lpthread -lz -lnvpair -lavl -lumem
+LIBADD= md pthread z nvpair avl umem
# atomic.S doesn't like profiling.
MK_PROFILE= no
Modified: head/cddl/sbin/zfs/Makefile
==============================================================================
--- head/cddl/sbin/zfs/Makefile Fri Dec 4 03:17:24 2015 (r291737)
+++ head/cddl/sbin/zfs/Makefile Fri Dec 4 03:17:47 2015 (r291738)
@@ -22,8 +22,6 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/
CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys
CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs
-DPADD= ${LIBGEOM} ${LIBJAIL} ${LIBNVPAIR} ${LIBUMEM} \
- ${LIBUTIL} ${LIBUUTIL} ${LIBZFS_CORE} ${LIBZFS}
-LDADD= -lgeom -ljail -lnvpair -lumem -lutil -luutil -lzfs_core -lzfs
+LIBADD= geom jail nvpair umem util uutil zfs_core zfs
.include <bsd.prog.mk>
Modified: head/cddl/sbin/zpool/Makefile
==============================================================================
--- head/cddl/sbin/zpool/Makefile Fri Dec 4 03:17:24 2015
(r291737)
+++ head/cddl/sbin/zpool/Makefile Fri Dec 4 03:17:47 2015
(r291738)
@@ -27,8 +27,6 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/
CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common
CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/stat/common
-DPADD= ${LIBAVL} ${LIBGEOM} ${LIBNVPAIR} \
- ${LIBUMEM} ${LIBUTIL} ${LIBUUTIL} ${LIBZFS_CORE} ${LIBZFS}
-LDADD= -lavl -lgeom -lnvpair -lumem -lutil -luutil -lzfs_core -lzfs
+LIBADD= avl geom nvpair umem util uutil zfs_core zfs
.include <bsd.prog.mk>
Modified: head/cddl/usr.bin/zinject/Makefile
==============================================================================
--- head/cddl/usr.bin/zinject/Makefile Fri Dec 4 03:17:24 2015
(r291737)
+++ head/cddl/usr.bin/zinject/Makefile Fri Dec 4 03:17:47 2015
(r291738)
@@ -21,8 +21,6 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/
CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/head
CFLAGS+= -I${.CURDIR}/../../lib/libumem
-DPADD= ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBUUTIL} \
- ${LIBZFS_CORE} ${LIBZFS} ${LIBZPOOL}
-LDADD= -lgeom -lm -lnvpair -lumem -luutil -lzfs_core -lzfs -lzpool
+LIBADD= geom m nvpair umem uutil zfs_core zfs zpool
.include <bsd.prog.mk>
Modified: head/cddl/usr.bin/zstreamdump/Makefile
==============================================================================
--- head/cddl/usr.bin/zstreamdump/Makefile Fri Dec 4 03:17:24 2015
(r291737)
+++ head/cddl/usr.bin/zstreamdump/Makefile Fri Dec 4 03:17:47 2015
(r291738)
@@ -18,9 +18,7 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/
CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/head
CFLAGS+= -I${.CURDIR}/../../lib/libumem
-DPADD= ${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBZPOOL} \
- ${LIBPTHREAD} ${LIBZ} ${LIBAVL}
-LDADD= -lm -lnvpair -lumem -lzpool -lpthread -lz -lavl
+LIBADD= m nvpair umem zpool pthread z avl
CSTD= c99
Modified: head/cddl/usr.bin/ztest/Makefile
==============================================================================
--- head/cddl/usr.bin/ztest/Makefile Fri Dec 4 03:17:24 2015
(r291737)
+++ head/cddl/usr.bin/ztest/Makefile Fri Dec 4 03:17:47 2015
(r291738)
@@ -18,10 +18,7 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/
CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/head
CFLAGS+= -I${.CURDIR}/../../lib/libumem
-DPADD= ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBZPOOL} \
- ${LIBPTHREAD} ${LIBAVL} ${LIBZFS_CORE} ${LIBZFS} ${LIBUUTIL}
-LDADD= -lgeom -lm -lnvpair -lumem -lzpool -lpthread -lavl -lzfs_core -lzfs \
- -luutil
+LIBADD= geom m nvpair umem zpool pthread avl zfs_core zfs uutil
CSTD= c99
Modified: head/cddl/usr.sbin/dtrace/tests/common/proc/Makefile
==============================================================================
--- head/cddl/usr.sbin/dtrace/tests/common/proc/Makefile Fri Dec 4
03:17:24 2015 (r291737)
+++ head/cddl/usr.sbin/dtrace/tests/common/proc/Makefile Fri Dec 4
03:17:47 2015 (r291738)
@@ -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"
Modified: head/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh
==============================================================================
--- head/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh Fri Dec 4
03:17:24 2015 (r291737)
+++ head/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh Fri Dec 4
03:17:47 2015 (r291738)
@@ -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="
Modified: head/cddl/usr.sbin/zdb/Makefile
==============================================================================
--- head/cddl/usr.sbin/zdb/Makefile Fri Dec 4 03:17:24 2015
(r291737)
+++ head/cddl/usr.sbin/zdb/Makefile Fri Dec 4 03:17:47 2015
(r291738)
@@ -24,9 +24,7 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/
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.
Modified: head/cddl/usr.sbin/zhack/Makefile
==============================================================================
--- head/cddl/usr.sbin/zhack/Makefile Fri Dec 4 03:17:24 2015
(r291737)
+++ head/cddl/usr.sbin/zhack/Makefile Fri Dec 4 03:17:47 2015
(r291738)
@@ -23,9 +23,7 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/
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
Modified: head/contrib/ofed/usr.bin/osmtest/Makefile
==============================================================================
--- head/contrib/ofed/usr.bin/osmtest/Makefile Fri Dec 4 03:17:24 2015
(r291737)
+++ head/contrib/ofed/usr.bin/osmtest/Makefile Fri Dec 4 03:17:47 2015
(r291738)
@@ -22,7 +22,8 @@ LDADD= -libcommon \
-losmvendor \
-losmcomp \
-lopensm \
- -lpthread
+
+LIBADD+= pthread
CFLAGS= -DVENDOR_RMPP_SUPPORT -DDUAL_SIDED_RMPP \
-I${OPENSM}/osmtest/include
Modified: head/gnu/usr.bin/gdb/kgdb/Makefile
==============================================================================
--- head/gnu/usr.bin/gdb/kgdb/Makefile Fri Dec 4 03:17:24 2015
(r291737)
+++ head/gnu/usr.bin/gdb/kgdb/Makefile Fri Dec 4 03:17:47 2015
(r291738)
@@ -8,8 +8,8 @@ BULIBS= ${OBJ_BU}/libbfd/libbfd.a ${OBJ_
${OBJ_BU}/libiberty/libiberty.a
GDBLIBS= ${OBJ_GDB}/libgdb/libgdb.a
-DPADD= ${GDBLIBS} ${BULIBS} ${LIBKVM}
-LDADD= ${GDBLIBS} ${BULIBS} -lkvm
-LIBADD+= m readline ncursesw gnuregex
+DPADD= ${GDBLIBS} ${BULIBS}
+LDADD= ${GDBLIBS} ${BULIBS}
+LIBADD+= m readline ncursesw gnuregex kvm
.include <bsd.prog.mk>
Modified: head/gnu/usr.bin/groff/src/devices/grodvi/Makefile
==============================================================================
--- head/gnu/usr.bin/groff/src/devices/grodvi/Makefile Fri Dec 4 03:17:24
2015 (r291737)
+++ head/gnu/usr.bin/groff/src/devices/grodvi/Makefile Fri Dec 4 03:17:47
2015 (r291738)
@@ -2,8 +2,9 @@
PROG_CXX= grodvi
SRCS= dvi.cpp
-DPADD= ${LIBDRIVER} ${LIBGROFF} ${LIBM}
-LDADD= ${LIBDRIVER} ${LIBGROFF} -lm
+DPADD= ${LIBDRIVER} ${LIBGROFF}
+LDADD= ${LIBDRIVER} ${LIBGROFF}
+LIBADD= m
CLEANFILES= ${MAN}
.include <bsd.prog.mk>
Modified: head/gnu/usr.bin/groff/src/devices/grohtml/Makefile
==============================================================================
--- head/gnu/usr.bin/groff/src/devices/grohtml/Makefile Fri Dec 4 03:17:24
2015 (r291737)
+++ head/gnu/usr.bin/groff/src/devices/grohtml/Makefile Fri Dec 4 03:17:47
2015 (r291738)
@@ -2,8 +2,9 @@
PROG_CXX= post-grohtml
SRCS= post-html.cpp html-table.cpp html-text.cpp output.cpp
-DPADD= ${LIBDRIVER} ${LIBGROFF} ${LIBM}
-LDADD= ${LIBDRIVER} ${LIBGROFF} -lm
+DPADD= ${LIBDRIVER} ${LIBGROFF}
+LDADD= ${LIBDRIVER} ${LIBGROFF}
+LIBADD= m
MAN=
.include <bsd.prog.mk>
Modified: head/gnu/usr.bin/groff/src/devices/grolbp/Makefile
==============================================================================
--- head/gnu/usr.bin/groff/src/devices/grolbp/Makefile Fri Dec 4 03:17:24
2015 (r291737)
+++ head/gnu/usr.bin/groff/src/devices/grolbp/Makefile Fri Dec 4 03:17:47
2015 (r291738)
@@ -2,8 +2,9 @@
PROG_CXX= grolbp
SRCS= lbp.cpp
-DPADD= ${LIBDRIVER} ${LIBGROFF} ${LIBM}
-LDADD= ${LIBDRIVER} ${LIBGROFF} -lm
+DPADD= ${LIBDRIVER} ${LIBGROFF}
+LDADD= ${LIBDRIVER} ${LIBGROFF}
+LIBADD= m
CLEANFILES= ${MAN}
.include <bsd.prog.mk>
Modified: head/gnu/usr.bin/groff/src/devices/grolj4/Makefile
==============================================================================
--- head/gnu/usr.bin/groff/src/devices/grolj4/Makefile Fri Dec 4 03:17:24
2015 (r291737)
+++ head/gnu/usr.bin/groff/src/devices/grolj4/Makefile Fri Dec 4 03:17:47
2015 (r291738)
@@ -3,8 +3,9 @@
PROG_CXX= grolj4
MAN= grolj4.1 lj4_font.5
SRCS= lj4.cpp
-DPADD= ${LIBDRIVER} ${LIBGROFF} ${LIBM}
-LDADD= ${LIBDRIVER} ${LIBGROFF} -lm
+DPADD= ${LIBDRIVER} ${LIBGROFF}
+LDADD= ${LIBDRIVER} ${LIBGROFF}
+LIBADD= m
CLEANFILES= ${MAN}
.include <bsd.prog.mk>
Modified: head/gnu/usr.bin/groff/src/devices/grops/Makefile
==============================================================================
--- head/gnu/usr.bin/groff/src/devices/grops/Makefile Fri Dec 4 03:17:24
2015 (r291737)
+++ head/gnu/usr.bin/groff/src/devices/grops/Makefile Fri Dec 4 03:17:47
2015 (r291738)
@@ -2,8 +2,9 @@
PROG_CXX= grops
SRCS= ps.cpp psrm.cpp
-DPADD= ${LIBDRIVER} ${LIBGROFF} ${LIBM}
-LDADD= ${LIBDRIVER} ${LIBGROFF} -lm
+DPADD= ${LIBDRIVER} ${LIBGROFF}
+LDADD= ${LIBDRIVER} ${LIBGROFF}
+LIBADD= m
CLEANFILES= ${MAN}
.include <bsd.prog.mk>
Modified: head/gnu/usr.bin/groff/src/devices/grotty/Makefile
==============================================================================
--- head/gnu/usr.bin/groff/src/devices/grotty/Makefile Fri Dec 4 03:17:24
2015 (r291737)
+++ head/gnu/usr.bin/groff/src/devices/grotty/Makefile Fri Dec 4 03:17:47
2015 (r291738)
@@ -2,8 +2,9 @@
PROG_CXX= grotty
SRCS= tty.cpp
-DPADD= ${LIBDRIVER} ${LIBGROFF} ${LIBM}
-LDADD= ${LIBDRIVER} ${LIBGROFF} -lm
+DPADD= ${LIBDRIVER} ${LIBGROFF}
+LDADD= ${LIBDRIVER} ${LIBGROFF}
+LIBADD= m
CLEANFILES= ${MAN}
.include <bsd.prog.mk>
Modified: head/gnu/usr.bin/groff/src/preproc/grn/Makefile
==============================================================================
--- head/gnu/usr.bin/groff/src/preproc/grn/Makefile Fri Dec 4 03:17:24
2015 (r291737)
+++ head/gnu/usr.bin/groff/src/preproc/grn/Makefile Fri Dec 4 03:17:47
2015 (r291738)
@@ -2,8 +2,9 @@
PROG_CXX= grn
SRCS= hdb.cpp hpoint.cpp hgraph.cpp main.cpp
-DPADD= ${LIBGROFF} ${LIBM}
-LDADD= ${LIBGROFF} -lm
+DPADD= ${LIBGROFF}
+LDADD= ${LIBGROFF}
+LIBADD= m
CLEANFILES= ${MAN}
.include <bsd.prog.mk>
Modified: head/gnu/usr.bin/groff/src/preproc/pic/Makefile
==============================================================================
--- head/gnu/usr.bin/groff/src/preproc/pic/Makefile Fri Dec 4 03:17:24
2015 (r291737)
+++ head/gnu/usr.bin/groff/src/preproc/pic/Makefile Fri Dec 4 03:17:47
2015 (r291738)
@@ -4,8 +4,9 @@ PROG_CXX= pic
SRCS= lex.cpp main.cpp object.cpp pic.cpp pic_tab.h \
common.cpp troff.cpp tex.cpp
CFLAGS+= -I${DIST_DIR} -I.
-DPADD= ${LIBGROFF} ${LIBM}
-LDADD= ${LIBGROFF} -lm
+DPADD= ${LIBGROFF}
+LDADD= ${LIBGROFF}
+LIBADD= m
CLEANFILES= ${MAN} pic.cpp pic_tab.h y.tab.c y.tab.h
pic_tab.h: pic.cpp
Modified: head/gnu/usr.bin/groff/src/preproc/refer/Makefile
==============================================================================
--- head/gnu/usr.bin/groff/src/preproc/refer/Makefile Fri Dec 4 03:17:24
2015 (r291737)
+++ head/gnu/usr.bin/groff/src/preproc/refer/Makefile Fri Dec 4 03:17:47
2015 (r291738)
@@ -3,8 +3,9 @@
PROG_CXX= refer
SRCS= command.cpp label.cpp ref.cpp refer.cpp token.cpp
CFLAGS+= -I${DIST_DIR}
-DPADD= ${LIBBIB} ${LIBGROFF} ${LIBM}
-LDADD= ${LIBBIB} ${LIBGROFF} -lm
+DPADD= ${LIBBIB} ${LIBGROFF}
+LDADD= ${LIBBIB} ${LIBGROFF}
+LIBADD= m
CLEANFILES= label.cpp label_tab.h ${MAN} y.tab.c y.tab.h
.include <bsd.prog.mk>
Modified: head/gnu/usr.bin/groff/src/preproc/tbl/Makefile
==============================================================================
--- head/gnu/usr.bin/groff/src/preproc/tbl/Makefile Fri Dec 4 03:17:24
2015 (r291737)
+++ head/gnu/usr.bin/groff/src/preproc/tbl/Makefile Fri Dec 4 03:17:47
2015 (r291738)
@@ -2,8 +2,9 @@
PROG_CXX= tbl
SRCS= main.cpp table.cpp
-DPADD= ${LIBGROFF} ${LIBM}
-LDADD= ${LIBGROFF} -lm
+DPADD= ${LIBGROFF}
+LDADD= ${LIBGROFF}
+LIBADD= m
CLEANFILES= ${MAN}
.include <bsd.prog.mk>
Modified: head/gnu/usr.bin/groff/src/roff/groff/Makefile
==============================================================================
--- head/gnu/usr.bin/groff/src/roff/groff/Makefile Fri Dec 4 03:17:24
2015 (r291737)
+++ head/gnu/usr.bin/groff/src/roff/groff/Makefile Fri Dec 4 03:17:47
2015 (r291738)
@@ -2,8 +2,9 @@
PROG_CXX= groff
SRCS= groff.cpp pipeline.c
-DPADD= ${LIBGROFF} ${LIBM}
-LDADD= ${LIBGROFF} -lm
+DPADD= ${LIBGROFF}
+LDADD= ${LIBGROFF}
+LIBADD= m
CLEANFILES= ${MAN}
.include <bsd.prog.mk>
Modified: head/gnu/usr.bin/groff/src/roff/troff/Makefile
==============================================================================
--- head/gnu/usr.bin/groff/src/roff/troff/Makefile Fri Dec 4 03:17:24
2015 (r291737)
+++ head/gnu/usr.bin/groff/src/roff/troff/Makefile Fri Dec 4 03:17:47
2015 (r291738)
@@ -3,8 +3,9 @@
PROG_CXX= troff
SRCS= dictionary.cpp div.cpp env.cpp input.cpp \
majorminor.cpp mtsm.cpp node.cpp number.cpp reg.cpp
-DPADD= ${LIBGROFF} ${LIBM}
-LDADD= ${LIBGROFF} -lm
+DPADD= ${LIBGROFF}
+LDADD= ${LIBGROFF}
+LIBADD= m
CLEANFILES= majorminor.cpp ${MAN}
.include <bsd.prog.mk>
Modified: head/gnu/usr.bin/groff/src/utils/hpftodit/Makefile
==============================================================================
--- head/gnu/usr.bin/groff/src/utils/hpftodit/Makefile Fri Dec 4 03:17:24
2015 (r291737)
+++ head/gnu/usr.bin/groff/src/utils/hpftodit/Makefile Fri Dec 4 03:17:47
2015 (r291738)
@@ -2,8 +2,9 @@
PROG_CXX= hpftodit
SRCS= hpftodit.cpp hpuni.cpp
-DPADD= ${LIBGROFF} ${LIBM}
-LDADD= ${LIBGROFF} -lm
+DPADD= ${LIBGROFF}
+LDADD= ${LIBGROFF}
+LIBADD= m
CLEANFILES= ${MAN}
.include <bsd.prog.mk>
Modified: head/gnu/usr.bin/groff/src/utils/indxbib/Makefile
==============================================================================
--- head/gnu/usr.bin/groff/src/utils/indxbib/Makefile Fri Dec 4 03:17:24
2015 (r291737)
+++ head/gnu/usr.bin/groff/src/utils/indxbib/Makefile Fri Dec 4 03:17:47
2015 (r291738)
@@ -2,8 +2,9 @@
PROG_CXX= indxbib
SRCS= indxbib.cpp signal.c
-DPADD= ${LIBBIB} ${LIBGROFF} ${LIBM}
-LDADD= ${LIBBIB} ${LIBGROFF} -lm
+DPADD= ${LIBBIB} ${LIBGROFF}
+LDADD= ${LIBBIB} ${LIBGROFF}
+LIBADD= m
CLEANFILES= ${MAN}
FILES= ${DIST_DIR}/eign
FILESDIR= ${SHAREDIR}/dict/
Modified: head/gnu/usr.bin/groff/src/utils/lkbib/Makefile
==============================================================================
--- head/gnu/usr.bin/groff/src/utils/lkbib/Makefile Fri Dec 4 03:17:24
2015 (r291737)
+++ head/gnu/usr.bin/groff/src/utils/lkbib/Makefile Fri Dec 4 03:17:47
2015 (r291738)
@@ -2,8 +2,9 @@
PROG_CXX= lkbib
SRCS= lkbib.cpp
-DPADD= ${LIBBIB} ${LIBGROFF} ${LIBM}
-LDADD= ${LIBBIB} ${LIBGROFF} -lm
+DPADD= ${LIBBIB} ${LIBGROFF}
+LDADD= ${LIBBIB} ${LIBGROFF}
+LIBADD= m
CLEANFILES= ${MAN}
.include <bsd.prog.mk>
Modified: head/gnu/usr.bin/groff/src/utils/lookbib/Makefile
==============================================================================
--- head/gnu/usr.bin/groff/src/utils/lookbib/Makefile Fri Dec 4 03:17:24
2015 (r291737)
+++ head/gnu/usr.bin/groff/src/utils/lookbib/Makefile Fri Dec 4 03:17:47
2015 (r291738)
@@ -2,8 +2,9 @@
PROG_CXX= lookbib
SRCS= lookbib.cpp
-DPADD= ${LIBBIB} ${LIBGROFF} ${LIBM}
-LDADD= ${LIBBIB} ${LIBGROFF} -lm
+DPADD= ${LIBBIB} ${LIBGROFF}
+LDADD= ${LIBBIB} ${LIBGROFF}
+LIBADD= m
CLEANFILES= ${MAN}
.include <bsd.prog.mk>
Modified: head/gnu/usr.bin/groff/src/utils/tfmtodit/Makefile
==============================================================================
--- head/gnu/usr.bin/groff/src/utils/tfmtodit/Makefile Fri Dec 4 03:17:24
2015 (r291737)
+++ head/gnu/usr.bin/groff/src/utils/tfmtodit/Makefile Fri Dec 4 03:17:47
2015 (r291738)
@@ -2,8 +2,9 @@
PROG_CXX= tfmtodit
SRCS= tfmtodit.cpp
-DPADD= ${LIBGROFF} ${LIBM}
-LDADD= ${LIBGROFF} -lm
+DPADD= ${LIBGROFF}
+LDADD= ${LIBGROFF}
+LIBADD= m
CLEANFILES= ${MAN}
.include <bsd.prog.mk>
Modified: head/lib/libc/tests/gen/Makefile
==============================================================================
--- head/lib/libc/tests/gen/Makefile Fri Dec 4 03:17:24 2015
(r291737)
+++ head/lib/libc/tests/gen/Makefile Fri Dec 4 03:17:47 2015
(r291738)
@@ -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}
-
-LDADD.nice_test+= -lpthread
-DPADD.nice_test+= ${LIBPTHREAD}
-LDADD.syslog_test+= -lpthread
-DPADD.syslog_test+= ${LIBPTHREAD}
+LIBADD.fpclassify_test+=m
+LIBADD.fpsetround_test+=m
+LIBADD.siginfo_test+= m
+
+LIBADD.nice_test+= pthread
+LIBADD.syslog_test+= pthread
CFLAGS+= -I${.CURDIR}
Modified: head/lib/libc/tests/hash/Makefile
==============================================================================
--- head/lib/libc/tests/hash/Makefile Fri Dec 4 03:17:24 2015
(r291737)
+++ head/lib/libc/tests/hash/Makefile Fri Dec 4 03:17:47 2015
(r291738)
@@ -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
Modified: head/lib/libc/tests/net/Makefile
==============================================================================
--- head/lib/libc/tests/net/Makefile Fri Dec 4 03:17:24 2015
(r291737)
+++ head/lib/libc/tests/net/Makefile Fri Dec 4 03:17:47 2015
(r291738)
@@ -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
Modified: head/lib/libc/tests/regex/Makefile
==============================================================================
--- head/lib/libc/tests/regex/Makefile Fri Dec 4 03:17:24 2015
(r291737)
+++ head/lib/libc/tests/regex/Makefile Fri Dec 4 03:17:47 2015
(r291738)
@@ -51,7 +51,6 @@ CFLAGS.$t+= -I${TESTSRC} ${IMPLEMENTATIO
.include "../Makefile.netbsd-tests"
-DPADD.regex_att_test+= ${LIBUTIL}
-LDADD.regex_att_test+= -lutil
+LIBADD.regex_att_test+= util
.include <bsd.test.mk>
Modified: head/lib/libc/tests/rpc/Makefile
==============================================================================
--- head/lib/libc/tests/rpc/Makefile Fri Dec 4 03:17:24 2015
(r291737)
+++ head/lib/libc/tests/rpc/Makefile Fri Dec 4 03:17:47 2015
(r291738)
@@ -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"
Modified: head/lib/libc/tests/setjmp/Makefile
==============================================================================
--- head/lib/libc/tests/setjmp/Makefile Fri Dec 4 03:17:24 2015
(r291737)
+++ head/lib/libc/tests/setjmp/Makefile Fri Dec 4 03:17:47 2015
(r291738)
@@ -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
Modified: head/lib/libc/tests/ssp/Makefile
==============================================================================
--- head/lib/libc/tests/ssp/Makefile Fri Dec 4 03:17:24 2015
(r291737)
+++ head/lib/libc/tests/ssp/Makefile Fri Dec 4 03:17:47 2015
(r291738)
@@ -10,8 +10,7 @@ CFLAGS.h_raw+= -fstack-protector-all -Ws
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
Modified: head/lib/libc/tests/stdio/Makefile
==============================================================================
--- head/lib/libc/tests/stdio/Makefile Fri Dec 4 03:17:24 2015
(r291737)
+++ head/lib/libc/tests/stdio/Makefile Fri Dec 4 03:17:47 2015
(r291738)
@@ -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
Modified: head/lib/libc/tests/stdlib/Makefile
==============================================================================
--- head/lib/libc/tests/stdlib/Makefile Fri Dec 4 03:17:24 2015
(r291737)
+++ head/lib/libc/tests/stdlib/Makefile Fri Dec 4 03:17:47 2015
(r291738)
@@ -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>
Modified: head/lib/libc/tests/string/Makefile
==============================================================================
--- head/lib/libc/tests/string/Makefile Fri Dec 4 03:17:24 2015
(r291737)
+++ head/lib/libc/tests/string/Makefile Fri Dec 4 03:17:47 2015
(r291738)
@@ -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>
Modified: head/lib/libc/tests/sys/Makefile
==============================================================================
--- head/lib/libc/tests/sys/Makefile Fri Dec 4 03:17:24 2015
(r291737)
+++ head/lib/libc/tests/sys/Makefile Fri Dec 4 03:17:47 2015
(r291738)
@@ -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"
Modified: head/lib/libc/tests/tls/Makefile
==============================================================================
--- head/lib/libc/tests/tls/Makefile Fri Dec 4 03:17:24 2015
(r291737)
+++ head/lib/libc/tests/tls/Makefile Fri Dec 4 03:17:47 2015
(r291738)
@@ -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>
Modified: head/lib/libc/tests/ttyio/Makefile
==============================================================================
--- head/lib/libc/tests/ttyio/Makefile Fri Dec 4 03:17:24 2015
(r291737)
+++ head/lib/libc/tests/ttyio/Makefile Fri Dec 4 03:17:47 2015
(r291738)
@@ -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"
Modified: head/lib/libproc/tests/Makefile
==============================================================================
--- head/lib/libproc/tests/Makefile Fri Dec 4 03:17:24 2015
(r291737)
+++ head/lib/libproc/tests/Makefile Fri Dec 4 03:17:47 2015
(r291738)
@@ -6,8 +6,7 @@ PROGS= target_prog
SRCS_target_prog= target_prog.c
BINDIR_target_prog= ${TESTSDIR}
-LDADD+= -lelf -lproc -lrtld_db -lutil
-DPADD+= ${LIBELF} ${LIBPROC} ${LIBRTLD_DB} ${LIBUTIL}
+LIBADD= elf proc rtld_db util
# Ensure that symbols aren't stripped from the test program, as they're needed
# for testing symbol lookup.
Modified: head/lib/libthr/tests/Makefile
==============================================================================
--- head/lib/libthr/tests/Makefile Fri Dec 4 03:17:24 2015
(r291737)
+++ head/lib/libthr/tests/Makefile Fri Dec 4 03:17:47 2015
(r291738)
@@ -30,12 +30,9 @@ NETBSD_ATF_TESTS_SH+= cancel_test
NETBSD_ATF_TESTS_SH+= exit_test
NETBSD_ATF_TESTS_SH+= resolv_test
-DPADD+= ${LIBPTHREAD}
-LDADD+= -lpthread
-DPADD.fpu_test+= ${LIBM}
-LDADD.fpu_test+= -lm
-DPADD.sem_test+= ${LIBRT}
-LDADD.sem_test+= -lrt
+LIBADD+= pthread
+LIBADD.fpu_test+= m
+LIBADD.sem_test+= rt
BINDIR= ${TESTSDIR}
Modified: head/lib/libthr/tests/dlopen/Makefile
==============================================================================
--- head/lib/libthr/tests/dlopen/Makefile Fri Dec 4 03:17:24 2015
(r291737)
+++ head/lib/libthr/tests/dlopen/Makefile Fri Dec 4 03:17:47 2015
(r291738)
@@ -18,8 +18,7 @@ NETBSD_ATF_TESTS_C+= main_pthread_create
#NETBSD_ATF_TESTS_C+= dso_pthread_create_test
.for t in dlopen_test main_pthread_create_test
-DPADD.$t+= ${LIBPTHREAD}
-LDADD.$t+= -lpthread
+LIBADD.${t}+= pthread
.endfor
.endif
Modified: head/lib/libthr/tests/dlopen/dso/Makefile
==============================================================================
--- head/lib/libthr/tests/dlopen/dso/Makefile Fri Dec 4 03:17:24 2015
(r291737)
+++ head/lib/libthr/tests/dlopen/dso/Makefile Fri Dec 4 03:17:47 2015
(r291738)
@@ -8,8 +8,7 @@ SHLIB_MAJOR= 1
SHLIB_NAME= h_pthread_dlopen.so.${SHLIB_MAJOR}
SRCS= h_pthread_dlopen.c
-DPADD+= ${LIBPTHREAD}
-LDADD+= -lpthread
+LIBADD+= pthread
LIBDIR= ${TESTSBASE}/lib/libthr/dlopen
Modified: head/libexec/rtld-elf/tests/libpythagoras/Makefile
==============================================================================
--- head/libexec/rtld-elf/tests/libpythagoras/Makefile Fri Dec 4 03:17:24
2015 (r291737)
+++ head/libexec/rtld-elf/tests/libpythagoras/Makefile Fri Dec 4 03:17:47
2015 (r291738)
@@ -10,7 +10,6 @@ SHLIBDIR= ${TESTSBASE}/libexec/rtld-elf
SRCS= pythagoras.c
-DPADD= ${LIBM}
-LDADD= -lm
+LIBADD= m
.include <bsd.lib.mk>
Modified: head/sbin/dhclient/tests/Makefile
==============================================================================
--- head/sbin/dhclient/tests/Makefile Fri Dec 4 03:17:24 2015
(r291737)
+++ head/sbin/dhclient/tests/Makefile Fri Dec 4 03:17:47 2015
(r291738)
@@ -6,8 +6,7 @@ PLAIN_TESTS_C= option-domain-search_t
SRCS.option-domain-search_test= alloc.c convert.c hash.c
options.c \
tables.c fake.c option-domain-search.c
CFLAGS.option-domain-search_test+= -I${.CURDIR}/..
-DPADD.option-domain-search_test= ${LIBUTIL}
-LDADD.option-domain-search_test= -lutil
+LIBADD.option-domain-search_test= util
WARNS?= 2
Modified: head/share/mk/netbsd-tests.test.mk
==============================================================================
--- head/share/mk/netbsd-tests.test.mk Fri Dec 4 03:17:24 2015
(r291737)
+++ head/share/mk/netbsd-tests.test.mk Fri Dec 4 03:17:47 2015
(r291738)
@@ -18,8 +18,7 @@ LIBNETBSD_OBJDIR= ${OBJTOP}/lib/libnetbs
CFLAGS.$t+= -I${LIBNETBSD_SRCDIR} -I${SRCTOP}/contrib/netbsd-tests
LDFLAGS.$t+= -L${LIBNETBSD_OBJDIR}
-DPADD.$t+= ${LIBNETBSD}
-LDADD.$t+= -lnetbsd
+LIBADD.${t}+= netbsd
SRCS.$t?= ${t:C/^/t_/:C/_test$//g}.c
.endfor
Modified: head/sys/dev/aic7xxx/aicasm/Makefile
==============================================================================
--- head/sys/dev/aic7xxx/aicasm/Makefile Fri Dec 4 03:17:24 2015
(r291737)
+++ head/sys/dev/aic7xxx/aicasm/Makefile Fri Dec 4 03:17:47 2015
(r291738)
@@ -13,8 +13,7 @@ GENHDRS= aicasm_gram.h aicasm_macro_gram
SRCS= ${GENHDRS} ${CSRCS} ${YSRCS} ${LSRCS}
CLEANFILES+= ${GENHDRS} ${YSRCS:R:C/(.*)/\1.output/g}
-DPADD= ${LIBL}
-LDADD= -ll
+LIBADD= l
WARNS?= 0
# Correct path for kernel builds
Modified: head/sys/dev/patm/genrtab/Makefile
==============================================================================
--- head/sys/dev/patm/genrtab/Makefile Fri Dec 4 03:17:24 2015
(r291737)
+++ head/sys/dev/patm/genrtab/Makefile Fri Dec 4 03:17:47 2015
(r291738)
@@ -7,7 +7,6 @@ PROG= genrtab
INTERNALPROG=
WARNS?= 5
MAN=
-DPADD= ${LIBM}
-LDADD= -lm
+LIBADD= m
.include <bsd.prog.mk>
Modified: head/tests/sys/aio/Makefile
==============================================================================
--- head/tests/sys/aio/Makefile Fri Dec 4 03:17:24 2015 (r291737)
+++ head/tests/sys/aio/Makefile Fri Dec 4 03:17:47 2015 (r291738)
@@ -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}
Modified: head/tests/sys/file/Makefile
==============================================================================
--- head/tests/sys/file/Makefile Fri Dec 4 03:17:24 2015
(r291737)
+++ head/tests/sys/file/Makefile Fri Dec 4 03:17:47 2015
(r291738)
@@ -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 <bsd.test.mk>
Modified: head/tests/sys/kern/Makefile
==============================================================================
--- head/tests/sys/kern/Makefile Fri Dec 4 03:17:24 2015
(r291737)
+++ head/tests/sys/kern/Makefile Fri Dec 4 03:17:47 2015
(r291738)
@@ -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
Modified: head/tests/sys/mqueue/Makefile
==============================================================================
--- head/tests/sys/mqueue/Makefile Fri Dec 4 03:17:24 2015
(r291737)
+++ head/tests/sys/mqueue/Makefile Fri Dec 4 03:17:47 2015
(r291738)
@@ -14,8 +14,7 @@ PROGS+= mqtest2
#PROGS+= mqtest4
PROGS+= mqtest5
-LDADD+= -lrt
-DPADD+= ${LIBRT}
+LIBADD+= rt
WARNS?= 6
Modified: head/tools/diag/dumpvfscache/Makefile
==============================================================================
--- head/tools/diag/dumpvfscache/Makefile Fri Dec 4 03:17:24 2015
(r291737)
+++ head/tools/diag/dumpvfscache/Makefile Fri Dec 4 03:17:47 2015
(r291738)
@@ -1,8 +1,7 @@
# $FreeBSD$
PROG= dumpvfscache
-DPADD= ${LIBKVM}
-LDADD= -lkvm
+LIBADD= kvm
MAN=
Modified: head/tools/regression/gaithrstress/Makefile
==============================================================================
--- head/tools/regression/gaithrstress/Makefile Fri Dec 4 03:17:24 2015
(r291737)
+++ head/tools/regression/gaithrstress/Makefile Fri Dec 4 03:17:47 2015
(r291738)
@@ -1,8 +1,7 @@
# $FreeBSD$
PROG= gaithrstress
-DPADD= ${LIBPTHREAD}
-LDADD= -lpthread
+LIBADD= pthread
MAN=
.include <bsd.prog.mk>
Modified: head/tools/regression/geom/ConfCmp/Makefile
==============================================================================
--- head/tools/regression/geom/ConfCmp/Makefile Fri Dec 4 03:17:24 2015
(r291737)
+++ head/tools/regression/geom/ConfCmp/Makefile Fri Dec 4 03:17:47 2015
(r291738)
@@ -12,8 +12,7 @@ CFLAGS+= -g -W -Wall -Wstrict-prototype
# Uncomment for ElectricFence
#LDADD += -lefence -L/usr/local/lib
-DPADD += ${LIBBSDXML}
-LDADD += -lbsdxml
+LIBADD= bsdxml
MAN=
CLEANFILES += _*
Modified: head/tools/regression/geom/MdLoad/Makefile
==============================================================================
--- head/tools/regression/geom/MdLoad/Makefile Fri Dec 4 03:17:24 2015
(r291737)
+++ head/tools/regression/geom/MdLoad/Makefile Fri Dec 4 03:17:47 2015
(r291738)
@@ -1,8 +1,7 @@
# $FreeBSD$
PROG= MdLoad
-DPADD= ${LIBSBUF} ${LIBBSDXML}
-LDADD= -lsbuf -lbsdxml
+LIBADD= sbuf bsdxml
MAN=
Modified: head/tools/regression/kgssapi/Makefile
==============================================================================
--- head/tools/regression/kgssapi/Makefile Fri Dec 4 03:17:24 2015
(r291737)
+++ head/tools/regression/kgssapi/Makefile Fri Dec 4 03:17:47 2015
(r291738)
@@ -3,8 +3,7 @@
PROG= gsstest
MAN=
WARNS?= 2
-DPADD= ${LIBGSSAPI} ${LIBGSSAPI_KRB5}
-LDADD= -lgssapi -lgssapi_krb5
+LIBADD= gssapi gssapi_krb5
DEBUG_FLAGS= -g -O0
.include <bsd.prog.mk>
Modified: head/tools/regression/lib/libc/resolv/Makefile
==============================================================================
--- head/tools/regression/lib/libc/resolv/Makefile Fri Dec 4 03:17:24
2015 (r291737)
+++ head/tools/regression/lib/libc/resolv/Makefile Fri Dec 4 03:17:47
2015 (r291738)
@@ -6,8 +6,7 @@ MAN=
# Note: this test relies on being dynamically linked. You will get a
# spurious PASS for a statically linked test.
-DPADD+= ${LIBPTHREAD}
-LDADD+= -lpthread
+LIBADD+= pthread
regress: ${PROG}
./${PROG} -r ${.CURDIR}/mach
Modified: head/tools/regression/mac/mac_bsdextended/Makefile
==============================================================================
--- head/tools/regression/mac/mac_bsdextended/Makefile Fri Dec 4 03:17:24
2015 (r291737)
+++ head/tools/regression/mac/mac_bsdextended/Makefile Fri Dec 4 03:17:47
2015 (r291738)
@@ -1,8 +1,7 @@
# $FreeBSD$
PROG= test_ugidfw
-DPADD= ${LIBUGIDFW}
-LDADD= -lugidfw
+LIBADD= ugidfw
MAN=
.include <bsd.prog.mk>
Modified: head/tools/regression/posixsem/Makefile
==============================================================================
--- head/tools/regression/posixsem/Makefile Fri Dec 4 03:17:24 2015
(r291737)
+++ head/tools/regression/posixsem/Makefile Fri Dec 4 03:17:47 2015
(r291738)
@@ -2,8 +2,7 @@
PROG= posixsem
SRCS= posixsem.c test.c
-DPADD= ${LIBKVM}
-LDADD= -lkvm
+LIBADD= kvm
MAN=
WARNS?= 3
Modified: head/tools/regression/priv/Makefile
==============================================================================
--- head/tools/regression/priv/Makefile Fri Dec 4 03:17:24 2015
(r291737)
+++ head/tools/regression/priv/Makefile Fri Dec 4 03:17:47 2015
(r291738)
@@ -48,8 +48,7 @@ SRCS= main.c \
MAN=
WARNS?= 3
-DPADD+= ${LIBIPSEC}
-LDADD+= -lipsec
+LIBADD+= ipsec
.if ${MK_INET6_SUPPORT} != "no"
CFLAGS+= -DINET6
Modified: head/tools/regression/pthread/cv_cancel1/Makefile
==============================================================================
--- head/tools/regression/pthread/cv_cancel1/Makefile Fri Dec 4 03:17:24
2015 (r291737)
+++ head/tools/regression/pthread/cv_cancel1/Makefile Fri Dec 4 03:17:47
2015 (r291738)
@@ -2,7 +2,6 @@
PROG= cv_cancel1
MAN=
-DPADD= ${LIBPTHREAD}
-LDADD= -lpthread
+LIBADD= pthread
.include <bsd.prog.mk>
Modified: head/tools/regression/pthread/mutex_isowned_np/Makefile
==============================================================================
--- head/tools/regression/pthread/mutex_isowned_np/Makefile Fri Dec 4
03:17:24 2015 (r291737)
+++ head/tools/regression/pthread/mutex_isowned_np/Makefile Fri Dec 4
03:17:47 2015 (r291738)
@@ -2,7 +2,6 @@
PROG= mutex_isowned_np
MAN=
-DPADD= ${LIBPTHREAD}
-LDADD= -lpthread
+LIBADD= pthread
.include <bsd.prog.mk>
Modified: head/tools/regression/rpcsec_gss/Makefile
==============================================================================
--- head/tools/regression/rpcsec_gss/Makefile Fri Dec 4 03:17:24 2015
(r291737)
+++ head/tools/regression/rpcsec_gss/Makefile Fri Dec 4 03:17:47 2015
(r291738)
@@ -3,8 +3,7 @@
PROG= rpctest
MAN=
WARNS?= 6
-DPADD= ${LIBRPCSEC_GSS}
-LDADD= -lrpcsec_gss
+LIBADD= rpcsec_gss
DEBUG_FLAGS= -g -O0
.include <bsd.prog.mk>
Modified: head/tools/regression/sockets/sendfile/Makefile
==============================================================================
--- head/tools/regression/sockets/sendfile/Makefile Fri Dec 4 03:17:24
2015 (r291737)
+++ head/tools/regression/sockets/sendfile/Makefile Fri Dec 4 03:17:47
2015 (r291738)
@@ -5,7 +5,6 @@
PROG= sendfile
MAN=
WARNS?= 6
-DPADD= ${LIBMD}
-LDADD= -lmd
+LIBADD= md
.include <bsd.prog.mk>
Modified: head/tools/regression/tls/ttls2/Makefile
==============================================================================
--- head/tools/regression/tls/ttls2/Makefile Fri Dec 4 03:17:24 2015
(r291737)
+++ head/tools/regression/tls/ttls2/Makefile Fri Dec 4 03:17:47 2015
(r291738)
@@ -1,8 +1,7 @@
# $FreeBSD$
PROG= ttls2
-DPADD= ${LIBPTHREAD}
-LDADD= -lpthread
+LIBADD= pthread
MAN=
DEBUG_FLAGS= -g
Modified: head/tools/regression/tls/ttls4/Makefile
==============================================================================
--- head/tools/regression/tls/ttls4/Makefile Fri Dec 4 03:17:24 2015
(r291737)
+++ head/tools/regression/tls/ttls4/Makefile Fri Dec 4 03:17:47 2015
(r291738)
@@ -1,8 +1,7 @@
# $FreeBSD$
PROG= ttls4
-DPADD= ${LIBPTHREAD}
-LDADD= -lpthread
+LIBADD= pthread
MAN=
DEBUG_FLAGS= -g
Modified: head/tools/tools/ath/athratestats/Makefile
==============================================================================
--- head/tools/tools/ath/athratestats/Makefile Fri Dec 4 03:17:24 2015
(r291737)
+++ head/tools/tools/ath/athratestats/Makefile Fri Dec 4 03:17:47 2015
(r291738)
@@ -7,7 +7,7 @@ PROG= athratestats
SRCS= main.c opt_ah.h ah_osdep.h
-LDADD+= -lcurses
+LIBADD+= curses
CLEANFILES+= opt_ah.h ah_osdep.h
Modified: head/tools/tools/atsectl/Makefile
==============================================================================
--- head/tools/tools/atsectl/Makefile Fri Dec 4 03:17:24 2015
(r291737)
+++ head/tools/tools/atsectl/Makefile Fri Dec 4 03:17:47 2015
(r291738)
@@ -2,8 +2,7 @@
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
