d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix LDADD/DPADD that should be LIBADD.

Browse Source 
Sponsored by:	EMC / Isilon Storage Division
This commit is contained in:
Bryan Drewery 2015-12-04 03:17:47 +00:00
parent 2fd6394d34
commit eacae6dc66
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=291738
112 changed files with 183 additions and 289 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cddl/lib/libctf/Makefile
View File

@ -28,8 +28,6 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris \
-I${OPENSOLARIS_USR_DISTDIR}/lib/libctf/common \
-I${OPENSOLARIS_SYS_DISTDIR}/uts/common
DPADD= ${LIBZ}
LDADD= -lz
LIBADD+= z
.include <bsd.lib.mk>

8
cddl/lib/libzfs/Makefile
View File

@ -6,13 +6,7 @@
.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs/common
LIB= zfs
DPADD= ${LIBMD} ${LIBPTHREAD} ${LIBUMEM} ${LIBUTIL} ${LIBM} ${LIBNVPAIR} \
${LIBAVL} ${LIBZFS_CORE} ${LIBUUTIL} ${LIBBSDXML} ${LIBGEOM} \
${LIBNVPAIR} ${LIBZ}
LDADD= -lmd -lpthread -lumem -lutil -luutil -lm -lnvpair -lavl \
-lbsdxml -lgeom -lnvpair -lz -lzfs_core
LIBADD= md pthread umem util uutil m avl bsdxml geom nvpair z zfs_core
SRCS= deviceid.c \
fsshare.c \
mkdirp.c \

3
cddl/lib/libzfs_core/Makefile
View File

@ -7,8 +7,7 @@
.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs/common
LIB= zfs_core
DPADD= ${LIBNVPAIR}
LDADD= -lnvpair
LIBADD= nvpair
SRCS= libzfs_core.c \
libzfs_core_compat.c \

4
cddl/lib/libzpool/Makefile
View File

@ -56,9 +56,7 @@ 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

4
cddl/sbin/zfs/Makefile
View File

@ -22,8 +22,6 @@ 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 <bsd.prog.mk>

4
cddl/sbin/zpool/Makefile
View File

@ -27,8 +27,6 @@ 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 <bsd.prog.mk>

4
cddl/usr.bin/zinject/Makefile
View File

@ -21,8 +21,6 @@ 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 <bsd.prog.mk>

4
cddl/usr.bin/zstreamdump/Makefile
View File

@ -18,9 +18,7 @@ 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

5
cddl/usr.bin/ztest/Makefile
View File

@ -18,10 +18,7 @@ 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

3
cddl/usr.sbin/dtrace/tests/common/proc/Makefile
View File

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

3
cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh
View File

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

4
cddl/usr.sbin/zdb/Makefile
View File

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

4
cddl/usr.sbin/zhack/Makefile
View File

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

3
contrib/ofed/usr.bin/osmtest/Makefile
View File

@ -22,7 +22,8 @@ LDADD= -libcommon \
-losmvendor \
-losmcomp \
-lopensm \
-lpthread
LIBADD+= pthread
CFLAGS= -DVENDOR_RMPP_SUPPORT -DDUAL_SIDED_RMPP \
-I${OPENSM}/osmtest/include

6
gnu/usr.bin/gdb/kgdb/Makefile
View File

@ -8,8 +8,8 @@ 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 <bsd.prog.mk>

5
gnu/usr.bin/groff/src/devices/grodvi/Makefile
View File

@ -2,8 +2,9 @@
PROG_CXX= grodvi
SRCS= dvi.cpp
DPADD= ${LIBDRIVER} ${LIBGROFF} ${LIBM}
LDADD= ${LIBDRIVER} ${LIBGROFF} -lm
DPADD= ${LIBDRIVER} ${LIBGROFF}
LDADD= ${LIBDRIVER} ${LIBGROFF}
LIBADD= m
CLEANFILES= ${MAN}
.include <bsd.prog.mk>

5
gnu/usr.bin/groff/src/devices/grohtml/Makefile
View File

@ -2,8 +2,9 @@
PROG_CXX= post-grohtml
SRCS= post-html.cpp html-table.cpp html-text.cpp output.cpp
DPADD= ${LIBDRIVER} ${LIBGROFF} ${LIBM}
LDADD= ${LIBDRIVER} ${LIBGROFF} -lm
DPADD= ${LIBDRIVER} ${LIBGROFF}
LDADD= ${LIBDRIVER} ${LIBGROFF}
LIBADD= m
MAN=
.include <bsd.prog.mk>

5
gnu/usr.bin/groff/src/devices/grolbp/Makefile
View File

@ -2,8 +2,9 @@
PROG_CXX= grolbp
SRCS= lbp.cpp
DPADD= ${LIBDRIVER} ${LIBGROFF} ${LIBM}
LDADD= ${LIBDRIVER} ${LIBGROFF} -lm
DPADD= ${LIBDRIVER} ${LIBGROFF}
LDADD= ${LIBDRIVER} ${LIBGROFF}
LIBADD= m
CLEANFILES= ${MAN}
.include <bsd.prog.mk>

