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

Convert to usr.bin/ to LIBADD

Browse Source 
Reduce overlinking
This commit is contained in:
Baptiste Daroussin 2014-11-25 14:29:10 +00:00
parent 30fca3b0cc
commit 3e11bd9e2a
100 changed files with 131 additions and 268 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
usr.bin/Makefile
View File

@ -134,7 +134,6 @@ SUBDIR= alias \
printenv \
printf \
procstat \
protect \
rctl \
renice \
rev \

4
usr.bin/apply/Makefile
View File

@ -4,8 +4,8 @@
.include <src.opts.mk>
PROG= apply
DPADD= ${LIBSBUF}
LDADD= -lsbuf
LIBADD= sbuf
.if ${MK_TESTS} != "no"
SUBDIR+= tests

3
usr.bin/ar/Makefile
View File

@ -5,8 +5,7 @@
PROG= ar
SRCS= ar.c acplex.l acpyacc.y read.c util.c write.c y.tab.h
DPADD= ${LIBARCHIVE} ${LIBELF} ${LIBZ}
LDADD= -larchive -lelf -lz
LIBADD= archive elf
NO_WMISSING_VARIABLE_DECLARATIONS=

3
usr.bin/atm/sscop/Makefile
View File

@ -8,7 +8,6 @@ PROG= sscop
SRCS= common.c sscop_main.c
CFLAGS+= -I${CONTRIB} -DUSE_LIBBEGEMOT
DPADD= ${LIBBEGEMOT} ${LIBNETGRAPH} ${LIBNGATM}
LDADD= -lbegemot -lnetgraph -lngatm
LIBADD= begemot ngatm
.include <bsd.prog.mk>

3
usr.bin/awk/Makefile
View File

@ -10,8 +10,7 @@ CFLAGS+= -DHAS_ISBLANK -I. -I${AWKSRC} -DFOPEN_MAX=64
WARNS?= 1
DPADD= ${LIBM}
LDADD= -lm
LIBADD= m
LINKS= ${BINDIR}/awk ${BINDIR}/nawk
MLINKS= awk.1 nawk.1

3
usr.bin/bc/Makefile
View File

@ -5,8 +5,7 @@ PROG= bc
SRCS= bc.y scan.l tty.c
CFLAGS+= -I. -I${.CURDIR}
DPADD+= ${LIBEDIT} ${LIBNCURSESW}
LDADD+= -ledit -lncursesw
LIBADD= edit
NO_WMISSING_VARIABLE_DECLARATIONS=

3
usr.bin/bluetooth/bthost/Makefile
View File

@ -3,7 +3,6 @@
PROG= bthost
DPADD= ${LIBBLUETOOTH}
LDADD= -lbluetooth
LIBADD= bluetooth
.include <bsd.prog.mk>

3
usr.bin/bluetooth/btsockstat/Makefile
View File

@ -6,7 +6,6 @@ WARNS?= 2
BINGRP= kmem
BINMODE= 2555
DPADD= ${LIBBLUETOOTH} ${LIBKVM}
LDADD= -lbluetooth -lkvm
LIBADD= bluetooth kvm
.include <bsd.prog.mk>

3
usr.bin/bluetooth/rfcomm_sppd/Makefile
View File

@ -5,7 +5,6 @@ PROG= rfcomm_sppd
SRCS= rfcomm_sppd.c rfcomm_sdp.c
WARNS?= 2
DPADD= ${LIBBLUETOOTH} ${LIBSDP}
LDADD= -lbluetooth -lsdp -lutil
LIBADD= bluetooth sdp util
.include <bsd.prog.mk>

3
usr.bin/bsdiff/bsdiff/Makefile
View File

@ -2,7 +2,6 @@
PROG= bsdiff
DPADD= ${LIBBZ2}
LDADD= -lbz2
LIBADD= bz2
.include <bsd.prog.mk>

3
usr.bin/bsdiff/bspatch/Makefile
View File

@ -2,7 +2,6 @@
PROG= bspatch
DPADD= ${LIBBZ2}
LDADD= -lbz2
LIBADD= bz2
.include <bsd.prog.mk>

3
usr.bin/bzip2/Makefile
View File

@ -8,8 +8,7 @@ CFLAGS+= -D_FILE_OFFSET_BITS=64
WARNS?= 3
DPADD= ${LIBBZ2}
LDADD= -lbz2
LIBADD= bz2
LINKS= ${BINDIR}/bzip2 ${BINDIR}/bunzip2
LINKS+= ${BINDIR}/bzip2 ${BINDIR}/bzcat

3
usr.bin/calendar/Makefile
View File

@ -6,8 +6,7 @@
PROG= calendar
SRCS= calendar.c locale.c events.c dates.c parsedata.c io.c day.c \
ostern.c paskha.c pom.c sunpos.c calcpp.c
DPADD= ${LIBM}
LDADD= -lm
LIBADD= m
INTER= de_AT.ISO_8859-15 de_DE.ISO8859-1 fr_FR.ISO8859-1 \
hr_HR.ISO8859-2 hu_HU.ISO8859-2 pt_BR.ISO8859-1 \
pt_BR.UTF-8 ru_RU.KOI8-R ru_RU.UTF-8 uk_UA.KOI8-U

3
usr.bin/chkey/Makefile
View File

@ -10,7 +10,6 @@ CFLAGS+= -I${.CURDIR}/../newkey
.if ${MK_NIS} != "no"
CFLAGS+= -DYP
.endif
DPADD= ${LIBRPCSVC} ${LIBMP} ${LIBCRYPTO}
LDADD= -lrpcsvc -lmp -lcrypto
LIBADD+= rpcsvc mp
.include <bsd.prog.mk>

