Index: head/cddl/lib/libctf/Makefile =================================================================== --- head/cddl/lib/libctf/Makefile (revision 291737) +++ head/cddl/lib/libctf/Makefile (revision 291738) @@ -1,35 +1,33 @@ # $FreeBSD$ .PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/common/ctf .PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libctf/common .PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/ctf LIB= ctf SRCS= ctf_create.c \ ctf_decl.c \ ctf_error.c \ ctf_hash.c \ ctf_labels.c \ ctf_lib.c \ ctf_lookup.c \ ctf_open.c \ ctf_subr.c \ ctf_types.c \ ctf_util.c MAN= ctf.5 WARNS?= 0 CFLAGS+= -DCTF_OLD_VERSIONS CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris \ -I${.CURDIR}/../../../cddl/compat/opensolaris/include \ -I${OPENSOLARIS_USR_DISTDIR}/head \ -I${OPENSOLARIS_USR_DISTDIR}/common/ctf \ -I${OPENSOLARIS_USR_DISTDIR}/lib/libctf/common \ -I${OPENSOLARIS_SYS_DISTDIR}/uts/common -DPADD= ${LIBZ} -LDADD= -lz +LIBADD+= z .include - Index: head/cddl/lib/libzfs/Makefile =================================================================== --- head/cddl/lib/libzfs/Makefile (revision 291737) +++ head/cddl/lib/libzfs/Makefile (revision 291738) @@ -1,64 +1,58 @@ # $FreeBSD$ .PATH: ${.CURDIR}/../../../cddl/compat/opensolaris/misc .PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs .PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs .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 \ mnttab.c \ thread_pool.c \ zmount.c \ zone.c SRCS+= libzfs_changelist.c \ libzfs_compat.c \ libzfs_config.c \ libzfs_dataset.c \ libzfs_diff.c \ libzfs_import.c \ libzfs_iter.c \ libzfs_mount.c \ libzfs_pool.c \ libzfs_sendrecv.c \ libzfs_status.c \ libzfs_util.c \ zfeature_common.c \ zfs_comutil.c \ zfs_deleg.c \ zfs_fletcher.c \ zfs_namecheck.c \ zfs_prop.c \ zpool_prop.c \ zprop_common.c \ WARNS?= 0 CSTD= c99 CFLAGS+= -DZFS_NO_ACL CFLAGS+= -I${.CURDIR}/../../../sbin/mount CFLAGS+= -I${.CURDIR}/../../../cddl/lib/libumem CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/include CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libnvpair CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libuutil/common CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs/common CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs_core/common .include Index: head/cddl/lib/libzfs_core/Makefile =================================================================== --- head/cddl/lib/libzfs_core/Makefile (revision 291737) +++ head/cddl/lib/libzfs_core/Makefile (revision 291738) @@ -1,38 +1,37 @@ # $FreeBSD$ .PATH: ${.CURDIR}/../../../cddl/compat/opensolaris/misc .PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs .PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs .PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs_core/common .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 \ zfs_ioctl_compat.c SRCS+= libzfs_compat.c WARNS?= 0 CSTD= c99 CFLAGS+= -DZFS_NO_ACL CFLAGS+= -I${.CURDIR}/../../../sbin/mount CFLAGS+= -I${.CURDIR}/../../../cddl/lib/libumem CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/include CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libnvpair CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libuutil/common CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs_core/common CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs/common .include Index: head/cddl/lib/libzpool/Makefile =================================================================== --- head/cddl/lib/libzpool/Makefile (revision 291737) +++ head/cddl/lib/libzpool/Makefile (revision 291738) @@ -1,73 +1,71 @@ # $FreeBSD$ .include "${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/Makefile.files" # ZFS_COMMON_SRCS .PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs # ZFS_SHARED_SRCS .PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs # KERNEL_SRCS .PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common # LIST_SRCS .PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/os # ATOMIC_SRCS .if exists(${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/atomic/${MACHINE_ARCH}/opensolaris_atomic.S) .PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/atomic/${MACHINE_ARCH} ATOMIC_SRCS= opensolaris_atomic.S .if ${MACHINE_ARCH} != "sparc64" ACFLAGS+= -Wa,--noexecstack .endif .else .PATH: ${.CURDIR}/../../../sys/cddl/compat/opensolaris/kern ATOMIC_SRCS= opensolaris_atomic.c .endif # UNICODE_SRCS .PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/unicode LIB= zpool ZFS_COMMON_SRCS= ${ZFS_COMMON_OBJS:C/.o$/.c/} vdev_file.c trim_map.c ZFS_SHARED_SRCS= ${ZFS_SHARED_OBJS:C/.o$/.c/} KERNEL_SRCS= kernel.c taskq.c util.c LIST_SRCS= list.c UNICODE_SRCS= u8_textprep.c SRCS= ${ZFS_COMMON_SRCS} ${ZFS_SHARED_SRCS} \ ${KERNEL_SRCS} ${LIST_SRCS} ${ATOMIC_SRCS} \ ${UNICODE_SRCS} WARNS?= 0 CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris CFLAGS+= -I${.CURDIR}/../../compat/opensolaris/include CFLAGS+= -I${.CURDIR}/../../compat/opensolaris/lib/libumem CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/lib/libzpool/common CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/head CFLAGS+= -I${.CURDIR}/../../lib/libumem CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/lib/libnvpair # XXX: pthread doesn't have mutex_owned() equivalent, so we need to look # into libthr private structures. That's sooo evil, but it's only for # ZFS debugging tools needs. CFLAGS+= -DWANTS_MUTEX_OWNED CFLAGS+= -I${.CURDIR}/../../../lib/libpthread/thread 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 CSTD= c99 # Since there are many asserts in this library, it makes no sense to compile # it without debugging. CFLAGS+= -g -DDEBUG=1 .include Index: head/cddl/sbin/zfs/Makefile =================================================================== --- head/cddl/sbin/zfs/Makefile (revision 291737) +++ head/cddl/sbin/zfs/Makefile (revision 291738) @@ -1,29 +1,27 @@ # $FreeBSD$ .PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/zfs PROG= zfs MAN= zfs.8 SRCS= zfs_main.c zfs_iter.c WARNS?= 0 CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/include CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libuutil/common CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs/common CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs_core/common CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libumem/common CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libnvpair CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs 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 Index: head/cddl/sbin/zpool/Makefile =================================================================== --- head/cddl/sbin/zpool/Makefile (revision 291737) +++ head/cddl/sbin/zpool/Makefile (revision 291738) @@ -1,34 +1,32 @@ # $FreeBSD$ .PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/zpool .PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/stat/common .PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs PROG= zpool MAN= zpool.8 zpool-features.7 SRCS= zpool_main.c zpool_vdev.c zpool_iter.c zpool_util.c zfs_comutil.c SRCS+= timestamp.c WARNS?= 0 CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/include CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libuutil/common CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libumem/common CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs/common CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs_core/common CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libnvpair CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys 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 Index: head/cddl/usr.bin/zinject/Makefile =================================================================== --- head/cddl/usr.bin/zinject/Makefile (revision 291737) +++ head/cddl/usr.bin/zinject/Makefile (revision 291738) @@ -1,28 +1,26 @@ # $FreeBSD$ .PATH: ${.CURDIR}/../../contrib/opensolaris/cmd/zinject PROG= zinject SRCS= zinject.c translate.c MAN= WARNS?= 0 CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris CFLAGS+= -I${.CURDIR}/../../compat/opensolaris/include CFLAGS+= -I${.CURDIR}/../../compat/opensolaris/lib/libumem CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/lib/libzfs/common CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/lib/libzfs_core/common CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/lib/libzpool/common CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/lib/libnvpair CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs/ 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 Index: head/cddl/usr.bin/zstreamdump/Makefile =================================================================== --- head/cddl/usr.bin/zstreamdump/Makefile (revision 291737) +++ head/cddl/usr.bin/zstreamdump/Makefile (revision 291738) @@ -1,27 +1,25 @@ # $FreeBSD$ .PATH: ${.CURDIR}/../..//contrib/opensolaris/cmd/zstreamdump PROG= zstreamdump MAN= zstreamdump.1 WARNS?= 0 CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris CFLAGS+= -I${.CURDIR}/../../compat/opensolaris/include CFLAGS+= -I${.CURDIR}/../../compat/opensolaris/lib/libumem CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/lib/libzpool/common CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/lib/libnvpair CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common 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 .include Index: head/cddl/usr.bin/ztest/Makefile =================================================================== --- head/cddl/usr.bin/ztest/Makefile (revision 291737) +++ head/cddl/usr.bin/ztest/Makefile (revision 291738) @@ -1,32 +1,29 @@ # $FreeBSD$ .PATH: ${.CURDIR}/../..//contrib/opensolaris/cmd/ztest PROG= ztest MAN= WARNS?= 0 CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris CFLAGS+= -I${.CURDIR}/../../compat/opensolaris/include CFLAGS+= -I${.CURDIR}/../../compat/opensolaris/lib/libumem CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/lib/libzpool/common CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/lib/libnvpair CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common 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 # Since there are many asserts in this program, it makes no sense to compile # it without debugging. CFLAGS+= -g -DDEBUG=1 .include Index: head/cddl/usr.sbin/dtrace/tests/common/proc/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/common/proc/Makefile (revision 291737) +++ head/cddl/usr.sbin/dtrace/tests/common/proc/Makefile (revision 291738) @@ -1,30 +1,29 @@ # $FreeBSD$ # # This Makefile was generated by $srcdir/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh. # TESTFILES= \ tst.create.ksh \ tst.discard.ksh \ tst.exec.ksh \ tst.execfail.ENOENT.ksh \ tst.execfail.ksh \ tst.exitcore.ksh \ tst.exitexit.ksh \ tst.exitkilled.ksh \ tst.signal.ksh \ tst.sigwait.d \ tst.startexit.ksh \ TESTEXES= \ CFILES= \ tst.sigwait.c \ -LDADD.tst.sigwait.exe+= -lrt -DPADD.tst.sigwait.exe+= ${LIBRT} +LIBADD.tst.sigwait.exe=rt .include "../../dtrace.test.mk" Index: head/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh =================================================================== --- head/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh (revision 291737) +++ head/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh (revision 291738) @@ -1,85 +1,84 @@ # $FreeBSD$ usage() { cat <<__EOF__ >&2 usage: $(basename $0) This script regenerates the DTrace test suite makefiles. It should be run whenever \$srcdir/cddl/contrib/opensolaris/cmd/dtrace/test/tst is modified. __EOF__ exit 1 } # Format a file list for use in a make(1) variable assignment: take the # basename of each input file and append " \" to it. fmtflist() { awk 'function bn(f) { sub(".*/", "", f) return f } {print " ", bn($1), " \\"}' } genmakefile() { local basedir=$1 local tdir=${CONTRIB_TESTDIR}/${basedir} local tfiles=$(find $tdir -type f -a \ \( -name \*.d -o -name \*.ksh -o -name \*.out \) | sort | fmtflist) local tcfiles=$(find $tdir -type f -a -name \*.c | sort | fmtflist) local texes=$(find $tdir -type f -a -name \*.exe | sort | fmtflist) # One-off variable definitions. 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=" WITH_CTF=YES " fi local makefile=$(mktemp) cat <<__EOF__ > $makefile # \$FreeBSD$ # # This Makefile was generated by \$srcdir${ORIGINDIR#${TOPDIR}}/genmakefiles.sh. # TESTFILES= \\ $tfiles TESTEXES= \\ $texes CFILES= \\ $tcfiles $special .include "../../dtrace.test.mk" __EOF__ mv -f $makefile ${ORIGINDIR}/../common/${basedir}/Makefile } set -e if [ $# -ne 0 ]; then usage fi readonly ORIGINDIR=$(realpath $(dirname $0)) readonly TOPDIR=$(realpath ${ORIGINDIR}/../../../../..) readonly CONTRIB_TESTDIR=${TOPDIR}/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common # Generate a Makefile for each test group under common/. for dir in $(find ${CONTRIB_TESTDIR} -mindepth 1 -maxdepth 1 -type d); do genmakefile $(basename $dir) done Index: head/cddl/usr.sbin/zdb/Makefile =================================================================== --- head/cddl/usr.sbin/zdb/Makefile (revision 291737) +++ head/cddl/usr.sbin/zdb/Makefile (revision 291738) @@ -1,35 +1,33 @@ # $FreeBSD$ .PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/zdb PROG= zdb MAN= zdb.8 SRCS= zdb.c zdb_il.c WARNS?= 0 CSTD= c99 CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/include CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libnvpair CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libuutil/common CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs/common CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs_core/common CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys 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. CFLAGS+= -g -DDEBUG=1 .include Index: head/cddl/usr.sbin/zhack/Makefile =================================================================== --- head/cddl/usr.sbin/zhack/Makefile (revision 291737) +++ head/cddl/usr.sbin/zhack/Makefile (revision 291738) @@ -1,33 +1,31 @@ # $FreeBSD$ .PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/zhack PROG= zhack MAN= WARNS?= 0 CSTD= c99 CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/include CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libnvpair CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libuutil/common CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs/common CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs_core/common CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys 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 .include Index: head/contrib/ofed/usr.bin/osmtest/Makefile =================================================================== --- head/contrib/ofed/usr.bin/osmtest/Makefile (revision 291737) +++ head/contrib/ofed/usr.bin/osmtest/Makefile (revision 291738) @@ -1,34 +1,35 @@ # $FreeBSD$ .include "../Makefile.inc" OPENSM= ${.CURDIR}/../../management/opensm .PATH: ${OPENSM}/osmtest ${OPENSM}/man BINDIR= ${TESTSBASE}/usr.bin/opensm PROG= osmtest SRCS= main.c \ osmt_inform.c \ osmt_mtl_regular_qp.c \ osmt_multicast.c \ osmt_service.c \ osmt_slvl_vl_arb.c \ osmtest.c LDADD= -libcommon \ -libmad \ -libumad \ -losmvendor \ -losmcomp \ -lopensm \ - -lpthread + +LIBADD+= pthread CFLAGS= -DVENDOR_RMPP_SUPPORT -DDUAL_SIDED_RMPP \ -I${OPENSM}/osmtest/include MAN= osmtest.8 WARNS?= 1 .include Index: head/gnu/usr.bin/gdb/kgdb/Makefile =================================================================== --- head/gnu/usr.bin/gdb/kgdb/Makefile (revision 291737) +++ head/gnu/usr.bin/gdb/kgdb/Makefile (revision 291738) @@ -1,15 +1,15 @@ # $FreeBSD$ PROG= kgdb${GDB_SUFFIX} SRCS= main.c kld.c kthr.c trgt.c trgt_${TARGET_CPUARCH}.c WARNS?= 2 BULIBS= ${OBJ_BU}/libbfd/libbfd.a ${OBJ_BU}/libopcodes/libopcodes.a \ ${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 Index: head/gnu/usr.bin/groff/src/devices/grodvi/Makefile =================================================================== --- head/gnu/usr.bin/groff/src/devices/grodvi/Makefile (revision 291737) +++ head/gnu/usr.bin/groff/src/devices/grodvi/Makefile (revision 291738) @@ -1,9 +1,10 @@ # $FreeBSD$ 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 Index: head/gnu/usr.bin/groff/src/devices/grohtml/Makefile =================================================================== --- head/gnu/usr.bin/groff/src/devices/grohtml/Makefile (revision 291737) +++ head/gnu/usr.bin/groff/src/devices/grohtml/Makefile (revision 291738) @@ -1,9 +1,10 @@ # $FreeBSD$ 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 Index: head/gnu/usr.bin/groff/src/devices/grolbp/Makefile =================================================================== --- head/gnu/usr.bin/groff/src/devices/grolbp/Makefile (revision 291737) +++ head/gnu/usr.bin/groff/src/devices/grolbp/Makefile (revision 291738) @@ -1,9 +1,10 @@ # $FreeBSD$ 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 Index: head/gnu/usr.bin/groff/src/devices/grolj4/Makefile =================================================================== --- head/gnu/usr.bin/groff/src/devices/grolj4/Makefile (revision 291737) +++ head/gnu/usr.bin/groff/src/devices/grolj4/Makefile (revision 291738) @@ -1,10 +1,11 @@ # $FreeBSD$ 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 Index: head/gnu/usr.bin/groff/src/devices/grops/Makefile =================================================================== --- head/gnu/usr.bin/groff/src/devices/grops/Makefile (revision 291737) +++ head/gnu/usr.bin/groff/src/devices/grops/Makefile (revision 291738) @@ -1,9 +1,10 @@ # $FreeBSD$ 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 Index: head/gnu/usr.bin/groff/src/devices/grotty/Makefile =================================================================== --- head/gnu/usr.bin/groff/src/devices/grotty/Makefile (revision 291737) +++ head/gnu/usr.bin/groff/src/devices/grotty/Makefile (revision 291738) @@ -1,9 +1,10 @@ # $FreeBSD$ 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 Index: head/gnu/usr.bin/groff/src/preproc/grn/Makefile =================================================================== --- head/gnu/usr.bin/groff/src/preproc/grn/Makefile (revision 291737) +++ head/gnu/usr.bin/groff/src/preproc/grn/Makefile (revision 291738) @@ -1,9 +1,10 @@ # $FreeBSD$ 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 Index: head/gnu/usr.bin/groff/src/preproc/pic/Makefile =================================================================== --- head/gnu/usr.bin/groff/src/preproc/pic/Makefile (revision 291737) +++ head/gnu/usr.bin/groff/src/preproc/pic/Makefile (revision 291738) @@ -1,13 +1,14 @@ # $FreeBSD$ 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 .include Index: head/gnu/usr.bin/groff/src/preproc/refer/Makefile =================================================================== --- head/gnu/usr.bin/groff/src/preproc/refer/Makefile (revision 291737) +++ head/gnu/usr.bin/groff/src/preproc/refer/Makefile (revision 291738) @@ -1,10 +1,11 @@ # $FreeBSD$ 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 Index: head/gnu/usr.bin/groff/src/preproc/tbl/Makefile =================================================================== --- head/gnu/usr.bin/groff/src/preproc/tbl/Makefile (revision 291737) +++ head/gnu/usr.bin/groff/src/preproc/tbl/Makefile (revision 291738) @@ -1,9 +1,10 @@ # $FreeBSD$ PROG_CXX= tbl SRCS= main.cpp table.cpp -DPADD= ${LIBGROFF} ${LIBM} -LDADD= ${LIBGROFF} -lm +DPADD= ${LIBGROFF} +LDADD= ${LIBGROFF} +LIBADD= m CLEANFILES= ${MAN} .include Index: head/gnu/usr.bin/groff/src/roff/groff/Makefile =================================================================== --- head/gnu/usr.bin/groff/src/roff/groff/Makefile (revision 291737) +++ head/gnu/usr.bin/groff/src/roff/groff/Makefile (revision 291738) @@ -1,9 +1,10 @@ # $FreeBSD$ PROG_CXX= groff SRCS= groff.cpp pipeline.c -DPADD= ${LIBGROFF} ${LIBM} -LDADD= ${LIBGROFF} -lm +DPADD= ${LIBGROFF} +LDADD= ${LIBGROFF} +LIBADD= m CLEANFILES= ${MAN} .include Index: head/gnu/usr.bin/groff/src/roff/troff/Makefile =================================================================== --- head/gnu/usr.bin/groff/src/roff/troff/Makefile (revision 291737) +++ head/gnu/usr.bin/groff/src/roff/troff/Makefile (revision 291738) @@ -1,19 +1,20 @@ # $FreeBSD$ 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 majorminor.cpp: ${GROFF_DIST}/VERSION ${GROFF_DIST}/REVISION @${ECHO} Making $@ @-rm -f $@ @echo const char \*major_version = \ \"`sed -e 's/^\([^.]*\)\..*$$/\1/' ${GROFF_DIST}/VERSION`\"\; >$@ @echo const char \*minor_version = \ \"`sed -e 's/^[^.]*\.\([0-9]*\).*$$/\1/' ${GROFF_DIST}/VERSION`\"\; >>$@ @echo const char \*revision = \"`cat ${GROFF_DIST}/REVISION`\"\; >>$@ Index: head/gnu/usr.bin/groff/src/utils/hpftodit/Makefile =================================================================== --- head/gnu/usr.bin/groff/src/utils/hpftodit/Makefile (revision 291737) +++ head/gnu/usr.bin/groff/src/utils/hpftodit/Makefile (revision 291738) @@ -1,9 +1,10 @@ # $FreeBSD$ PROG_CXX= hpftodit SRCS= hpftodit.cpp hpuni.cpp -DPADD= ${LIBGROFF} ${LIBM} -LDADD= ${LIBGROFF} -lm +DPADD= ${LIBGROFF} +LDADD= ${LIBGROFF} +LIBADD= m CLEANFILES= ${MAN} .include Index: head/gnu/usr.bin/groff/src/utils/indxbib/Makefile =================================================================== --- head/gnu/usr.bin/groff/src/utils/indxbib/Makefile (revision 291737) +++ head/gnu/usr.bin/groff/src/utils/indxbib/Makefile (revision 291738) @@ -1,11 +1,12 @@ # $FreeBSD$ 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/ .include Index: head/gnu/usr.bin/groff/src/utils/lkbib/Makefile =================================================================== --- head/gnu/usr.bin/groff/src/utils/lkbib/Makefile (revision 291737) +++ head/gnu/usr.bin/groff/src/utils/lkbib/Makefile (revision 291738) @@ -1,9 +1,10 @@ # $FreeBSD$ 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 Index: head/gnu/usr.bin/groff/src/utils/lookbib/Makefile =================================================================== --- head/gnu/usr.bin/groff/src/utils/lookbib/Makefile (revision 291737) +++ head/gnu/usr.bin/groff/src/utils/lookbib/Makefile (revision 291738) @@ -1,9 +1,10 @@ # $FreeBSD$ 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 Index: head/gnu/usr.bin/groff/src/utils/tfmtodit/Makefile =================================================================== --- head/gnu/usr.bin/groff/src/utils/tfmtodit/Makefile (revision 291737) +++ head/gnu/usr.bin/groff/src/utils/tfmtodit/Makefile (revision 291738) @@ -1,9 +1,10 @@ # $FreeBSD$ PROG_CXX= tfmtodit SRCS= tfmtodit.cpp -DPADD= ${LIBGROFF} ${LIBM} -LDADD= ${LIBGROFF} -lm +DPADD= ${LIBGROFF} +LDADD= ${LIBGROFF} +LIBADD= m CLEANFILES= ${MAN} .include Index: head/lib/libc/tests/gen/Makefile =================================================================== --- head/lib/libc/tests/gen/Makefile (revision 291737) +++ head/lib/libc/tests/gen/Makefile (revision 291738) @@ -1,84 +1,78 @@ # $FreeBSD$ .include ATF_TESTS_C+= arc4random_test ATF_TESTS_C+= fmtcheck2_test ATF_TESTS_C+= fmtmsg_test ATF_TESTS_C+= fnmatch2_test ATF_TESTS_C+= fpclassify2_test ATF_TESTS_C+= ftw_test ATF_TESTS_C+= popen_test ATF_TESTS_C+= posix_spawn_test ATF_TESTS_C+= wordexp_test # TODO: t_closefrom, t_cpuset, t_fmtcheck, t_randomid, t_sleep # TODO: t_siginfo (fixes require further inspection) # TODO: t_sethostname_test (consistently screws up the hostname) NETBSD_ATF_TESTS_C= alarm_test NETBSD_ATF_TESTS_C+= assert_test NETBSD_ATF_TESTS_C+= basedirname_test NETBSD_ATF_TESTS_C+= dir_test NETBSD_ATF_TESTS_C+= floatunditf_test NETBSD_ATF_TESTS_C+= fnmatch_test NETBSD_ATF_TESTS_C+= fpclassify_test NETBSD_ATF_TESTS_C+= fpsetmask_test NETBSD_ATF_TESTS_C+= fpsetround_test NETBSD_ATF_TESTS_C+= ftok_test NETBSD_ATF_TESTS_C+= getcwd_test NETBSD_ATF_TESTS_C+= getgrent_test NETBSD_ATF_TESTS_C+= glob_test NETBSD_ATF_TESTS_C+= humanize_number_test NETBSD_ATF_TESTS_C+= isnan_test NETBSD_ATF_TESTS_C+= nice_test NETBSD_ATF_TESTS_C+= pause_test NETBSD_ATF_TESTS_C+= raise_test NETBSD_ATF_TESTS_C+= realpath_test NETBSD_ATF_TESTS_C+= setdomainname_test NETBSD_ATF_TESTS_C+= sethostname_test NETBSD_ATF_TESTS_C+= sleep_test NETBSD_ATF_TESTS_C+= syslog_test NETBSD_ATF_TESTS_C+= time_test NETBSD_ATF_TESTS_C+= ttyname_test 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} SRCS.fmtcheck2_test= fmtcheck_test.c SRCS.fnmatch2_test= fnmatch_test.c TESTS_SUBDIRS= execve TESTS_SUBDIRS+= posix_spawn # The old testcase name TEST_FNMATCH= test-fnmatch CLEANFILES+= ${GEN_SH_CASE_TESTCASES} sh-tests: .PHONY .for target in clean obj depend all @cd ${.CURDIR} && ${MAKE} PROG=${TEST_FNMATCH} \ -DNO_SUBDIR ${target} .endfor @cd ${.OBJDIR} && ./${TEST_FNMATCH} -s 1 > \ ${SRCTOP}/bin/sh/tests/builtins/case2.0 @cd ${.OBJDIR} && ./${TEST_FNMATCH} -s 2 > \ ${SRCTOP}/bin/sh/tests/builtins/case3.0 .include Index: head/lib/libc/tests/hash/Makefile =================================================================== --- head/lib/libc/tests/hash/Makefile (revision 291737) +++ head/lib/libc/tests/hash/Makefile (revision 291738) @@ -1,35 +1,33 @@ # $FreeBSD$ .include NETBSD_ATF_TESTS_C= .if ${MK_OPENSSL} != "no" NETBSD_ATF_TESTS_C+= sha2_test .endif NETBSD_ATF_TESTS_SH= hash_test BINDIR= ${TESTSDIR} PROGS+= h_hash FILESDIR= ${TESTSDIR}/data FILES+= data/md5test-in FILES+= data/md5test-out 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 .include "../Makefile.netbsd-tests" .include Index: head/lib/libc/tests/net/Makefile =================================================================== --- head/lib/libc/tests/net/Makefile (revision 291737) +++ head/lib/libc/tests/net/Makefile (revision 291738) @@ -1,40 +1,39 @@ # $FreeBSD$ ATF_TESTS_C+= ether_test ATF_TESTS_C+= eui64_aton_test ATF_TESTS_C+= eui64_ntoa_test CFLAGS+= -I${.CURDIR} NETBSD_ATF_TESTS_C+= getprotoent_test NETBSD_ATF_TESTS_C+= ether_aton_test SRCS.ether_aton_test= aton_ether_subr.c t_ether_aton.c # TODO: hostent_test NETBSD_ATF_TESTS_SH= nsdispatch_test NETBSD_ATF_TESTS_SH+= protoent_test NETBSD_ATF_TESTS_SH+= servent_test BINDIR= ${TESTSDIR} PROGS= h_nsd_recurse 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 ${__MAKE_SHELL} ${.ALLSRC} ${.TARGET} .include "../Makefile.netbsd-tests" # TODO: the testcases needs to be ported to FreeBSD #TESTS_SUBDIRS= getaddrinfo FILES+= hosts FILES+= resolv.conf .include Index: head/lib/libc/tests/regex/Makefile =================================================================== --- head/lib/libc/tests/regex/Makefile (revision 291737) +++ head/lib/libc/tests/regex/Makefile (revision 291738) @@ -1,57 +1,56 @@ # $FreeBSD$ .include BINDIR= ${TESTSDIR} IMPLEMENTATION?= -DREGEX_SPENCER CFLAGS.h_regex+=-I${TESTSRC} -I${.CURDIR:H:H}/regex PROGS+= h_regex SRCS.h_regex= main.c split.c debug.c NETBSD_ATF_TESTS_SH= regex_test FILESDIR= ${TESTSDIR}/data FILES+= README FILES+= data/anchor.in FILES+= data/backref.in FILES+= data/basic.in FILES+= data/bracket.in FILES+= data/c_comments.in FILES+= data/complex.in FILES+= data/error.in FILES+= data/meta.in FILES+= data/nospec.in FILES+= data/paren.in FILES+= data/regress.in FILES+= data/repet_bounded.in FILES+= data/repet_multi.in FILES+= data/repet_ordinary.in FILES+= data/startend.in FILES+= data/subexp.in FILES+= data/subtle.in FILES+= data/word_bound.in FILES+= data/zero.in #FILES+= data/att/README FILES+= data/att/basic.dat FILES+= data/att/categorization.dat FILES+= data/att/forcedassoc.dat FILES+= data/att/leftassoc.dat FILES+= data/att/nullsubexpr.dat FILES+= data/att/repetition.dat FILES+= data/att/rightassoc.dat NETBSD_ATF_TESTS_C= exhaust_test NETBSD_ATF_TESTS_C+= regex_att_test .for t in ${NETBSD_ATF_TESTS_C} CFLAGS.$t+= -I${TESTSRC} ${IMPLEMENTATION} .endfor .include "../Makefile.netbsd-tests" -DPADD.regex_att_test+= ${LIBUTIL} -LDADD.regex_att_test+= -lutil +LIBADD.regex_att_test+= util .include Index: head/lib/libc/tests/rpc/Makefile =================================================================== --- head/lib/libc/tests/rpc/Makefile (revision 291737) +++ head/lib/libc/tests/rpc/Makefile (revision 291738) @@ -1,26 +1,25 @@ # $FreeBSD$ SRCS.xdr_test= ${RPCSRC:.x=_xdr.c} t_xdr.c ${RPCSRC:.x=.h} \ h_testbits.h NETBSD_ATF_TESTS_C= rpc_test NETBSD_ATF_TESTS_C+= xdr_test RPCSRC= h_testbits.x RPCGEN= RPCGEN_CPP=${CPP:Q} rpcgen -L -C h_testbits.h: ${RPCSRC} ${RPCGEN} -h -o ${.TARGET} ${.ALLSRC} h_testbits_xdr.c: ${RPCSRC} h_testbits.h ${RPCGEN} ${.ALLSRC:M*.x} 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" .include Index: head/lib/libc/tests/setjmp/Makefile =================================================================== --- head/lib/libc/tests/setjmp/Makefile (revision 291737) +++ head/lib/libc/tests/setjmp/Makefile (revision 291738) @@ -1,13 +1,12 @@ # $FreeBSD$ 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 .include "../Makefile.netbsd-tests" .include Index: head/lib/libc/tests/ssp/Makefile =================================================================== --- head/lib/libc/tests/ssp/Makefile (revision 291737) +++ head/lib/libc/tests/ssp/Makefile (revision 291738) @@ -1,57 +1,56 @@ # $FreeBSD$ .include NO_WERROR= WARNS?= 2 CFLAGS.h_raw+= -fstack-protector-all -Wstack-protector .if ${COMPILER_TYPE} == "clang" 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 BINDIR= ${TESTSDIR} PROGS= h_fgets PROGS+= h_gets PROGS+= h_getcwd PROGS+= h_memcpy PROGS+= h_memmove PROGS+= h_memset # This testcase doesn't run properly when not compiled with -fsantize=bounds # with clang, which is currently contingent on a compiler_rt update # # XXX: the h_raw/h_read testcases don't cause a SIGABRT with in-tree gcc right # now on amd64 when it trips the stack bounds specified in t_ssp.sh . This # probably needs to be fixed as it's currently hardcoded. # # sanitizer is not tested or supported for ARM right now. sbruno .if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64" .if ${COMPILER_TYPE} == "clang" .if ${COMPILER_VERSION} < 30500 || 30700 <= ${COMPILER_VERSION} PROGS+= h_raw .endif .endif .endif PROGS+= h_read PROGS+= h_readlink PROGS+= h_snprintf PROGS+= h_sprintf PROGS+= h_stpcpy PROGS+= h_stpncpy PROGS+= h_strcat PROGS+= h_strcpy PROGS+= h_strncat PROGS+= h_strncpy PROGS+= h_vsnprintf PROGS+= h_vsprintf .include "../Makefile.netbsd-tests" .include Index: head/lib/libc/tests/stdio/Makefile =================================================================== --- head/lib/libc/tests/stdio/Makefile (revision 291737) +++ head/lib/libc/tests/stdio/Makefile (revision 291738) @@ -1,45 +1,42 @@ # $FreeBSD$ .include ATF_TESTS_C+= fdopen_test ATF_TESTS_C+= fmemopen2_test ATF_TESTS_C+= fopen2_test ATF_TESTS_C+= freopen_test ATF_TESTS_C+= getdelim_test ATF_TESTS_C+= mkostemp_test ATF_TESTS_C+= open_memstream_test ATF_TESTS_C+= open_wmemstream_test ATF_TESTS_C+= perror_test ATF_TESTS_C+= print_positional_test ATF_TESTS_C+= printbasic_test ATF_TESTS_C+= printfloat_test ATF_TESTS_C+= scanfloat_test SRCS.fopen2_test= fopen_test.c NETBSD_ATF_TESTS_C= clearerr_test NETBSD_ATF_TESTS_C+= fflush_test NETBSD_ATF_TESTS_C+= fmemopen_test NETBSD_ATF_TESTS_C+= fopen_test NETBSD_ATF_TESTS_C+= fputc_test NETBSD_ATF_TESTS_C+= mktemp_test 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 PROG_OVERRIDE_VARS+= NO_WFORMAT NO_WFORMAT.scanfloat_test= .endif .include "../Makefile.netbsd-tests" .include Index: head/lib/libc/tests/stdlib/Makefile =================================================================== --- head/lib/libc/tests/stdlib/Makefile (revision 291737) +++ head/lib/libc/tests/stdlib/Makefile (revision 291738) @@ -1,46 +1,44 @@ # $FreeBSD$ ATF_TESTS_C+= heapsort_test ATF_TESTS_C+= mergesort_test ATF_TESTS_C+= qsort_test # TODO: t_getenv_thread, t_mi_vector_hash NETBSD_ATF_TESTS_C+= abs_test NETBSD_ATF_TESTS_C+= atoi_test NETBSD_ATF_TESTS_C+= div_test NETBSD_ATF_TESTS_C+= getenv_test NETBSD_ATF_TESTS_C+= exit_test NETBSD_ATF_TESTS_C+= hsearch_test NETBSD_ATF_TESTS_C+= posix_memalign_test NETBSD_ATF_TESTS_C+= random_test NETBSD_ATF_TESTS_C+= strtod_test NETBSD_ATF_TESTS_C+= strtol_test NETBSD_ATF_TESTS_C+= system_test # TODO: need to come up with a correct explanation of what the patch pho does # with h_atexit #ATF_TESTS_SH= atexit_test NETBSD_ATF_TESTS_SH= getopt_test .include "../Makefile.netbsd-tests" BINDIR= ${TESTSDIR} # TODO: see comment above #PROGS+= h_atexit PROGS+= h_getopt h_getopt_long CFLAGS+= -I${.CURDIR} .for t in h_getopt h_getopt_long 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 Index: head/lib/libc/tests/string/Makefile =================================================================== --- head/lib/libc/tests/string/Makefile (revision 291737) +++ head/lib/libc/tests/string/Makefile (revision 291738) @@ -1,36 +1,33 @@ # $FreeBSD$ ATF_TESTS_C+= stpncpy_test ATF_TESTS_C+= strerror2_test ATF_TESTS_C+= wcscasecmp_test ATF_TESTS_C+= wcsnlen_test # TODO: popcount, stresep NETBSD_ATF_TESTS_C+= memchr_test NETBSD_ATF_TESTS_C+= memcpy_test NETBSD_ATF_TESTS_C+= memmem_test NETBSD_ATF_TESTS_C+= memset_test NETBSD_ATF_TESTS_C+= strcat_test NETBSD_ATF_TESTS_C+= strchr_test NETBSD_ATF_TESTS_C+= strcmp_test NETBSD_ATF_TESTS_C+= strcpy_test NETBSD_ATF_TESTS_C+= strcspn_test NETBSD_ATF_TESTS_C+= strerror_test NETBSD_ATF_TESTS_C+= strlen_test NETBSD_ATF_TESTS_C+= strpbrk_test NETBSD_ATF_TESTS_C+= strrchr_test NETBSD_ATF_TESTS_C+= strspn_test NETBSD_ATF_TESTS_C+= swab_test 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 Index: head/lib/libc/tests/sys/Makefile =================================================================== --- head/lib/libc/tests/sys/Makefile (revision 291737) +++ head/lib/libc/tests/sys/Makefile (revision 291738) @@ -1,85 +1,83 @@ # $FreeBSD$ .include ATF_TESTS_C+= queue_test # TODO: clone, lwp_create, lwp_ctl, posix_fadvise, recvmmsg, # swapcontext NETBSD_ATF_TESTS_C+= access_test NETBSD_ATF_TESTS_C+= chroot_test NETBSD_ATF_TESTS_C+= clock_gettime_test NETBSD_ATF_TESTS_C+= connect_test NETBSD_ATF_TESTS_C+= dup_test NETBSD_ATF_TESTS_C+= fsync_test NETBSD_ATF_TESTS_C+= getcontext_test NETBSD_ATF_TESTS_C+= getgroups_test NETBSD_ATF_TESTS_C+= getitimer_test NETBSD_ATF_TESTS_C+= getlogin_test NETBSD_ATF_TESTS_C+= getpid_test NETBSD_ATF_TESTS_C+= getrusage_test NETBSD_ATF_TESTS_C+= getsid_test NETBSD_ATF_TESTS_C+= gettimeofday_test NETBSD_ATF_TESTS_C+= issetugid_test NETBSD_ATF_TESTS_C+= kevent_test NETBSD_ATF_TESTS_C+= kill_test NETBSD_ATF_TESTS_C+= link_test NETBSD_ATF_TESTS_C+= listen_test NETBSD_ATF_TESTS_C+= mincore_test NETBSD_ATF_TESTS_C+= mkdir_test NETBSD_ATF_TESTS_C+= mkfifo_test NETBSD_ATF_TESTS_C+= mknod_test NETBSD_ATF_TESTS_C+= mlock_test NETBSD_ATF_TESTS_C+= mmap_test NETBSD_ATF_TESTS_C+= mprotect_test NETBSD_ATF_TESTS_C+= msgctl_test NETBSD_ATF_TESTS_C+= msgget_test NETBSD_ATF_TESTS_C+= msgrcv_test NETBSD_ATF_TESTS_C+= msgsnd_test NETBSD_ATF_TESTS_C+= msync_test NETBSD_ATF_TESTS_C+= nanosleep_test NETBSD_ATF_TESTS_C+= pipe_test NETBSD_ATF_TESTS_C+= pipe2_test NETBSD_ATF_TESTS_C+= poll_test NETBSD_ATF_TESTS_C+= revoke_test NETBSD_ATF_TESTS_C+= select_test NETBSD_ATF_TESTS_C+= setrlimit_test NETBSD_ATF_TESTS_C+= setuid_test NETBSD_ATF_TESTS_C+= sigaction_test NETBSD_ATF_TESTS_C+= sigqueue_test NETBSD_ATF_TESTS_C+= sigtimedwait_test NETBSD_ATF_TESTS_C+= socketpair_test NETBSD_ATF_TESTS_C+= stat_test NETBSD_ATF_TESTS_C+= timer_create_test NETBSD_ATF_TESTS_C+= truncate_test NETBSD_ATF_TESTS_C+= ucontext_test 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" .if ${COMPILER_TYPE} == "gcc" WARNS?= 3 .else WARNS?= 4 .endif FILESGROUPS= FILES truncate_test_FILES truncate_test_FILES= truncate_test.root_owned truncate_test_FILESDIR= ${TESTSDIR} truncate_test_FILESMODE= 0600 truncate_test_FILESOWNER= root truncate_test_FILESGRP= wheel CLEANFILES= truncate_test.root_owned truncate_test.root_owned: dd if=/dev/null bs=1 count=1 of=${.TARGET} .include Index: head/lib/libc/tests/tls/Makefile =================================================================== --- head/lib/libc/tests/tls/Makefile (revision 291737) +++ head/lib/libc/tests/tls/Makefile (revision 291738) @@ -1,34 +1,33 @@ # $FreeBSD$ .include .if !defined(NO_PIC) SUBDIR+= dso .endif # TODO: doesn't link properly (for some odd reason it's trying to link in # libatf.so) #NETBSD_ATF_TESTS_C= tls_static_test .if !defined(NO_PIC) NETBSD_ATF_TESTS_C+= tls_dlopen_test NETBSD_ATF_TESTS_C+= tls_dynamic_test .endif .include "../Makefile.netbsd-tests" 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 Index: head/lib/libc/tests/ttyio/Makefile =================================================================== --- head/lib/libc/tests/ttyio/Makefile (revision 291737) +++ head/lib/libc/tests/ttyio/Makefile (revision 291738) @@ -1,13 +1,12 @@ # $FreeBSD$ .include # 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" .include Index: head/lib/libproc/tests/Makefile =================================================================== --- head/lib/libproc/tests/Makefile (revision 291737) +++ head/lib/libproc/tests/Makefile (revision 291738) @@ -1,18 +1,17 @@ # $FreeBSD$ ATF_TESTS_C+= proc_test 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. STRIP= WARNS?= 6 .include Index: head/lib/libthr/tests/Makefile =================================================================== --- head/lib/libthr/tests/Makefile (revision 291737) +++ head/lib/libthr/tests/Makefile (revision 291738) @@ -1,56 +1,53 @@ # $FreeBSD$ TESTSRC= ${SRCTOP}/contrib/netbsd-tests/lib/libpthread # TODO: t_name (missing pthread_getname_np support in FreeBSD) NETBSD_ATF_TESTS_C= barrier_test NETBSD_ATF_TESTS_C+= cond_test NETBSD_ATF_TESTS_C+= condwait_test NETBSD_ATF_TESTS_C+= detach_test NETBSD_ATF_TESTS_C+= equal_test NETBSD_ATF_TESTS_C+= fork_test NETBSD_ATF_TESTS_C+= fpu_test NETBSD_ATF_TESTS_C+= join_test NETBSD_ATF_TESTS_C+= kill_test NETBSD_ATF_TESTS_C+= mutex_test NETBSD_ATF_TESTS_C+= once_test NETBSD_ATF_TESTS_C+= preempt_test NETBSD_ATF_TESTS_C+= rwlock_test NETBSD_ATF_TESTS_C+= sem_test NETBSD_ATF_TESTS_C+= sigmask_test NETBSD_ATF_TESTS_C+= sigsuspend_test NETBSD_ATF_TESTS_C+= siglongjmp_test NETBSD_ATF_TESTS_C+= sleep_test .if ${MACHINE} != "arm64" # ARM64TODO: Missing makecontext NETBSD_ATF_TESTS_C+= swapcontext_test .endif NETBSD_ATF_TESTS_SH= atexit_test 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} PROGS= h_atexit PROGS+= h_cancel PROGS+= h_exit PROGS+= h_resolv FILESDIR= ${TESTSDIR} FILES= d_mach TESTS_SUBDIRS= dlopen .include CFLAGS.condwait_test+= -I${SRCTOP}/contrib/netbsd-tests/lib/libc/gen .include Index: head/lib/libthr/tests/dlopen/Makefile =================================================================== --- head/lib/libthr/tests/dlopen/Makefile (revision 291737) +++ head/lib/libthr/tests/dlopen/Makefile (revision 291738) @@ -1,28 +1,27 @@ # $FreeBSD$ TESTSRC= ${SRCTOP}/contrib/netbsd-tests/lib/libpthread/dlopen .include TESTSDIR= ${TESTSBASE}/lib/libthr/dlopen CFLAGS+= -DTESTDIR=\"${TESTSDIR:Q}/\" LDFLAGS+= -L${.OBJDIR}/dso -Wl,-rpath=${TESTDIR} .if !defined(NO_PIC) SUBDIR+= dso NETBSD_ATF_TESTS_C= dlopen_test NETBSD_ATF_TESTS_C+= main_pthread_create_test # XXX: this blocks running the testcase #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 .include .include Index: head/lib/libthr/tests/dlopen/dso/Makefile =================================================================== --- head/lib/libthr/tests/dlopen/dso/Makefile (revision 291737) +++ head/lib/libthr/tests/dlopen/dso/Makefile (revision 291738) @@ -1,18 +1,17 @@ # $FreeBSD$ OBJTOP= ${.OBJDIR:H:H:H:H:H} TESTSRC= ${SRCTOP}/contrib/netbsd-tests/lib/libpthread/dlopen/dso SHLIB= h_pthread_dlopen 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 .include .include Index: head/libexec/rtld-elf/tests/libpythagoras/Makefile =================================================================== --- head/libexec/rtld-elf/tests/libpythagoras/Makefile (revision 291737) +++ head/libexec/rtld-elf/tests/libpythagoras/Makefile (revision 291738) @@ -1,16 +1,15 @@ # $FreeBSD$ .include LIB= pythagoras SHLIB_MAJOR= 0 LIBDIR= ${TESTSBASE}/libexec/rtld-elf SHLIBDIR= ${TESTSBASE}/libexec/rtld-elf SRCS= pythagoras.c -DPADD= ${LIBM} -LDADD= -lm +LIBADD= m .include Index: head/sbin/dhclient/tests/Makefile =================================================================== --- head/sbin/dhclient/tests/Makefile (revision 291737) +++ head/sbin/dhclient/tests/Makefile (revision 291738) @@ -1,14 +1,13 @@ # $FreeBSD$ .PATH: ${.CURDIR}/.. PLAIN_TESTS_C= option-domain-search_test 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 .include Index: head/share/mk/netbsd-tests.test.mk =================================================================== --- head/share/mk/netbsd-tests.test.mk (revision 291737) +++ head/share/mk/netbsd-tests.test.mk (revision 291738) @@ -1,40 +1,39 @@ # $FreeBSD$ .if !target(__netbsd_tests.test.mk__) __netbsd_tests.test.mk__: TESTSRC?= ${SRCTOP}/contrib/netbsd-tests/${RELDIR:H} .if !exists(${TESTSRC}/) .error "Please define TESTSRC to the absolute path of the test sources, e.g. $${SRCTOP}/contrib/netbsd-tests/lib/libc/stdio" .endif .PATH: ${TESTSRC} LIBNETBSD_SRCDIR= ${SRCTOP}/lib/libnetbsd LIBNETBSD_OBJDIR= ${OBJTOP}/lib/libnetbsd .for t in ${NETBSD_ATF_TESTS_C} 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 ATF_TESTS_C+= ${NETBSD_ATF_TESTS_C} # A C++ analog isn't provided because there aren't any C++ testcases in # contrib/netbsd-tests .for t in ${NETBSD_ATF_TESTS_SH} ATF_TESTS_SH_SRC_$t?= ${t:C/^/t_/:C/_test$//g}.sh .endfor ATF_TESTS_SH+= ${NETBSD_ATF_TESTS_SH} .endif # vim: syntax=make Index: head/sys/dev/aic7xxx/aicasm/Makefile =================================================================== --- head/sys/dev/aic7xxx/aicasm/Makefile (revision 291737) +++ head/sys/dev/aic7xxx/aicasm/Makefile (revision 291738) @@ -1,46 +1,45 @@ # # $Id: //depot/aic7xxx/freebsd/dev/aic7xxx/aicasm/Makefile#2 $ # # $FreeBSD$ PROG= aicasm CSRCS= aicasm.c aicasm_symbol.c YSRCS= aicasm_gram.y aicasm_macro_gram.y LSRCS= aicasm_scan.l aicasm_macro_scan.l GENHDRS= aicasm_gram.h aicasm_macro_gram.h 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 # Don't rely on the kernel's .depend file .ifdef MAKESRCPATH .PATH: ${MAKESRCPATH} DEPENDFILE= .depend_aicasm .endif CFLAGS+= -I${.CURDIR} .ifdef MAKESRCPATH CFLAGS+= -I${MAKESRCPATH} .endif MAN= YFLAGS= -b ${.TARGET:R} ${.TARGET:M*macro*:S/$(.TARGET)/-p mm/} -d LFLAGS+= ${.TARGET:M*macro*:S/$(.TARGET)/-Pmm/} .ifdef AICASM_DEBUG CFLAGS+= -DDEBUG -g YFLAGS+= -t -v LFLAGS+= -d .endif BINDIR=/usr/bin build-tools: ${PROG} .include CFLAGS+= -Wno-missing-prototypes Index: head/sys/dev/patm/genrtab/Makefile =================================================================== --- head/sys/dev/patm/genrtab/Makefile (revision 291737) +++ head/sys/dev/patm/genrtab/Makefile (revision 291738) @@ -1,13 +1,12 @@ # $FreeBSD$ # # This program is used to generate the if_patm_rtables.c file # for the idt77252 driver. It is not installed. # PROG= genrtab INTERNALPROG= WARNS?= 5 MAN= -DPADD= ${LIBM} -LDADD= -lm +LIBADD= m .include Index: head/tests/sys/aio/Makefile =================================================================== --- head/tests/sys/aio/Makefile (revision 291737) +++ head/tests/sys/aio/Makefile (revision 291738) @@ -1,16 +1,15 @@ # $FreeBSD$ TESTSDIR= ${TESTSBASE}/sys/aio 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} WARNS?= 6 .include Index: head/tests/sys/file/Makefile =================================================================== --- head/tests/sys/file/Makefile (revision 291737) +++ head/tests/sys/file/Makefile (revision 291738) @@ -1,25 +1,22 @@ # $FreeBSD$ TESTSDIR= ${TESTSBASE}/sys/file BINDIR= ${TESTSDIR} TAP_TESTS_C+= closefrom_test TAP_TESTS_C+= dup_test TAP_TESTS_C+= fcntlflags_test TAP_TESTS_SH+= flock_test PLAIN_TESTS_C+= ftruncate_test 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 Index: head/tests/sys/kern/Makefile =================================================================== --- head/tests/sys/kern/Makefile (revision 291737) +++ head/tests/sys/kern/Makefile (revision 291738) @@ -1,31 +1,30 @@ # $FreeBSD$ TESTSRC= ${SRCTOP}/contrib/netbsd-tests/kernel TESTSDIR= ${TESTSBASE}/sys/kern ATF_TESTS_C+= kern_copyin ATF_TESTS_C+= kern_descrip_test 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 TESTS_SUBDIRS+= acct TESTS_SUBDIRS+= execve TESTS_SUBDIRS+= pipe .include .include Index: head/tests/sys/mqueue/Makefile =================================================================== --- head/tests/sys/mqueue/Makefile (revision 291737) +++ head/tests/sys/mqueue/Makefile (revision 291738) @@ -1,22 +1,21 @@ # $FreeBSD$ TESTSDIR= ${TESTSBASE}/sys/mqueue ATF_TESTS_SH= mqueue_test BINDIR= ${TESTSDIR} CFLAGS+= -I${SRCTOP}/tests PROGS+= mqtest1 PROGS+= mqtest2 #PROGS+= mqtest3 #PROGS+= mqtest4 PROGS+= mqtest5 -LDADD+= -lrt -DPADD+= ${LIBRT} +LIBADD+= rt WARNS?= 6 .include Index: head/tools/diag/dumpvfscache/Makefile =================================================================== --- head/tools/diag/dumpvfscache/Makefile (revision 291737) +++ head/tools/diag/dumpvfscache/Makefile (revision 291738) @@ -1,12 +1,11 @@ # $FreeBSD$ PROG= dumpvfscache -DPADD= ${LIBKVM} -LDADD= -lkvm +LIBADD= kvm MAN= test: ${PROG} ./${PROG} > a .include Index: head/tools/regression/gaithrstress/Makefile =================================================================== --- head/tools/regression/gaithrstress/Makefile (revision 291737) +++ head/tools/regression/gaithrstress/Makefile (revision 291738) @@ -1,8 +1,7 @@ # $FreeBSD$ PROG= gaithrstress -DPADD= ${LIBPTHREAD} -LDADD= -lpthread +LIBADD= pthread MAN= .include Index: head/tools/regression/geom/ConfCmp/Makefile =================================================================== --- head/tools/regression/geom/ConfCmp/Makefile (revision 291737) +++ head/tools/regression/geom/ConfCmp/Makefile (revision 291738) @@ -1,35 +1,34 @@ # $FreeBSD$ PROG= ConfCmp SRCS+= ConfCmp.c SRCS+= subr_sbuf.c .PATH: ../../../../sys/kern NO_OBJ= WARNS?= 5 CFLAGS+= -g -W -Wall -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith -static # Uncomment for ElectricFence #LDADD += -lefence -L/usr/local/lib -DPADD += ${LIBBSDXML} -LDADD += -lbsdxml +LIBADD= bsdxml MAN= CLEANFILES += _* .include test: ${PROG} rm -f _* *.core ./${PROG} a1.conf a1.conf ./${PROG} a1.conf a1a.conf if ./${PROG} a1.conf a1b.conf > /dev/null 2>&1 ; then exit 1 ; fi if ./${PROG} a1.conf a1c.conf > /dev/null 2>&1 ; then exit 1 ; fi if ./${PROG} a1.conf a1d.conf > /dev/null 2>&1 ; then exit 1 ; fi ./${PROG} a2.conf a2.conf ./${PROG} a2.conf a2a.conf if ./${PROG} a2.conf a2b.conf > /dev/null 2>&1 ; then exit 1 ; fi if ./${PROG} a2.conf a2c.conf > /dev/null 2>&1 ; then exit 1 ; fi if ./${PROG} a2.conf a2d.conf > /dev/null 2>&1 ; then exit 1 ; fi Index: head/tools/regression/geom/MdLoad/Makefile =================================================================== --- head/tools/regression/geom/MdLoad/Makefile (revision 291737) +++ head/tools/regression/geom/MdLoad/Makefile (revision 291738) @@ -1,14 +1,13 @@ # $FreeBSD$ PROG= MdLoad -DPADD= ${LIBSBUF} ${LIBBSDXML} -LDADD= -lsbuf -lbsdxml +LIBADD= sbuf bsdxml MAN= WARNS?= 4 .include "bsd.prog.mk" test: ${PROG} ./${PROG} md34 ../Data/disk.critter.ad0.xml Index: head/tools/regression/kgssapi/Makefile =================================================================== --- head/tools/regression/kgssapi/Makefile (revision 291737) +++ head/tools/regression/kgssapi/Makefile (revision 291738) @@ -1,10 +1,9 @@ # $FreeBSD$ PROG= gsstest MAN= WARNS?= 2 -DPADD= ${LIBGSSAPI} ${LIBGSSAPI_KRB5} -LDADD= -lgssapi -lgssapi_krb5 +LIBADD= gssapi gssapi_krb5 DEBUG_FLAGS= -g -O0 .include Index: head/tools/regression/lib/libc/resolv/Makefile =================================================================== --- head/tools/regression/lib/libc/resolv/Makefile (revision 291737) +++ head/tools/regression/lib/libc/resolv/Makefile (revision 291738) @@ -1,15 +1,14 @@ # $NetBSD: Makefile,v 1.1 2004/05/13 19:17:12 christos Exp $ # $FreeBSD$ PROG= resolv 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 .include Index: head/tools/regression/mac/mac_bsdextended/Makefile =================================================================== --- head/tools/regression/mac/mac_bsdextended/Makefile (revision 291737) +++ head/tools/regression/mac/mac_bsdextended/Makefile (revision 291738) @@ -1,8 +1,7 @@ # $FreeBSD$ PROG= test_ugidfw -DPADD= ${LIBUGIDFW} -LDADD= -lugidfw +LIBADD= ugidfw MAN= .include Index: head/tools/regression/posixsem/Makefile =================================================================== --- head/tools/regression/posixsem/Makefile (revision 291737) +++ head/tools/regression/posixsem/Makefile (revision 291738) @@ -1,11 +1,10 @@ # $FreeBSD$ PROG= posixsem SRCS= posixsem.c test.c -DPADD= ${LIBKVM} -LDADD= -lkvm +LIBADD= kvm MAN= WARNS?= 3 .include Index: head/tools/regression/priv/Makefile =================================================================== --- head/tools/regression/priv/Makefile (revision 291737) +++ head/tools/regression/priv/Makefile (revision 291738) @@ -1,58 +1,57 @@ # # $FreeBSD$ # .include PROG= priv SRCS= main.c \ priv_acct.c \ priv_adjtime.c \ priv_audit_control.c \ priv_audit_getaudit.c \ priv_audit_setaudit.c \ priv_audit_submit.c \ priv_clock_settime.c \ priv_cred.c \ priv_io.c \ priv_kenv_set.c \ priv_kenv_unset.c \ priv_msgbuf.c \ priv_netinet_ipsec.c \ priv_netinet_raw.c \ priv_proc_setlogin.c \ priv_proc_setrlimit.c \ priv_sched_rtprio.c \ priv_sched_setpriority.c \ priv_settimeofday.c \ priv_sysctl_write.c \ priv_vfs_chflags.c \ priv_vfs_chmod.c \ priv_vfs_chown.c \ priv_vfs_chroot.c \ priv_vfs_clearsugid.c \ priv_vfs_extattr_system.c \ priv_vfs_fhopen.c \ priv_vfs_fhstat.c \ priv_vfs_fhstatfs.c \ priv_vfs_generation.c \ priv_vfs_getfh.c \ priv_vfs_read_write.c \ priv_vfs_setgid.c \ priv_vfs_stickyfile.c \ priv_vfs_utimes.c \ priv_vm_madv_protect.c \ priv_vm_mlock.c \ priv_vm_munlock.c MAN= WARNS?= 3 -DPADD+= ${LIBIPSEC} -LDADD+= -lipsec +LIBADD+= ipsec .if ${MK_INET6_SUPPORT} != "no" CFLAGS+= -DINET6 .endif .include Index: head/tools/regression/pthread/cv_cancel1/Makefile =================================================================== --- head/tools/regression/pthread/cv_cancel1/Makefile (revision 291737) +++ head/tools/regression/pthread/cv_cancel1/Makefile (revision 291738) @@ -1,8 +1,7 @@ # $FreeBSD$ PROG= cv_cancel1 MAN= -DPADD= ${LIBPTHREAD} -LDADD= -lpthread +LIBADD= pthread .include Index: head/tools/regression/pthread/mutex_isowned_np/Makefile =================================================================== --- head/tools/regression/pthread/mutex_isowned_np/Makefile (revision 291737) +++ head/tools/regression/pthread/mutex_isowned_np/Makefile (revision 291738) @@ -1,8 +1,7 @@ # $FreeBSD$ PROG= mutex_isowned_np MAN= -DPADD= ${LIBPTHREAD} -LDADD= -lpthread +LIBADD= pthread .include Index: head/tools/regression/rpcsec_gss/Makefile =================================================================== --- head/tools/regression/rpcsec_gss/Makefile (revision 291737) +++ head/tools/regression/rpcsec_gss/Makefile (revision 291738) @@ -1,10 +1,9 @@ # $FreeBSD$ PROG= rpctest MAN= WARNS?= 6 -DPADD= ${LIBRPCSEC_GSS} -LDADD= -lrpcsec_gss +LIBADD= rpcsec_gss DEBUG_FLAGS= -g -O0 .include Index: head/tools/regression/sockets/sendfile/Makefile =================================================================== --- head/tools/regression/sockets/sendfile/Makefile (revision 291737) +++ head/tools/regression/sockets/sendfile/Makefile (revision 291738) @@ -1,11 +1,10 @@ # # $FreeBSD$ # PROG= sendfile MAN= WARNS?= 6 -DPADD= ${LIBMD} -LDADD= -lmd +LIBADD= md .include Index: head/tools/regression/tls/ttls2/Makefile =================================================================== --- head/tools/regression/tls/ttls2/Makefile (revision 291737) +++ head/tools/regression/tls/ttls2/Makefile (revision 291738) @@ -1,9 +1,8 @@ # $FreeBSD$ PROG= ttls2 -DPADD= ${LIBPTHREAD} -LDADD= -lpthread +LIBADD= pthread MAN= DEBUG_FLAGS= -g .include Index: head/tools/regression/tls/ttls4/Makefile =================================================================== --- head/tools/regression/tls/ttls4/Makefile (revision 291737) +++ head/tools/regression/tls/ttls4/Makefile (revision 291738) @@ -1,9 +1,8 @@ # $FreeBSD$ PROG= ttls4 -DPADD= ${LIBPTHREAD} -LDADD= -lpthread +LIBADD= pthread MAN= DEBUG_FLAGS= -g .include Index: head/tools/tools/ath/athratestats/Makefile =================================================================== --- head/tools/tools/ath/athratestats/Makefile (revision 291737) +++ head/tools/tools/ath/athratestats/Makefile (revision 291738) @@ -1,30 +1,30 @@ # $FreeBSD$ .PATH: ${.CURDIR}/../../../../sys/dev/ath/ath_hal .PATH: ${.CURDIR}/../../../../sys/dev/ath/ PROG= athratestats SRCS= main.c opt_ah.h ah_osdep.h -LDADD+= -lcurses +LIBADD+= curses CLEANFILES+= opt_ah.h ah_osdep.h .include <../Makefile.inc> CFLAGS+=-DATH_SUPPORT_ANI -g -ggdb CFLAGS+=-DATH_SUPPORT_TDMA opt_ah.h: echo "#define AH_DEBUG 1" > opt_ah.h echo "#define AH_DEBUG_COUNTRY 1" >> opt_ah.h echo "#define AH_SUPPORT_AR5416 1" >> opt_ah.h ah_osdep.h: echo 'typedef void *HAL_SOFTC;' >ah_osdep.h echo 'typedef int HAL_BUS_TAG;' >>ah_osdep.h echo 'typedef void *HAL_BUS_HANDLE;' >>ah_osdep.h echo 'typedef uint32_t *HAL_DMA_ADDR;' >>ah_osdep.h .include Index: head/tools/tools/atsectl/Makefile =================================================================== --- head/tools/tools/atsectl/Makefile (revision 291737) +++ head/tools/tools/atsectl/Makefile (revision 291738) @@ -1,12 +1,11 @@ # $FreeBSD$ PROG= atsectl -DPADD= ${LIBMD} -LDADD= -lmd +LIBADD= md BINDIR?= /usr/sbin MAN= .include Index: head/tools/tools/ether_reflect/Makefile =================================================================== --- head/tools/tools/ether_reflect/Makefile (revision 291737) +++ head/tools/tools/ether_reflect/Makefile (revision 291738) @@ -1,11 +1,10 @@ # # $FreeBSD$ # # A Makefile that builds both the ether_reflect program and its manual page. PROG= ether_reflect -DPADD= ${LIBPCAP} -LDADD= -lpcap +LIBADD= pcap CFLAGS+=-DHAVE_SNPRINTF .include Index: head/tools/tools/ifpifa/Makefile =================================================================== --- head/tools/tools/ifpifa/Makefile (revision 291737) +++ head/tools/tools/ifpifa/Makefile (revision 291738) @@ -1,10 +1,9 @@ # $FreeBSD$ PROG= ifpifa MAN= WARNS?=6 BINDIR?=/usr/local/bin -DPADD=${LIBKVM} -LDADD=-lkvm +LIBADD=kvm .include Index: head/tools/tools/mctest/Makefile =================================================================== --- head/tools/tools/mctest/Makefile (revision 291737) +++ head/tools/tools/mctest/Makefile (revision 291738) @@ -1,7 +1,6 @@ # $FreeBSD$ PROG_CXX= mctest -DPADD= ${LIBPTHREAD} -LDADD= -lpthread +LIBADD= pthread .include Index: head/tools/tools/ncpus/Makefile =================================================================== --- head/tools/tools/ncpus/Makefile (revision 291737) +++ head/tools/tools/ncpus/Makefile (revision 291738) @@ -1,15 +1,14 @@ # $FreeBSD$ PROG= ncpus MAN= SRCS= ncpus.c acpi.c .if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386" SRCS+= biosmptable.c .endif BINDIR= /usr/local/bin WARNS?= 6 -DPADD= ${LIBDEVINFO} -LDADD= -ldevinfo +LIBADD= devinfo .include Index: head/tools/tools/net80211/stumbler/Makefile =================================================================== --- head/tools/tools/net80211/stumbler/Makefile (revision 291737) +++ head/tools/tools/net80211/stumbler/Makefile (revision 291738) @@ -1,10 +1,9 @@ # $FreeBSD$ PROG= stumbler BINDIR= /usr/local/bin -DPADD= ${LIBPCAP} ${LIBNCURSESW} -LDADD= -lpcap -lncursesw +LIBADD= pcap ncursesw CFLAGS=-g MAN= .include Index: head/tools/tools/net80211/wesside/dics/Makefile =================================================================== --- head/tools/tools/net80211/wesside/dics/Makefile (revision 291737) +++ head/tools/tools/net80211/wesside/dics/Makefile (revision 291738) @@ -1,10 +1,9 @@ # $FreeBSD$ PROG= dics BINDIR= /usr/local/bin -DPADD= ${LIBZ} -LDADD= -lz +LIBADD= z CFLAGS=-g MAN= .include Index: head/tools/tools/net80211/wesside/udps/Makefile =================================================================== --- head/tools/tools/net80211/wesside/udps/Makefile (revision 291737) +++ head/tools/tools/net80211/wesside/udps/Makefile (revision 291738) @@ -1,10 +1,9 @@ # $FreeBSD$ PROG= udps BINDIR= /usr/local/bin -DPADD= ${LIBZ} -LDADD= -lz +LIBADD= z CFLAGS=-g MAN= .include Index: head/tools/tools/net80211/wesside/wesside/Makefile =================================================================== --- head/tools/tools/net80211/wesside/wesside/Makefile (revision 291737) +++ head/tools/tools/net80211/wesside/wesside/Makefile (revision 291738) @@ -1,11 +1,10 @@ # $FreeBSD$ PROG= wesside BINDIR= /usr/local/bin -DPADD= ${LIBZ} -LDADD= -lz +LIBADD= z CFLAGS=-g MAN= SRCS=wesside.c aircrack-ptw-lib.c .include Index: head/tools/tools/netrate/http/Makefile =================================================================== --- head/tools/tools/netrate/http/Makefile (revision 291737) +++ head/tools/tools/netrate/http/Makefile (revision 291738) @@ -1,9 +1,8 @@ # $FreeBSD$ PROG= http MAN= WARNS?= 3 -DPADD= ${LIBPTHREAD} -LDADD= -lpthread +LIBADD= pthread .include Index: head/tools/tools/netrate/httpd/Makefile =================================================================== --- head/tools/tools/netrate/httpd/Makefile (revision 291737) +++ head/tools/tools/netrate/httpd/Makefile (revision 291738) @@ -1,9 +1,8 @@ # $FreeBSD$ PROG= httpd MAN= WARNS?= 3 -DPADD= ${LIBPTHREAD} -LDADD= -lpthread +LIBADD= pthread .include Index: head/tools/tools/netrate/juggle/Makefile =================================================================== --- head/tools/tools/netrate/juggle/Makefile (revision 291737) +++ head/tools/tools/netrate/juggle/Makefile (revision 291738) @@ -1,9 +1,8 @@ # $FreeBSD$ PROG= juggle MAN= WARNS?= 3 -DPADD= ${LIBPTHREAD} -LDADD= -lpthread +LIBADD= pthread .include Index: head/tools/tools/tscdrift/Makefile =================================================================== --- head/tools/tools/tscdrift/Makefile (revision 291737) +++ head/tools/tools/tscdrift/Makefile (revision 291738) @@ -1,10 +1,9 @@ # $FreeBSD$ PROG= tscdrift MAN= WARNS?= 6 -LDADD= -lpthread -lm -DPADD= ${LIBPTHREAD} ${LIBM} +LIBADD= pthread m .include Index: head/tools/tools/umastat/Makefile =================================================================== --- head/tools/tools/umastat/Makefile (revision 291737) +++ head/tools/tools/umastat/Makefile (revision 291738) @@ -1,10 +1,9 @@ # $FreeBSD$ PROG= umastat MAN= WARNS?= 3 -DPADD= ${LIBKVM} -LDADD= -lkvm +LIBADD= kvm .include Index: head/tools/tools/usbtest/Makefile =================================================================== --- head/tools/tools/usbtest/Makefile (revision 291737) +++ head/tools/tools/usbtest/Makefile (revision 291738) @@ -1,43 +1,42 @@ # # $FreeBSD$ # # Copyright (c) 2013 Hans Petter Selasky. All rights reserved. # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions # are met: # 1. Redistributions of source code must retain the above copyright # notice, this list of conditions and the following disclaimer. # 2. Redistributions in binary form must reproduce the above copyright # notice, this list of conditions and the following disclaimer in the # documentation and/or other materials provided with the distribution. # # THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND # ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE # ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE # FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL # DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS # OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) # HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT # LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # PROG= usbtest MAN= BINDIR?= /usr/sbin SRCS+= usbtest.c SRCS+= usb_msc_test.c SRCS+= usb_modem_test.c SRCS+= usb_control_ep_test.c SYSDIR?= ${.CURDIR}/../../../sys -DPADD+= ${LIBUSB} -LDADD+= -lusb +LIBADD+= usb WARNS= 3 CFLAGS+= -I${SYSDIR}/dev/usb/gadget .include Index: head/tools/tools/vimage/Makefile =================================================================== --- head/tools/tools/vimage/Makefile (revision 291737) +++ head/tools/tools/vimage/Makefile (revision 291738) @@ -1,14 +1,13 @@ # $FreeBSD$ PROG= vimage -LDADD= -ljail -DPADD= ${LIBJAIL} +LIBADD= jail WARNS?= 2 CFLAGS+= -I../../../sys MAN= vimage.8 BINDIR?= /usr/sbin .include Index: head/tools/tools/zfsboottest/Makefile =================================================================== --- head/tools/tools/zfsboottest/Makefile (revision 291737) +++ head/tools/tools/zfsboottest/Makefile (revision 291738) @@ -1,29 +1,29 @@ # $FreeBSD$ .PATH: ${.CURDIR}/../../../sys/boot/zfs ${.CURDIR}/../../../sys/cddl/boot/zfs BINDIR?= /usr/bin SCRIPTSDIR?= /usr/bin PROG= zfsboottest SCRIPTS= zfsboottest.sh SCRIPTSNAME= zfsboottest.sh MAN= CFLAGS= -O1 \ -I${.CURDIR}/../../../sys/boot/zfs \ -I${.CURDIR}/../../../sys/cddl/boot/zfs \ -I. \ -fdiagnostics-show-option \ -W -Wextra -Wno-sign-compare -Wno-unused-parameter CFLAGS+=-m32 -LDADD+= -lmd +LIBADD+= md .if ${MACHINE_CPUARCH} == "amd64" beforedepend zfsboottest.o: machine CLEANFILES+= machine machine: ln -sf ${.CURDIR}/../../../sys/i386/include machine .endif .include Index: head/usr.bin/caesar/Makefile =================================================================== --- head/usr.bin/caesar/Makefile (revision 291737) +++ head/usr.bin/caesar/Makefile (revision 291738) @@ -1,11 +1,10 @@ # @(#)Makefile 8.1 (Berkeley) 5/31/93 # $FreeBSD$ PROG= caesar -DPADD= ${LIBM} -LDADD= -lm +LIBADD= m SCRIPTS=rot13.sh MAN= caesar.6 MLINKS= caesar.6 rot13.6 .include Index: head/usr.bin/clang/clang/Makefile =================================================================== --- head/usr.bin/clang/clang/Makefile (revision 291737) +++ head/usr.bin/clang/clang/Makefile (revision 291738) @@ -1,127 +1,126 @@ # $FreeBSD$ .include PROG_CXX=clang SRCDIR= tools/clang/tools/driver SRCS= cc1_main.cpp \ cc1as_main.cpp \ driver.cpp .if ${MK_SHARED_TOOLCHAIN} == "no" NO_SHARED?= yes .endif LINKS= ${BINDIR}/clang ${BINDIR}/clang++ \ ${BINDIR}/clang ${BINDIR}/clang-cpp MLINKS= clang.1 clang++.1 \ clang.1 clang-cpp.1 .if ${MK_CLANG_IS_CC} != "no" LINKS+= ${BINDIR}/clang ${BINDIR}/cc \ ${BINDIR}/clang ${BINDIR}/c++ \ ${BINDIR}/clang ${BINDIR}/CC \ ${BINDIR}/clang ${BINDIR}/cpp MLINKS+= clang.1 cc.1 \ clang.1 c++.1 \ clang.1 CC.1 \ clang.1 cpp.1 .endif TGHDRS= DiagnosticCommonKinds \ DiagnosticDriverKinds \ DiagnosticFrontendKinds \ DiagnosticLexKinds \ DiagnosticSemaKinds \ Options .if ${MK_CLANG_FULL} != "no" _clangstaticanalyzer= \ clangstaticanalyzerfrontend \ clangstaticanalyzercheckers \ clangstaticanalyzercore _clangarcmigrate= \ clangarcmigrate .endif # MK_CLANG_FULL LIBDEPS=clangfrontendtool \ clangfrontend \ clangdriver \ clangserialization \ clangcodegen \ clangparse \ clangsema \ clangrewritefrontend \ clangrewrite \ ${_clangstaticanalyzer} \ ${_clangarcmigrate} \ clanganalysis \ clangedit \ clangast \ clanglex \ clangbasic \ llvmoption \ llvmobjcarcopts \ llvmlinker \ llvmirreader \ llvmipo \ llvmvectorize \ llvmbitwriter \ llvmasmparser \ llvmaarch64codegen \ llvmaarch64asmparser \ llvmaarch64desc \ llvmaarch64info \ llvmaarch64instprinter \ llvmaarch64utils \ llvmarmdisassembler \ llvmarmcodegen \ llvmarmasmparser \ llvmarmdesc \ llvmarminfo \ llvmarminstprinter \ llvmmipscodegen \ llvmmipsasmparser \ llvmmipsdesc \ llvmmipsinfo \ llvmmipsinstprinter \ llvmpowerpcdisassembler \ llvmpowerpccodegen \ llvmpowerpcasmparser \ llvmpowerpcdesc \ llvmpowerpcinfo \ llvmpowerpcinstprinter \ llvmsparccodegen \ llvmsparcasmparser \ llvmsparcdesc \ llvmsparcinfo \ llvmsparcinstprinter \ llvmx86asmparser \ llvmx86codegen \ llvmselectiondag \ llvmasmprinter \ llvmcodegen \ llvmtarget \ llvmscalaropts \ llvmprofiledata \ llvminstcombine \ llvminstrumentation \ llvmtransformutils \ llvmipa \ llvmanalysis \ llvmx86desc \ llvmobject \ llvmmcparser \ llvmbitreader \ llvmmcdisassembler \ llvmx86info \ llvmx86instprinter \ llvmmc \ llvmx86utils \ llvmcore \ llvmsupport -.include "../clang.prog.mk" +LIBADD+= z -DPADD+= ${LIBZ} -LDADD+= -lz +.include "../clang.prog.mk" Index: head/usr.bin/clang/clang.prog.mk =================================================================== --- head/usr.bin/clang/clang.prog.mk (revision 291737) +++ head/usr.bin/clang/clang.prog.mk (revision 291738) @@ -1,25 +1,21 @@ # $FreeBSD$ LLVM_SRCS= ${.CURDIR}/../../../contrib/llvm .include "../../lib/clang/clang.build.mk" .for lib in ${LIBDEPS} DPADD+= ${.OBJDIR}/../../../lib/clang/lib${lib}/lib${lib}.a LDADD+= ${.OBJDIR}/../../../lib/clang/lib${lib}/lib${lib}.a .endfor -DPADD+= ${LIBNCURSESW} -LDADD+= -lncursesw - -DPADD+= ${LIBPTHREAD} -LDADD+= -lpthread +LIBADD+= ncursesw pthread BINDIR?= /usr/bin .if ${MK_SHARED_TOOLCHAIN} == "no" NO_SHARED= yes .endif .include Index: head/usr.bin/clang/llc/Makefile =================================================================== --- head/usr.bin/clang/llc/Makefile (revision 291737) +++ head/usr.bin/clang/llc/Makefile (revision 291738) @@ -1,74 +1,73 @@ # $FreeBSD$ .include PROG_CXX=llc SRCDIR= tools/llc SRCS= llc.cpp TGHDRS= Intrinsics LIBDEPS=llvmmirparser \ llvmirreader \ llvmasmparser \ llvmaarch64disassembler \ llvmaarch64codegen \ llvmaarch64asmparser \ llvmaarch64desc \ llvmaarch64info \ llvmaarch64instprinter \ llvmaarch64utils \ llvmarmdisassembler \ llvmarmcodegen \ llvmarmasmparser \ llvmarmdesc \ llvmarminfo \ llvmarminstprinter \ llvmmipsdisassembler \ llvmmipscodegen \ llvmmipsasmparser \ llvmmipsdesc \ llvmmipsinfo \ llvmmipsinstprinter \ llvmpowerpcdisassembler \ llvmpowerpccodegen \ llvmpowerpcasmparser \ llvmpowerpcdesc \ llvmpowerpcinfo \ llvmpowerpcinstprinter \ llvmsparcdisassembler \ llvmsparccodegen \ llvmsparcasmparser \ llvmsparcdesc \ llvmsparcinfo \ llvmsparcinstprinter \ llvmx86disassembler \ llvmx86asmparser \ llvmx86codegen \ llvmselectiondag \ llvmasmprinter \ llvmcodegen \ llvmtarget \ llvmscalaropts \ llvmprofiledata \ llvminstcombine \ llvminstrumentation \ llvmtransformutils \ llvmipa \ llvmanalysis \ llvmx86desc \ llvmobject \ llvmmcparser \ llvmbitreader \ llvmmcdisassembler \ llvmx86info \ llvmx86instprinter \ llvmmc \ llvmx86utils \ llvmcore \ llvmsupport -.include "../clang.prog.mk" +LIBADD+= z -DPADD+= ${LIBZ} -LDADD+= -lz +.include "../clang.prog.mk" Index: head/usr.bin/clang/lli/Makefile =================================================================== --- head/usr.bin/clang/lli/Makefile (revision 291737) +++ head/usr.bin/clang/lli/Makefile (revision 291738) @@ -1,50 +1,49 @@ # $FreeBSD$ .include PROG_CXX=lli SRCDIR= tools/lli SRCS= OrcLazyJIT.cpp \ RemoteMemoryManager.cpp \ RemoteTarget.cpp \ RemoteTargetExternal.cpp \ lli.cpp LIBDEPS=llvmx86disassembler \ llvmx86asmparser \ llvmirreader \ llvmasmparser \ llvmx86codegen \ llvmx86desc \ llvmx86info \ llvmmcdisassembler \ llvmx86instprinter \ llvmx86utils \ llvmselectiondag \ llvmasmprinter \ llvminterpreter \ llvmcodegen \ llvmscalaropts \ llvmprofiledata \ llvminstcombine \ llvminstrumentation \ llvmorcjit \ llvmtransformutils \ llvmipa \ llvmmcjit \ llvmexecutionengine \ llvmtarget \ llvmanalysis \ llvmruntimedyld \ llvmobject \ llvmmcparser \ llvmbitreader \ llvmmc \ llvmcore \ llvmsupport -.include "../clang.prog.mk" +LIBADD= z -DPADD+= ${LIBZ} -LDADD+= -lz +.include "../clang.prog.mk" Index: head/usr.bin/clang/llvm-ar/Makefile =================================================================== --- head/usr.bin/clang/llvm-ar/Makefile (revision 291737) +++ head/usr.bin/clang/llvm-ar/Makefile (revision 291738) @@ -1,72 +1,71 @@ # $FreeBSD$ .include PROG_CXX=llvm-ar SRCDIR= tools/llvm-ar SRCS= llvm-ar.cpp LIBDEPS=llvmlibdriver \ llvmoption \ llvmaarch64disassembler \ llvmaarch64codegen \ llvmaarch64asmparser \ llvmaarch64desc \ llvmaarch64info \ llvmaarch64instprinter \ llvmaarch64utils \ llvmarmdisassembler \ llvmarmcodegen \ llvmarmasmparser \ llvmarmdesc \ llvmarminfo \ llvmarminstprinter \ llvmmipsdisassembler \ llvmmipscodegen \ llvmmipsasmparser \ llvmmipsdesc \ llvmmipsinfo \ llvmmipsinstprinter \ llvmpowerpcdisassembler \ llvmpowerpccodegen \ llvmpowerpcasmparser \ llvmpowerpcdesc \ llvmpowerpcinfo \ llvmpowerpcinstprinter \ llvmsparcdisassembler \ llvmsparccodegen \ llvmsparcasmparser \ llvmsparcdesc \ llvmsparcinfo \ llvmsparcinstprinter \ llvmx86disassembler \ llvmx86asmparser \ llvmx86codegen \ llvmselectiondag \ llvmasmprinter \ llvmcodegen \ llvmtarget \ llvmscalaropts \ llvmprofiledata \ llvminstcombine \ llvminstrumentation \ llvmtransformutils \ llvmipa \ llvmanalysis \ llvmx86desc \ llvmobject \ llvmmcparser \ llvmbitreader \ llvmmcdisassembler \ llvmx86info \ llvmx86instprinter \ llvmmc \ llvmx86utils \ llvmcore \ llvmsupport -.include "../clang.prog.mk" +LIBADD= z -DPADD+= ${LIBZ} -LDADD+= -lz +.include "../clang.prog.mk" Index: head/usr.bin/clang/llvm-cxxdump/Makefile =================================================================== --- head/usr.bin/clang/llvm-cxxdump/Makefile (revision 291737) +++ head/usr.bin/clang/llvm-cxxdump/Makefile (revision 291738) @@ -1,72 +1,71 @@ # $FreeBSD$ MAN= .include PROG_CXX=llvm-cxxdump SRCDIR= tools/llvm-cxxdump SRCS= Error.cpp \ llvm-cxxdump.cpp LIBDEPS=llvmaarch64disassembler \ llvmaarch64codegen \ llvmaarch64asmparser \ llvmaarch64desc \ llvmaarch64info \ llvmaarch64instprinter \ llvmaarch64utils \ llvmarmdisassembler \ llvmarmcodegen \ llvmarmasmparser \ llvmarmdesc \ llvmarminfo \ llvmarminstprinter \ llvmmipsdisassembler \ llvmmipscodegen \ llvmmipsasmparser \ llvmmipsdesc \ llvmmipsinfo \ llvmmipsinstprinter \ llvmpowerpcdisassembler \ llvmpowerpccodegen \ llvmpowerpcasmparser \ llvmpowerpcdesc \ llvmpowerpcinfo \ llvmpowerpcinstprinter \ llvmsparcdisassembler \ llvmsparccodegen \ llvmsparcasmparser \ llvmsparcdesc \ llvmsparcinfo \ llvmsparcinstprinter \ llvmx86disassembler \ llvmx86asmparser \ llvmx86codegen \ llvmselectiondag \ llvmasmprinter \ llvmcodegen \ llvmtarget \ llvmscalaropts \ llvmprofiledata \ llvminstcombine \ llvminstrumentation \ llvmtransformutils \ llvmipa \ llvmanalysis \ llvmx86desc \ llvmmcdisassembler \ llvmx86info \ llvmx86instprinter \ llvmx86utils \ llvmobject \ llvmmcparser \ llvmmc \ llvmbitreader \ llvmcore \ llvmsupport -.include "../clang.prog.mk" +LIBADD= z -DPADD+= ${LIBZ} -LDADD+= -lz +.include "../clang.prog.mk" Index: head/usr.bin/clang/llvm-dwarfdump/Makefile =================================================================== --- head/usr.bin/clang/llvm-dwarfdump/Makefile (revision 291737) +++ head/usr.bin/clang/llvm-dwarfdump/Makefile (revision 291738) @@ -1,21 +1,20 @@ # $FreeBSD$ .include PROG_CXX=llvm-dwarfdump SRCDIR= tools/llvm-dwarfdump SRCS= llvm-dwarfdump.cpp LIBDEPS=llvmdebuginfodwarf \ llvmobject \ llvmmcparser \ llvmmc \ llvmbitreader \ llvmcore \ llvmsupport -.include "../clang.prog.mk" +LIBADD= z -DPADD+= ${LIBZ} -LDADD+= -lz +.include "../clang.prog.mk" Index: head/usr.bin/clang/llvm-lto/Makefile =================================================================== --- head/usr.bin/clang/llvm-lto/Makefile (revision 291737) +++ head/usr.bin/clang/llvm-lto/Makefile (revision 291738) @@ -1,78 +1,77 @@ # $FreeBSD$ MAN= .include PROG_CXX=llvm-lto SRCDIR= tools/llvm-lto SRCS= llvm-lto.cpp TGHDRS= Intrinsics LIBDEPS=llvmaarch64disassembler \ llvmaarch64codegen \ llvmaarch64asmparser \ llvmaarch64desc \ llvmaarch64info \ llvmaarch64instprinter \ llvmaarch64utils \ llvmarmdisassembler \ llvmarmcodegen \ llvmarmasmparser \ llvmarmdesc \ llvmarminfo \ llvmarminstprinter \ llvmmipsdisassembler \ llvmmipscodegen \ llvmmipsasmparser \ llvmmipsdesc \ llvmmipsinfo \ llvmmipsinstprinter \ llvmpowerpcdisassembler \ llvmpowerpccodegen \ llvmpowerpcasmparser \ llvmpowerpcdesc \ llvmpowerpcinfo \ llvmpowerpcinstprinter \ llvmsparcdisassembler \ llvmsparccodegen \ llvmsparcasmparser \ llvmsparcdesc \ llvmsparcinfo \ llvmsparcinstprinter \ llvmx86disassembler \ llvmx86asmparser \ llvmx86codegen \ llvmselectiondag \ llvmasmprinter \ llvmx86desc \ llvmx86info \ llvmx86instprinter \ llvmx86utils \ llvmmcdisassembler \ llvmlto \ llvmobjcarcopts \ llvmlinker \ llvmipo \ llvmvectorize \ llvmcodegen \ llvmtarget \ llvmscalaropts \ llvmprofiledata \ llvmobject \ llvmmcparser \ llvminstcombine \ llvminstrumentation \ llvmtransformutils \ llvmipa \ llvmmc \ llvmbitwriter \ llvmbitreader \ llvmanalysis \ llvmcore \ llvmsupport -.include "../clang.prog.mk" +LIBADD= z -DPADD+= ${LIBZ} -LDADD+= -lz +.include "../clang.prog.mk" Index: head/usr.bin/clang/llvm-mc/Makefile =================================================================== --- head/usr.bin/clang/llvm-mc/Makefile (revision 291737) +++ head/usr.bin/clang/llvm-mc/Makefile (revision 291738) @@ -1,72 +1,71 @@ # $FreeBSD$ MAN= .include PROG_CXX=llvm-mc SRCDIR= tools/llvm-mc SRCS= Disassembler.cpp \ llvm-mc.cpp LIBDEPS=llvmaarch64disassembler \ llvmaarch64codegen \ llvmaarch64asmparser \ llvmaarch64desc \ llvmaarch64info \ llvmaarch64instprinter \ llvmaarch64utils \ llvmarmdisassembler \ llvmarmcodegen \ llvmarmasmparser \ llvmarmdesc \ llvmarminfo \ llvmarminstprinter \ llvmmipsdisassembler \ llvmmipscodegen \ llvmmipsasmparser \ llvmmipsdesc \ llvmmipsinfo \ llvmmipsinstprinter \ llvmpowerpcdisassembler \ llvmpowerpccodegen \ llvmpowerpcasmparser \ llvmpowerpcdesc \ llvmpowerpcinfo \ llvmpowerpcinstprinter \ llvmsparcdisassembler \ llvmsparccodegen \ llvmsparcasmparser \ llvmsparcdesc \ llvmsparcinfo \ llvmsparcinstprinter \ llvmx86disassembler \ llvmx86asmparser \ llvmx86codegen \ llvmselectiondag \ llvmasmprinter \ llvmcodegen \ llvmtarget \ llvmscalaropts \ llvmprofiledata \ llvminstcombine \ llvminstrumentation \ llvmtransformutils \ llvmipa \ llvmanalysis \ llvmx86desc \ llvmobject \ llvmmcparser \ llvmbitreader \ llvmmcdisassembler \ llvmx86info \ llvmx86instprinter \ llvmmc \ llvmx86utils \ llvmcore \ llvmsupport -.include "../clang.prog.mk" +LIBADD= z -DPADD+= ${LIBZ} -LDADD+= -lz +.include "../clang.prog.mk" Index: head/usr.bin/clang/llvm-nm/Makefile =================================================================== --- head/usr.bin/clang/llvm-nm/Makefile (revision 291737) +++ head/usr.bin/clang/llvm-nm/Makefile (revision 291738) @@ -1,70 +1,69 @@ # $FreeBSD$ .include PROG_CXX=llvm-nm SRCDIR= tools/llvm-nm SRCS= llvm-nm.cpp LIBDEPS=llvmaarch64disassembler \ llvmaarch64codegen \ llvmaarch64asmparser \ llvmaarch64desc \ llvmaarch64info \ llvmaarch64instprinter \ llvmaarch64utils \ llvmarmdisassembler \ llvmarmcodegen \ llvmarmasmparser \ llvmarmdesc \ llvmarminfo \ llvmarminstprinter \ llvmmipsdisassembler \ llvmmipscodegen \ llvmmipsasmparser \ llvmmipsdesc \ llvmmipsinfo \ llvmmipsinstprinter \ llvmpowerpcdisassembler \ llvmpowerpccodegen \ llvmpowerpcasmparser \ llvmpowerpcdesc \ llvmpowerpcinfo \ llvmpowerpcinstprinter \ llvmsparcdisassembler \ llvmsparccodegen \ llvmsparcasmparser \ llvmsparcdesc \ llvmsparcinfo \ llvmsparcinstprinter \ llvmx86disassembler \ llvmx86asmparser \ llvmx86codegen \ llvmselectiondag \ llvmasmprinter \ llvmcodegen \ llvmtarget \ llvmscalaropts \ llvmprofiledata \ llvminstcombine \ llvminstrumentation \ llvmtransformutils \ llvmipa \ llvmanalysis \ llvmx86desc \ llvmobject \ llvmmcparser \ llvmbitreader \ llvmmcdisassembler \ llvmx86info \ llvmx86instprinter \ llvmmc \ llvmx86utils \ llvmcore \ llvmsupport -.include "../clang.prog.mk" +LIBADD= z -DPADD+= ${LIBZ} -LDADD+= -lz +.include "../clang.prog.mk" Index: head/usr.bin/clang/llvm-objdump/Makefile =================================================================== --- head/usr.bin/clang/llvm-objdump/Makefile (revision 291737) +++ head/usr.bin/clang/llvm-objdump/Makefile (revision 291738) @@ -1,75 +1,74 @@ # $FreeBSD$ MAN= .include PROG_CXX=llvm-objdump SRCDIR= tools/llvm-objdump SRCS= llvm-objdump.cpp \ COFFDump.cpp \ ELFDump.cpp \ MachODump.cpp LIBDEPS=llvmdebuginfodwarf \ llvmaarch64disassembler \ llvmaarch64codegen \ llvmaarch64asmparser \ llvmaarch64desc \ llvmaarch64info \ llvmaarch64instprinter \ llvmaarch64utils \ llvmarmdisassembler \ llvmarmcodegen \ llvmarmasmparser \ llvmarmdesc \ llvmarminfo \ llvmarminstprinter \ llvmmipsdisassembler \ llvmmipscodegen \ llvmmipsasmparser \ llvmmipsdesc \ llvmmipsinfo \ llvmmipsinstprinter \ llvmpowerpcdisassembler \ llvmpowerpccodegen \ llvmpowerpcasmparser \ llvmpowerpcdesc \ llvmpowerpcinfo \ llvmpowerpcinstprinter \ llvmsparcdisassembler \ llvmsparccodegen \ llvmsparcasmparser \ llvmsparcdesc \ llvmsparcinfo \ llvmsparcinstprinter \ llvmx86disassembler \ llvmx86asmparser \ llvmx86codegen \ llvmselectiondag \ llvmasmprinter \ llvmcodegen \ llvmtarget \ llvmscalaropts \ llvmprofiledata \ llvminstcombine \ llvminstrumentation \ llvmtransformutils \ llvmipa \ llvmanalysis \ llvmx86desc \ llvmobject \ llvmmcparser \ llvmbitreader \ llvmmcdisassembler \ llvmx86info \ llvmx86instprinter \ llvmmc \ llvmx86utils \ llvmcore \ llvmsupport -.include "../clang.prog.mk" +LIBADD= z -DPADD+= ${LIBZ} -LDADD+= -lz +.include "../clang.prog.mk" Index: head/usr.bin/clang/llvm-pdbdump/Makefile =================================================================== --- head/usr.bin/clang/llvm-pdbdump/Makefile (revision 291737) +++ head/usr.bin/clang/llvm-pdbdump/Makefile (revision 291738) @@ -1,32 +1,31 @@ # $FreeBSD$ MAN= .include PROG_CXX=llvm-pdbdump SRCDIR= tools/llvm-pdbdump SRCS= BuiltinDumper.cpp \ ClassDefinitionDumper.cpp \ CompilandDumper.cpp \ EnumDumper.cpp \ ExternalSymbolDumper.cpp \ FunctionDumper.cpp \ LinePrinter.cpp \ TypeDumper.cpp \ TypedefDumper.cpp \ VariableDumper.cpp \ llvm-pdbdump.cpp LIBDEPS=llvmdebuginfopdb \ llvmobject \ llvmmcparser \ llvmmc \ llvmbitreader \ llvmcore \ llvmsupport -.include "../clang.prog.mk" +LIBADD= z -DPADD+= ${LIBZ} -LDADD+= -lz +.include "../clang.prog.mk" Index: head/usr.bin/clang/llvm-rtdyld/Makefile =================================================================== --- head/usr.bin/clang/llvm-rtdyld/Makefile (revision 291737) +++ head/usr.bin/clang/llvm-rtdyld/Makefile (revision 291738) @@ -1,75 +1,74 @@ # $FreeBSD$ MAN= .include PROG_CXX=llvm-rtdyld SRCDIR= tools/llvm-rtdyld SRCS= llvm-rtdyld.cpp LIBDEPS=llvmdebuginfodwarf \ llvmmcjit \ llvmexecutionengine \ llvmruntimedyld \ llvmaarch64disassembler \ llvmaarch64codegen \ llvmaarch64asmparser \ llvmaarch64desc \ llvmaarch64info \ llvmaarch64instprinter \ llvmaarch64utils \ llvmarmdisassembler \ llvmarmcodegen \ llvmarmasmparser \ llvmarmdesc \ llvmarminfo \ llvmarminstprinter \ llvmmipsdisassembler \ llvmmipscodegen \ llvmmipsasmparser \ llvmmipsdesc \ llvmmipsinfo \ llvmmipsinstprinter \ llvmpowerpcdisassembler \ llvmpowerpccodegen \ llvmpowerpcasmparser \ llvmpowerpcdesc \ llvmpowerpcinfo \ llvmpowerpcinstprinter \ llvmsparcdisassembler \ llvmsparccodegen \ llvmsparcasmparser \ llvmsparcdesc \ llvmsparcinfo \ llvmsparcinstprinter \ llvmx86disassembler \ llvmx86asmparser \ llvmx86codegen \ llvmselectiondag \ llvmasmprinter \ llvmcodegen \ llvmtarget \ llvmscalaropts \ llvmprofiledata \ llvminstcombine \ llvminstrumentation \ llvmtransformutils \ llvmipa \ llvmanalysis \ llvmx86desc \ llvmobject \ llvmmcparser \ llvmbitreader \ llvmmcdisassembler \ llvmx86info \ llvmx86instprinter \ llvmmc \ llvmx86utils \ llvmcore \ llvmsupport -.include "../clang.prog.mk" +LIBADD= z -DPADD+= ${LIBZ} -LDADD+= -lz +.include "../clang.prog.mk" Index: head/usr.bin/clang/llvm-symbolizer/Makefile =================================================================== --- head/usr.bin/clang/llvm-symbolizer/Makefile (revision 291737) +++ head/usr.bin/clang/llvm-symbolizer/Makefile (revision 291738) @@ -1,23 +1,22 @@ # $FreeBSD$ .include PROG_CXX=llvm-symbolizer SRCDIR= tools/llvm-symbolizer SRCS= llvm-symbolizer.cpp \ LLVMSymbolize.cpp LIBDEPS=llvmdebuginfopdb \ llvmdebuginfodwarf \ llvmobject \ llvmmcparser \ llvmmc \ llvmbitreader \ llvmcore \ llvmsupport -.include "../clang.prog.mk" +LIBADD= z -DPADD+= ${LIBZ} -LDADD+= -lz +.include "../clang.prog.mk" Index: head/usr.bin/clang/opt/Makefile =================================================================== --- head/usr.bin/clang/opt/Makefile (revision 291737) +++ head/usr.bin/clang/opt/Makefile (revision 291738) @@ -1,84 +1,83 @@ # $FreeBSD$ .include PROG_CXX=opt SRCDIR= tools/opt SRCS= AnalysisWrappers.cpp \ BreakpointPrinter.cpp \ GraphPrinters.cpp \ NewPMDriver.cpp \ PassPrinters.cpp \ PrintSCC.cpp \ opt.cpp TGHDRS= Intrinsics LIBDEPS=llvmpasses \ llvmaarch64disassembler \ llvmaarch64codegen \ llvmaarch64asmparser \ llvmaarch64desc \ llvmaarch64info \ llvmaarch64instprinter \ llvmaarch64utils \ llvmarmdisassembler \ llvmarmcodegen \ llvmarmasmparser \ llvmarmdesc \ llvmarminfo \ llvmarminstprinter \ llvmmipsdisassembler \ llvmmipscodegen \ llvmmipsasmparser \ llvmmipsdesc \ llvmmipsinfo \ llvmmipsinstprinter \ llvmpowerpcdisassembler \ llvmpowerpccodegen \ llvmpowerpcasmparser \ llvmpowerpcdesc \ llvmpowerpcinfo \ llvmpowerpcinstprinter \ llvmsparcdisassembler \ llvmsparccodegen \ llvmsparcasmparser \ llvmsparcdesc \ llvmsparcinfo \ llvmsparcinstprinter \ llvmx86disassembler \ llvmx86asmparser \ llvmx86codegen \ llvmselectiondag \ llvmasmprinter \ llvmcodegen \ llvmtarget \ llvmx86desc \ llvmmcdisassembler \ llvmx86info \ llvmx86instprinter \ llvmx86utils \ llvmipo \ llvmvectorize \ llvmobjcarcopts \ llvmscalaropts \ llvmprofiledata \ llvmobject \ llvmmcparser \ llvminstcombine \ llvminstrumentation \ llvmtransformutils \ llvmipa \ llvmmc \ llvmanalysis \ llvmirreader \ llvmasmparser \ llvmbitwriter \ llvmbitreader \ llvmcore \ llvmsupport -.include "../clang.prog.mk" +LIBADD= z -DPADD+= ${LIBZ} -LDADD+= -lz +.include "../clang.prog.mk" Index: head/usr.bin/factor/Makefile =================================================================== --- head/usr.bin/factor/Makefile (revision 291737) +++ head/usr.bin/factor/Makefile (revision 291738) @@ -1,20 +1,19 @@ # @(#)Makefile 8.1 (Berkeley) 5/31/93 # $FreeBSD$ .include PROG= factor SRCS= factor.c pr_tbl.c CFLAGS+=-I${.CURDIR}/../primes .if ${MK_OPENSSL} != "no" CFLAGS+=-DHAVE_OPENSSL -DPADD= ${LIBCRYPTO} -LDADD= -lcrypto +LIBADD+=crypto .endif MAN= factor.6 MLINKS+=factor.6 primes.6 .PATH: ${.CURDIR}/../primes .include Index: head/usr.bin/grdc/Makefile =================================================================== --- head/usr.bin/grdc/Makefile (revision 291737) +++ head/usr.bin/grdc/Makefile (revision 291738) @@ -1,8 +1,8 @@ # $FreeBSD$ PROG= grdc MAN= grdc.6 DPADD= ${LIBNCURSESW} -LDADD= -lncursesw +LIBADD= ncursesw .include Index: head/usr.bin/pom/Makefile =================================================================== --- head/usr.bin/pom/Makefile (revision 291737) +++ head/usr.bin/pom/Makefile (revision 291738) @@ -1,9 +1,8 @@ # @(#)Makefile 8.1 (Berkeley) 5/31/93 # $FreeBSD$ PROG= pom MAN= pom.6 -DPADD= ${LIBM} -LDADD= -lm +LIBADD= m .include Index: head/usr.bin/primes/Makefile =================================================================== --- head/usr.bin/primes/Makefile (revision 291737) +++ head/usr.bin/primes/Makefile (revision 291738) @@ -1,10 +1,9 @@ # @(#)Makefile 8.1 (Berkeley) 5/31/93 # $FreeBSD$ PROG= primes SRCS= pattern.c pr_tbl.c primes.c spsp.c MAN= -DPADD= ${LIBM} -LDADD= -lm +LIBADD= m .include Index: head/usr.sbin/fstyp/Makefile =================================================================== --- head/usr.sbin/fstyp/Makefile (revision 291737) +++ head/usr.sbin/fstyp/Makefile (revision 291738) @@ -1,46 +1,45 @@ # $FreeBSD$ .include PROG= fstyp SRCS= cd9660.c ext2fs.c fstyp.c geli.c msdosfs.c ntfs.c ufs.c .if ${MK_ZFS} != "no" SRCS += zfs.c .endif MAN= fstyp.8 WARNS?= 2 .include .if ${MK_TESTS} != "no" SUBDIR+= tests .endif .if ${MK_ZFS} != "no" IGNORE_PRAGMA= YES CFLAGS+= -DNEED_SOLARIS_BOOLEAN -DHAVE_ZFS CFLAGS+= -I${.CURDIR}/../../sys/cddl/compat/opensolaris CFLAGS+= -I${.CURDIR}/../../cddl/compat/opensolaris/include CFLAGS+= -I${.CURDIR}/../../cddl/compat/opensolaris/lib/libumem CFLAGS+= -I${.CURDIR}/../../cddl/contrib/opensolaris/lib/libnvpair CFLAGS+= -I${.CURDIR}/../../cddl/contrib/opensolaris/lib/libzpool/common CFLAGS+= -I${.CURDIR}/../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs CFLAGS+= -I${.CURDIR}/../../sys/cddl/contrib/opensolaris/uts/common CFLAGS+= -I${.CURDIR}/../../sys/cddl/contrib/opensolaris/uts/common/sys CFLAGS+= -I${.CURDIR}/../../cddl/contrib/opensolaris/head .endif CFLAGS+=-I${.CURDIR}/../../sys LIBADD= geom md .if ${MK_ZFS} != "no" -DPADD += ${LIBNVPAIR} ${LIBZFS} -LDADD += -lnvpair -lzfs +LIBADD+=nvpair zfs .endif .include