5
gnu/usr.bin/groff/src/devices/grolj4/Makefile
View File

@ -3,8 +3,9 @@
PROG_CXX= grolj4
MAN= grolj4.1 lj4_font.5
SRCS= lj4.cpp
DPADD= ${LIBDRIVER} ${LIBGROFF} ${LIBM}
LDADD= ${LIBDRIVER} ${LIBGROFF} -lm
DPADD= ${LIBDRIVER} ${LIBGROFF}
LDADD= ${LIBDRIVER} ${LIBGROFF}
LIBADD= m
CLEANFILES= ${MAN}
.include <bsd.prog.mk>

5
gnu/usr.bin/groff/src/devices/grops/Makefile
View File

@ -2,8 +2,9 @@
PROG_CXX= grops
SRCS= ps.cpp psrm.cpp
DPADD= ${LIBDRIVER} ${LIBGROFF} ${LIBM}
LDADD= ${LIBDRIVER} ${LIBGROFF} -lm
DPADD= ${LIBDRIVER} ${LIBGROFF}
LDADD= ${LIBDRIVER} ${LIBGROFF}
LIBADD= m
CLEANFILES= ${MAN}
.include <bsd.prog.mk>

5
gnu/usr.bin/groff/src/devices/grotty/Makefile
View File

@ -2,8 +2,9 @@
PROG_CXX= grotty
SRCS= tty.cpp
DPADD= ${LIBDRIVER} ${LIBGROFF} ${LIBM}
LDADD= ${LIBDRIVER} ${LIBGROFF} -lm
DPADD= ${LIBDRIVER} ${LIBGROFF}
LDADD= ${LIBDRIVER} ${LIBGROFF}
LIBADD= m
CLEANFILES= ${MAN}
.include <bsd.prog.mk>

5
gnu/usr.bin/groff/src/preproc/grn/Makefile
View File

@ -2,8 +2,9 @@
PROG_CXX= grn
SRCS= hdb.cpp hpoint.cpp hgraph.cpp main.cpp
DPADD= ${LIBGROFF} ${LIBM}
LDADD= ${LIBGROFF} -lm
DPADD= ${LIBGROFF}
LDADD= ${LIBGROFF}
LIBADD= m
CLEANFILES= ${MAN}
.include <bsd.prog.mk>

5
gnu/usr.bin/groff/src/preproc/pic/Makefile
View File

@ -4,8 +4,9 @@ PROG_CXX= pic
SRCS= lex.cpp main.cpp object.cpp pic.cpp pic_tab.h \
common.cpp troff.cpp tex.cpp
CFLAGS+= -I${DIST_DIR} -I.
DPADD= ${LIBGROFF} ${LIBM}
LDADD= ${LIBGROFF} -lm
DPADD= ${LIBGROFF}
LDADD= ${LIBGROFF}
LIBADD= m
CLEANFILES= ${MAN} pic.cpp pic_tab.h y.tab.c y.tab.h
pic_tab.h: pic.cpp

5
gnu/usr.bin/groff/src/preproc/refer/Makefile
View File

@ -3,8 +3,9 @@
PROG_CXX= refer
SRCS= command.cpp label.cpp ref.cpp refer.cpp token.cpp
CFLAGS+= -I${DIST_DIR}
DPADD= ${LIBBIB} ${LIBGROFF} ${LIBM}
LDADD= ${LIBBIB} ${LIBGROFF} -lm
DPADD= ${LIBBIB} ${LIBGROFF}
LDADD= ${LIBBIB} ${LIBGROFF}
LIBADD= m
CLEANFILES= label.cpp label_tab.h ${MAN} y.tab.c y.tab.h
.include <bsd.prog.mk>

5
gnu/usr.bin/groff/src/preproc/tbl/Makefile
View File

@ -2,8 +2,9 @@
PROG_CXX= tbl
SRCS= main.cpp table.cpp
DPADD= ${LIBGROFF} ${LIBM}
LDADD= ${LIBGROFF} -lm
DPADD= ${LIBGROFF}
LDADD= ${LIBGROFF}
LIBADD= m
CLEANFILES= ${MAN}
.include <bsd.prog.mk>

5
gnu/usr.bin/groff/src/roff/groff/Makefile
View File

@ -2,8 +2,9 @@
PROG_CXX= groff
SRCS= groff.cpp pipeline.c
DPADD= ${LIBGROFF} ${LIBM}
LDADD= ${LIBGROFF} -lm
DPADD= ${LIBGROFF}
LDADD= ${LIBGROFF}
LIBADD= m
CLEANFILES= ${MAN}
.include <bsd.prog.mk>

5
gnu/usr.bin/groff/src/roff/troff/Makefile
View File