6
usr.bin/chpass/Makefile
View File

@ -16,11 +16,9 @@ CFLAGS+= -DYP
#CFLAGS+=-DRESTRICT_FULLNAME_CHANGE
CFLAGS+=-I${.CURDIR}/../../usr.sbin/pwd_mkdb -I${.CURDIR}/../../lib/libc/gen -I.
DPADD= ${LIBCRYPT} ${LIBUTIL}
LDADD= -lcrypt -lutil
LIBADD= crypt util
.if ${MK_NIS} != "no"
DPADD+= ${LIBYPCLNT}
LDADD+= -lypclnt
LIBADD+= ypclnt
.endif
LINKS= ${BINDIR}/chpass ${BINDIR}/chfn

3
usr.bin/colldef/Makefile
View File

@ -5,8 +5,7 @@ SRCS= parse.y scan.l y.tab.h
LFLAGS= -8 -i
CFLAGS+=-I. -I${.CURDIR} -I${.CURDIR}/../../lib/libc/locale
CFLAGS+=-DCOLLATE_DEBUG -DYY_NO_UNPUT -DYY_NO_INPUT
LDADD= -ll
DPADD= ${LIBL}
LIBADD= l
WARNS?= 2

5
usr.bin/compile_et/Makefile
View File

@ -2,12 +2,9 @@
.PATH: ${.CURDIR}/../../contrib/com_err
LIBVERS= ${.OBJDIR}/../../kerberos5/lib/libvers/libvers.a
PROG= compile_et
SRCS= compile_et.c parse.y lex.l
LDADD= -lroken ${LIBVERS}
DPADD= ${LIBROKEN} ${LIBVERS}
LIBADD= roken vers
CFLAGS+=-I. -I${.CURDIR}/../../contrib/com_err
WARNS?= 0

10
usr.bin/cpio/Makefile
View File

@ -23,15 +23,7 @@ CFLAGS+= -I${LIBARCHIVEDIR}/cpio -I${LIBARCHIVEDIR}/libarchive_fe
# statically linked, cannot use -lcrypto, and are size sensitive.
CFLAGS+= -DSMALLER
.endif
DPADD= ${LIBARCHIVE} ${LIBZ} ${LIBBZ2} ${LIBLZMA} ${LIBBSDXML}
LDADD= -larchive -lz -lbz2 -llzma -lbsdxml
.if ${MK_OPENSSL} != "no"
DPADD+= ${LIBCRYPTO}
LDADD+= -lcrypto
.else
DPADD+= ${LIBMD}
LDADD+= -lmd
.endif
LIBADD= archive
.if ${MK_ICONV} != "no"
CFLAGS+= -DHAVE_ICONV=1 -DHAVE_ICONV_H=1 -DICONV_CONST=const

3
usr.bin/cpio/test/Makefile
View File

@ -67,10 +67,9 @@ CLEANFILES+= list.h bsdcpio_test
MAN=
PROG=bsdcpio_test
DPADD=${LIBARCHIVE} ${LIBBZ2} ${LIBZ} ${LIBLZMA}
CFLAGS+= -DPLATFORM_CONFIG_H=\"${.CURDIR}/../../../lib/libarchive/config_freebsd.h\"
CFLAGS+= -I${.CURDIR}/../../../lib/libarchive -I${.OBJDIR}
LDADD= -larchive -lz -lbz2 -llzma
LIBADD= archive
#CFLAGS+= -static -g -O2 -Wall
CFLAGS+= -g -O2 -Wall
CFLAGS+= -I${.OBJDIR}

3
usr.bin/dc/Makefile
View File

@ -3,7 +3,6 @@
PROG= dc
SRCS= dc.c bcode.c inout.c mem.c stack.c
DPADD= ${LIBCRYPTO}
LDADD= -lcrypto
LIBADD= crypto
.include <bsd.prog.mk>

3
usr.bin/dpv/Makefile
View File

@ -4,8 +4,7 @@ PROG= dpv
CFLAGS+= -I${.CURDIR}
DPADD= ${LIBDPV} ${LIBDIALOG} ${LIBFIGPAR} ${LIBNCURSESW} ${LIBUTIL} ${LIBM}
LDADD= -ldpv -ldialog -lfigpar -lncursesw -lutil -lm
LIBADD= dpv dialog
WARNS?= 6

4
usr.bin/drill/Makefile
View File

@ -12,8 +12,6 @@ CFLAGS+= -I${LDNSDIR}
NO_WERROR= true
MAN= drill.1
DPADD+= ${LIBLDNS} ${LIBCRYPTO}
LDADD+= ${LDLDNS} -lcrypto
USEPRIVATELIB= ldns
LIBADD= ldns crypto
.include <bsd.prog.mk>

3
usr.bin/du/Makefile
View File

@ -2,7 +2,6 @@
# $FreeBSD$
PROG= du
DPADD= ${LIBUTIL}
LDADD= -lutil
LIBADD= util
.include <bsd.prog.mk>

3
usr.bin/ee/Makefile
View File

@ -8,8 +8,7 @@ CFLAGS+= -DHAS_NCURSES -DHAS_UNISTD -DHAS_STDARG -DHAS_STDLIB \
PROG= ee
LINKS= ${BINDIR}/ee ${BINDIR}/ree ${BINDIR}/ee ${BINDIR}/edit
MLINKS= ee.1 ree.1 ee.1 edit.1
DPADD= ${LIBNCURSESW}
LDADD= -lncursesw
LIBADD= ncursesw
WARNS?= 2

