diff options
100 files changed, 131 insertions, 268 deletions
diff --git a/usr.bin/Makefile b/usr.bin/Makefile index 298903e..3f2a6e7 100644 --- a/usr.bin/Makefile +++ b/usr.bin/Makefile @@ -134,7 +134,6 @@ SUBDIR= alias \ printenv \ printf \ procstat \ - protect \ rctl \ renice \ rev \ diff --git a/usr.bin/apply/Makefile b/usr.bin/apply/Makefile index 3ecf038..2233434 100644 --- a/usr.bin/apply/Makefile +++ b/usr.bin/apply/Makefile @@ -4,8 +4,8 @@ .include <src.opts.mk> PROG= apply -DPADD= ${LIBSBUF} -LDADD= -lsbuf + +LIBADD= sbuf .if ${MK_TESTS} != "no" SUBDIR+= tests diff --git a/usr.bin/ar/Makefile b/usr.bin/ar/Makefile index 157d411..7a6601a 100644 --- a/usr.bin/ar/Makefile +++ b/usr.bin/ar/Makefile @@ -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= diff --git a/usr.bin/atm/sscop/Makefile b/usr.bin/atm/sscop/Makefile index 36d3dcf..cc688fd 100644 --- a/usr.bin/atm/sscop/Makefile +++ b/usr.bin/atm/sscop/Makefile @@ -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> diff --git a/usr.bin/awk/Makefile b/usr.bin/awk/Makefile index 6538636..a8bcb5c 100644 --- a/usr.bin/awk/Makefile +++ b/usr.bin/awk/Makefile @@ -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 diff --git a/usr.bin/bc/Makefile b/usr.bin/bc/Makefile index d2f26f1..14d5677 100644 --- a/usr.bin/bc/Makefile +++ b/usr.bin/bc/Makefile @@ -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= diff --git a/usr.bin/bluetooth/bthost/Makefile b/usr.bin/bluetooth/bthost/Makefile index 833d107..13b1d90 100644 --- a/usr.bin/bluetooth/bthost/Makefile +++ b/usr.bin/bluetooth/bthost/Makefile @@ -3,7 +3,6 @@ PROG= bthost -DPADD= ${LIBBLUETOOTH} -LDADD= -lbluetooth +LIBADD= bluetooth .include <bsd.prog.mk> diff --git a/usr.bin/bluetooth/btsockstat/Makefile b/usr.bin/bluetooth/btsockstat/Makefile index cdec9f7..36ef850 100644 --- a/usr.bin/bluetooth/btsockstat/Makefile +++ b/usr.bin/bluetooth/btsockstat/Makefile @@ -6,7 +6,6 @@ WARNS?= 2 BINGRP= kmem BINMODE= 2555 -DPADD= ${LIBBLUETOOTH} ${LIBKVM} -LDADD= -lbluetooth -lkvm +LIBADD= bluetooth kvm .include <bsd.prog.mk> diff --git a/usr.bin/bluetooth/rfcomm_sppd/Makefile b/usr.bin/bluetooth/rfcomm_sppd/Makefile index 0da7498..b17c5cf 100644 --- a/usr.bin/bluetooth/rfcomm_sppd/Makefile +++ b/usr.bin/bluetooth/rfcomm_sppd/Makefile @@ -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> diff --git a/usr.bin/bsdiff/bsdiff/Makefile b/usr.bin/bsdiff/bsdiff/Makefile index 0e8498f..7569b4f 100644 --- a/usr.bin/bsdiff/bsdiff/Makefile +++ b/usr.bin/bsdiff/bsdiff/Makefile @@ -2,7 +2,6 @@ PROG= bsdiff -DPADD= ${LIBBZ2} -LDADD= -lbz2 +LIBADD= bz2 .include <bsd.prog.mk> diff --git a/usr.bin/bsdiff/bspatch/Makefile b/usr.bin/bsdiff/bspatch/Makefile index c0ed521..c2d6d4e 100644 --- a/usr.bin/bsdiff/bspatch/Makefile +++ b/usr.bin/bsdiff/bspatch/Makefile @@ -2,7 +2,6 @@ PROG= bspatch -DPADD= ${LIBBZ2} -LDADD= -lbz2 +LIBADD= bz2 .include <bsd.prog.mk> diff --git a/usr.bin/bzip2/Makefile b/usr.bin/bzip2/Makefile index c2490a2..5cb33b3 100644 --- a/usr.bin/bzip2/Makefile +++ b/usr.bin/bzip2/Makefile @@ -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 diff --git a/usr.bin/calendar/Makefile b/usr.bin/calendar/Makefile index ef1d7f2..79101f0 100644 --- a/usr.bin/calendar/Makefile +++ b/usr.bin/calendar/Makefile @@ -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 diff --git a/usr.bin/chkey/Makefile b/usr.bin/chkey/Makefile index a9e00e8..4f47b9c 100644 --- a/usr.bin/chkey/Makefile +++ b/usr.bin/chkey/Makefile @@ -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> diff --git a/usr.bin/chpass/Makefile b/usr.bin/chpass/Makefile index cf3acc6..9b3e878 100644 --- a/usr.bin/chpass/Makefile +++ b/usr.bin/chpass/Makefile @@ -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 diff --git a/usr.bin/colldef/Makefile b/usr.bin/colldef/Makefile index c028e4a..fd59a6c 100644 --- a/usr.bin/colldef/Makefile +++ b/usr.bin/colldef/Makefile @@ -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 diff --git a/usr.bin/compile_et/Makefile b/usr.bin/compile_et/Makefile index d7177b2..8af87ae 100644 --- a/usr.bin/compile_et/Makefile +++ b/usr.bin/compile_et/Makefile @@ -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 diff --git a/usr.bin/cpio/Makefile b/usr.bin/cpio/Makefile index 16446c4..72a0e2b 100644 --- a/usr.bin/cpio/Makefile +++ b/usr.bin/cpio/Makefile @@ -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 diff --git a/usr.bin/cpio/test/Makefile b/usr.bin/cpio/test/Makefile index 13293b0..77c73d7 100644 --- a/usr.bin/cpio/test/Makefile +++ b/usr.bin/cpio/test/Makefile @@ -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} diff --git a/usr.bin/dc/Makefile b/usr.bin/dc/Makefile index 67af146..832b197 100644 --- a/usr.bin/dc/Makefile +++ b/usr.bin/dc/Makefile @@ -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> diff --git a/usr.bin/dpv/Makefile b/usr.bin/dpv/Makefile index 6f89c0f..93a6cd1 100644 --- a/usr.bin/dpv/Makefile +++ b/usr.bin/dpv/Makefile @@ -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 diff --git a/usr.bin/drill/Makefile b/usr.bin/drill/Makefile index 0db0604..0de0ae5 100644 --- a/usr.bin/drill/Makefile +++ b/usr.bin/drill/Makefile @@ -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> diff --git a/usr.bin/du/Makefile b/usr.bin/du/Makefile index f614866..9f96ec6 100644 --- a/usr.bin/du/Makefile +++ b/usr.bin/du/Makefile @@ -2,7 +2,6 @@ # $FreeBSD$ PROG= du -DPADD= ${LIBUTIL} -LDADD= -lutil +LIBADD= util .include <bsd.prog.mk> diff --git a/usr.bin/ee/Makefile b/usr.bin/ee/Makefile index 8dcf2f5..7423fa7 100644 --- a/usr.bin/ee/Makefile +++ b/usr.bin/ee/Makefile @@ -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 diff --git a/usr.bin/enigma/Makefile b/usr.bin/enigma/Makefile index 32a670b..55fcc46 100644 --- a/usr.bin/enigma/Makefile +++ b/usr.bin/enigma/Makefile @@ -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> diff --git a/usr.bin/fetch/Makefile b/usr.bin/fetch/Makefile index ed56f2f..93c43a7 100644 --- a/usr.bin/fetch/Makefile +++ b/usr.bin/fetch/Makefile @@ -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> diff --git a/usr.bin/file/Makefile b/usr.bin/file/Makefile index 4054365..70c211b 100644 --- a/usr.bin/file/Makefile +++ b/usr.bin/file/Makefile @@ -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 diff --git a/usr.bin/fstat/Makefile b/usr.bin/fstat/Makefile index 8ea8da3..830b23c 100644 --- a/usr.bin/fstat/Makefile +++ b/usr.bin/fstat/Makefile @@ -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 diff --git a/usr.bin/ftp/Makefile b/usr.bin/ftp/Makefile index 3d236d8..18068a6 100644 --- a/usr.bin/ftp/Makefile +++ b/usr.bin/ftp/Makefile @@ -20,8 +20,7 @@ CFLAGS+= -DINET6 .endif CFLAGS+= -I${.CURDIR} -I${TNFTP} -LDADD= -ledit -ltermcapw -DPADD= ${LIBEDIT} ${LIBTERMCAPW} +LIBADD= edit WARNS?= 2 diff --git a/usr.bin/gcore/Makefile b/usr.bin/gcore/Makefile index 7fff540..ad4b540 100644 --- a/usr.bin/gcore/Makefile +++ b/usr.bin/gcore/Makefile @@ -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 diff --git a/usr.bin/grep/Makefile b/usr.bin/grep/Makefile index 32941fd..7dfde14 100644 --- a/usr.bin/grep/Makefile +++ b/usr.bin/grep/Makefile @@ -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" diff --git a/usr.bin/gzip/Makefile b/usr.bin/gzip/Makefile index 24e2506..1266277 100644 --- a/usr.bin/gzip/Makefile +++ b/usr.bin/gzip/Makefile @@ -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 diff --git a/usr.bin/host/Makefile b/usr.bin/host/Makefile index cc1111f..5c2ce52 100644 --- a/usr.bin/host/Makefile +++ b/usr.bin/host/Makefile @@ -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> diff --git a/usr.bin/ipcrm/Makefile b/usr.bin/ipcrm/Makefile index f55311c..990b9f9 100644 --- a/usr.bin/ipcrm/Makefile +++ b/usr.bin/ipcrm/Makefile @@ -2,8 +2,7 @@ PROG= ipcrm SRCS= ipcrm.c ipc.c -DPADD= ${LIBKVM} -LDADD= -lkvm +LIBADD= kvm CFLAGS+=-I${.CURDIR}/../ipcs .PATH: ${.CURDIR}/../ipcs diff --git a/usr.bin/ipcs/Makefile b/usr.bin/ipcs/Makefile index 0d422e1..3106004 100644 --- a/usr.bin/ipcs/Makefile +++ b/usr.bin/ipcs/Makefile @@ -2,8 +2,7 @@ PROG= ipcs SRCS= ipcs.c ipc.c -DPADD= ${LIBKVM} -LDADD= -lkvm +LIBADD= kvm WARNS?= 1 diff --git a/usr.bin/iscsictl/Makefile b/usr.bin/iscsictl/Makefile index 9351ed7..afac715 100644 --- a/usr.bin/iscsictl/Makefile +++ b/usr.bin/iscsictl/Makefile @@ -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 diff --git a/usr.bin/kdump/Makefile b/usr.bin/kdump/Makefile index cba8e41..94caaa9 100644 --- a/usr.bin/kdump/Makefile +++ b/usr.bin/kdump/Makefile @@ -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 diff --git a/usr.bin/keylogin/Makefile b/usr.bin/keylogin/Makefile index 4c03051..2dab249 100644 --- a/usr.bin/keylogin/Makefile +++ b/usr.bin/keylogin/Makefile @@ -2,8 +2,7 @@ PROG= keylogin -DPADD= ${LIBRPCSVC} -LDADD= -lrpcsvc +LIBADD= rpcsvc WARNS?= 0 diff --git a/usr.bin/killall/Makefile b/usr.bin/killall/Makefile index de58c78..890d7a1 100644 --- a/usr.bin/killall/Makefile +++ b/usr.bin/killall/Makefile @@ -1,7 +1,6 @@ # $FreeBSD$ PROG= killall -DPADD= ${LIBJAIL} -LDADD= -ljail +LIBADD= jail .include <bsd.prog.mk> diff --git a/usr.bin/ktrdump/Makefile b/usr.bin/ktrdump/Makefile index c30dc3d..63cd2cf 100644 --- a/usr.bin/ktrdump/Makefile +++ b/usr.bin/ktrdump/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PROG= ktrdump -DPADD= ${LIBKVM} -LDADD= -lkvm +LIBADD= kvm MAN= ktrdump.8 WARNS?= 2 diff --git a/usr.bin/less/Makefile b/usr.bin/less/Makefile index 22147cd..b6adf2c 100644 --- a/usr.bin/less/Makefile +++ b/usr.bin/less/Makefile @@ -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 \ diff --git a/usr.bin/limits/Makefile b/usr.bin/limits/Makefile index 0133178..13ea597 100644 --- a/usr.bin/limits/Makefile +++ b/usr.bin/limits/Makefile @@ -1,7 +1,6 @@ # $FreeBSD$ PROG= limits -DPADD= ${LIBUTIL} -LDADD= -lutil +LIBADD= util .include <bsd.prog.mk> diff --git a/usr.bin/lock/Makefile b/usr.bin/lock/Makefile index dc09a87..cc5d689 100644 --- a/usr.bin/lock/Makefile +++ b/usr.bin/lock/Makefile @@ -4,7 +4,7 @@ PROG= lock BINOWN= root BINMODE=4555 -DPADD= ${LIBCRYPT} -LDADD= -lcrypt + +LIBADD= crypt .include <bsd.prog.mk> diff --git a/usr.bin/login/Makefile b/usr.bin/login/Makefile index 1ebc760..0763c84 100644 --- a/usr.bin/login/Makefile +++ b/usr.bin/login/Makefile @@ -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" diff --git a/usr.bin/lzmainfo/Makefile b/usr.bin/lzmainfo/Makefile index b92b46c..158a209 100644 --- a/usr.bin/lzmainfo/Makefile +++ b/usr.bin/lzmainfo/Makefile @@ -16,7 +16,6 @@ CFLAGS+= -DHAVE_CONFIG_H \ -I${LZMALIBDIR} \ -I${XZDIR}/common -DPADD= ${LIBLZMA} -LDADD= -llzma +LIBADD= lzma .include <bsd.prog.mk> diff --git a/usr.bin/m4/Makefile b/usr.bin/m4/Makefile index 9153e71..d955075 100644 --- a/usr.bin/m4/Makefile +++ b/usr.bin/m4/Makefile @@ -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= diff --git a/usr.bin/makewhatis/Makefile b/usr.bin/makewhatis/Makefile index 4da90ef..ba0e1ee 100644 --- a/usr.bin/makewhatis/Makefile +++ b/usr.bin/makewhatis/Makefile @@ -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 diff --git a/usr.bin/minigzip/Makefile b/usr.bin/minigzip/Makefile index b2cfc46..da15aa9 100644 --- a/usr.bin/minigzip/Makefile +++ b/usr.bin/minigzip/Makefile @@ -7,7 +7,6 @@ PROG= minigzip WARNS?= 5 CFLAGS+=-DUSE_MMAP -DPADD= ${LIBZ} -LDADD= -lz +LIBADD= z .include <bsd.prog.mk> diff --git a/usr.bin/ministat/Makefile b/usr.bin/ministat/Makefile index e4c2f07..2a63797 100644 --- a/usr.bin/ministat/Makefile +++ b/usr.bin/ministat/Makefile @@ -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 diff --git a/usr.bin/mkimg/Makefile b/usr.bin/mkimg/Makefile index 28aac7d..f028f3f 100644 --- a/usr.bin/mkimg/Makefile +++ b/usr.bin/mkimg/Makefile @@ -31,8 +31,7 @@ SRCS+= \ BINDIR?=/usr/bin -DPADD= ${LIBUTIL} -LDADD= -lutil +LIBADD= util WARNS?= 6 diff --git a/usr.bin/mkulzma/Makefile b/usr.bin/mkulzma/Makefile index 8147ebf..15596bf 100644 --- a/usr.bin/mkulzma/Makefile +++ b/usr.bin/mkulzma/Makefile @@ -2,7 +2,7 @@ PROG= mkulzma MAN= mkulzma.8 -DPADD= ${LIBLZMA} -LDADD= -llzma + +LIBADD= lzma .include <bsd.prog.mk> diff --git a/usr.bin/mkuzip/Makefile b/usr.bin/mkuzip/Makefile index c5eac20..92ab43e 100644 --- a/usr.bin/mkuzip/Makefile +++ b/usr.bin/mkuzip/Makefile @@ -3,8 +3,6 @@ PROG= mkuzip MAN= mkuzip.8 -DPADD= ${LIBZ} -LDADD= -lz - +LIBADD= z .include <bsd.prog.mk> diff --git a/usr.bin/msgs/Makefile b/usr.bin/msgs/Makefile index 6c5a8d9..3af95c3 100644 --- a/usr.bin/msgs/Makefile +++ b/usr.bin/msgs/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PROG= msgs -DPADD= ${LIBTERMCAPW} -LDADD= -ltermcapw + +LIBADD= ncursesw .include <bsd.prog.mk> diff --git a/usr.bin/nc/Makefile b/usr.bin/nc/Makefile index 17cea06..b24a086 100644 --- a/usr.bin/nc/Makefile +++ b/usr.bin/nc/Makefile @@ -6,8 +6,7 @@ PROG= nc SRCS= netcat.c atomicio.c socks.c CFLAGS+=-DIPSEC -LDADD= -lipsec -DPADD= ${LIBIPSEC} +LIBADD= ipsec WARNS?= 2 diff --git a/usr.bin/ncal/Makefile b/usr.bin/ncal/Makefile index 1422ce1..23b5da2 100644 --- a/usr.bin/ncal/Makefile +++ b/usr.bin/ncal/Makefile @@ -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 diff --git a/usr.bin/netstat/Makefile b/usr.bin/netstat/Makefile index 2d50a49..89c8e03 100644 --- a/usr.bin/netstat/Makefile +++ b/usr.bin/netstat/Makefile @@ -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 diff --git a/usr.bin/newgrp/Makefile b/usr.bin/newgrp/Makefile index 8195348..0a8e4a8 100644 --- a/usr.bin/newgrp/Makefile +++ b/usr.bin/newgrp/Makefile @@ -1,8 +1,8 @@ # $FreeBSD$ PROG= newgrp -DPADD= ${LIBCRYPT} ${LIBUTIL} -LDADD= -lcrypt -lutil + +LIBADD= crypt util .if defined(ENABLE_SUID_NEWGRP) BINMODE= 4555 diff --git a/usr.bin/newkey/Makefile b/usr.bin/newkey/Makefile index bf46513..be1ea37 100644 --- a/usr.bin/newkey/Makefile +++ b/usr.bin/newkey/Makefile @@ -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> diff --git a/usr.bin/nfsstat/Makefile b/usr.bin/nfsstat/Makefile index d31db0a..10b0b31 100644 --- a/usr.bin/nfsstat/Makefile +++ b/usr.bin/nfsstat/Makefile @@ -3,8 +3,8 @@ PROG= nfsstat CFLAGS+=-DNFS -DPADD= ${LIBKVM} -LDADD= -lkvm + +LIBADD= kvm WARNS?= 3 diff --git a/usr.bin/opieinfo/Makefile b/usr.bin/opieinfo/Makefile index b3ba166..f386be2 100644 --- a/usr.bin/opieinfo/Makefile +++ b/usr.bin/opieinfo/Makefile @@ -10,8 +10,7 @@ CFLAGS+=-DINSECURE_OVERRIDE WARNS?= 0 -DPADD= ${LIBOPIE} ${LIBMD} -LDADD= -lopie -lmd +LIBADD= opie BINOWN= root BINMODE=4555 diff --git a/usr.bin/opiekey/Makefile b/usr.bin/opiekey/Makefile index 0ee8570..95ae8b3 100644 --- a/usr.bin/opiekey/Makefile +++ b/usr.bin/opiekey/Makefile @@ -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 diff --git a/usr.bin/opiepasswd/Makefile b/usr.bin/opiepasswd/Makefile index b05e3b2..7b3f1f2 100644 --- a/usr.bin/opiepasswd/Makefile +++ b/usr.bin/opiepasswd/Makefile @@ -10,8 +10,7 @@ CFLAGS+=-DINSECURE_OVERRIDE WARNS?= 0 -DPADD= ${LIBOPIE} ${LIBMD} -LDADD= -lopie -lmd +LIBADD= opie BINOWN= root BINMODE=4555 diff --git a/usr.bin/pamtest/Makefile b/usr.bin/pamtest/Makefile index 1968300..289beb6 100644 --- a/usr.bin/pamtest/Makefile +++ b/usr.bin/pamtest/Makefile @@ -5,7 +5,7 @@ OPENPAM= ${.CURDIR}/../../contrib/openpam PROG= pamtest SRCS= pamtest.c -DPADD= ${LIBPAM} -LDADD= ${MINUSLPAM} + +LIBADD= pam .include <bsd.prog.mk> diff --git a/usr.bin/passwd/Makefile b/usr.bin/passwd/Makefile index 3e6dc93..f1fff46 100644 --- a/usr.bin/passwd/Makefile +++ b/usr.bin/passwd/Makefile @@ -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 diff --git a/usr.bin/procstat/Makefile b/usr.bin/procstat/Makefile index 4def311..1744fe0 100644 --- a/usr.bin/procstat/Makefile +++ b/usr.bin/procstat/Makefile @@ -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> diff --git a/usr.bin/quota/Makefile b/usr.bin/quota/Makefile index 26585ae..753972e 100644 --- a/usr.bin/quota/Makefile +++ b/usr.bin/quota/Makefile @@ -5,7 +5,6 @@ PROG= quota BINOWN= root BINMODE=4555 -DPADD= ${LIBRPCSVC} ${LIBUTIL} -LDADD= -lrpcsvc -lutil +LIBADD= rpcsvc util .include <bsd.prog.mk> diff --git a/usr.bin/rctl/Makefile b/usr.bin/rctl/Makefile index c5c32eb..0191bdd 100644 --- a/usr.bin/rctl/Makefile +++ b/usr.bin/rctl/Makefile @@ -3,7 +3,6 @@ PROG= rctl MAN= rctl.8 -DPADD= ${LIBUTIL} -LDADD= -lutil +LIBADD= util .include <bsd.prog.mk> diff --git a/usr.bin/rup/Makefile b/usr.bin/rup/Makefile index e872201..4b5131e 100644 --- a/usr.bin/rup/Makefile +++ b/usr.bin/rup/Makefile @@ -4,7 +4,6 @@ PROG= rup WARNS?= 1 -DPADD= ${LIBRPCSVC} -LDADD= -lrpcsvc +LIBADD= rpcsvc .include <bsd.prog.mk> diff --git a/usr.bin/rusers/Makefile b/usr.bin/rusers/Makefile index 6cb39ac..f640350 100644 --- a/usr.bin/rusers/Makefile +++ b/usr.bin/rusers/Makefile @@ -2,7 +2,6 @@ PROG = rusers -DPADD= ${LIBRPCSVC} -LDADD= -lrpcsvc +LIBADD= rpcsvc .include <bsd.prog.mk> diff --git a/usr.bin/script/Makefile b/usr.bin/script/Makefile index 50ba12e..f75106f 100644 --- a/usr.bin/script/Makefile +++ b/usr.bin/script/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PROG= script -LDADD= -lutil -DPADD= ${LIBUTIL} + +LIBADD= util .include <bsd.prog.mk> diff --git a/usr.bin/seq/Makefile b/usr.bin/seq/Makefile index 58b16ae..bb3c295 100644 --- a/usr.bin/seq/Makefile +++ b/usr.bin/seq/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PROG= seq -DPADD= ${LIBM} -LDADD= -lm + +LIBADD= m .include <bsd.prog.mk> diff --git a/usr.bin/smbutil/Makefile b/usr.bin/smbutil/Makefile index 19ac5fd..56367e8 100644 --- a/usr.bin/smbutil/Makefile +++ b/usr.bin/smbutil/Makefile @@ -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 diff --git a/usr.bin/sort/Makefile b/usr.bin/sort/Makefile index 532e930..d097beb 100644 --- a/usr.bin/sort/Makefile +++ b/usr.bin/sort/Makefile @@ -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 diff --git a/usr.bin/split/Makefile b/usr.bin/split/Makefile index 097932c..6891f8b 100644 --- a/usr.bin/split/Makefile +++ b/usr.bin/split/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PROG= split -LDADD= -lutil -DPADD= ${LIBUTIL} + +LIBADD= util .include <bsd.prog.mk> diff --git a/usr.bin/su/Makefile b/usr.bin/su/Makefile index d5eb805..178e670 100644 --- a/usr.bin/su/Makefile +++ b/usr.bin/su/Makefile @@ -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 diff --git a/usr.bin/systat/Makefile b/usr.bin/systat/Makefile index 1bb2da0..672aadc 100644 --- a/usr.bin/systat/Makefile +++ b/usr.bin/systat/Makefile @@ -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> diff --git a/usr.bin/tabs/Makefile b/usr.bin/tabs/Makefile index 2c5f729..f8c085b 100644 --- a/usr.bin/tabs/Makefile +++ b/usr.bin/tabs/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PROG= tabs -DPADD= ${LIBTERMCAPW} -LDADD= -ltermcapw + +LIBADD= ncursesw .include <bsd.prog.mk> diff --git a/usr.bin/talk/Makefile b/usr.bin/talk/Makefile index eb14d22..f595be8 100644 --- a/usr.bin/talk/Makefile +++ b/usr.bin/talk/Makefile @@ -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> diff --git a/usr.bin/tar/Makefile b/usr.bin/tar/Makefile index a289ea4..f7e7775 100644 --- a/usr.bin/tar/Makefile +++ b/usr.bin/tar/Makefile @@ -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 diff --git a/usr.bin/telnet/Makefile b/usr.bin/telnet/Makefile index b88f8e1..a24a966 100644 --- a/usr.bin/telnet/Makefile +++ b/usr.bin/telnet/Makefile @@ -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> diff --git a/usr.bin/tftp/Makefile b/usr.bin/tftp/Makefile index 88f8c37..0f96d23 100644 --- a/usr.bin/tftp/Makefile +++ b/usr.bin/tftp/Makefile @@ -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> diff --git a/usr.bin/top/Makefile b/usr.bin/top/Makefile index de08724..67ab20d 100644 --- a/usr.bin/top/Makefile +++ b/usr.bin/top/Makefile @@ -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 diff --git a/usr.bin/tput/Makefile b/usr.bin/tput/Makefile index c42ef79..d3171da 100644 --- a/usr.bin/tput/Makefile +++ b/usr.bin/tput/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PROG= tput -DPADD= ${LIBTERMCAPW} -LDADD= -ltermcapw +LIBADD= ncursesw SCRIPTS=clear.sh MLINKS= tput.1 clear.1 diff --git a/usr.bin/truncate/Makefile b/usr.bin/truncate/Makefile index b51c9b0..a6de5c6 100644 --- a/usr.bin/truncate/Makefile +++ b/usr.bin/truncate/Makefile @@ -2,9 +2,8 @@ .include <src.opts.mk> -PROG= truncate -DPADD= ${LIBUTIL} -LDADD= -lutil +PROG= truncate +LIBADD= util .if ${MK_TESTS} != "no" SUBDIR+= tests diff --git a/usr.bin/tset/Makefile b/usr.bin/tset/Makefile index c486bf8..acf8334 100644 --- a/usr.bin/tset/Makefile +++ b/usr.bin/tset/Makefile @@ -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 diff --git a/usr.bin/ul/Makefile b/usr.bin/ul/Makefile index 685e4a4..817f07b 100644 --- a/usr.bin/ul/Makefile +++ b/usr.bin/ul/Makefile @@ -3,7 +3,6 @@ PROG= ul -DPADD= ${LIBTERMCAPW} -LDADD= -ltermcapw +LIBADD= ncursesw .include <bsd.prog.mk> diff --git a/usr.bin/units/Makefile b/usr.bin/units/Makefile index 3757c85..9018866 100644 --- a/usr.bin/units/Makefile +++ b/usr.bin/units/Makefile @@ -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 diff --git a/usr.bin/unzip/Makefile b/usr.bin/unzip/Makefile index ef8a690..9ed1a95 100644 --- a/usr.bin/unzip/Makefile +++ b/usr.bin/unzip/Makefile @@ -2,7 +2,6 @@ PROG = unzip CSTD = c99 -DPADD = ${LIBARCHIVE} ${LIBZ} -LDADD = -larchive -lz +LIBADD= archive .include <bsd.prog.mk> diff --git a/usr.bin/usbhidaction/Makefile b/usr.bin/usbhidaction/Makefile index 6c2f7a6..7aadd6c 100644 --- a/usr.bin/usbhidaction/Makefile +++ b/usr.bin/usbhidaction/Makefile @@ -3,7 +3,6 @@ PROG= usbhidaction -LDADD= -lusbhid -DPADD= ${LIBUSBHID} +LIBADD= usbhid .include <bsd.prog.mk> diff --git a/usr.bin/usbhidctl/Makefile b/usr.bin/usbhidctl/Makefile index 3738b50..f0b5758 100644 --- a/usr.bin/usbhidctl/Makefile +++ b/usr.bin/usbhidctl/Makefile @@ -3,7 +3,7 @@ PROG= usbhidctl SRCS= usbhid.c -DPADD= ${LIBUSBHID} -LDADD= -lusbhid + +LIBADD= usbhid .include <bsd.prog.mk> diff --git a/usr.bin/vacation/Makefile b/usr.bin/vacation/Makefile index 056f576..f32e0c4 100644 --- a/usr.bin/vacation/Makefile +++ b/usr.bin/vacation/Makefile @@ -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 diff --git a/usr.bin/vi/Makefile b/usr.bin/vi/Makefile index 6ed95ee..3595aec 100644 --- a/usr.bin/vi/Makefile +++ b/usr.bin/vi/Makefile @@ -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 diff --git a/usr.bin/vmstat/Makefile b/usr.bin/vmstat/Makefile index d413d25..8945b3d 100644 --- a/usr.bin/vmstat/Makefile +++ b/usr.bin/vmstat/Makefile @@ -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 diff --git a/usr.bin/w/Makefile b/usr.bin/w/Makefile index 6a5bbe5..cb7a063 100644 --- a/usr.bin/w/Makefile +++ b/usr.bin/w/Makefile @@ -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 diff --git a/usr.bin/wc/Makefile b/usr.bin/wc/Makefile index 6c67135..540e33d 100644 --- a/usr.bin/wc/Makefile +++ b/usr.bin/wc/Makefile @@ -2,7 +2,6 @@ # $FreeBSD$ PROG= wc -DPADD= ${LIBXO} -LDADD= -lxo +LIBADD= xo .include <bsd.prog.mk> diff --git a/usr.bin/xinstall/Makefile b/usr.bin/xinstall/Makefile index 773dd4e..1d39273 100644 --- a/usr.bin/xinstall/Makefile +++ b/usr.bin/xinstall/Makefile @@ -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> diff --git a/usr.bin/xlint/lint1/Makefile b/usr.bin/xlint/lint1/Makefile index b7f78c5..2d6539e 100644 --- a/usr.bin/xlint/lint1/Makefile +++ b/usr.bin/xlint/lint1/Makefile @@ -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 diff --git a/usr.bin/xo/Makefile b/usr.bin/xo/Makefile index c7b51d8..b199207 100644 --- a/usr.bin/xo/Makefile +++ b/usr.bin/xo/Makefile @@ -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> diff --git a/usr.bin/xz/Makefile b/usr.bin/xz/Makefile index 13703fd..e2eaca5 100644 --- a/usr.bin/xz/Makefile +++ b/usr.bin/xz/Makefile @@ -42,7 +42,6 @@ CFLAGS+= -DHAVE_CONFIG_H \ -I${LZMALIBDIR} \ -I${XZDIR}/common -DPADD= ${LIBLZMA} -LDADD= -llzma +LIBADD= lzma .include <bsd.prog.mk> diff --git a/usr.bin/xzdec/Makefile b/usr.bin/xzdec/Makefile index daef296..f78a16c 100644 --- a/usr.bin/xzdec/Makefile +++ b/usr.bin/xzdec/Makefile @@ -22,7 +22,6 @@ CFLAGS+= -DHAVE_CONFIG_H \ -I${LZMALIBDIR} \ -I${XZDIR}/common -DPADD= ${LIBLZMA} -LDADD= -llzma +LIBADD= lzma .include <bsd.prog.mk> |