@ -3,8 +3,9 @@
PROG_CXX= troff
SRCS= dictionary.cpp div.cpp env.cpp input.cpp \
majorminor.cpp mtsm.cpp node.cpp number.cpp reg.cpp
DPADD= ${LIBGROFF} ${LIBM}
LDADD= ${LIBGROFF} -lm
DPADD= ${LIBGROFF}
LDADD= ${LIBGROFF}
LIBADD= m
CLEANFILES= majorminor.cpp ${MAN}
.include <bsd.prog.mk>

5
gnu/usr.bin/groff/src/utils/hpftodit/Makefile
View File

@ -2,8 +2,9 @@
PROG_CXX= hpftodit
SRCS= hpftodit.cpp hpuni.cpp
DPADD= ${LIBGROFF} ${LIBM}
LDADD= ${LIBGROFF} -lm
DPADD= ${LIBGROFF}
LDADD= ${LIBGROFF}
LIBADD= m
CLEANFILES= ${MAN}
.include <bsd.prog.mk>

5
gnu/usr.bin/groff/src/utils/indxbib/Makefile
View File

@ -2,8 +2,9 @@
PROG_CXX= indxbib
SRCS= indxbib.cpp signal.c
DPADD= ${LIBBIB} ${LIBGROFF} ${LIBM}
LDADD= ${LIBBIB} ${LIBGROFF} -lm
DPADD= ${LIBBIB} ${LIBGROFF}
LDADD= ${LIBBIB} ${LIBGROFF}
LIBADD= m
CLEANFILES= ${MAN}
FILES= ${DIST_DIR}/eign
FILESDIR= ${SHAREDIR}/dict/

5
gnu/usr.bin/groff/src/utils/lkbib/Makefile
View File

@ -2,8 +2,9 @@
PROG_CXX= lkbib
SRCS= lkbib.cpp
DPADD= ${LIBBIB} ${LIBGROFF} ${LIBM}
LDADD= ${LIBBIB} ${LIBGROFF} -lm
DPADD= ${LIBBIB} ${LIBGROFF}
LDADD= ${LIBBIB} ${LIBGROFF}
LIBADD= m
CLEANFILES= ${MAN}
.include <bsd.prog.mk>

5
gnu/usr.bin/groff/src/utils/lookbib/Makefile
View File

@ -2,8 +2,9 @@
PROG_CXX= lookbib
SRCS= lookbib.cpp
DPADD= ${LIBBIB} ${LIBGROFF} ${LIBM}
LDADD= ${LIBBIB} ${LIBGROFF} -lm
DPADD= ${LIBBIB} ${LIBGROFF}
LDADD= ${LIBBIB} ${LIBGROFF}
LIBADD= m
CLEANFILES= ${MAN}
.include <bsd.prog.mk>

5
gnu/usr.bin/groff/src/utils/tfmtodit/Makefile
View File

@ -2,8 +2,9 @@
PROG_CXX= tfmtodit
SRCS= tfmtodit.cpp
DPADD= ${LIBGROFF} ${LIBM}
LDADD= ${LIBGROFF} -lm
DPADD= ${LIBGROFF}
LDADD= ${LIBGROFF}
LIBADD= m
CLEANFILES= ${MAN}
.include <bsd.prog.mk>

18
lib/libc/tests/gen/Makefile
View File

@ -45,20 +45,14 @@ NETBSD_ATF_TESTS_C+= vis_test
.include "../Makefile.netbsd-tests"
LDADD.humanize_number_test+= -lutil
DPADD.humanize_number_test+= ${LIBUTIL}
LIBADD.humanize_number_test+= util
LDADD.fpclassify_test+= -lm
DPADD.fpclassify_test+= ${LIBM}
LDADD.fpsetround_test+= -lm
DPADD.fpsetround_test+= ${LIBM}
LDADD.siginfo_test+= -lm
DPADD.siginfo_test+= ${LIBM}
LIBADD.fpclassify_test+=m
LIBADD.fpsetround_test+=m
LIBADD.siginfo_test+= m
LDADD.nice_test+= -lpthread
DPADD.nice_test+= ${LIBPTHREAD}
LDADD.syslog_test+= -lpthread
DPADD.syslog_test+= ${LIBPTHREAD}
LIBADD.nice_test+= pthread
LIBADD.syslog_test+= pthread
CFLAGS+= -I${.CURDIR}

6
lib/libc/tests/hash/Makefile
View File

@ -22,10 +22,8 @@ FILES+= data/sha1test-in
FILES+= data/sha1test-out
FILES+= data/sha1test2-out
DPADD+= ${LIBMD}
LDADD+= -lmd
DPADD.sha2_test+= ${LIBCRYPTO}
LDADD.sha2_test+= -lcrypto
LIBADD+= md
LIBADD.sha2_test+= crypto
CFLAGS.sha2_test+= -I${SRCTOP}/crypto/openssh/openbsd-compat
CFLAGS.sha2_test+= -I${SRCTOP}/crypto/openssh