3
usr.bin/enigma/Makefile
View File

@ -5,7 +5,6 @@ PROG= enigma
LINKS= ${BINDIR}/enigma ${BINDIR}/crypt
MLINKS= enigma.1 crypt.1
DPADD= ${LIBCRYPT}
LDADD= -lcrypt
LIBADD= crypt
.include <bsd.prog.mk>

10
usr.bin/fetch/Makefile
View File

@ -1,15 +1,7 @@
# $FreeBSD$
.include <src.opts.mk>
PROG= fetch
CSTD?= c99
.if ${MK_OPENSSL} != "no"
DPADD= ${LIBFETCH} ${LIBSSL} ${LIBCRYPTO}
LDADD= -lfetch -lssl -lcrypto
.else
DPADD= ${LIBFETCH} ${LIBMD}
LDADD= -lfetch -lmd
.endif
LIBADD= fetch
.include <bsd.prog.mk>

3
usr.bin/file/Makefile
View File

@ -31,8 +31,7 @@ MAGICPATH?= /usr/share/misc
CFLAGS+= -DMAGIC='"${MAGICPATH}/magic"' -DHAVE_CONFIG_H
CFLAGS+= -I${.CURDIR}/../../lib/libmagic
DPADD= ${LIBMAGIC} ${LIBZ}
LDADD= -lmagic -lz
LIBADD= magic
FILEVER!= awk '$$1 == "\#define" && $$2 == "VERSION" { print $$3; exit }' \
${.CURDIR}/../../lib/libmagic/config.h

3
usr.bin/fstat/Makefile
View File

@ -4,8 +4,7 @@
PROG= fstat
SRCS= fstat.c fuser.c main.c
LINKS= ${BINDIR}/fstat ${BINDIR}/fuser
DPADD= ${LIBKVM} ${LIBUTIL} ${LIBPROCSTAT}
LDADD= -lkvm -lutil -lprocstat
LIBADD= procstat
MAN1= fuser.1 fstat.1

3
usr.bin/ftp/Makefile
View File

@ -20,8 +20,7 @@ CFLAGS+= -DINET6
.endif
CFLAGS+= -I${.CURDIR} -I${TNFTP}
LDADD= -ledit -ltermcapw
DPADD= ${LIBEDIT} ${LIBTERMCAPW}
LIBADD= edit
WARNS?= 2

3
usr.bin/gcore/Makefile
View File

@ -3,8 +3,7 @@
PROG= gcore
SRCS= elfcore.c gcore.c
DPADD= ${LIBSBUF} ${LIBUTIL}
LDADD= -lsbuf -lutil
LIBADD= sbuf util
.if ${MACHINE_ARCH} == "amd64"
SRCS+= elf32core.c

12
usr.bin/grep/Makefile
View File

@ -40,12 +40,10 @@ MLINKS= grep.1 egrep.1 \
grep.1 lzfgrep.1
.endif
LDADD= -lz
DPADD= ${LIBZ}
LIBADD= z
.if ${MK_LZMA_SUPPORT} != "no"
LDADD+= -llzma
DPADD+= ${LIBLZMA}
LIBADD+= lzma
LINKS+= ${BINDIR}/${PROG} ${BINDIR}/xzgrep \
${BINDIR}/${PROG} ${BINDIR}/xzegrep \
@ -58,8 +56,7 @@ CFLAGS+= -DWITHOUT_LZMA
.endif
.if ${MK_BZIP2_SUPPORT} != "no"
LDADD+= -lbz2
DPADD+= ${LIBBZ2}
LIBADD+= bz2
.if ${MK_BSD_GREP} == "yes"
LINKS+= ${BINDIR}/grep ${BINDIR}/bzgrep \
@ -75,8 +72,7 @@ CFLAGS+= -DWITHOUT_BZIP2
.if ${MK_GNU_GREP_COMPAT} != "no"
CFLAGS+= -I${DESTDIR}/usr/include/gnu
LDADD+= -lgnuregex
DPADD+= ${LIBGNUREGEX}
LIBADD+= gnuregex
.endif
.if ${MK_NLS} != "no"

6
usr.bin/gzip/Makefile
View File

@ -6,12 +6,10 @@
PROG= gzip
MAN= gzip.1 gzexe.1 zdiff.1 zforce.1 zmore.1 znew.1
DPADD= ${LIBZ} ${LIBLZMA}
LDADD= -lz -llzma
LIBADD= z lzma
.if ${MK_BZIP2_SUPPORT} != "no"
DPADD+= ${LIBBZ2}
LDADD+= -lbz2
LIBADD+= bz2
.else
CFLAGS+= -DNO_BZIP2_SUPPORT
.endif

4
usr.bin/host/Makefile
View File

@ -15,8 +15,6 @@ host.1: ldns-host.1
(rm -rf ${.TARGET} ; false)
CFLAGS+= -I${LDNSDIR}
DPADD+= ${LIBLDNS} ${LIBCRYPTO}
LDADD+= ${LDLDNS} -lcrypto
USEPRIVATELIB= ldns
LIBADD= ldns
.include <bsd.prog.mk>

3
usr.bin/ipcrm/Makefile
View File