3
lib/libc/tests/net/Makefile
View File

@ -23,8 +23,7 @@ PROGS+= h_protoent
PROGS+= h_servent
PROGS+= h_dns_server
DPADD.h_nsd_recurse+= ${LIBPTHREAD}
LDADD.h_nsd_recurse+= -lpthread
LIBADD.h_nsd_recurse+= pthread
CLEANFILES+= aton_ether_subr.c
aton_ether_subr.c: gen_ether_subr ${SRCTOP}/sys/net/if_ethersubr.c

3
lib/libc/tests/regex/Makefile
View File

@ -51,7 +51,6 @@ CFLAGS.$t+= -I${TESTSRC} ${IMPLEMENTATION}
.include "../Makefile.netbsd-tests"
DPADD.regex_att_test+= ${LIBUTIL}
LDADD.regex_att_test+= -lutil
LIBADD.regex_att_test+= util
.include <bsd.test.mk>

3
lib/libc/tests/rpc/Makefile
View File

@ -18,8 +18,7 @@ h_testbits_xdr.c: ${RPCSRC} h_testbits.h
CLEANFILES+= ${RPCSRC:.x=.h} ${RPCSRC:.x=.c} h_testbits_xdr.c
CFLAGS+= -I${.OBJDIR}
LDADD+= -lrpcsvc -lutil
DPADD+= ${LIBRPCSVC} ${LIBUTIL}
LIBADD+= rpcsvc util
.include "../Makefile.netbsd-tests"

3
lib/libc/tests/setjmp/Makefile
View File

@ -3,8 +3,7 @@
NETBSD_ATF_TESTS_C= setjmp_test
NETBSD_ATF_TESTS_C+= threadjmp_test
DPADD.threadjmp_test+= ${LIBPTHREAD}
LDADD.threadjmp_test+= -lpthread
LIBADD.t_threadjmp+= pthread
WARNS?= 4

3
lib/libc/tests/ssp/Makefile
View File

@ -10,8 +10,7 @@ CFLAGS.h_raw+= -fstack-protector-all -Wstack-protector
CFLAGS.h_raw+= -fsanitize=bounds
.elif ${COMPILER_TYPE} == "gcc"
CFLAGS.h_raw+= --param ssp-buffer-size=1
DPADD+= ${LIBSSP}
LDADD+= -lssp
LIBADD+= ssp
.endif
NETBSD_ATF_TESTS_SH= ssp_test

7
lib/libc/tests/stdio/Makefile
View File

@ -28,11 +28,8 @@ NETBSD_ATF_TESTS_C+= popen_test
NETBSD_ATF_TESTS_C+= printf_test
NETBSD_ATF_TESTS_C+= scanf_test
DPADD.printfloat_test+= ${LIBM}
LDADD.printfloat_test+= -lm
DPADD.scanfloat_test+= ${LIBM}
LDADD.scanfloat_test+= -lm
LIBADD.printfloat_test+= m
LIBADD.scanfloat_test+= m
.if ${COMPILER_TYPE} == "gcc"
# 90: use of assignment suppression and length modifier together in scanf format

6
lib/libc/tests/stdlib/Makefile
View File

@ -36,11 +36,9 @@ CFLAGS+= -I${.CURDIR}
CFLAGS.$t+= -I${LIBNETBSD_SRCDIR} -I${SRCTOP}/contrib/netbsd-tests
LDFLAGS.$t+= -L${LIBNETBSD_OBJDIR}
DPADD.$t+= ${LIBNETBSD} ${LIBUTIL}
LDADD.$t+= -lnetbsd -lutil
LIBADD.${t}+= netbsd util
.endfor
DPADD.strtod_test+= ${LIBM}
LDADD.strtod_test+= -lm
LIBADD.strtod_test+= m
.include <bsd.test.mk>

7
lib/libc/tests/string/Makefile
View File

@ -27,10 +27,7 @@ SRCS.strerror2_test= strerror_test.c
.include "../Makefile.netbsd-tests"
LDADD.memchr_test+= -lmd
DPADD.memchr_test+= ${LIBMD}
LDADD.memcpy_test+= -lmd
DPADD.memcpy_test+= ${LIBMD}
LIBADD.memchr_test+= md
LIBADD.memcpy_test+= md
.include <bsd.test.mk>

6
lib/libc/tests/sys/Makefile
View File

@ -57,10 +57,8 @@ NETBSD_ATF_TESTS_C+= umask_test
NETBSD_ATF_TESTS_C+= unlink_test
NETBSD_ATF_TESTS_C+= write_test
DPADD.getpid_test+= ${LIBPTHREAD}
LDADD.getpid_test+= -lpthread
DPADD.timer_create_test+= ${LIBRT}
LDADD.timer_create_test+= -lrt
LIBADD.getpid_test+= pthread
LIBADD.timer_create_test+= rt
.include "../Makefile.netbsd-tests"

11
lib/libc/tests/tls/Makefile
View File

@ -18,17 +18,16 @@ NETBSD_ATF_TESTS_C+= tls_dynamic_test
DSODIR= ${.OBJDIR}/../tls_dso
DPADD.tls_static_test+= ${LIBPTHREAD}
LDADD.tls_static_test+= -lpthread
LIBADD.tls_static_test+= pthread
LDFLAGS.tls_static_test+= -static
SRCS.tls_static_test= t_tls_static.c t_tls_static_helper.c
DPADD.tls_dynamic_test+= ${LIBPTHREAD} ${DSODIR}/libh_tls_dynamic.so
LDADD.tls_dynamic_test+= -lpthread -lh_tls_dynamic
DPADD.tls_dynamic_test+= ${DSODIR}/libh_tls_dynamic.so
LDADD.tls_dynamic_test+= -lh_tls_dynamic
LDFLAGS.tls_dynamic_test+= -Wl,-rpath,${TESTSDIR} -L${DSODIR}
LIBADD.tls_dynamic_test+= pthread
DPADD.tls_dlopen_test+= ${LIBPTHREAD}
LDADD.tls_dlopen_test+= -lpthread
LIBADD.tls_dlopen_test+= pthread
LDFLAGS.tls_dlopen_test+= -Wl,-rpath,${TESTSDIR} -Wl,-export-dynamic
.include <bsd.test.mk>

3
lib/libc/tests/ttyio/Makefile
View File

@ -5,8 +5,7 @@
# TODO: ptm_test
NETBSD_ATF_TESTS_C= ttyio_test
DPADD.ttyio_test+= ${LIBUTIL}
LDADD.ttyio_test+= -lutil
LIBADD.ttyio_test+= util
.include "../Makefile.netbsd-tests"

3
lib/libproc/tests/Makefile
View File

@ -6,8 +6,7 @@ PROGS= target_prog
SRCS_target_prog= target_prog.c
BINDIR_target_prog= ${TESTSDIR}
LDADD+= -lelf -lproc -lrtld_db -lutil
DPADD+= ${LIBELF} ${LIBPROC} ${LIBRTLD_DB} ${LIBUTIL}
LIBADD= elf proc rtld_db util
# Ensure that symbols aren't stripped from the test program, as they're needed
# for testing symbol lookup.

9
lib/libthr/tests/Makefile
View File

@ -30,12 +30,9 @@ NETBSD_ATF_TESTS_SH+= cancel_test
NETBSD_ATF_TESTS_SH+= exit_test
NETBSD_ATF_TESTS_SH+= resolv_test
DPADD+= ${LIBPTHREAD}
LDADD+= -lpthread
DPADD.fpu_test+= ${LIBM}
LDADD.fpu_test+= -lm
DPADD.sem_test+= ${LIBRT}
LDADD.sem_test+= -lrt
LIBADD+= pthread
LIBADD.fpu_test+= m
LIBADD.sem_test+= rt
BINDIR= ${TESTSDIR}

3
lib/libthr/tests/dlopen/Makefile
View File

@ -18,8 +18,7 @@ NETBSD_ATF_TESTS_C+= main_pthread_create_test
#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

3
lib/libthr/tests/dlopen/dso/Makefile
View File

@ -8,8 +8,7 @@ SHLIB_MAJOR= 1
SHLIB_NAME= h_pthread_dlopen.so.${SHLIB_MAJOR}
SRCS= h_pthread_dlopen.c
DPADD+= ${LIBPTHREAD}
LDADD+= -lpthread
LIBADD+= pthread
LIBDIR= ${TESTSBASE}/lib/libthr/dlopen

3
libexec/rtld-elf/tests/libpythagoras/Makefile
View File

@ -10,7 +10,6 @@ SHLIBDIR= ${TESTSBASE}/libexec/rtld-elf
SRCS= pythagoras.c
DPADD= ${LIBM}
LDADD= -lm
LIBADD= m
.include <bsd.lib.mk>

3
sbin/dhclient/tests/Makefile
View File

@ -6,8 +6,7 @@ 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

3
share/mk/netbsd-tests.test.mk
View File

@ -18,8 +18,7 @@ LIBNETBSD_OBJDIR= ${OBJTOP}/lib/libnetbsd
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

3
sys/dev/aic7xxx/aicasm/Makefile
View File

@ -13,8 +13,7 @@ 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

3
sys/dev/patm/genrtab/Makefile
View File

@ -7,7 +7,6 @@ PROG= genrtab
INTERNALPROG=
WARNS?= 5
MAN=
DPADD= ${LIBM}
LDADD= -lm
LIBADD= m
.include <bsd.prog.mk>

3
tests/sys/aio/Makefile
View File