@ -2,8 +2,7 @@
PROG= ipcrm
SRCS= ipcrm.c ipc.c
DPADD= ${LIBKVM}
LDADD= -lkvm
LIBADD= kvm
CFLAGS+=-I${.CURDIR}/../ipcs
.PATH: ${.CURDIR}/../ipcs

3
usr.bin/ipcs/Makefile
View File

@ -2,8 +2,7 @@
PROG= ipcs
SRCS= ipcs.c ipc.c
DPADD= ${LIBKVM}
LDADD= -lkvm
LIBADD= kvm
WARNS?= 1

3
usr.bin/iscsictl/Makefile
View File

@ -6,8 +6,7 @@ CFLAGS+= -I${.CURDIR}
CFLAGS+= -I${.CURDIR}/../../sys/dev/iscsi
MAN= iscsictl.8
DPADD= ${LIBCAM} ${LIBUTIL}
LDADD= -lcam -lutil
LIBADD= cam util
YFLAGS+= -v
LFLAGS+= -i

5
usr.bin/kdump/Makefile
View File

@ -11,12 +11,11 @@ SFX= 32
PROG= kdump
SRCS= kdump_subr.c kdump.c ioctl.c subr.c
DPSRCS= kdump_subr.h
DPSRCS= kdump_subr.h
CFLAGS+= -I${.CURDIR}/../ktrace -I${.CURDIR} -I${.CURDIR}/../.. -I.
.if ${MK_CASPER} != "no"
DPADD+= ${LIBCAPSICUM} ${LIBNV}
LDADD+= -lcapsicum -lnv
LIBADD= capsicum
CFLAGS+=-DHAVE_LIBCAPSICUM
.endif

3
usr.bin/keylogin/Makefile
View File

@ -2,8 +2,7 @@
PROG= keylogin
DPADD= ${LIBRPCSVC}
LDADD= -lrpcsvc
LIBADD= rpcsvc
WARNS?= 0

3
usr.bin/killall/Makefile
View File

@ -1,7 +1,6 @@
# $FreeBSD$
PROG= killall
DPADD= ${LIBJAIL}
LDADD= -ljail
LIBADD= jail
.include <bsd.prog.mk>

3
usr.bin/ktrdump/Makefile
View File

@ -1,8 +1,7 @@
# $FreeBSD$
PROG= ktrdump
DPADD= ${LIBKVM}
LDADD= -lkvm
LIBADD= kvm
MAN= ktrdump.8
WARNS?= 2

3
usr.bin/less/Makefile
View File

@ -8,8 +8,7 @@ SRCS= main.c screen.c brac.c ch.c charset.c cmdbuf.c command.c cvt.c \
signal.c tags.c ttyin.c version.c
SCRIPTS=lesspipe.sh zless.sh
SCRIPTSNAME_lesspipe.sh=lesspipe.sh
DPADD= ${LIBTERMCAPW}
LDADD= -ltermcapw
LIBADD= ncursesw
LINKS= ${BINDIR}/less ${BINDIR}/more \
${BINDIR}/zless ${BINDIR}/bzless \
${BINDIR}/zless ${BINDIR}/xzless \

3
usr.bin/limits/Makefile
View File

@ -1,7 +1,6 @@
# $FreeBSD$
PROG= limits
DPADD= ${LIBUTIL}
LDADD= -lutil
LIBADD= util
.include <bsd.prog.mk>

4
usr.bin/lock/Makefile
View File

@ -4,7 +4,7 @@
PROG= lock
BINOWN= root
BINMODE=4555
DPADD= ${LIBCRYPT}
LDADD= -lcrypt
LIBADD= crypt
.include <bsd.prog.mk>

6
usr.bin/login/Makefile
View File

@ -6,16 +6,14 @@
PROG= login
SRCS= login.c login_fbtab.c
CFLAGS+=-DLOGALL
DPADD= ${LIBUTIL} ${LIBPAM}
LDADD= -lutil ${MINUSLPAM}
LIBADD= util pam
WARNS?= 5
.if ${MK_AUDIT} != "no"
SRCS+= login_audit.c
CFLAGS+= -DUSE_BSM_AUDIT
DPADD+= ${LIBBSM}
LDADD+= -lbsm
LIBADD+= bsm
.endif
.if ${MK_SETUID_LOGIN} != "no"

3
usr.bin/lzmainfo/Makefile
View File

@ -16,7 +16,6 @@ CFLAGS+= -DHAVE_CONFIG_H \
-I${LZMALIBDIR} \
-I${XZDIR}/common
DPADD= ${LIBLZMA}
LDADD= -llzma
LIBADD= lzma
.include <bsd.prog.mk>

3
usr.bin/m4/Makefile
View File

@ -8,8 +8,7 @@
PROG= m4
CFLAGS+=-DEXTENDED -I${.CURDIR} -I${.CURDIR}/../../lib/libohash
DPADD= ${LIBY} ${LIBL} ${LIBM} ${LIBOHASH}
LDADD= -ly -ll -lm ${LDOHASH}
LIBADD= y l m ohash
NO_WMISSING_VARIABLE_DECLARATIONS=

3
usr.bin/makewhatis/Makefile
View File

@ -1,8 +1,7 @@
# $FreeBSD$
PROG= makewhatis
DPADD= ${LIBZ}
LDADD= -lz
LIBADD= z
SCRIPTS= makewhatis.local.sh
MAN= makewhatis.1 makewhatis.local.8
SCRIPTSDIR= /usr/libexec

3
usr.bin/minigzip/Makefile
View File