@ -6,8 +6,7 @@ PLAIN_TESTS_C+= aio_kqueue_test
PLAIN_TESTS_C+= lio_kqueue_test
ATF_TESTS_C+= aio_test
DPADD.aio_test+= ${LIBUTIL}
LDADD.aio_test+= -lutil
LIBADD.aio_test+= util
CFLAGS+= -I${.CURDIR:H:H}

9
tests/sys/file/Makefile
View File

@ -13,13 +13,10 @@ PLAIN_TESTS_C+= newfileops_on_fork_test
PROGS+= flock_helper
DPADD.closefrom_test= ${LIBUTIL}
LDADD.closefrom_test= -lutil
LIBADD.closefrom_test= util
DPADD.flock_helper= ${LIBPTHREAD}
LDADD.flock_helper= -lpthread
LIBADD.flock_helper= pthread
DPADD.newfileops_on_fork_test= ${LIBPTHREAD}
LDADD.newfileops_on_fork_test= -lpthread
LIBADD.newfileops_on_fork_test= pthread
.include <bsd.test.mk>

7
tests/sys/kern/Makefile
View File

@ -10,15 +10,14 @@ ATF_TESTS_C+= ptrace_test
ATF_TESTS_C+= unix_seqpacket_test
TEST_METADATA.unix_seqpacket_test+= timeout="15"
LDADD.ptrace_test+= -lpthread
LDADD.unix_seqpacket_test+= -lpthread
LIBADD.ptrace_test+= pthread
LIBADD.unix_seqpacket_test+= pthread
NETBSD_ATF_TESTS_C+= lockf_test
NETBSD_ATF_TESTS_C+= mqueue_test
CFLAGS.mqueue_test+= -I${SRCTOP}/tests
DPADD.mqueue_test+= ${LIBRT}
LDADD.mqueue_test+= -lrt
LIBADD.mqueue_test+= rt
WARNS?= 5

3
tests/sys/mqueue/Makefile
View File

@ -14,8 +14,7 @@ PROGS+= mqtest2
#PROGS+= mqtest4
PROGS+= mqtest5
LDADD+= -lrt
DPADD+= ${LIBRT}
LIBADD+= rt
WARNS?= 6

3
tools/diag/dumpvfscache/Makefile
View File

@ -1,8 +1,7 @@
# $FreeBSD$
PROG= dumpvfscache
DPADD= ${LIBKVM}
LDADD= -lkvm
LIBADD= kvm
MAN=

3
tools/regression/gaithrstress/Makefile
View File

@ -1,8 +1,7 @@
# $FreeBSD$
PROG= gaithrstress
DPADD= ${LIBPTHREAD}
LDADD= -lpthread
LIBADD= pthread
MAN=
.include <bsd.prog.mk>

3
tools/regression/geom/ConfCmp/Makefile
View File

@ -12,8 +12,7 @@ CFLAGS+= -g -W -Wall -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith -
# Uncomment for ElectricFence
#LDADD += -lefence -L/usr/local/lib
DPADD += ${LIBBSDXML}
LDADD += -lbsdxml
LIBADD= bsdxml
MAN=
CLEANFILES += _*

3
tools/regression/geom/MdLoad/Makefile
View File

@ -1,8 +1,7 @@
# $FreeBSD$
PROG= MdLoad
DPADD= ${LIBSBUF} ${LIBBSDXML}
LDADD= -lsbuf -lbsdxml
LIBADD= sbuf bsdxml
MAN=

3
tools/regression/kgssapi/Makefile
View File

@ -3,8 +3,7 @@
PROG= gsstest
MAN=
WARNS?= 2
DPADD= ${LIBGSSAPI} ${LIBGSSAPI_KRB5}
LDADD= -lgssapi -lgssapi_krb5
LIBADD= gssapi gssapi_krb5
DEBUG_FLAGS= -g -O0
.include <bsd.prog.mk>

3
tools/regression/lib/libc/resolv/Makefile
View File

@ -6,8 +6,7 @@ MAN=
# Note: this test relies on being dynamically linked. You will get a
# spurious PASS for a statically linked test.
DPADD+= ${LIBPTHREAD}
LDADD+= -lpthread
LIBADD+= pthread
regress: ${PROG}
./${PROG} -r ${.CURDIR}/mach

3
tools/regression/mac/mac_bsdextended/Makefile
View File

@ -1,8 +1,7 @@
# $FreeBSD$
PROG= test_ugidfw
DPADD= ${LIBUGIDFW}
LDADD= -lugidfw
LIBADD= ugidfw
MAN=
.include <bsd.prog.mk>

3
tools/regression/posixsem/Makefile
View File

@ -2,8 +2,7 @@
PROG= posixsem
SRCS= posixsem.c test.c
DPADD= ${LIBKVM}
LDADD= -lkvm
LIBADD= kvm
MAN=
WARNS?= 3

3
tools/regression/priv/Makefile
View File

@ -48,8 +48,7 @@ SRCS= main.c \
MAN=
WARNS?= 3
DPADD+= ${LIBIPSEC}
LDADD+= -lipsec
LIBADD+= ipsec
.if ${MK_INET6_SUPPORT} != "no"
CFLAGS+= -DINET6

3
tools/regression/pthread/cv_cancel1/Makefile
View File

@ -2,7 +2,6 @@
PROG= cv_cancel1
MAN=
DPADD= ${LIBPTHREAD}
LDADD= -lpthread
LIBADD= pthread
.include <bsd.prog.mk>

3
tools/regression/pthread/mutex_isowned_np/Makefile
View File

@ -2,7 +2,6 @@
PROG= mutex_isowned_np
MAN=
DPADD= ${LIBPTHREAD}
LDADD= -lpthread
LIBADD= pthread
.include <bsd.prog.mk>

3
tools/regression/rpcsec_gss/Makefile
View File

@ -3,8 +3,7 @@
PROG= rpctest
MAN=
WARNS?= 6
DPADD= ${LIBRPCSEC_GSS}
LDADD= -lrpcsec_gss
LIBADD= rpcsec_gss
DEBUG_FLAGS= -g -O0
.include <bsd.prog.mk>

3
tools/regression/sockets/sendfile/Makefile
View File

@ -5,7 +5,6 @@
PROG= sendfile
MAN=
WARNS?= 6
DPADD= ${LIBMD}
LDADD= -lmd
LIBADD= md
.include <bsd.prog.mk>

3
tools/regression/tls/ttls2/Makefile
View File

@ -1,8 +1,7 @@
# $FreeBSD$
PROG= ttls2
DPADD= ${LIBPTHREAD}
LDADD= -lpthread
LIBADD= pthread
MAN=
DEBUG_FLAGS= -g

3
tools/regression/tls/ttls4/Makefile
View File

@ -1,8 +1,7 @@
# $FreeBSD$
PROG= ttls4
DPADD= ${LIBPTHREAD}
LDADD= -lpthread
LIBADD= pthread
MAN=
DEBUG_FLAGS= -g

2
tools/tools/ath/athratestats/Makefile
View File

@ -7,7 +7,7 @@ PROG= athratestats
SRCS= main.c opt_ah.h ah_osdep.h
LDADD+= -lcurses
LIBADD+= curses
CLEANFILES+= opt_ah.h ah_osdep.h

3
tools/tools/atsectl/Makefile
View File

@ -2,8 +2,7 @@
PROG= atsectl
DPADD= ${LIBMD}
LDADD= -lmd
LIBADD= md
BINDIR?= /usr/sbin

3
tools/tools/ether_reflect/Makefile
View File

@ -4,8 +4,7 @@
# 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 <bsd.prog.mk>

3
tools/tools/ifpifa/Makefile
View File

@ -4,7 +4,6 @@ PROG= ifpifa
MAN=
WARNS?=6
BINDIR?=/usr/local/bin
DPADD=${LIBKVM}
LDADD=-lkvm
LIBADD=kvm
.include <bsd.prog.mk>

3
tools/tools/mctest/Makefile
View File

@ -1,7 +1,6 @@
# $FreeBSD$
PROG_CXX= mctest
DPADD= ${LIBPTHREAD}
LDADD= -lpthread
LIBADD= pthread
.include <bsd.prog.mk>

3
tools/tools/ncpus/Makefile
View File

@ -9,7 +9,6 @@ SRCS+= biosmptable.c
BINDIR= /usr/local/bin
WARNS?= 6
DPADD= ${LIBDEVINFO}
LDADD= -ldevinfo
LIBADD= devinfo
.include <bsd.prog.mk>

3
tools/tools/net80211/stumbler/Makefile
View File

@ -2,8 +2,7 @@
PROG= stumbler
BINDIR= /usr/local/bin
DPADD= ${LIBPCAP} ${LIBNCURSESW}
LDADD= -lpcap -lncursesw
LIBADD= pcap ncursesw
CFLAGS=-g
MAN=

3
tools/tools/net80211/wesside/dics/Makefile
View File

@ -2,8 +2,7 @@
PROG= dics
BINDIR= /usr/local/bin
DPADD= ${LIBZ}
LDADD= -lz
LIBADD= z
CFLAGS=-g
MAN=

3
tools/tools/net80211/wesside/udps/Makefile
View File

@ -2,8 +2,7 @@
PROG= udps
BINDIR= /usr/local/bin
DPADD= ${LIBZ}
LDADD= -lz
LIBADD= z
CFLAGS=-g
MAN=

3
tools/tools/net80211/wesside/wesside/Makefile
View File

@ -2,8 +2,7 @@
PROG= wesside
BINDIR= /usr/local/bin
DPADD= ${LIBZ}
LDADD= -lz
LIBADD= z
CFLAGS=-g
MAN=
SRCS=wesside.c aircrack-ptw-lib.c

3
tools/tools/netrate/http/Makefile
View File