@ -7,7 +7,6 @@ PROG= minigzip
WARNS?= 5
CFLAGS+=-DUSE_MMAP
DPADD= ${LIBZ}
LDADD= -lz
LIBADD= z
.include <bsd.prog.mk>

8
usr.bin/ministat/Makefile
View File

@ -1,13 +1,13 @@
# $FreeBSD$
PROG= ministat
DPADD= ${LIBM}
LDADD= -lm
LIBADD= m
.include <bsd.prog.mk>
test: ${PROG}
./${PROG} < ${.CURDIR}/chameleon
./${PROG} ${.CURDIR}/chameleon
./${PROG} < ${.CURDIR}/chameleon
./${PROG} ${.CURDIR}/chameleon
./${PROG} ${.CURDIR}/iguana ${.CURDIR}/chameleon
./${PROG} -c 80 ${.CURDIR}/iguana ${.CURDIR}/chameleon
./${PROG} -s -c 80 ${.CURDIR}/chameleon ${.CURDIR}/iguana

3
usr.bin/mkimg/Makefile
View File

@ -31,8 +31,7 @@ SRCS+= \
BINDIR?=/usr/bin
DPADD= ${LIBUTIL}
LDADD= -lutil
LIBADD= util
WARNS?= 6

4
usr.bin/mkulzma/Makefile
View File

@ -2,7 +2,7 @@
PROG= mkulzma
MAN= mkulzma.8
DPADD= ${LIBLZMA}
LDADD= -llzma
LIBADD= lzma
.include <bsd.prog.mk>

4
usr.bin/mkuzip/Makefile
View File

@ -3,8 +3,6 @@
PROG= mkuzip
MAN= mkuzip.8
DPADD= ${LIBZ}
LDADD= -lz
LIBADD= z
.include <bsd.prog.mk>

4
usr.bin/msgs/Makefile
View File

@ -2,7 +2,7 @@
# $FreeBSD$
PROG= msgs
DPADD= ${LIBTERMCAPW}
LDADD= -ltermcapw
LIBADD= ncursesw
.include <bsd.prog.mk>

3
usr.bin/nc/Makefile
View File

@ -6,8 +6,7 @@ PROG= nc
SRCS= netcat.c atomicio.c socks.c
CFLAGS+=-DIPSEC
LDADD= -lipsec
DPADD= ${LIBIPSEC}
LIBADD= ipsec
WARNS?= 2

3
usr.bin/ncal/Makefile
View File

@ -4,8 +4,7 @@
PROG= ncal
DPADD= ${LIBCALENDAR} ${LIBTERMCAPW}
LDADD= -lcalendar -ltermcapw
LIBADD= calendar ncursesw
LINKS= ${BINDIR}/ncal ${BINDIR}/cal
MLINKS= ncal.1 cal.1

6
usr.bin/netstat/Makefile
View File

@ -33,13 +33,11 @@ CFLAGS+=-DPF
BINGRP= kmem
BINMODE=2555
DPADD= ${LIBKVM} ${LIBMEMSTAT} ${LIBUTIL}
LDADD= -lkvm -lmemstat -lutil
LIBADD= kvm memstat util
.if ${MK_NETGRAPH_SUPPORT} != "no"
SRCS+= netgraph.c
DPADD+= ${LIBNETGRAPH}
LDADD+= -lnetgraph
LIBADD+= netgraph
CFLAGS+=-DNETGRAPH
.endif

4
usr.bin/newgrp/Makefile
View File

@ -1,8 +1,8 @@
# $FreeBSD$
PROG= newgrp
DPADD= ${LIBCRYPT} ${LIBUTIL}
LDADD= -lcrypt -lutil
LIBADD= crypt util
.if defined(ENABLE_SUID_NEWGRP)
BINMODE= 4555

3
usr.bin/newkey/Makefile
View File

@ -8,7 +8,6 @@ SRCS= newkey.c generic.c update.c
CFLAGS+= -DYP
.endif
MAN= newkey.8
DPADD= ${LIBRPCSVC} ${LIBMP} ${LIBCRYPTO}
LDADD= -lrpcsvc -lmp -lcrypto
LIBADD= rpcsvc mp
.include <bsd.prog.mk>

4
usr.bin/nfsstat/Makefile
View File

@ -3,8 +3,8 @@
PROG= nfsstat
CFLAGS+=-DNFS
DPADD= ${LIBKVM}
LDADD= -lkvm
LIBADD= kvm
WARNS?= 3

3
usr.bin/opieinfo/Makefile
View File

@ -10,8 +10,7 @@ CFLAGS+=-DINSECURE_OVERRIDE
WARNS?= 0
DPADD= ${LIBOPIE} ${LIBMD}
LDADD= -lopie -lmd
LIBADD= opie
BINOWN= root
BINMODE=4555

3
usr.bin/opiekey/Makefile
View File

@ -10,8 +10,7 @@ CFLAGS+=-DINSECURE_OVERRIDE
WARNS?= 0
DPADD= ${LIBOPIE} ${LIBMD}
LDADD= -lopie -lmd
LIBADD= opie
LINKS= ${BINDIR}/opiekey ${BINDIR}/otp-md4
LINKS+= ${BINDIR}/opiekey ${BINDIR}/otp-md5

3
usr.bin/opiepasswd/Makefile
View File

@ -10,8 +10,7 @@ CFLAGS+=-DINSECURE_OVERRIDE
WARNS?= 0
DPADD= ${LIBOPIE} ${LIBMD}
LDADD= -lopie -lmd
LIBADD= opie
BINOWN= root
BINMODE=4555

4
usr.bin/pamtest/Makefile
View File

@ -5,7 +5,7 @@ OPENPAM= ${.CURDIR}/../../contrib/openpam
PROG= pamtest
SRCS= pamtest.c
DPADD= ${LIBPAM}
LDADD= ${MINUSLPAM}
LIBADD= pam
.include <bsd.prog.mk>

3
usr.bin/passwd/Makefile
View File

@ -6,8 +6,7 @@
PROG = passwd
BINOWN = root
BINMODE = 4555
DPADD = ${LIBPAM}
LDADD = ${MINUSLPAM}
LIBADD = pam
.if ${MK_NIS} != "no"
LINKS = ${BINDIR}/passwd ${BINDIR}/yppasswd
MLINKS = passwd.1 yppasswd.1

3
usr.bin/procstat/Makefile
View File

@ -16,7 +16,6 @@ SRCS= procstat.c \
procstat_threads.c \
procstat_vm.c
LDADD+= -lutil -lprocstat -lkvm
DPADD+= ${LIBUTIL} ${LIBPROCSTAT} ${LIBKVM}
LIBADD+= util procstat
.include <bsd.prog.mk>

3
usr.bin/quota/Makefile
View File

@ -5,7 +5,6 @@ PROG= quota
BINOWN= root
BINMODE=4555
DPADD= ${LIBRPCSVC} ${LIBUTIL}
LDADD= -lrpcsvc -lutil
LIBADD= rpcsvc util
.include <bsd.prog.mk>

3
usr.bin/rctl/Makefile
View File

@ -3,7 +3,6 @@
PROG= rctl
MAN= rctl.8
DPADD= ${LIBUTIL}
LDADD= -lutil
LIBADD= util
.include <bsd.prog.mk>

3
usr.bin/rup/Makefile
View File

@ -4,7 +4,6 @@ PROG= rup
WARNS?= 1
DPADD= ${LIBRPCSVC}
LDADD= -lrpcsvc
LIBADD= rpcsvc
.include <bsd.prog.mk>

3
usr.bin/rusers/Makefile
View File

@ -2,7 +2,6 @@
PROG = rusers
DPADD= ${LIBRPCSVC}
LDADD= -lrpcsvc
LIBADD= rpcsvc
.include <bsd.prog.mk>

4
usr.bin/script/Makefile
View File

@ -2,7 +2,7 @@
# $FreeBSD$
PROG= script
LDADD= -lutil
DPADD= ${LIBUTIL}
LIBADD= util
.include <bsd.prog.mk>

4
usr.bin/seq/Makefile
View File

@ -2,7 +2,7 @@
# $FreeBSD$
PROG= seq
DPADD= ${LIBM}
LDADD= -lm
LIBADD= m
.include <bsd.prog.mk>

3
usr.bin/smbutil/Makefile
View File

@ -3,8 +3,7 @@
PROG= smbutil
SRCS= smbutil.c dumptree.c login.c lookup.c view.c print.c
DPADD= ${LIBSMB} ${LIBKICONV}
LDADD= -lsmb -lkiconv
LIBADD= smb kiconv
CONTRIBDIR= ${.CURDIR}/../../contrib/smbfs
CFLAGS+= -I${CONTRIBDIR}/include

6
usr.bin/sort/Makefile
View File

@ -13,12 +13,10 @@ CLEANFILES+= sort.1
.if ${MK_SORT_THREADS} != "no"
CFLAGS+= -DSORT_THREADS
LDADD= -lpthread -lmd
DPADD= ${LIBPTHREAD} ${LIBMD}
LIBADD= pthread md
MAN_SUB+= -e 's|%%THREADS%%||g'
.else
LDADD= -lmd
DPADD= ${LIBMD}
LIBADD= md
MAN_SUB+= -e 's|%%THREADS%%|\.\\"|g'
.endif

4
usr.bin/split/Makefile
View File

@ -2,7 +2,7 @@
# $FreeBSD$
PROG= split
LDADD= -lutil
DPADD= ${LIBUTIL}
LIBADD= util
.include <bsd.prog.mk>

6
usr.bin/su/Makefile
View File

@ -7,13 +7,11 @@ PROG= su
WARNS?= 5
DPADD= ${LIBUTIL} ${LIBPAM}
LDADD= -lutil ${MINUSLPAM}
LIBADD= util pam
.if ${MK_AUDIT} != "no"
CFLAGS+= -DUSE_BSM_AUDIT
DPADD+= ${LIBBSM}
LDADD+= -lbsm
LIBADD+= bsm
.endif
BINOWN= root

3
usr.bin/systat/Makefile
View File

@ -16,7 +16,6 @@ CFLAGS+= -DINET6
WARNS?= 0
DPADD= ${LIBNCURSESW} ${LIBM} ${LIBDEVSTAT} ${LIBKVM}
LDADD= -lncursesw -lm -ldevstat -lkvm
LIBADD= ncursesw m devstat kvm
.include <bsd.prog.mk>

4
usr.bin/tabs/Makefile
View File

@ -1,7 +1,7 @@
# $FreeBSD$
PROG= tabs
DPADD= ${LIBTERMCAPW}
LDADD= -ltermcapw
LIBADD= ncursesw
.include <bsd.prog.mk>

4
usr.bin/talk/Makefile
View File