@ -3,7 +3,6 @@
PROG= http
MAN=
WARNS?= 3
DPADD= ${LIBPTHREAD}
LDADD= -lpthread
LIBADD= pthread
.include <bsd.prog.mk>

3
tools/tools/netrate/httpd/Makefile
View File

@ -3,7 +3,6 @@
PROG= httpd
MAN=
WARNS?= 3
DPADD= ${LIBPTHREAD}
LDADD= -lpthread
LIBADD= pthread
.include <bsd.prog.mk>

3
tools/tools/netrate/juggle/Makefile
View File

@ -3,7 +3,6 @@
PROG= juggle
MAN=
WARNS?= 3
DPADD= ${LIBPTHREAD}
LDADD= -lpthread
LIBADD= pthread
.include <bsd.prog.mk>

3
tools/tools/tscdrift/Makefile
View File

@ -4,7 +4,6 @@ PROG= tscdrift
MAN=
WARNS?= 6
LDADD= -lpthread -lm
DPADD= ${LIBPTHREAD} ${LIBM}
LIBADD= pthread m
.include <bsd.prog.mk>

3
tools/tools/umastat/Makefile
View File

@ -4,7 +4,6 @@ PROG= umastat
MAN=
WARNS?= 3
DPADD= ${LIBKVM}
LDADD= -lkvm
LIBADD= kvm
.include <bsd.prog.mk>

3
tools/tools/usbtest/Makefile
View File

@ -33,8 +33,7 @@ SRCS+= usb_modem_test.c
SRCS+= usb_control_ep_test.c
SYSDIR?= ${.CURDIR}/../../../sys
DPADD+= ${LIBUSB}
LDADD+= -lusb
LIBADD+= usb
WARNS= 3

3
tools/tools/vimage/Makefile
View File

@ -1,8 +1,7 @@
# $FreeBSD$
PROG= vimage
LDADD= -ljail
DPADD= ${LIBJAIL}
LIBADD= jail
WARNS?= 2
CFLAGS+= -I../../../sys

2
tools/tools/zfsboottest/Makefile
View File

@ -17,7 +17,7 @@ CFLAGS= -O1 \
-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

3
usr.bin/caesar/Makefile
View File

@ -2,8 +2,7 @@
# $FreeBSD$
PROG= caesar
DPADD= ${LIBM}
LDADD= -lm
LIBADD= m
SCRIPTS=rot13.sh
MAN= caesar.6
MLINKS= caesar.6 rot13.6

6
usr.bin/clang/clang.prog.mk
View File

@ -9,11 +9,7 @@ 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

5
usr.bin/clang/clang/Makefile
View File

@ -121,7 +121,6 @@ LIBDEPS=clangfrontendtool \
llvmcore \
llvmsupport
.include "../clang.prog.mk"
LIBADD+= z
DPADD+= ${LIBZ}
LDADD+= -lz
.include "../clang.prog.mk"

5
usr.bin/clang/llc/Makefile
View File

@ -68,7 +68,6 @@ LIBDEPS=llvmmirparser \
llvmcore \
llvmsupport
.include "../clang.prog.mk"
LIBADD+= z
DPADD+= ${LIBZ}
LDADD+= -lz
.include "../clang.prog.mk"

5
usr.bin/clang/lli/Makefile
View File

@ -44,7 +44,6 @@ LIBDEPS=llvmx86disassembler \
llvmcore \
llvmsupport
.include "../clang.prog.mk"
LIBADD= z
DPADD+= ${LIBZ}
LDADD+= -lz
.include "../clang.prog.mk"

5
usr.bin/clang/llvm-ar/Makefile
View File

@ -66,7 +66,6 @@ LIBDEPS=llvmlibdriver \
llvmcore \
llvmsupport
.include "../clang.prog.mk"
LIBADD= z
DPADD+= ${LIBZ}
LDADD+= -lz
.include "../clang.prog.mk"

5
usr.bin/clang/llvm-cxxdump/Makefile
View File

@ -66,7 +66,6 @@ LIBDEPS=llvmaarch64disassembler \
llvmcore \
llvmsupport
.include "../clang.prog.mk"
LIBADD= z
DPADD+= ${LIBZ}
LDADD+= -lz
.include "../clang.prog.mk"

5
usr.bin/clang/llvm-dwarfdump/Makefile
View File

@ -15,7 +15,6 @@ LIBDEPS=llvmdebuginfodwarf \
llvmcore \
llvmsupport
.include "../clang.prog.mk"
LIBADD= z
DPADD+= ${LIBZ}
LDADD+= -lz
.include "../clang.prog.mk"

5
usr.bin/clang/llvm-lto/Makefile
View File

@ -72,7 +72,6 @@ LIBDEPS=llvmaarch64disassembler \
llvmcore \
llvmsupport
.include "../clang.prog.mk"
LIBADD= z
DPADD+= ${LIBZ}
LDADD+= -lz
.include "../clang.prog.mk"

Some files were not shown because too many files have changed in this diff Show More