@ -4,7 +4,7 @@
PROG= talk
SRCS= ctl.c ctl_transact.c display.c get_addrs.c get_iface.c get_names.c \
init_disp.c invite.c io.c look_up.c msgs.c talk.c
DPADD= ${LIBNCURSESW}
LDADD= -lncursesw
LIBADD= ncursesw
.include <bsd.prog.mk>

10
usr.bin/tar/Makefile
View File

@ -19,15 +19,7 @@ SRCS= bsdtar.c \
SRCS+= err.c \
line_reader.c
DPADD= ${LIBARCHIVE} ${LIBBZ2} ${LIBZ} ${LIBLZMA} ${LIBBSDXML}
LDADD= -larchive -lbz2 -lz -llzma -lbsdxml
.if ${MK_OPENSSL} != "no"
DPADD+= ${LIBCRYPTO}
LDADD+= -lcrypto
.else
DPADD+= ${LIBMD}
LDADD+= -lmd
.endif
LIBADD= archive
.if ${MK_ICONV} != "no"
CFLAGS+= -DHAVE_ICONV=1 -DHAVE_ICONV_H=1 -DICONV_CONST=const

16
usr.bin/telnet/Makefile
View File

@ -19,15 +19,11 @@ CFLAGS+= -DINET6
WARNS?= 2
LIBTELNET= ${.OBJDIR}/../../lib/libtelnet/libtelnet.a
DPADD= ${LIBTERMCAPW} ${LIBTELNET}
LDADD= -ltermcapw ${LIBTELNET}
LIBADD= telnet ncursesw
.if !defined(RELEASE_CRUNCH)
CFLAGS+= -DIPSEC
DPADD+= ${LIBIPSEC}
LDADD+= -lipsec
LIBADD+= ipsec
.else
.PATH: ${TELNETDIR}/libtelnet
SRCS+= genget.c getent.c misc.c
@ -35,16 +31,14 @@ CFLAGS+= -DHAS_CGETENT
.endif
.if ${MK_OPENSSL} != "no"
SRCS+= authenc.c
SRCS+= authenc.c
CFLAGS+= -DENCRYPTION -DAUTHENTICATION -DIPSEC
DPADD+= ${LIBMP} ${LIBCRYPTO} ${LIBCRYPT} ${LIBIPSEC} ${LIBPAM}
LDADD+= -lmp -lcrypto -lcrypt -lipsec ${MINUSLPAM}
LIBADD+= mp crypto ipsec pam
.endif
.if ${MK_KERBEROS_SUPPORT} != "no"
CFLAGS+= -DKRB5 -DFORWARD -Dnet_write=telnet_net_write
DPADD+= ${LIBKRB5} ${LIBHX509} ${LIBASN1} ${LIBCOM_ERR} ${LIBROKEN}
LDADD+= -lkrb5 -lhx509 -lasn1 -lcom_err -lroken
LIBADD+= krb5 roken
.endif
.include <bsd.prog.mk>

4
usr.bin/tftp/Makefile
View File

@ -7,7 +7,7 @@ PROG= tftp
SRCS= main.c tftp-file.c tftp-io.c tftp-options.c tftp-transfer.c
SRCS+= tftp-utils.c tftp.c
CFLAGS+=-I${.CURDIR}/../../libexec/tftpd
DPADD= ${LIBEDIT} ${LIBTERMCAPW}
LDADD= -ledit -ltermcapw
LIBADD= edit
.include <bsd.prog.mk>

3
usr.bin/top/Makefile
View File

@ -21,8 +21,7 @@ WARNS?= 0
CFLAGS+= -D"Table_size=${TOP_TABLE_SIZE}"
.endif
DPADD= ${LIBTERMCAP} ${LIBM} ${LIBKVM} ${LIBJAIL}
LDADD= -ltermcap -lm -lkvm -ljail
LIBADD= ncursesw m kvm jail
CLEANFILES= sigdesc.h
SIGCONV_AWK= ${.CURDIR}/../../contrib/top/sigconv.awk

3
usr.bin/tput/Makefile
View File

@ -2,8 +2,7 @@
# $FreeBSD$
PROG= tput
DPADD= ${LIBTERMCAPW}
LDADD= -ltermcapw
LIBADD= ncursesw
SCRIPTS=clear.sh
MLINKS= tput.1 clear.1

5
usr.bin/truncate/Makefile
View File

@ -2,9 +2,8 @@
.include <src.opts.mk>
PROG= truncate
DPADD= ${LIBUTIL}
LDADD= -lutil
PROG= truncate
LIBADD= util
.if ${MK_TESTS} != "no"
SUBDIR+= tests

3
usr.bin/tset/Makefile
View File

@ -4,8 +4,7 @@
PROG= tset
SRCS= map.c misc.c set.c term.c tset.c wrterm.c
DPADD= ${LIBTERMCAPW}
LDADD= -ltermcapw
LIBADD= ncursesw
LINKS= ${BINDIR}/tset ${BINDIR}/reset
MLINKS= tset.1 reset.1

3
usr.bin/ul/Makefile
View File

@ -3,7 +3,6 @@
PROG= ul
DPADD= ${LIBTERMCAPW}
LDADD= -ltermcapw
LIBADD= ncursesw
.include <bsd.prog.mk>

3
usr.bin/units/Makefile
View File

@ -6,8 +6,7 @@ PROG= units
FILES= units.lib
FILESDIR= ${SHAREDIR}/misc
LDADD+=-ledit -ltermcapw
DPADD+=${LIBEDIT} ${LIBTERMCAPW}
LIBADD= edit
.if ${MK_TESTS} != "no"
SUBDIR+= tests

3
usr.bin/unzip/Makefile
View File

@ -2,7 +2,6 @@
PROG = unzip
CSTD = c99
DPADD = ${LIBARCHIVE} ${LIBZ}
LDADD = -larchive -lz
LIBADD= archive
.include <bsd.prog.mk>

3
usr.bin/usbhidaction/Makefile
View File

@ -3,7 +3,6 @@
PROG= usbhidaction
LDADD= -lusbhid
DPADD= ${LIBUSBHID}
LIBADD= usbhid
.include <bsd.prog.mk>

4
usr.bin/usbhidctl/Makefile
View File

@ -3,7 +3,7 @@
PROG= usbhidctl
SRCS= usbhid.c
DPADD= ${LIBUSBHID}
LDADD= -lusbhid
LIBADD= usbhid
.include <bsd.prog.mk>

12
usr.bin/vacation/Makefile
View File

@ -11,17 +11,7 @@ CFLAGS+=-D_FFR_LISTDB -D_FFR_DEBUG
WARNS?= 2
LIBSMDIR= ${.OBJDIR}/../../lib/libsm
LIBSM= ${LIBSMDIR}/libsm.a
LIBSMDBDIR= ${.OBJDIR}/../../lib/libsmdb
LIBSMDB= ${LIBSMDBDIR}/libsmdb.a
LIBSMUTILDIR= ${.OBJDIR}/../../lib/libsmutil
LIBSMUTIL= ${LIBSMUTILDIR}/libsmutil.a
DPADD= ${LIBSMDB} ${LIBSMUTIL} ${LIBSM}
LDADD= ${LIBSMDB} ${LIBSMUTIL} ${LIBSM}
LIBADD= smdb smutil sm
SRCS+= sm_os.h
CLEANFILES+=sm_os.h

6
usr.bin/vi/Makefile
View File

@ -33,12 +33,8 @@ MLINKS+=vi.1 nex.1 vi.1 nview.1 vi.1 nvi.1
CFLAGS+=-I${.CURDIR} -I${SRCDIR} -I${SRCDIR}/regex
DPADD= ${LIBUTIL}
LDADD= -lutil
LIBADD= util ncursesw
CFLAGS+= -DUSE_WIDECHAR
DPADD+= ${LIBNCURSESW}
LDADD+= -lncursesw
.if ${MK_ICONV} == "yes" && !defined(RESCUE) && !defined(RELEASE_CRUNCH)
CFLAGS+= -DUSE_ICONV

3
usr.bin/vmstat/Makefile
View File

@ -3,8 +3,7 @@
PROG= vmstat
MAN= vmstat.8
DPADD= ${LIBDEVSTAT} ${LIBKVM} ${LIBMEMSTAT} ${LIBUTIL}
LDADD= -ldevstat -lkvm -lmemstat -lutil
LIBADD= devstat kvm memstat util
WARNS?= 1

3
usr.bin/w/Makefile
View File

@ -4,8 +4,7 @@
PROG= w
SRCS= fmt.c pr_time.c proc_compare.c w.c
MAN= w.1 uptime.1
DPADD= ${LIBKVM} ${LIBUTIL} ${LIBXO}
LDADD= -lkvm -lutil -lxo
LIBADD= kvm util xo
#BINGRP= kmem
#BINMODE=2555
LINKS= ${BINDIR}/w ${BINDIR}/uptime

3
usr.bin/wc/Makefile
View File

@ -2,7 +2,6 @@
# $FreeBSD$
PROG= wc
DPADD= ${LIBXO}
LDADD= -lxo
LIBADD= xo
.include <bsd.prog.mk>

3
usr.bin/xinstall/Makefile
View File

@ -12,7 +12,6 @@ CFLAGS+= -I${.CURDIR}/../../contrib/mtree
CFLAGS+= -I${.CURDIR}/../../lib/libnetbsd
CFLAGS+= -I${.CURDIR}/../../lib/libmd
DPADD+= ${LIBMD}
LDADD+= -lmd
LIBADD= md
.include <bsd.prog.mk>

3
usr.bin/xlint/lint1/Makefile
View File

@ -7,8 +7,7 @@ SRCS= cgram.y scan.l mem1.c mem.c err.c main1.c decl.c tree.c func.c \
MAN= lint.7
CLEANFILES= lint.7
LDADD= -ll -lm
DPADD= ${LIBL} ${LIBM}
LIBADD= l m
CFLAGS+= -I. -I${.CURDIR}
LINTFLAGS=-aehpz

3
usr.bin/xo/Makefile
View File

@ -10,7 +10,6 @@ MAN= xo.1
# XXX For xoversion.h
CFLAGS+=-I${LIBXO}/libxo
DPADD= ${LIBXO}
LDADD= -lxo
LIBADD= xo
.include <bsd.prog.mk>

3
usr.bin/xz/Makefile
View File

@ -42,7 +42,6 @@ CFLAGS+= -DHAVE_CONFIG_H \
-I${LZMALIBDIR} \
-I${XZDIR}/common
DPADD= ${LIBLZMA}
LDADD= -llzma
LIBADD= lzma
.include <bsd.prog.mk>

3
usr.bin/xzdec/Makefile
View File

@ -22,7 +22,6 @@ CFLAGS+= -DHAVE_CONFIG_H \
-I${LZMALIBDIR} \
-I${XZDIR}/common
DPADD= ${LIBLZMA}
LDADD= -llzma
LIBADD= lzma
.include <bsd.prog.mk>