Index: bin/csh/Makefile =================================================================== --- bin/csh/Makefile (revision 274143) +++ bin/csh/Makefile (working copy) @@ -40,8 +40,7 @@ # utilities of the same name are handled with the associated manpage, # builtin.1 in share/man/man1/. -DPADD= ${LIBTERMCAPW} ${LIBCRYPT} -LDADD= -ltermcapw -lcrypt +LIBADD= termcapw crypt LINKS= ${BINDIR}/csh ${BINDIR}/tcsh Index: bin/df/Makefile =================================================================== --- bin/df/Makefile (revision 274143) +++ bin/df/Makefile (working copy) @@ -9,7 +9,6 @@ CFLAGS+= -I${MOUNT} -DPADD= ${LIBUTIL} -LDADD= -lutil +LIBADD= util .include Index: bin/ed/Makefile =================================================================== --- bin/ed/Makefile (revision 274143) +++ bin/ed/Makefile (working copy) @@ -9,8 +9,7 @@ .if ${MK_OPENSSL} != "no" && ${MK_ED_CRYPTO} != "no" CFLAGS+=-DDES -DPADD= ${LIBCRYPTO} -LDADD= -lcrypto +LIBADD= crypto .endif .include Index: bin/ls/Makefile =================================================================== --- bin/ls/Makefile (revision 274143) +++ bin/ls/Makefile (working copy) @@ -5,14 +5,12 @@ PROG= ls SRCS= cmp.c ls.c print.c util.c -DPADD= ${LIBUTIL} -LDADD= -lutil +LIBADD= util .if !defined(RELEASE_CRUNCH) && \ ${MK_LS_COLORS} != no CFLAGS+= -DCOLORLS -DPADD+= ${LIBTERMCAPW} -LDADD+= -ltermcapw +LIBADD+= termcapw .endif .include Index: bin/pkill/Makefile =================================================================== --- bin/pkill/Makefile (revision 274143) +++ bin/pkill/Makefile (working copy) @@ -5,8 +5,7 @@ PROG= pkill -DPADD= ${LIBKVM} -LDADD= -lkvm +LIBADD= kvm LINKS= ${BINDIR}/pkill ${BINDIR}/pgrep MLINKS= pkill.1 pgrep.1 Index: bin/ps/Makefile =================================================================== --- bin/ps/Makefile (revision 274143) +++ bin/ps/Makefile (working copy) @@ -11,7 +11,6 @@ # on large systems. # CFLAGS+=-DLAZY_PS -DPADD= ${LIBM} ${LIBKVM} ${LIBJAIL} -LDADD= -lm -lkvm -ljail +LIBADD= m kvm jail .include Index: bin/rmail/Makefile =================================================================== --- bin/rmail/Makefile (revision 274143) +++ bin/rmail/Makefile (working copy) @@ -14,12 +14,8 @@ WARNS?= 2 CFLAGS+=-I${SENDMAIL_DIR}/include -I. -LIBSMDIR= ${.OBJDIR}/../../lib/libsm -LIBSM= ${LIBSMDIR}/libsm.a +LIBADD= sm -DPADD= ${LIBSM} -LDADD= ${LIBSM} - SRCS+= sm_os.h CLEANFILES+=sm_os.h Index: bin/sh/Makefile =================================================================== --- bin/sh/Makefile (revision 274143) +++ bin/sh/Makefile (working copy) @@ -18,8 +18,7 @@ # utilities of the same name are handled with the associated manpage, # builtin.1 in share/man/man1/. -DPADD= ${LIBEDIT} ${LIBTERMCAPW} -LDADD= -ledit -ltermcapw +LIBADD= edit CFLAGS+=-DSHELL -I. -I${.CURDIR} # for debug: Index: lib/atf/libatf-c++/Makefile =================================================================== --- lib/atf/libatf-c++/Makefile (revision 274143) +++ lib/atf/libatf-c++/Makefile (working copy) @@ -33,8 +33,7 @@ SHLIB_MAJOR= 2 # libatf-c++ depends on the C version of the ATF library to build. -DPADD= ${LIBATF_C} -LDADD= -latf-c +LIBADD+= atf_c LDFLAGS+= -L${.OBJDIR}/../libatf-c Index: lib/libarchive/Makefile =================================================================== --- lib/libarchive/Makefile (revision 274143) +++ lib/libarchive/Makefile (working copy) @@ -4,20 +4,10 @@ LIBARCHIVEDIR= ${.CURDIR}/../../contrib/libarchive LIB= archive -DPADD= ${LIBZ} -LDADD= -lz -DPADD+= ${LIBBZ2} -LDADD+= -lbz2 -CFLAGS+= -DHAVE_BZLIB_H=1 +LIBADD= z bz2 lzma bsdxml +CFLAGS+= -DHAVE_BZLIB_H=1 -DHAVE_LIBLZMA=1 -DHAVE_LZMA_H=1 -DPADD+= ${LIBLZMA} -LDADD+= -llzma -CFLAGS+= -DHAVE_LIBLZMA=1 -DHAVE_LZMA_H=1 - -DPADD+= ${LIBBSDXML} -LDADD+= -lbsdxml - # FreeBSD SHLIB_MAJOR value is managed as part of the FreeBSD system. # It has no real relation to the libarchive version number. SHLIB_MAJOR= 6 @@ -27,11 +17,9 @@ .if ${MK_OPENSSL} != "no" CFLAGS+= -DWITH_OPENSSL -DPADD+= ${LIBCRYPTO} -LDADD+= -lcrypto +LIBADD+= crypto .else -DPADD+= ${LIBMD} -LDADD+= -lmd +LIBADD+= md .endif .if ${MK_ICONV} != "no" Index: lib/libarchive/test/Makefile =================================================================== --- lib/libarchive/test/Makefile (revision 274143) +++ lib/libarchive/test/Makefile (working copy) @@ -6,9 +6,8 @@ PROG=libarchive_test INTERNALPROG=yes # Don't install this; it's just for testing -DPADD=${LIBBZ2} ${LIBZ} ${LIBMD} ${LIBCRYPTO} ${LIBBSDXML} LDADD= -L ${.OBJDIR}/.. -larchive -LDADD+= -lz -lbz2 -llzma -lmd -lcrypto -lbsdxml +LIBADD= z bz2 lzma md crypto bsdxml CFLAGS+= -g CFLAGS+= -I${.CURDIR}/.. -I${.OBJDIR} CFLAGS+= -I${LIBARCHIVEDIR}/libarchive -I${LIBARCHIVEDIR}/test_utils Index: lib/libbsnmp/libbsnmp/Makefile =================================================================== --- lib/libbsnmp/libbsnmp/Makefile (revision 274143) +++ lib/libbsnmp/libbsnmp/Makefile (working copy) @@ -15,8 +15,7 @@ .if ${MK_OPENSSL} != "no" CFLAGS+= -DHAVE_LIBCRYPTO -DPADD+= ${LIBCRYPTO} -LDADD+= -lcrypto +LIBADD= crypto .endif SRCS= asn1.c snmp.c snmpagent.c snmpclient.c snmpcrypto.c support.c Index: lib/libc++/Makefile =================================================================== --- lib/libc++/Makefile (revision 274143) +++ lib/libc++/Makefile (working copy) @@ -62,8 +62,7 @@ CXXFLAGS+= -std=c++11 .endif -DPADD= ${LIBCXXRT} -LDADD= -lcxxrt +LIBADD+= cxxrt LDFLAGS+= --verbose INCSGROUPS= STD EXP EXT Index: lib/libcam/Makefile =================================================================== --- lib/libcam/Makefile (revision 274143) +++ lib/libcam/Makefile (working copy) @@ -6,8 +6,7 @@ ata_all.c smp_all.c INCS= camlib.h -DPADD= ${LIBSBUF} -LDADD= -lsbuf +LIBADD= sbuf MAN= cam.3 cam_cdbparse.3 Index: lib/libcapsicum/Makefile =================================================================== --- lib/libcapsicum/Makefile (revision 274143) +++ lib/libcapsicum/Makefile (working copy) @@ -21,8 +21,7 @@ INCS+= libcapsicum_service.h INCS+= libcapsicum_sysctl.h -DPADD= ${LIBNV} -LDADD= -lnv +LIBADD= nv CFLAGS+=-I${.CURDIR} CFLAGS+=-I${.CURDIR}/../libnv Index: lib/libcasper/Makefile =================================================================== --- lib/libcasper/Makefile (revision 274143) +++ lib/libcasper/Makefile (working copy) @@ -8,8 +8,7 @@ SRCS= libcasper.c INCS= libcasper.h -DPADD= ${LIBCAPSICUM} ${LIBNV} ${LIBPJDLOG} -LDADD= -lcapsicum -lnv -lpjdlog +LIBADD= capsicum nv pjdlog CFLAGS+=-I${.CURDIR} CFLAGS+=-I${.CURDIR}/../libpjdlog Index: lib/libcrypt/tests/Makefile =================================================================== --- lib/libcrypt/tests/Makefile (revision 274143) +++ lib/libcrypt/tests/Makefile (working copy) @@ -7,7 +7,6 @@ ATF_TESTS_C= crypt_tests CFLAGS+= -I${.CURDIR:H} -DPADD+= ${LIBCRYPT} -LDADD+= -lcrypt +LIBADD= crypt .include Index: lib/libcuse/Makefile =================================================================== --- lib/libcuse/Makefile (revision 274143) +++ lib/libcuse/Makefile (working copy) @@ -30,14 +30,12 @@ SRCS= cuse_lib.c INCS= cuse.h MAN= cuse.3 -PTHREAD_LIBS?= -lpthread CFLAGS+= -D_GNU_SOURCE .if defined(HAVE_DEBUG) CFLAGS+= -g CFLAGS+= -DHAVE_DEBUG .endif -DPADD+= ${LIBPTHREAD} -LDADD+= ${PTHREAD_LIBS} +LIBADD= pthread MLINKS= MLINKS+= cuse.3 cuse_alloc_unit_number.3 Index: lib/libdevstat/Makefile =================================================================== --- lib/libdevstat/Makefile (revision 274143) +++ lib/libdevstat/Makefile (working copy) @@ -7,8 +7,7 @@ SRCS= devstat.c INCS= devstat.h -DPADD= ${LIBKVM} -LDADD= -lkvm +LIBADD= kvm MAN= devstat.3 Index: lib/libdpv/Makefile =================================================================== --- lib/libdpv/Makefile (revision 274167) +++ lib/libdpv/Makefile (working copy) @@ -6,8 +6,7 @@ MAN= dpv.3 MLINKS= dpv.3 dpv_free.3 -DPADD= ${LIBDIALOG} ${LIBFIGPAR} ${LIBNCURSESW} ${LIBUTIL} -LDADD= -ldialog -lfigpar -lncursesw -lutil +LIBADD= dialog figpar SRCS= dialog_util.c dialogrc.c dprompt.c dpv.c status.c util.c Index: lib/libdwarf/Makefile =================================================================== --- lib/libdwarf/Makefile (revision 274143) +++ lib/libdwarf/Makefile (working copy) @@ -96,8 +96,7 @@ mkdir -p ${.OBJDIR}/sys ln -sf ${.CURDIR}/../../sys/${.TARGET} ${.TARGET} -LDADD+= -lelf -DPADD+= ${LIBELF} +LIBADD+= elf SHLIB_MAJOR= 4 Index: lib/libedit/Makefile =================================================================== --- lib/libedit/Makefile (revision 274143) +++ lib/libedit/Makefile (working copy) @@ -10,8 +10,7 @@ hist.c key.c map.c \ parse.c prompt.c read.c refresh.c search.c sig.c term.c tty.c vi.c -DPADD= ${LIBNCURSESW} -LDADD= -lncursesw +LIBADD= ncursesw MAN= editline.3 editrc.5 Index: lib/libexecinfo/Makefile =================================================================== --- lib/libexecinfo/Makefile (revision 274143) +++ lib/libexecinfo/Makefile (working copy) @@ -10,8 +10,7 @@ INCS= execinfo.h SRCS= backtrace.c symtab.c unwind.c -DPADD= ${LIBELF} -LDADD= -lelf +LIBADD= elf MAN= backtrace.3 Index: lib/libfetch/Makefile =================================================================== --- lib/libfetch/Makefile (revision 274143) +++ lib/libfetch/Makefile (working copy) @@ -16,11 +16,9 @@ .if ${MK_OPENSSL} != "no" CFLAGS+= -DWITH_SSL -DPADD= ${LIBSSL} ${LIBCRYPTO} -LDADD= -lssl -lcrypto +LIBADD+= ssl crypto .else -DPADD= ${LIBMD} -LDADD= -lmd +LIBADD+= md .endif CFLAGS+= -DFTP_COMBINE_CWDS Index: lib/libgeom/Makefile =================================================================== --- lib/libgeom/Makefile (revision 274143) +++ lib/libgeom/Makefile (working copy) @@ -13,8 +13,7 @@ WARNS?= 3 -DPADD= ${LIBBSDXML} ${LIBSBUF} -LDADD= -lbsdxml -lsbuf +LIBADD+= bsdxml sbuf MAN= libgeom.3 Index: lib/libldns/Makefile =================================================================== --- lib/libldns/Makefile (revision 274143) +++ lib/libldns/Makefile (working copy) @@ -18,8 +18,7 @@ SRCS+= b64_ntop.c b64_pton.c -DPADD+= ${LIBCRYPTO} -LDADD+= -lcrypto +LIBADD= crypto WARNS ?= 3 Index: lib/libmagic/Makefile =================================================================== --- lib/libmagic/Makefile (revision 274143) +++ lib/libmagic/Makefile (working copy) @@ -7,8 +7,7 @@ LIB= magic SHLIB_MAJOR= 4 -DPADD= ${LIBZ} -LDADD= -lz +LIBADD= z MAN= libmagic.3 magic.5 SRCS= apprentice.c apptype.c ascmagic.c cdf.c cdf_time.c compress.c \ Index: lib/libmemstat/Makefile =================================================================== --- lib/libmemstat/Makefile (revision 274143) +++ lib/libmemstat/Makefile (working copy) @@ -3,8 +3,7 @@ WARNS?= 3 LIB= memstat SHLIB_MAJOR= 3 -DPADD= ${LIBKVM} -LDADD= -lkvm +LIBADD+= kvm SRCS+= memstat.c SRCS+= memstat_all.c SRCS+= memstat_malloc.c Index: lib/libmp/Makefile =================================================================== --- lib/libmp/Makefile (revision 274143) +++ lib/libmp/Makefile (working copy) @@ -4,8 +4,7 @@ LIB= mp SHLIB_MAJOR= 7 -DPADD= ${LIBCRYPTO} -LDADD= -lcrypto +LIBADD= crypto MAN= libmp.3 INCS= mp.h SRCS= mpasbn.c Index: lib/libmp/tests/Makefile =================================================================== --- lib/libmp/tests/Makefile (revision 274143) +++ lib/libmp/tests/Makefile (working copy) @@ -4,7 +4,6 @@ TAP_TESTS_C+= legacy_test -DPADD+= ${LIBCRYPTO} ${LIBMP} -LDADD+= -lcrypto -lmp +LIBADD+= mp .include Index: lib/libnv/tests/Makefile =================================================================== --- lib/libnv/tests/Makefile (revision 274143) +++ lib/libnv/tests/Makefile (working copy) @@ -9,8 +9,7 @@ TAP_TESTS_C+= nvlist_move_test TAP_TESTS_C+= nvlist_send_recv_test -DPADD+= ${LIBNV} -LDADD+= -lnv +LIBADD+= nv WARNS?= 6 Index: lib/libopie/Makefile =================================================================== --- lib/libopie/Makefile (revision 274143) +++ lib/libopie/Makefile (working copy) @@ -27,8 +27,7 @@ WARNS?= 0 -DPADD= ${LIBMD} -LDADD= -lmd +LIBADD= md MAN= ${OPIE_DIST}/opie.4 ${OPIE_DIST}/opiekeys.5 ${OPIE_DIST}/opieaccess.5 Index: lib/libpam/modules/Makefile.inc =================================================================== --- lib/libpam/modules/Makefile.inc (revision 274143) +++ lib/libpam/modules/Makefile.inc (working copy) @@ -14,8 +14,7 @@ NO_PIC= .else SHLIB_NAME?= ${LIB}.so.${SHLIB_MAJOR} -DPADD+= ${LIBPAM} -LDADD+= -lpam +LIBADD+= pam .endif .include "../Makefile.inc" Index: lib/libpam/modules/pam_ssh/Makefile =================================================================== --- lib/libpam/modules/pam_ssh/Makefile (revision 274143) +++ lib/libpam/modules/pam_ssh/Makefile (working copy) @@ -13,8 +13,9 @@ WARNS?= 3 CFLAGS+= -I${SSHDIR} -include ssh_namespace.h -DPADD= ${LIBSSH} ${LIBCRYPTO} ${LIBCRYPT} -LDADD= ${LDSSH} -lcrypto -lcrypt +LIBADD= ssh +#DPADD= ${LIBSSH} ${LIBCRYPTO} ${LIBCRYPT} +#LDADD= ${LDSSH} -lcrypto -lcrypt USEPRIVATELIB= ssh .include Index: lib/libpjdlog/Makefile =================================================================== --- lib/libpjdlog/Makefile (revision 274143) +++ lib/libpjdlog/Makefile (working copy) @@ -13,8 +13,7 @@ CFLAGS+=-I${.CURDIR} -DPADD= ${LIBUTIL} -LDADD= -lutil +LIBADD= util WARNS?= 6 Index: lib/libproc/Makefile =================================================================== --- lib/libproc/Makefile (revision 274143) +++ lib/libproc/Makefile (working copy) @@ -18,16 +18,13 @@ .if ${MK_CXX} == "no" CFLAGS+= -DNO_CXA_DEMANGLE .elif ${MK_LIBCPLUSPLUS} != "no" -LDADD+= -lcxxrt -DPADD+= ${LIBCXXRT} +LIBADD+= cxxrt .else -LDADD+= -lsupc++ -DPADD+= ${LIBSTDCPLUSPLUS} +LIBADD+= supcplusplus .endif .if ${MK_CDDL} != "no" -LDADD+= -lctf -DPADD+= ${LIBCTF} +LIBADD+= cft IGNORE_PRAGMA= YES CFLAGS+= -I${.CURDIR}/../../cddl/contrib/opensolaris/lib/libctf/common \ -I${.CURDIR}/../../sys/cddl/contrib/opensolaris/uts/common \ Index: lib/libprocstat/Makefile =================================================================== --- lib/libprocstat/Makefile (revision 274143) +++ lib/libprocstat/Makefile (working copy) @@ -19,8 +19,7 @@ CFLAGS+= -I. -I${.CURDIR} -D_KVM_VNODE SHLIB_MAJOR= 1 -DPADD= ${LIBELF} ${LIBKVM} ${LIBUTIL} -LDADD= -lelf -lkvm -lutil +LIBADD= elf kvm util MAN= libprocstat.3 Index: lib/libradius/Makefile =================================================================== --- lib/libradius/Makefile (revision 274143) +++ lib/libradius/Makefile (working copy) @@ -70,12 +70,7 @@ WARNS?= 3 -.if ${MK_OPENSSL} == "no" -DPADD= ${LIBMD} -LDADD= -lmd -.else -DPADD= ${LIBCRYPTO} -LDADD= -lcrypto +.if ${MK_OPENSSL} != "no" CFLAGS+= -DWITH_SSL .endif Index: lib/librpcsec_gss/Makefile =================================================================== --- lib/librpcsec_gss/Makefile (revision 274143) +++ lib/librpcsec_gss/Makefile (working copy) @@ -5,8 +5,7 @@ SRCS+= rpcsec_gss.c rpcsec_gss_prot.c rpcsec_gss_conf.c rpcsec_gss_misc.c \ svc_rpcsec_gss.c -DPADD+= ${LIBGSSAPI} -LDADD+= -lgssapi +LIBADD= gssapi VERSION_DEF= ${.CURDIR}/../libc/Versions.def SYMBOL_MAPS= ${.CURDIR}/Symbol.map Index: lib/librt/Makefile =================================================================== --- lib/librt/Makefile (revision 274143) +++ lib/librt/Makefile (working copy) @@ -7,8 +7,7 @@ CFLAGS+=-fexceptions .endif CFLAGS+=-Winline -Wall -DPADD= ${LIBPTHREAD} -LDADD= -lpthread +LIBADD= pthread WARNS?= 2 Index: lib/libsmb/Makefile =================================================================== --- lib/libsmb/Makefile (revision 274143) +++ lib/libsmb/Makefile (working copy) @@ -7,8 +7,7 @@ LIB= smb SHLIB_MAJOR= 4 -DPADD= ${LIBKICONV} -LDADD= -lkiconv +LIBADD= kiconv SRCS= rcfile.c ctx.c cfopt.c subr.c nls.c rap.c mbuf.c rq.c file.c \ print.c \ Index: lib/libstdthreads/Makefile =================================================================== --- lib/libstdthreads/Makefile (revision 274143) +++ lib/libstdthreads/Makefile (working copy) @@ -32,8 +32,7 @@ thrd_create.3 tss_get.3 \ thrd_create.3 tss_set.3 -DPADD= ${LIBPTHREAD} -LDADD= -lpthread +LIBADD= pthread VERSION_DEF= ${.CURDIR}/../libc/Versions.def SYMBOL_MAPS= ${.CURDIR}/Symbol.map Index: lib/libtacplus/Makefile =================================================================== --- lib/libtacplus/Makefile (revision 274143) +++ lib/libtacplus/Makefile (working copy) @@ -28,8 +28,7 @@ SRCS= taclib.c INCS= taclib.h CFLAGS+= -Wall -DPADD= ${LIBMD} -LDADD= -lmd +LIBADD= md SHLIB_MAJOR= 5 MAN= libtacplus.3 tacplus.conf.5 Index: lib/libulog/Makefile =================================================================== --- lib/libulog/Makefile (revision 274143) +++ lib/libulog/Makefile (working copy) @@ -19,8 +19,7 @@ utempter_remove_added_record.3 removeFromUtmp.3 \ utempter_remove_record.3 removeLineFromUtmp.3 -DPADD= ${LIBMD} -LDADD= -lmd +LIBADD= md VERSION_DEF= ${.CURDIR}/../libc/Versions.def SYMBOL_MAPS= ${.CURDIR}/Symbol.map Index: lib/libunbound/Makefile =================================================================== --- lib/libunbound/Makefile (revision 274143) +++ lib/libunbound/Makefile (working copy) @@ -28,8 +28,7 @@ WARNS?= 3 -DPADD+= ${LIBSSL} ${LIBCRYPTO} ${LIBPTHREAD} -LDADD+= -lssl -lcrypto -lpthread +LIBADD= ssl crypto pthread # Misnamed file in upstream source configlexer.l: configlexer.lex Index: lib/libusb/Makefile =================================================================== --- lib/libusb/Makefile (revision 274143) +++ lib/libusb/Makefile (working copy) @@ -19,8 +19,7 @@ WARNS?= 2 -DPADD= ${LIBPTHREAD} -LDADD= ${PTHREAD_LIBS} +LIBADD= pthread MLINKS+= libusb.3 usb.3 Index: lib/libutil/tests/Makefile =================================================================== --- lib/libutil/tests/Makefile (revision 274143) +++ lib/libutil/tests/Makefile (working copy) @@ -9,7 +9,6 @@ TAP_TESTS_C+= trimdomain_test TAP_TESTS_C+= trimdomain-nodomain_test -DPADD+= ${LIBUTIL} -LDADD+= -lutil +LIBADD+= util .include Index: sbin/atm/atmconfig/Makefile =================================================================== --- sbin/atm/atmconfig/Makefile (revision 274143) +++ sbin/atm/atmconfig/Makefile (working copy) @@ -17,11 +17,9 @@ .if !defined(RESCUE) && ${MK_BSNMP} != "no" CFLAGS+= -DWITH_BSNMP SRCS+= oid.h atmconfig_device.c -DPADD+= ${LIBBSNMP} -LDADD+= -lbsnmp +LIBADD+= bsnmp . if ${MK_DYNAMICROOT} == "no" && ${MK_OPENSSL} != "no" -DPADD+= ${LIBCRYPTO} -LDADD+= -lcrypto +LIBADD+= crypto . endif .endif Index: sbin/badsect/Makefile =================================================================== --- sbin/badsect/Makefile (revision 274143) +++ sbin/badsect/Makefile (working copy) @@ -2,8 +2,7 @@ # $FreeBSD$ PROG= badsect -DPADD= ${LIBUFS} -LDADD= -lufs +LIBADD= ufs MAN= badsect.8 WARNS?= 2 Index: sbin/bsdlabel/Makefile =================================================================== --- sbin/bsdlabel/Makefile (revision 274143) +++ sbin/bsdlabel/Makefile (working copy) @@ -12,7 +12,6 @@ MLINKS= bsdlabel.8 disklabel.8 .endif -DPADD= ${LIBGEOM} ${LIBBSDXML} ${LIBSBUF} -LDADD= -lgeom -lbsdxml -lsbuf +LIBADD= geom .include Index: sbin/camcontrol/Makefile =================================================================== --- sbin/camcontrol/Makefile (revision 274143) +++ sbin/camcontrol/Makefile (working copy) @@ -11,8 +11,7 @@ .if ${MACHINE_CPUARCH} == "arm" WARNS?= 3 .endif -DPADD= ${LIBCAM} ${LIBSBUF} ${LIBUTIL} -LDADD= -lcam -lsbuf -lutil +LIBADD= cam sbuf util MAN= camcontrol.8 .include Index: sbin/casperd/Makefile =================================================================== --- sbin/casperd/Makefile (revision 274143) +++ sbin/casperd/Makefile (working copy) @@ -4,8 +4,7 @@ SRCS= casperd.c zygote.c -DPADD= ${LIBCASPER} ${LIBCAPSICUM} ${LIBNV} ${LIBPJDLOG} ${LIBUTIL} -LDADD= -lcasper -lcapsicum -lnv -lpjdlog -lutil +LIBADD= casper nv pjdlog util MAN= casperd.8 Index: sbin/ccdconfig/Makefile =================================================================== --- sbin/ccdconfig/Makefile (revision 274143) +++ sbin/ccdconfig/Makefile (working copy) @@ -3,7 +3,6 @@ PROG= ccdconfig MAN= ccdconfig.8 -DPADD= ${LIBGEOM} -LDADD= -lgeom +LIBADD= geom .include Index: sbin/ddb/Makefile =================================================================== --- sbin/ddb/Makefile (revision 274143) +++ sbin/ddb/Makefile (working copy) @@ -5,7 +5,6 @@ MAN= ddb.8 WARNS?= 3 -DPADD= ${LIBKVM} -LDADD= -lkvm +LIBADD= kvm .include Index: sbin/devd/Makefile =================================================================== --- sbin/devd/Makefile (revision 274143) +++ sbin/devd/Makefile (working copy) @@ -10,8 +10,7 @@ NO_SHARED?=YES -DPADD= ${LIBL} ${LIBUTIL} -LDADD= -ll -lutil +LIBADD= l util YFLAGS+=-v CFLAGS+=-I. -I${.CURDIR} Index: sbin/dhclient/Makefile =================================================================== --- sbin/dhclient/Makefile (revision 274143) +++ sbin/dhclient/Makefile (working copy) @@ -41,8 +41,7 @@ SCRIPTS=dhclient-script MAN= dhclient.8 dhclient.conf.5 dhclient.leases.5 dhcp-options.5 \ dhclient-script.8 -DPADD= ${LIBUTIL} -LDADD= -lutil +LIBADD= util WARNS?= 2 Index: sbin/dmesg/Makefile =================================================================== --- sbin/dmesg/Makefile (revision 274143) +++ sbin/dmesg/Makefile (working copy) @@ -4,7 +4,6 @@ PROG= dmesg MAN= dmesg.8 -LDADD= -lkvm -DPADD= ${LIBKVM} +LIBADD= kvm .include Index: sbin/dumpfs/Makefile =================================================================== --- sbin/dumpfs/Makefile (revision 274143) +++ sbin/dumpfs/Makefile (working copy) @@ -3,8 +3,7 @@ PROG= dumpfs WARNS?= 2 -DPADD= ${LIBUFS} -LDADD= -lufs +LIBADD= ufs MAN= dumpfs.8 .include Index: sbin/fdisk/Makefile =================================================================== --- sbin/fdisk/Makefile (revision 274143) +++ sbin/fdisk/Makefile (working copy) @@ -7,8 +7,7 @@ .PATH: ${.CURDIR}/../../sys/geom -DPADD+= ${LIBGEOM} ${LIBBSDXML} ${LIBSBUF} -LDADD+= -lgeom -lbsdxml -lsbuf +LIBADD= geom .include Index: sbin/fdisk_pc98/Makefile =================================================================== --- sbin/fdisk_pc98/Makefile (revision 274143) +++ sbin/fdisk_pc98/Makefile (working copy) @@ -7,7 +7,6 @@ .PATH: ${.CURDIR}/../../sys/geom -DPADD+= ${LIBGEOM} ${LIBBSDXML} ${LIBSBUF} -LDADD+= -lgeom -lbsdxml -lsbuf +LIBADD= geom .include Index: sbin/ffsinfo/Makefile =================================================================== --- sbin/ffsinfo/Makefile (revision 274143) +++ sbin/ffsinfo/Makefile (working copy) @@ -13,7 +13,6 @@ WARNS?= 1 CFLAGS+=-DFS_DEBUG -I${GROWFS} -DPADD= ${LIBUFS} -LDADD= -lufs +LIBADD= ufs .include Index: sbin/fsck_ffs/Makefile =================================================================== --- sbin/fsck_ffs/Makefile (revision 274143) +++ sbin/fsck_ffs/Makefile (working copy) @@ -9,8 +9,7 @@ SRCS= dir.c ea.c fsutil.c inode.c main.c pass1.c pass1b.c pass2.c pass3.c \ pass4.c pass5.c setup.c suj.c utilities.c gjournal.c getmntopts.c \ globs.c -DPADD= ${LIBUFS} -LDADD= -lufs +LIBADD= ufs WARNS?= 2 CFLAGS+= -I${.CURDIR} -I${.CURDIR}/../mount Index: sbin/fsck_ffs/dir.c =================================================================== --- sbin/fsck_ffs/dir.c (revision 274143) +++ sbin/fsck_ffs/dir.c (working copy) @@ -37,6 +37,7 @@ #include #include +#include #include #include Index: sbin/fsdb/Makefile =================================================================== --- sbin/fsdb/Makefile (revision 274143) +++ sbin/fsdb/Makefile (working copy) @@ -9,8 +9,7 @@ pass5.c setup.c utilities.c ffs_subr.c ffs_tables.c globs.c CFLAGS+= -I${.CURDIR}/../fsck_ffs WARNS?= 2 -LDADD= -ledit -ltermcapw -DPADD= ${LIBEDIT} ${LIBTERMCAPW} +LIBADD= edit .PATH: ${.CURDIR}/../fsck_ffs ${.CURDIR}/../../sys/ufs/ffs .include Index: sbin/gbde/Makefile =================================================================== --- sbin/gbde/Makefile (revision 274143) +++ sbin/gbde/Makefile (working copy) @@ -20,8 +20,7 @@ CLEANFILES+= template.c MAN= gbde.8 -DPADD= ${LIBMD} ${LIBUTIL} ${LIBGEOM} -LDADD= -lmd -lutil -lgeom +LIBADD= md util geom template.c: template.txt file2c 'const char template[] = {' ',0};' \ Index: sbin/geom/Makefile =================================================================== --- sbin/geom/Makefile (revision 274143) +++ sbin/geom/Makefile (working copy) @@ -14,8 +14,7 @@ WARNS?= 2 CFLAGS+=-I${.CURDIR} -I${.CURDIR}/core -DSTATIC_GEOM_CLASSES -DPADD= ${LIBGEOM} ${LIBSBUF} ${LIBBSDXML} ${LIBUTIL} -LDADD= -lgeom -lsbuf -lbsdxml -lutil +LIBADD= geom util .include Index: sbin/geom/class/eli/Makefile =================================================================== --- sbin/geom/class/eli/Makefile (revision 274143) +++ sbin/geom/class/eli/Makefile (working copy) @@ -8,8 +8,7 @@ SRCS+= pkcs5v2.c SRCS+= sha2.c -DPADD= ${LIBMD} ${LIBCRYPTO} -LDADD= -lmd -lcrypto +LIBADD= md crypto WARNS?= 3 Index: sbin/geom/class/journal/Makefile =================================================================== --- sbin/geom/class/journal/Makefile (revision 274143) +++ sbin/geom/class/journal/Makefile (working copy) @@ -5,8 +5,7 @@ GEOM_CLASS= journal SRCS+= geom_journal_ufs.c -DPADD= ${LIBMD} ${LIBUFS} -LDADD= -lmd -lufs +LIBADD= ufs md CFLAGS+=-I${.CURDIR}/../../../../sys Index: sbin/geom/class/mirror/Makefile =================================================================== --- sbin/geom/class/mirror/Makefile (revision 274143) +++ sbin/geom/class/mirror/Makefile (working copy) @@ -4,7 +4,6 @@ GEOM_CLASS= mirror -DPADD= ${LIBMD} -LDADD= -lmd +LIBADD= md .include Index: sbin/geom/class/part/Makefile =================================================================== --- sbin/geom/class/part/Makefile (revision 274143) +++ sbin/geom/class/part/Makefile (working copy) @@ -4,7 +4,6 @@ GEOM_CLASS= part -DPADD= ${LIBUTIL} -LDADD= -lutil +LIBADD= util .include Index: sbin/geom/class/raid/Makefile =================================================================== --- sbin/geom/class/raid/Makefile (revision 274143) +++ sbin/geom/class/raid/Makefile (working copy) @@ -4,7 +4,6 @@ GEOM_CLASS= raid -DPADD= ${LIBMD} -LDADD= -lmd +LIBADD= md .include Index: sbin/geom/class/raid3/Makefile =================================================================== --- sbin/geom/class/raid3/Makefile (revision 274143) +++ sbin/geom/class/raid3/Makefile (working copy) @@ -4,7 +4,6 @@ GEOM_CLASS= raid3 -DPADD= ${LIBMD} -LDADD= -lmd +LIBADD= md .include Index: sbin/geom/core/Makefile =================================================================== --- sbin/geom/core/Makefile (revision 274143) +++ sbin/geom/core/Makefile (working copy) @@ -11,7 +11,6 @@ CFLAGS+= -DGEOM_CLASS_DIR=\"${GEOM_CLASS_DIR}\" CFLAGS+= -I${.CURDIR}/../../../sys -I${.CURDIR} -I${.CURDIR}/.. -DPADD= ${LIBGEOM} ${LIBSBUF} ${LIBBSDXML} ${LIBUTIL} -LDADD= -lgeom -lsbuf -lbsdxml -lutil +LIBADD= geom util .include Index: sbin/ggate/ggatec/Makefile =================================================================== --- sbin/ggate/ggatec/Makefile (revision 274143) +++ sbin/ggate/ggatec/Makefile (working copy) @@ -10,7 +10,6 @@ CFLAGS+= -DLIBGEOM CFLAGS+= -I${.CURDIR}/../shared -DPADD= ${LIBGEOM} ${LIBSBUF} ${LIBBSDXML} ${LIBUTIL} ${LIBPTHREAD} -LDADD= -lgeom -lsbuf -lbsdxml -lutil -lpthread +LIBADD= geom util pthread .include Index: sbin/ggate/ggated/Makefile =================================================================== --- sbin/ggate/ggated/Makefile (revision 274143) +++ sbin/ggate/ggated/Makefile (working copy) @@ -6,8 +6,7 @@ MAN= ggated.8 SRCS= ggated.c ggate.c -DPADD= ${LIBPTHREAD} -LDADD= -lpthread +LIBADD= pthread CFLAGS+= -I${.CURDIR}/../shared Index: sbin/ggate/ggatel/Makefile =================================================================== --- sbin/ggate/ggatel/Makefile (revision 274143) +++ sbin/ggate/ggatel/Makefile (working copy) @@ -9,7 +9,6 @@ CFLAGS+= -DLIBGEOM CFLAGS+= -I${.CURDIR}/../shared -DPADD= ${LIBGEOM} ${LIBSBUF} ${LIBBSDXML} ${LIBUTIL} -LDADD= -lgeom -lsbuf -lbsdxml -lutil +LIBADD= geom util .include Index: sbin/growfs/Makefile =================================================================== --- sbin/growfs/Makefile (revision 274143) +++ sbin/growfs/Makefile (working copy) @@ -19,11 +19,10 @@ SRCS+= debug.c .endif -DPADD= ${LIBUTIL} -LDADD= -lutil +LIBADD= util .if ${MK_TESTS} != "no" SUBDIR+= tests .endif -.include +.include Index: sbin/gvinum/Makefile =================================================================== --- sbin/gvinum/Makefile (revision 274143) +++ sbin/gvinum/Makefile (working copy) @@ -7,8 +7,7 @@ WARNS?= 2 CFLAGS+= -I${.CURDIR}/../../sys -I${DESTDIR}/${INCLUDEDIR}/edit -DPADD= ${LIBEDIT} ${LIBTERMCAPW} ${LIBDEVSTAT} ${LIBKVM} ${LIBGEOM} -LDADD= -ledit -ltermcapw -ldevstat -lkvm -lgeom +LIBADD= edit geom .PATH: ${.CURDIR}/../../sys/geom/vinum Index: sbin/hastctl/Makefile =================================================================== --- sbin/hastctl/Makefile (revision 274143) +++ sbin/hastctl/Makefile (working copy) @@ -32,11 +32,9 @@ CFLAGS+=-DYY_NO_UNPUT CFLAGS+=-DYY_NO_INPUT -DPADD= ${LIBUTIL} -LDADD= -lutil +LIBADD= util .if ${MK_OPENSSL} != "no" -DPADD+= ${LIBCRYPTO} -LDADD+= -lcrypto +LIBADD+= crypto CFLAGS+=-DHAVE_CRYPTO .endif Index: sbin/hastd/Makefile =================================================================== --- sbin/hastd/Makefile (revision 274143) +++ sbin/hastd/Makefile (working copy) @@ -30,11 +30,9 @@ CFLAGS+=-DINET6 .endif -DPADD= ${LIBGEOM} ${LIBBSDXML} ${LIBSBUF} ${LIBPTHREAD} ${LIBUTIL} -LDADD= -lgeom -lbsdxml -lsbuf -lpthread -lutil +LIBADD= geom pthread util .if ${MK_OPENSSL} != "no" -DPADD+= ${LIBCRYPTO} -LDADD+= -lcrypto +LIBADD+= crypto CFLAGS+=-DHAVE_CRYPTO .endif Index: sbin/ifconfig/Makefile =================================================================== --- sbin/ifconfig/Makefile (revision 274143) +++ sbin/ifconfig/Makefile (working copy) @@ -35,12 +35,10 @@ SRCS+= ifgif.c # GIF reversed header workaround SRCS+= sfp.c # SFP/SFP+ information -DPADD+= ${LIBM} -LDADD+= -lm +LIBADD+= m SRCS+= ifieee80211.c regdomain.c # SIOC[GS]IEEE80211 support -DPADD+= ${LIBBSDXML} ${LIBSBUF} -LDADD+= -lbsdxml -lsbuf +LIBADD+= bsdxml sbuf SRCS+= carp.c # SIOC[GS]VH support SRCS+= ifgroup.c # ... @@ -59,8 +57,7 @@ .endif .if ${MK_JAIL} != "no" && !defined(RELEASE_CRUNCH) && !defined(RESCUE) CFLAGS+= -DJAIL -DPADD+= ${LIBJAIL} -LDADD+= -ljail +LIBADD+= jail .endif MAN= ifconfig.8 Index: sbin/init/Makefile =================================================================== --- sbin/init/Makefile (revision 274143) +++ sbin/init/Makefile (working copy) @@ -6,8 +6,7 @@ PRECIOUSPROG= INSTALLFLAGS=-b -B.bak CFLAGS+=-DDEBUGSHELL -DSECURE -DLOGIN_CAP -DCOMPAT_SYSV_INIT -DPADD= ${LIBUTIL} ${LIBCRYPT} -LDADD= -lutil -lcrypt +LIBADD= util crypt NO_SHARED?= YES Index: sbin/ipf/Makefile.inc =================================================================== --- sbin/ipf/Makefile.inc (revision 274143) +++ sbin/ipf/Makefile.inc (working copy) @@ -19,8 +19,9 @@ .endif LIBIPF= ${.OBJDIR}/../libipf/libipf.a -DPADD+= ${LIBIPF} ${LIBKVM} -LDADD+= ${LIBIPF} -lkvm +LIBADD+= kvm +DPADD+= ${LIBIPF} +LDADD+= ${LIBIPF} CLEANFILES+= y.tab.c y.tab.h Index: sbin/ipf/ipf/Makefile =================================================================== --- sbin/ipf/ipf/Makefile (revision 274143) +++ sbin/ipf/ipf/Makefile (working copy) @@ -35,8 +35,7 @@ LIBIPF_SRCS!= cd ${.CURDIR}/../libipf && ${MAKE} -V SRCS SRCS+= ${LIBIPF_SRCS} .else -DPADD+= ${LIBPCAP} -LDADD+= -lpcap +LIBADD+= pcap .endif .include Index: sbin/ipf/ipsend/Makefile =================================================================== --- sbin/ipf/ipsend/Makefile (revision 274143) +++ sbin/ipf/ipsend/Makefile (working copy) @@ -8,8 +8,7 @@ SRCS= ipsend.c ip.c ipsopt.c iplang_y.c iplang_l.l sbpf.c \ sock.c 44arp.c MAN= ipsend.1 ipsend.5 -DPADD+= ${LIBL} -LDADD+= -ll +LIBADD+= l CFLAGS+= -I${NETBSDSRCDIR}/dist/ipf/ipsend CFLAGS+= -I${NETBSDSRCDIR}/dist/ipf/iplang Index: sbin/ipfw/Makefile =================================================================== --- sbin/ipfw/Makefile (revision 274143) +++ sbin/ipfw/Makefile (working copy) @@ -11,8 +11,7 @@ CFLAGS+=-DPF .endif -DPADD= ${LIBUTIL} -LDADD= -lutil +LDADD= util MAN= ipfw.8 .include Index: sbin/iscontrol/Makefile =================================================================== --- sbin/iscontrol/Makefile (revision 274143) +++ sbin/iscontrol/Makefile (working copy) @@ -2,8 +2,7 @@ SRCS= iscontrol.c pdu.c fsm.c config.c login.c auth_subr.c misc.c PROG= iscontrol -DPADD= ${LIBCAM} ${LIBMD} -LDADD= -lcam -lmd +LIBADD= cam md S= ${.CURDIR}/../../sys WARNS?= 3 Index: sbin/md5/Makefile =================================================================== --- sbin/md5/Makefile (revision 274143) +++ sbin/md5/Makefile (working copy) @@ -16,7 +16,6 @@ NO_WMISSING_VARIABLE_DECLARATIONS= WFORMAT?= 1 -DPADD= ${LIBMD} -LDADD= -lmd +LIBADD= md .include Index: sbin/mdconfig/Makefile =================================================================== --- sbin/mdconfig/Makefile (revision 274143) +++ sbin/mdconfig/Makefile (working copy) @@ -5,8 +5,7 @@ PROG= mdconfig MAN= mdconfig.8 -DPADD= ${LIBUTIL} ${LIBGEOM} ${LIBBSDXML} ${LIBSBUF} -LDADD= -lutil -lgeom -lbsdxml -lsbuf +LIBADD= util geom .if ${MK_TESTS} != "no" SUBDIR+= tests Index: sbin/mount/Makefile =================================================================== --- sbin/mount/Makefile (revision 274143) +++ sbin/mount/Makefile (working copy) @@ -6,7 +6,6 @@ MAN= mount.8 mount.conf.8 # We do NOT install the getmntopts.3 man page. -DPADD= ${LIBUTIL} -LDADD= -lutil +LIBADD= util .include Index: sbin/mount_cd9660/Makefile =================================================================== --- sbin/mount_cd9660/Makefile (revision 274143) +++ sbin/mount_cd9660/Makefile (working copy) @@ -4,8 +4,7 @@ PROG= mount_cd9660 SRCS= mount_cd9660.c getmntopts.c MAN= mount_cd9660.8 -DPADD= ${LIBKICONV} -LDADD= -lkiconv +LIBADD= kiconv MOUNT= ${.CURDIR}/../mount CFLAGS+= -I${MOUNT} Index: sbin/mount_msdosfs/Makefile =================================================================== --- sbin/mount_msdosfs/Makefile (revision 274143) +++ sbin/mount_msdosfs/Makefile (working copy) @@ -5,8 +5,7 @@ PROG= mount_msdosfs SRCS= mount_msdosfs.c getmntopts.c MAN= mount_msdosfs.8 -DPADD= ${LIBKICONV} -LDADD= -lkiconv +LIBADD= kiconv MOUNT= ${.CURDIR}/../mount CFLAGS+= -I${MOUNT} Index: sbin/mount_udf/Makefile =================================================================== --- sbin/mount_udf/Makefile (revision 274143) +++ sbin/mount_udf/Makefile (working copy) @@ -3,8 +3,7 @@ PROG= mount_udf SRCS= mount_udf.c getmntopts.c MAN= mount_udf.8 -DPADD= ${LIBKICONV} -LDADD= -lkiconv +LIBADD= kiconv MOUNT= ${.CURDIR}/../mount CFLAGS+= -I${MOUNT} -I${.CURDIR}/../../sys Index: sbin/nandfs/Makefile =================================================================== --- sbin/nandfs/Makefile (revision 274143) +++ sbin/nandfs/Makefile (working copy) @@ -4,7 +4,6 @@ SRCS= nandfs.c lssnap.c mksnap.c rmsnap.c MAN= nandfs.8 -DPADD= ${LIBNANDFS} -LDADD= -lnandfs +LIBADD= nandfs .include Index: sbin/natd/Makefile =================================================================== --- sbin/natd/Makefile (revision 274143) +++ sbin/natd/Makefile (working copy) @@ -3,8 +3,7 @@ PROG = natd SRCS = natd.c icmp.c WARNS?= 3 -LDADD = -lalias -DPADD = ${LIBALIAS} +LIBADD = alias MAN = natd.8 .include Index: sbin/newfs/Makefile =================================================================== --- sbin/newfs/Makefile (revision 274143) +++ sbin/newfs/Makefile (working copy) @@ -4,8 +4,7 @@ .PATH: ${.CURDIR}/../../sys/geom PROG= newfs -DPADD= ${LIBUFS} ${LIBUTIL} -LDADD= -lufs -lutil +LIBADD= ufs util SRCS= newfs.c mkfs.c geom_bsd_enc.c WARNS?= 3 Index: sbin/newfs_nandfs/Makefile =================================================================== --- sbin/newfs_nandfs/Makefile (revision 274143) +++ sbin/newfs_nandfs/Makefile (working copy) @@ -3,7 +3,6 @@ PROG= newfs_nandfs MAN= newfs_nandfs.8 -LDADD+= -lgeom -DPADD+= ${LIBGEOM} +LIBADD= geom .include Index: sbin/pfctl/Makefile =================================================================== --- sbin/pfctl/Makefile (revision 274143) +++ sbin/pfctl/Makefile (working copy) @@ -28,7 +28,6 @@ YFLAGS= -LDADD+= -lm -lmd -DPADD+= ${LIBM} ${LIBMD} +LIBADD= m md .include Index: sbin/pflogd/Makefile =================================================================== --- sbin/pflogd/Makefile (revision 274143) +++ sbin/pflogd/Makefile (working copy) @@ -8,8 +8,7 @@ CFLAGS+=-include ${.CURDIR}/../../lib/libpcap/config.h -LDADD= -lpcap -DPADD= ${LIBPCAP} +LIBADD= pcap WARNS?= 2 Index: sbin/ping/Makefile =================================================================== --- sbin/ping/Makefile (revision 274143) +++ sbin/ping/Makefile (working copy) @@ -8,19 +8,16 @@ BINOWN= root BINMODE=4555 WARNS?= 3 -DPADD= ${LIBM} -LDADD= -lm +LIBADD= m .if ${MK_CASPER} != "no" && !defined(RESCUE) -DPADD+= ${LIBCAPSICUM} ${LIBNV} -LDADD+= -lcapsicum -lnv +LIBADD+= capsicum CFLAGS+=-DHAVE_LIBCAPSICUM .endif .if !defined(RELEASE_CRUNCH) CFLAGS+=-DIPSEC -DPADD+= ${LIBIPSEC} -LDADD+= -lipsec +LIBADD+= ipsec .endif .include Index: sbin/ping6/Makefile =================================================================== --- sbin/ping6/Makefile (revision 274143) +++ sbin/ping6/Makefile (working copy) @@ -10,7 +10,6 @@ BINOWN= root BINMODE=4555 -LDADD= -lipsec -lm -lmd -DPADD= ${LIBIPSEC} ${LIBM} ${LIBMD} +LIBADD= ipsec m md .include Index: sbin/quotacheck/Makefile =================================================================== --- sbin/quotacheck/Makefile (revision 274143) +++ sbin/quotacheck/Makefile (working copy) @@ -5,8 +5,7 @@ SRCS= quotacheck.c preen.c fsutil.c utilities.c WARNS?= 2 MAN= quotacheck.8 -DPADD= ${LIBUTIL} -LDADD= -lutil +LIBADD= util .PATH: ${.CURDIR}/../fsck ${.CURDIR}/../fsck_ffs Index: sbin/rcorder/Makefile =================================================================== --- sbin/rcorder/Makefile (revision 274143) +++ sbin/rcorder/Makefile (working copy) @@ -5,8 +5,7 @@ SRCS= ealloc.c hash.c rcorder.c MAN= rcorder.8 -LDADD= -lutil -DPADD= ${LIBUTIL} +LIBADD= util # XXX hack for make's hash.[ch] CFLAGS+= -DORDER -I. Index: sbin/routed/Makefile =================================================================== --- sbin/routed/Makefile (revision 274143) +++ sbin/routed/Makefile (working copy) @@ -5,8 +5,7 @@ MAN= routed.8 SRCS= if.c input.c main.c output.c parms.c radix.c rdisc.c table.c trace.c WARNS?= 3 -DPADD= ${LIBMD} -LDADD= -lmd +LIBADD= md SUBDIR= rtquery Index: sbin/routed/rtquery/Makefile =================================================================== --- sbin/routed/rtquery/Makefile (revision 274143) +++ sbin/routed/rtquery/Makefile (working copy) @@ -4,8 +4,7 @@ PROG= rtquery MAN= rtquery.8 -LDADD= -lmd -DPADD= ${LIBMD} +LIBADD= md WARNS?= 3 NO_WARRAY_BOUNDS= Index: sbin/savecore/Makefile =================================================================== --- sbin/savecore/Makefile (revision 274143) +++ sbin/savecore/Makefile (working copy) @@ -1,8 +1,7 @@ # $FreeBSD$ PROG= savecore -DPADD= ${LIBZ} -LDADD= -lz +LIBADD= z MAN= savecore.8 .include Index: sbin/setkey/Makefile =================================================================== --- sbin/setkey/Makefile (revision 274143) +++ sbin/setkey/Makefile (working copy) @@ -37,8 +37,7 @@ CFLAGS+= -I${.CURDIR} -I${.CURDIR}/../../lib/libipsec YFLAGS= -d -DPADD= ${LIBL} ${LIBY} -LDADD= -ll -ly +LIBADD= l y CLEANFILES= y.tab.c y.tab.h key_test.o keytest @@ -55,8 +54,7 @@ CFLAGS+= -DINET6 .endif CFLAGS+= -I. -DPADD+= ${LIBIPSEC} -LDADD+= -lipsec +LIBADD+= ipsec CLEANFILES+= scriptdump y.tab.h #SCRIPTS= scriptdump Index: sbin/sunlabel/Makefile =================================================================== --- sbin/sunlabel/Makefile (revision 274143) +++ sbin/sunlabel/Makefile (working copy) @@ -11,8 +11,7 @@ MLINKS= sunlabel.8 disklabel.8 .endif -DPADD= ${LIBGEOM} -LDADD= -lgeom +LIBADD= geom .include Index: sbin/swapon/Makefile =================================================================== --- sbin/swapon/Makefile (revision 274143) +++ sbin/swapon/Makefile (working copy) @@ -8,7 +8,6 @@ MLINKS= swapon.8 swapoff.8 MLINKS+=swapon.8 swapctl.8 -DPADD= ${LIBUTIL} -LDADD= -lutil +LIBADD= util .include Index: sbin/tunefs/Makefile =================================================================== --- sbin/tunefs/Makefile (revision 274143) +++ sbin/tunefs/Makefile (working copy) @@ -2,8 +2,7 @@ # $FreeBSD$ PROG= tunefs -DPADD= ${LIBUFS} -LDADD= -lufs +LIBADD= ufs MAN= tunefs.8 WARNS= 3 Index: share/mk/bsd.libnames.mk =================================================================== --- share/mk/bsd.libnames.mk (revision 274200) +++ share/mk/bsd.libnames.mk (working copy) @@ -161,3 +161,13 @@ LIBZFS?= ${DESTDIR}${LIBDIR}/libzfs.a LIBZFS_CORE?= ${DESTDIR}${LIBDIR}/libzfs_core.a LIBZPOOL?= ${DESTDIR}${LIBDIR}/libzpool.a + +# enforce the 2 -lpthread and -lc to always be the last in that exact order +.if defined(LDADD) +.if ${LDADD:M-lpthread} +LDADD:= ${LDADD:N-lpthread} -lpthread +.endif +.if ${LDADD:M-lc} +LDADD:= ${LDADD:N-lc} -lc +.endif +.endif Index: share/mk/src.libnames.mk =================================================================== --- share/mk/src.libnames.mk (revision 274200) +++ share/mk/src.libnames.mk (working copy) @@ -7,8 +7,383 @@ .error src.libnames.mk cannot be included directly. .endif -ROOTOBJDIR= ${.OBJDIR:S/${.CURDIR}//}${.MAKE.MAKEFILES:M*/src.libnames.mk:H:H:H} +.include +ROOTSRCDIR= ${.MAKE.MAKEFILES:M*/src.libnames.mk:H:H:H} +ROOTOBJDIR= ${.OBJDIR:S/${.CURDIR}//}${ROOTSRCDIR} +_PRIVATELIBS= ucl bsdstat ssh ldns atf_c atf_cxx unbound + +.for _l in ${LIBADD} +DPADD+= ${DPADD_${_l}} +LDADD+= ${LDADD_${_l}} +.if ${_PRIVATELIBS:M${_l}} +USEPRIVATELIB+= ${_l} +.endif +.endfor + +DPADD_archive= ${LIBARCHIVE} +LDADD_archive= -larchive +.if defined(NO_SHARED) +DPADD_archive+= ${DPADD_z} ${DPADD_bz2} ${DPADD_lzma} ${DPADD_bsdxml} +LDADD_archive+= ${LDADD_z} ${LDADD_bz2} ${LDADD_lzma} ${LDADD_bsdxml} +.if ${MK_OPENSSL} != "no" +DPADD_archive+= ${DPADD_crypto} +LDADD_archive+= ${LDADD_crypto} +.else +DPADD_archive+= ${DPADD_md} +LDADD_archive+= ${LDADD_md} +.endif +.endif + +DPADD_z= ${LIBZ} +LDADD_z= -lz + +DPADD_bz2= ${LIBBZ2} +LDADD_bz2= -lbz2 + +DPADD_lzma= ${LIBLZMA} +LDADD_lzma= -llzma + +DPADD_bsdxml= ${LIBBSDXML} +LDADD_bsdxml= -lbsdxml + +DPADD_crypto= ${LIBCRYPTO} +LDADD_crypto= -lcrypto + +DPADD_ssl= ${LIBSSL} +LDADD_ssl= -lssl + +.if defined(NO_SHARED) +DPADD_ssl+= ${DPADD_crypto} +LDADD_ssl+= ${LDADD_crypto} +.endif + +DPADD_md= ${LIBMD} +LDADD_md= -lmd + +DPADD_pam= ${LIBPAM} +LDADD_pam= -lpam + +DPADD_ssh= ${LIBSSH} +LDADD_ssh= ${LDSSH} + +.if defined(NO_SHARED) +DPADD_ssh+= ${DPADD_crypto} ${DPADD_crypt} +LDADD_ssh+= ${LDADD_crypto} ${LDADD_crypt} +.endif + +DPADD_crypt= ${LIBCRYPT} +LDADD_crypt= -lcrypt + +DPADD_termcapw= ${LIBTERMCAPW} +LDADD_termcapw= -ltermcapw + +DPADD_util= ${LIBUTIL} +LDADD_util= -lutil + +DPADD_kvm= ${LIBKVM} +LDADD_kvm= -lkvm + +DPADD_m= ${LIBM} +LDADD_m= -lm + +DPADD_jail= ${LIBJAIL} +LDADD_jail= -ljail + +DPADD_sm= ${LIBSM} +LDADD_sm= ${LDSM} + +DPADD_edit= ${LIBEDIT} +LDADD_edit= -ledit +.if defined(NO_SHARED) +DPADD_edit+= ${DPADD_ncursesw} +LDADD_edit+= ${LDADD_ncursesw} +.endif + +DPADD_ncursesw= ${LIBNCURSESW} +LDADD_ncursesw= -lncursesw + +DPADD_bsnmp= ${LIBBSNMP} +LDADD_bsnmp= -lbsnmp +.if defined(NO_SHARED) +.if ${MK_OPENSSL} != "no" +DPADD_bsnmp+= ${DPADD_crypto} +LDADD_bsnmp+= ${LDADD_crypto} +.endif +.endif + +DPADD_geom= ${LIBGEOM} +LDADD_geom= -lgeom +.if defined(NO_SHARED) +DPADD_geom+= ${DPADD_bsdxml} ${DPADD_sbuf} +LDADD_geom+= ${LDADD_bsdxml} ${LDADD_sbuf} +.endif + +DPADD_sbuf= ${LIBSBUF} +LDADD_sbuf= -lsbuf + +DPADD_cam= ${LIBCAM} +LDADD_cam= -lcam +.if defined(NO_SHARED) +DPADD_cam+= ${DPADD_sbuf} +LDADD_sbuf+= -lsbuf +.endif + +DPADD_casper= ${LIBCASPER} +LDADD_casper= -lcasper +.if defined(NO_SHARED) +DPADD_casper+= ${DPADD_capsicum} ${DPADD_nv} ${DPADD_pjdlog} +LDADD_capser+= ${LDADD_capsicum} ${LDADD_nv} ${LDADD_pjdlog} +.endif + +DPADD_capsicum= ${LIBCAPSICUM} +LDADD_capsicum= -lcapsicum +.if defined(NO_SHARED) +DPADD_capsicum+= ${DPADD_nv} +LDADD_capsicum+= ${LDADD_nv} +.endif + +DPADD_nv= ${LIBNV} +LDADD_nv= -lnv + +DPADD_pjdlog= ${LIBPJDLOG} +LDADD_pjdlog= -lpjdlog + +.if defined(NO_SHARED) +DPADD_pjdlog+= ${DPADD_util} +LDADD_pjdlog+= ${LDADD_util} +.endif + +DPADD_opie= ${LIBOPIE} +LDADD_opie= -lopie +.if defined(NO_SHARED) +DPADD_opie+= ${DPADD_md} +LDADD_opie+= ${LDADD_md} +.endif + +DPADD_ufs= ${LIBUFS} +LDADD_ufs= -lufs + +DPADD_l= ${LIBL} +LDADD_l= -ll + +DPADD_y= ${LIBY} +LDADD_y= -ly + +DPADD_ipsec= ${LIBIPSEC} +LDADD_ipsec= -lipsec + +DPADD_pcap= ${LIBPCAP} +LDADD_pcap= -lpcap + +DPADD_alias= ${LIBALIAS} +LDADD_alias= -lalias + +DPADD_nandfs= ${LIBNANDFS} +LDADD_nandfs= -lnandfs + +DPADD_kiconv= ${LIBKICONV} +LDADD_kiconv= -lkiconv + +DPADD_usb= ${LIBUSB} +LDADD_usb= -lusb +.if defined(NO_SHARED) +DPADD_usb+= ${DPADD_pthread} +LDADD_usb+= ${LDADD_pthread} +.endif + +DPADD_unbound= ${LIBUNBOUND} +LDADD_unbound= ${LDUNBOUND} +.if defined(NO_SHARED) +LDADD_unbound= ${LIBUNBOUND} +DPADD_unbound+= ${DPADD_pthread} +LDADD_unbound+= ${LDADD_pthread} +.endif + +DPADD_ulog= ${LIBULOG} +LDADD_ulog= -lulog + +DPADD_tacplus= ${LIBTACPLUS} +LDADD_tacplus= -ltacplus + +DPADD_stdthreads= ${LIBSTDTHREADS} +LDADD_stdthreads= -lstdthreads + +DPADD_smb= ${LIBSMB} +LDADD_smb= -lsmb + +DPADD_rt= ${LIBRT} +LDADD_rt= -lrt +.if defined(NO_SHARED) +DPADD_rt+= ${DPADD_pthread} +LDADD_rt+= ${LDADD_rt} +.endif + +DPADD_gssapi= ${LIBGSSAPI} +LDADD_gssapi= -lgssapi + +DPADD_rpcsec_gss= ${LIBRPCSEC_GSS} +LDADD_rpcsec_gss= -lrpcsec_gss + +DPADD_radius= ${LIBRADIUS} +LDADD_radius= -lradius +.if defined(NO_SHARED) +.if ${MK_OPENSSL} == "no" +DPADD_radius+= ${DPADD_md} +LDADD_radius+= ${LDADD_md} +.else +DPADD_radius+= ${DPADD_crypto} +LDADD_radius+= ${LDADD_crypto} +.endif +.endif + +DPADD_procstat= ${LIBPROCSTAT} +LDADD_procstat= -lprocstat +.if defined(NO_SHARED) +DPADD_procstat+= ${DPADD_kvm} ${DPADD_util} ${DPADD_elf} +LDADD_procstat+= ${LDADD_kvm} ${LDADD_util} ${LDADD_elf} +.endif +DPADD_elf= ${LIBELF} +LDADD_elf= -lelf + +DPADD_cxxrt= ${LIBCXXRT} +LDADD_cxxrt= -lcxxrt + +DPADD_cft= ${LIBCFT} +LDADD_cft= -lcft + +DPADD_supcplusplus= ${LIBSUPCPLUSPLUS} +LDADD_supcplusplus= -lsupc++ + +DPADD_proc= ${LIBPROC} +LDADD_proc= -lproc +.if defined(NO_SHARED) +.if ${MK_CXX} == "yes" +.if ${MK_LIBCPLUSPLUS} != "no" +DPADD_proc+= ${DPADD_cxxrt} +LDADD_proc+= ${LDADD_cxxrt} +.else +DPADD_proc+= ${DPADD_supcplusplus} +LDADD_proc+= ${LDADD_supcplusplus} +.endif +.endif +.if ${MK_CDDL} != "no" +DPADD_proc+= ${DPADD_cft} +LDADD_proc+= ${LDADD_cft} +.endif +.endif + +DPADD_mp= ${LIBMP} +LDADD_mp= -lmp +.if defined(NO_SHARED) +DPADD_mp+= ${DPADD_crypto} +LDADD_mp+= ${LDADD_crypto} +.endif + +DPADD_memstat= ${LIBMEMSTAT} +LDADD_memstat= -lmemstat +.if defined(NO_SHARED) +DPADD_memstat+= ${DPADD_kvm} +LDADD_memstat+= ${LDADD_kvm} +.endif + +DPADD_magic= ${LIBMAGIC} +LDADD_magic= -lmagic +.if defined(NO_SHARED) +DPADD_magic+= ${DPADD_z} +LDADD_magic+= ${LDADD_z} +.endif + +DPADD_ldns= ${LIBLDNS} +LDADD_ldns= ${LDLDNS} +.if defined(NO_SHARED) +DPADD_ldns+= ${DPADD_crypto} +LDADD_ldns+= ${LDADD_crypto} +.endif + +DPADD_fetch= ${LIBFETCH} +LDADD_fetch= -lfetch +.if defined(NO_SHARED) +.if ${MK_OPENSSL} != "no" +DPADD_fetch+= ${DPADD_ssl} ${DPADD_crypto} +LDADD_fetch+= ${LDADD_ssl} ${LDADD_crypto} +.else +DPADD_fetch+= ${DPADD_md} +LDADD_fetch+= ${LDADD_md} +.endif +.endif + +DPADD_execinfo= ${LIBEXECINFO} +LDADD_execinfo= -lexecinfo +.if defined(NO_SHARED) +DPADD_execinfo+= ${DPADD_elf} +LDADD_execinfo+= ${LDADD_elf} +.endif + +DPADD_dwarf= ${LIBDWARF} +LDADD_dwarf= -ldwarf +.if defined(NO_SHARED) +DPADD_dwarf+= ${DPADD_elf} +LDADD_dwarf+= ${LDADD_elf} +.endif + +DPADD_dpv= ${LIBDPV} +LDADD_dpv= -ldpv +.if defined(NO_SHARED) +DPADD_dpv+= ${DPADD_dialog} ${DPADD_figpar} ${DPADD_util} +LDADD_dpv+= ${LDADD_dialog} ${LDADD_figpar} ${LDADD_util} +.endif + +DPADD_dialog= ${LIBDIALOG} +LDADD_dialog= -ldialog +.if defined(NO_SHARED) +DPADD_dialog+= ${DPADD_ncursesw} ${DPADD_m} +LDADD_dialog+= ${LDADD_ncursesw} ${LDADD_m} +.endif + +DPADD_figpar= ${LIBFIGIPAR} +LDADD_figpar= -lfigpar + +DPADD_cuse= ${LIBCUSE} +LDADD_cuse= -lcuse +.if defined(NO_SHARED) +DPADD_cuse+= ${DPADD_pthread} +LDADD_cuse+= ${LDADD_pthread} +.endif + +DPADD_atf_c= ${LIBATF_C} +LDADD_atf_c= ${LDATF_C} + +DPADD_atf_cxx= ${LIBATF_CXX} +LDADD_atf_cxx= ${LDATF_CXX} +.if defined(NO_SHARED) +DPADD_atf_cxx+= ${DPADD_atf_c} +LDADD_atf_cxx+= ${LDADD_atf_c} +.endif + +DPADD_ucl= ${LIBUCL} +.if defined(NO_SHARED) +LDADD_ucl= ${LIBUCL} +.else +LDADD_ucl= ${LDUCL} +.endif +# ucl needs and exposes libm +DPADD_ucl+= ${DPADD_m} +LDADD_ucl+= ${LDADD_m} + +DPADD_wrap= ${LIBWRAP} +LDADD_wrap= -lwrap + +DPADD_devstat= ${LIBDEVSTAT} +LDADD_devstat= -ldevstat +.if defined(NO_SHARED) +DPADD_devstat+= ${DPADD_kvm} +LDADD_devstat+= ${LDADD_kvm} +.endif + +DPADD_event= ${LIBEVENT} +LDADD_event= ${LDEVENT} + LIBATF_CDIR= ${ROOTOBJDIR}/lib/atf/libatf-c LDATF_C?= ${LIBATF_CDIR}/libatf-c.so LIBATF_C?= ${LIBATF_CDIR}/libatf-c.a @@ -22,7 +397,7 @@ LIBBSDSTAT?= ${LIBBSDSTATDIR}/libbsdstat.a LIBEVENTDIR= ${ROOTOBJDIR}/lib/libevent -LDEVENT?= ${LIBEVENTDIR}/libevent.so +LDEVENT?= ${LIBEVENTDIR}/libevent.a LIBEVENT?= ${LIBEVENTDIR}/libevent.a LIBHEIMIPCCDIR= ${ROOTOBJDIR}/kerberos5/lib/libheimipcc @@ -56,3 +431,7 @@ LIBOHASHDIR= ${ROOTOBJDIR}/lib/libohash LDOHASH?= ${LIBOHASHDIR}/libohash.a LIBOHASH?= ${LIBOHASHDIR}/libohash.a + +LIBSMDIR= ${ROOTOBJDIR}/lib/libsm +LDSM?= ${LIBSMDIR}/libsm.a +LIBSM?= ${LIBSMDIR}/libsm.a Index: sys/fs/fuse/fuse_node.c =================================================================== --- sys/fs/fuse/fuse_node.c (revision 274143) +++ sys/fs/fuse/fuse_node.c (working copy) @@ -270,12 +270,18 @@ fuse_vnode_open(struct vnode *vp, int32_t fuse_open_flags, struct thread *td) { /* - * Funcation is called for every vnode open. - * Merge fuse_open_flags it may be 0 - * - * XXXIP: Handle FOPEN_DIRECT_IO and FOPEN_KEEP_CACHE - */ + * Funcation is called for every vnode open. + * Merge fuse_open_flags it may be 0 + * + * XXXIP: Handle FOPEN_KEEP_CACHE + */ + if (fuse_open_flags & FOPEN_DIRECT_IO) { + VTOFUD(vp)->flag |= FN_DIRECTIO; + } else { + VTOFUD(vp)->flag &= ~FN_DIRECTIO; + } + if (vnode_vtype(vp) == VREG) { /* XXXIP prevent getattr, by using cached node size */ vnode_create_vobject(vp, 0, td); Index: sys/fs/fuse/fuse_node.h =================================================================== --- sys/fs/fuse/fuse_node.h (revision 274143) +++ sys/fs/fuse/fuse_node.h (working copy) @@ -67,6 +67,7 @@ #define FN_FLUSHINPROG 0x00000040 #define FN_FLUSHWANT 0x00000080 #define FN_SIZECHANGE 0x00000100 +#define FN_DIRECTIO 0x00000200 struct fuse_vnode_data { /** self **/ Index: sys/fs/fuse/fuse_vnops.c =================================================================== --- sys/fs/fuse/fuse_vnops.c (revision 274143) +++ sys/fs/fuse/fuse_vnops.c (working copy) @@ -1173,6 +1173,10 @@ if (fuse_isdeadfs(vp)) { return ENXIO; } + + if (VTOFUD(vp)->flag & FN_DIRECTIO) + ioflag |= IO_DIRECT; + return fuse_io_dispatch(vp, uio, ioflag, cred); } @@ -1712,6 +1716,9 @@ } fuse_vnode_refreshsize(vp, cred); + if (VTOFUD(vp)->flag & FN_DIRECTIO) + ioflag |= IO_DIRECT; + return fuse_io_dispatch(vp, uio, ioflag, cred); } Index: sys/powerpc/ps3/ps3_syscons.c =================================================================== --- sys/powerpc/ps3/ps3_syscons.c (revision 274143) +++ sys/powerpc/ps3/ps3_syscons.c (working copy) @@ -92,7 +92,6 @@ static int ps3fb_probe(struct vt_device *vd) { - struct ps3fb_softc *sc; int disable; char compatible[64]; #if 0 @@ -104,8 +103,6 @@ if (disable != 0) return (0); - sc = &ps3fb_softc; - #if 0 root = OF_finddevice("/"); if (OF_getprop(root, "compatible", compatible, sizeof(compatible)) <= 0) Index: usr.bin/cpio/Makefile =================================================================== --- usr.bin/cpio/Makefile (revision 274143) +++ usr.bin/cpio/Makefile (working copy) @@ -23,15 +23,7 @@ # 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 Index: usr.bin/timeout/tests/Makefile =================================================================== --- usr.bin/timeout/tests/Makefile (revision 274143) +++ usr.bin/timeout/tests/Makefile (working copy) @@ -1,6 +1,6 @@ # $FreeBSD$ -TESTSDIR= ${TESTSBASE}/usr.bin/timeout +#TESTSDIR= ${TESTSBASE}/usr.bin/timeout ATF_TESTS_SH= timeout Index: usr.sbin/ctld/Makefile =================================================================== --- usr.sbin/ctld/Makefile (revision 274143) +++ usr.sbin/ctld/Makefile (working copy) @@ -10,8 +10,8 @@ #CFLAGS+= -DICL_KERNEL_PROXY MAN= ctld.8 ctl.conf.5 -DPADD= ${LIBBSDXML} ${LIBCAM} ${LIBCRYPTO} ${LIBL} ${LIBSBUF} ${LIBSSL} ${LIBUTIL} -LDADD= -lbsdxml -lcam -lcrypto -ll -lsbuf -lssl -lutil +DPADD= ${LIBBSDXML} ${LIBCRYPTO} ${LIBL} ${LIBSBUF} ${LIBUTIL} +LDADD= -lbsdxml -lcrypto -ll -lsbuf -lutil YFLAGS+= -v CLEANFILES= y.tab.c y.tab.h y.output Index: usr.sbin/ctm/ctm/Makefile =================================================================== --- usr.sbin/ctm/ctm/Makefile (revision 274143) +++ usr.sbin/ctm/ctm/Makefile (working copy) @@ -14,8 +14,7 @@ NOTYET= ctm_ed.c -LDADD= -lmd -DPADD= ${LIBMD} +LIBADD= md WARNS?= 2 Index: usr.sbin/ctm/mkCTM/Makefile =================================================================== --- usr.sbin/ctm/mkCTM/Makefile (revision 274143) +++ usr.sbin/ctm/mkCTM/Makefile (working copy) @@ -3,8 +3,7 @@ PROG= mkctm MAN= -DPADD= ${LIBMD} -LDADD= -lmd +LIBADD= md test: mkctm rm -f tst.out* Index: usr.sbin/dconschat/Makefile =================================================================== --- usr.sbin/dconschat/Makefile (revision 274143) +++ usr.sbin/dconschat/Makefile (working copy) @@ -5,8 +5,7 @@ CFLAGS+= -I${.CURDIR}/../../sys -DPADD= ${LIBKVM} -LDADD= -lkvm +LIBADD= kvm WARNS?= 1 Index: usr.sbin/edquota/Makefile =================================================================== --- usr.sbin/edquota/Makefile (revision 274143) +++ usr.sbin/edquota/Makefile (working copy) @@ -7,7 +7,6 @@ CSTD= gnu99 WARNS?= 4 -DPADD= ${LIBUTIL} -LDADD= -lutil +LIBADD= util .include Index: usr.sbin/fifolog/fifolog_create/Makefile =================================================================== --- usr.sbin/fifolog/fifolog_create/Makefile (revision 274143) +++ usr.sbin/fifolog/fifolog_create/Makefile (working copy) @@ -4,8 +4,9 @@ CFLAGS+= -I${.CURDIR}/../lib -DPADD= ${LIBFIFOLOG} ${LIBUTIL} -LDADD= ${LIBFIFOLOG} -lutil +LIBADD= util +DPADD= ${LIBFIFOLOG} +LDADD= ${LIBFIFOLOG} MAN= fifolog.1 MLINKS= fifolog.1 fifolog_create.1 \ Index: usr.sbin/fifolog/fifolog_reader/Makefile =================================================================== --- usr.sbin/fifolog/fifolog_reader/Makefile (revision 274174) +++ usr.sbin/fifolog/fifolog_reader/Makefile (working copy) @@ -6,8 +6,9 @@ MAN= -DPADD= ${LIBFIFOLOG} ${LIBZ} -LDADD= ${LIBFIFOLOG} -lz +LIBADD= z +DPADD= ${LIBFIFOLOG} +LDADD= ${LIBFIFOLOG} regress: ./${PROG} /tmp/fifolog.0 Index: usr.sbin/fifolog/fifolog_writer/Makefile =================================================================== --- usr.sbin/fifolog/fifolog_writer/Makefile (revision 274176) +++ usr.sbin/fifolog/fifolog_writer/Makefile (working copy) @@ -6,8 +6,9 @@ MAN= -DPADD= ${LIBFIFOLOG} ${LIBZ} -LDADD= ${LIBFIFOLOG} -lz +LIBADD= z +DPADD= ${LIBFIFOLOG} +LDADD= ${LIBFIFOLOG} regress: date | ./${PROG} -z 0 /tmp/fifolog.0 Index: usr.sbin/ftp-proxy/Makefile =================================================================== --- usr.sbin/ftp-proxy/Makefile (revision 274143) +++ usr.sbin/ftp-proxy/Makefile (working copy) @@ -9,8 +9,7 @@ CFLAGS+=-I${.CURDIR}/../../contrib/pf/libevent -LDADD+= ${LIBEVENT} -DPADD+= ${LIBEVENT} +LIBADD= event WARNS?= 3 Index: usr.sbin/gstat/Makefile =================================================================== --- usr.sbin/gstat/Makefile (revision 274143) +++ usr.sbin/gstat/Makefile (working copy) @@ -2,7 +2,6 @@ PROG= gstat MAN= gstat.8 -DPADD= ${LIBDEVSTAT} ${LIBKVM} ${LIBGEOM} ${LIBBSDXML} ${LIBSBUF} ${LIBEDIT} ${LIBNCURSESW} -LDADD= -ldevstat -lkvm -lgeom -lbsdxml -lsbuf -ledit -lncursesw +LIBADD= devstat geom edit ncursesw .include Index: usr.sbin/ifmcstat/Makefile =================================================================== --- usr.sbin/ifmcstat/Makefile (revision 274143) +++ usr.sbin/ifmcstat/Makefile (working copy) @@ -17,8 +17,7 @@ .if ${MK_KVM_SUPPORT} != "no" CFLAGS+=-DWITH_KVM -DPADD= ${LIBKVM} -LDADD= -lkvm +LIBADD= kvm .endif .include Index: usr.sbin/inetd/Makefile =================================================================== --- usr.sbin/inetd/Makefile (revision 274143) +++ usr.sbin/inetd/Makefile (working copy) @@ -16,14 +16,12 @@ CFLAGS+= -DINET6 .endif -DPADD= ${LIBUTIL} ${LIBWRAP} -LDADD= -lutil -lwrap +LIBADD= util wrap # XXX for src/release/picobsd .if !defined(RELEASE_CRUNCH) CFLAGS+= -DIPSEC -DPADD+= ${LIBIPSEC} -LDADD+= -lipsec +LIBADD+= ipsec .endif .include Index: usr.sbin/iostat/Makefile =================================================================== --- usr.sbin/iostat/Makefile (revision 274143) +++ usr.sbin/iostat/Makefile (working copy) @@ -4,8 +4,7 @@ PROG= iostat MAN= iostat.8 -DPADD= ${LIBDEVSTAT} ${LIBKVM} ${LIBM} -LDADD= -ldevstat -lkvm -lm +LIBADD= devstat kvm m WARNS?= 1 Index: usr.sbin/ipfwpcap/Makefile =================================================================== --- usr.sbin/ipfwpcap/Makefile (revision 274143) +++ usr.sbin/ipfwpcap/Makefile (working copy) @@ -6,8 +6,7 @@ PROG= ipfwpcap -LDADD= -lpcap -DPADD= ${LIBPCAP} +LIBADD= pcap MAN= ipfwpcap.8 Index: usr.sbin/iscsid/Makefile =================================================================== --- usr.sbin/iscsid/Makefile (revision 274171) +++ usr.sbin/iscsid/Makefile (working copy) @@ -8,8 +8,7 @@ #CFLAGS+= -DICL_KERNEL_PROXY MAN= iscsid.8 -DPADD= ${LIBCRYPTO} ${LIBUTIL} -LDADD= -lcrypto -lutil +LIBADD= crypto util WARNS= 6 Index: usr.sbin/jail/Makefile =================================================================== --- usr.sbin/jail/Makefile (revision 274143) +++ usr.sbin/jail/Makefile (working copy) @@ -6,8 +6,7 @@ MAN= jail.8 jail.conf.5 SRCS= jail.c command.c config.c state.c jailp.h jaillex.l jailparse.y y.tab.h -DPADD= ${LIBJAIL} ${LIBKVM} ${LIBUTIL} ${LIBL} -LDADD= -ljail -lkvm -lutil -ll +LIBADD= jail kvm util l NO_WMISSING_VARIABLE_DECLARATIONS= Index: usr.sbin/jexec/Makefile =================================================================== --- usr.sbin/jexec/Makefile (revision 274143) +++ usr.sbin/jexec/Makefile (working copy) @@ -2,7 +2,6 @@ PROG= jexec MAN= jexec.8 -DPADD= ${LIBJAIL} ${LIBUTIL} -LDADD= -ljail -lutil +LIBADD= jail util .include Index: usr.sbin/jls/Makefile =================================================================== --- usr.sbin/jls/Makefile (revision 274143) +++ usr.sbin/jls/Makefile (working copy) @@ -4,8 +4,7 @@ PROG= jls MAN= jls.8 -DPADD= ${LIBJAIL} -LDADD= -ljail +LIBADD= jail .if ${MK_INET6_SUPPORT} != "no" CFLAGS+= -DINET6 Index: usr.sbin/kbdcontrol/Makefile =================================================================== --- usr.sbin/kbdcontrol/Makefile (revision 274143) +++ usr.sbin/kbdcontrol/Makefile (working copy) @@ -8,7 +8,6 @@ WARNS?= 4 CFLAGS+= -I${.CURDIR} -DPADD= ${LIBL} -LDADD= -ll +LIBADD= l .include Index: usr.sbin/kgmon/Makefile =================================================================== --- usr.sbin/kgmon/Makefile (revision 274143) +++ usr.sbin/kgmon/Makefile (working copy) @@ -11,7 +11,6 @@ #BINOWN=root #BINMODE=4555 -DPADD= ${LIBKVM} -LDADD= -lkvm +LIBADD= kvm .include Index: usr.sbin/mfiutil/Makefile =================================================================== --- usr.sbin/mfiutil/Makefile (revision 274143) +++ usr.sbin/mfiutil/Makefile (working copy) @@ -8,8 +8,7 @@ CFLAGS.gcc+= -fno-builtin-strftime -DPADD= ${LIBUTIL} -LDADD= -lutil +LIBADD= util # Here be dragons .ifdef DEBUG Index: usr.sbin/mount_smbfs/Makefile =================================================================== --- usr.sbin/mount_smbfs/Makefile (revision 274143) +++ usr.sbin/mount_smbfs/Makefile (working copy) @@ -8,8 +8,7 @@ CONTRIBDIR= ${.CURDIR}/../../contrib/smbfs CFLAGS+= -DSMBFS -I${MOUNTDIR} -I${CONTRIBDIR}/include -LDADD= -lsmb -lkiconv -DPADD= ${LIBSMB} ${LIBKICONV} +LIBADD= smb .PATH: ${CONTRIBDIR}/mount_smbfs .PATH: ${MOUNTDIR} Index: usr.sbin/mountd/Makefile =================================================================== --- usr.sbin/mountd/Makefile (revision 274143) +++ usr.sbin/mountd/Makefile (working copy) @@ -11,7 +11,6 @@ .PATH: ${MOUNT} -DPADD= ${LIBUTIL} -LDADD= -lutil +LIBADD= util .include Index: usr.sbin/moused/Makefile =================================================================== --- usr.sbin/moused/Makefile (revision 274143) +++ usr.sbin/moused/Makefile (working copy) @@ -3,8 +3,7 @@ PROG= moused MAN= moused.8 -DPADD= ${LIBUTIL} ${LIBM} -LDADD= -lutil -lm +LIBADD= m util #BINMODE=4555 #PRECIOUSPROG= Index: usr.sbin/mptutil/Makefile =================================================================== --- usr.sbin/mptutil/Makefile (revision 274143) +++ usr.sbin/mptutil/Makefile (working copy) @@ -8,8 +8,7 @@ WARNS?= 3 -DPADD= ${LIBCAM} ${LIBSBUF} ${LIBUTIL} -LDADD= -lcam -lsbuf -lutil +LIBADD= cam util # Here be dragons .ifdef DEBUG Index: usr.sbin/mtree/Makefile =================================================================== --- usr.sbin/mtree/Makefile (revision 274143) +++ usr.sbin/mtree/Makefile (working copy) @@ -11,8 +11,7 @@ SRCS+= specspec.c CFLAGS+= -DMD5 -DSHA1 -DRMD160 -DSHA256 -DPADD= ${LIBMD} -LDADD= -lmd +LIBADD= md CLEANFILES+= fmtree.8 Index: usr.sbin/nandtool/Makefile =================================================================== --- usr.sbin/nandtool/Makefile (revision 274143) +++ usr.sbin/nandtool/Makefile (working copy) @@ -4,8 +4,7 @@ SRCS= nandtool.c nand_read.c nand_write.c nand_erase.c nand_info.c SRCS+= nand_readoob.c nand_writeoob.c BINDIR= /usr/sbin -DPADD= ${LIBGEOM} -LDADD= -lgeom +LIBADD= geom MAN= nandtool.8 .include Index: usr.sbin/ndiscvt/Makefile =================================================================== --- usr.sbin/ndiscvt/Makefile (revision 274143) +++ usr.sbin/ndiscvt/Makefile (working copy) @@ -13,8 +13,7 @@ WARNS?= 4 NO_WCAST_ALIGN= -DPADD= ${LIBL} -LDADD= -ll +LIBADD= l YFLAGS+=-v Index: usr.sbin/nscd/Makefile =================================================================== --- usr.sbin/nscd/Makefile (revision 274143) +++ usr.sbin/nscd/Makefile (working copy) @@ -8,9 +8,9 @@ config.c query.c mp_ws_query.c mp_rs_query.c singletons.c protocol.c \ parser.c CFLAGS+= -DCONFIG_PATH="\"${PREFIX}/etc/nscd.conf\"" -DPADD= ${LIBM} ${LIBPTHREAD} ${LIBUTIL} -LDADD= -lm -lpthread -lutil +LIBADD= util pthread + .PATH: ${.CURDIR}/agents .include "${.CURDIR}/agents/Makefile.inc" .include Index: usr.sbin/ntp/ntpdate/Makefile =================================================================== --- usr.sbin/ntp/ntpdate/Makefile (revision 274143) +++ usr.sbin/ntp/ntpdate/Makefile (working copy) @@ -8,9 +8,11 @@ CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include -I${.CURDIR}/../ -DPADD= ${LIBNTP} ${LIBM} ${LIBMD} ${LIBRT} -LDADD= ${LIBNTP} -lm -lmd -lrt +DPADD= ${LIBNTP} +LDADD= ${LIBNTP} +LIBADD= md rt + CLEANFILES+= .version version.c version.c: Index: usr.sbin/ntp/ntpdc/Makefile =================================================================== --- usr.sbin/ntp/ntpdc/Makefile (revision 274143) +++ usr.sbin/ntp/ntpdc/Makefile (working copy) @@ -12,11 +12,10 @@ CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include -I${.CURDIR}/../ \ -I${.CURDIR}/../../../contrib/ntp/libopts -DPADD= ${LIBNTP} ${LIBM} ${LIBMD} ${LIBOPTS} -LDADD= ${LIBNTP} -lm -lmd ${LIBOPTS} +DPADD= ${LIBNTP} ${LIBOPTS} +LDADD= ${LIBNTP} ${LIBOPTS} -DPADD+= ${LIBEDIT} ${LIBTERMCAPW} -LDADD+= -ledit -ltermcapw +LIBADD= edit md CFLAGS+= -DHAVE_LIBEDIT -DHAVE_READLINE_READLINE_H \ -I${DESTDIR}/${INCLUDEDIR}/edit Index: usr.sbin/ntp/ntpq/Makefile =================================================================== --- usr.sbin/ntp/ntpq/Makefile (revision 274143) +++ usr.sbin/ntp/ntpq/Makefile (working copy) @@ -14,11 +14,10 @@ CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include -I${.CURDIR}/../ \ -I${.CURDIR}/../../../contrib/ntp/libopts -DPADD= ${LIBNTP} ${LIBM} ${LIBMD} ${LIBOPTS} -LDADD= ${LIBNTP} -lm -lmd ${LIBOPTS} +DPADD= ${LIBNTP} ${LIBOPTS} +LDADD= ${LIBNTP} ${LIBOPTS} -DPADD+= ${LIBEDIT} ${LIBTERMCAPW} -LDADD+= -ledit -ltermcapw +LIBADD+= edit md CFLAGS+= -DHAVE_LIBEDIT -DHAVE_READLINE_READLINE_H \ -I${DESTDIR}/${INCLUDEDIR}/edit Index: usr.sbin/pkg/Makefile =================================================================== --- usr.sbin/pkg/Makefile (revision 274143) +++ usr.sbin/pkg/Makefile (working copy) @@ -6,9 +6,6 @@ CFLAGS+=-I${.CURDIR}/../../contrib/libucl/include .PATH: ${.CURDIR}/../../contrib/libucl/include -DPADD= ${LIBARCHIVE} ${LIBFETCH} ${LIBUCL} ${LIBSBUF} ${LIBSSL} \ - ${LIBCRYPTO} ${LIBM} -LDADD= -larchive -lfetch ${LDUCL} -lsbuf -lssl -lcrypto -lm -USEPRIVATELIB= ucl +LIBADD= archive fetch ucl sbuf .include Index: usr.sbin/powerd/Makefile =================================================================== --- usr.sbin/powerd/Makefile (revision 274143) +++ usr.sbin/powerd/Makefile (working copy) @@ -3,7 +3,6 @@ PROG= powerd MAN= powerd.8 -DPADD= ${LIBUTIL} -LDADD= -lutil +LIBADD= util .include Index: usr.sbin/pppctl/Makefile =================================================================== --- usr.sbin/pppctl/Makefile (revision 274143) +++ usr.sbin/pppctl/Makefile (working copy) @@ -5,7 +5,6 @@ WARNS?= 2 -DPADD= ${LIBPTHREAD} ${LIBEDIT} ${LIBTERMCAPW} -LDADD= -lpthread -ledit -ltermcapw +LIBADD= edit pthread .include Index: usr.sbin/pstat/Makefile =================================================================== --- usr.sbin/pstat/Makefile (revision 274143) +++ usr.sbin/pstat/Makefile (working copy) @@ -6,7 +6,6 @@ MAN= pstat.8 MLINKS= pstat.8 swapinfo.8 -DPADD= ${LIBKVM} ${LIBUTIL} -LDADD= -lkvm -lutil +LIBADD= kvm util .include Index: usr.sbin/pw/Makefile =================================================================== --- usr.sbin/pw/Makefile (revision 274143) +++ usr.sbin/pw/Makefile (working copy) @@ -8,8 +8,7 @@ WARNS?= 2 -DPADD= ${LIBCRYPT} ${LIBUTIL} -LDADD= -lcrypt -lutil +LIBADD= crypt util .include Index: usr.sbin/quotaon/Makefile =================================================================== --- usr.sbin/quotaon/Makefile (revision 274143) +++ usr.sbin/quotaon/Makefile (working copy) @@ -6,7 +6,6 @@ MAN= quotaon.8 MLINKS= quotaon.8 quotaoff.8 -DPADD= ${LIBUTIL} -LDADD= -lutil +LIBADD= util .include Index: usr.sbin/rarpd/Makefile =================================================================== --- usr.sbin/rarpd/Makefile (revision 274143) +++ usr.sbin/rarpd/Makefile (working copy) @@ -4,8 +4,7 @@ PROG= rarpd MAN= rarpd.8 -DPADD= ${LIBUTIL} -LDADD= -lutil +LIBADD= util WARNS?= 3 # This breaks with format strings returned by expand_syslog_m().. argh! Index: usr.sbin/repquota/Makefile =================================================================== --- usr.sbin/repquota/Makefile (revision 274143) +++ usr.sbin/repquota/Makefile (working copy) @@ -3,7 +3,6 @@ PROG= repquota MAN= repquota.8 -DPADD= ${LIBUTIL} -LDADD= -lutil +LIBADD= util .include Index: usr.sbin/rpcbind/Makefile =================================================================== --- usr.sbin/rpcbind/Makefile (revision 274169) +++ usr.sbin/rpcbind/Makefile (working copy) @@ -16,7 +16,6 @@ WARNS?= 1 -DPADD= ${LIBWRAP} -LDADD= -lwrap +LIBADD= wrap .include Index: usr.sbin/rrenumd/Makefile =================================================================== --- usr.sbin/rrenumd/Makefile (revision 274143) +++ usr.sbin/rrenumd/Makefile (working copy) @@ -23,8 +23,7 @@ WARNS?= 2 -LDADD= -lipsec -ll -ly -DPADD= ${LIBIPSEC} ${LIBL} ${LIBY} +LIBADD= ipsrc l y CLEANFILES= y.tab.h SRCS+= y.tab.h Index: usr.sbin/rtadvd/Makefile =================================================================== --- usr.sbin/rtadvd/Makefile (revision 274143) +++ usr.sbin/rtadvd/Makefile (working copy) @@ -19,8 +19,7 @@ SRCS= rtadvd.c rrenum.c advcap.c if.c config.c timer.c timer_subr.c \ control.c control_server.c -DPADD= ${LIBUTIL} -LDADD= -lutil +LIBADD= util CFLAGS+= -DHAVE_ARC4RANDOM Index: usr.sbin/rtsold/Makefile =================================================================== --- usr.sbin/rtsold/Makefile (revision 274143) +++ usr.sbin/rtsold/Makefile (working copy) @@ -21,7 +21,6 @@ WARNS?= 3 CFLAGS+= -DHAVE_ARC4RANDOM -DHAVE_POLL_H -DPADD= ${LIBKVM} -LDADD= -lkvm +LIBADD= kvm .include Index: usr.sbin/services_mkdb/Makefile =================================================================== --- usr.sbin/services_mkdb/Makefile (revision 274143) +++ usr.sbin/services_mkdb/Makefile (working copy) @@ -4,7 +4,6 @@ MAN= services_mkdb.8 SRCS= services_mkdb.c uniq.c extern.h -DPADD+= ${LIBUTIL} -LDADD+= -lutil +LIBADD= util .include Index: usr.sbin/snapinfo/Makefile =================================================================== --- usr.sbin/snapinfo/Makefile (revision 274143) +++ usr.sbin/snapinfo/Makefile (working copy) @@ -4,7 +4,6 @@ PROG= snapinfo MAN= snapinfo.8 -DPADD= ${LIBUFS} -LDADD= -lufs +LIBADD= ufs -.include +.include Index: usr.sbin/tcpdmatch/Makefile =================================================================== --- usr.sbin/tcpdmatch/Makefile (revision 274143) +++ usr.sbin/tcpdmatch/Makefile (working copy) @@ -16,7 +16,6 @@ WARNS?= 0 -DPADD= ${LIBWRAP} -LDADD= -lwrap +LIBADD= wrap .include Index: usr.sbin/timed/timed/Makefile =================================================================== --- usr.sbin/timed/timed/Makefile (revision 274143) +++ usr.sbin/timed/timed/Makefile (working copy) @@ -8,8 +8,7 @@ SRCS= acksend.c candidate.c correct.c master.c networkdelta.c readmsg.c \ slave.c timed.c byteorder.c measure.c cksum.c -DPADD= ${LIBUTIL} -LDADD= -lutil +LIBADD= util WARNS?= 1 Index: usr.sbin/traceroute/Makefile =================================================================== --- usr.sbin/traceroute/Makefile (revision 274143) +++ usr.sbin/traceroute/Makefile (working copy) @@ -25,8 +25,7 @@ # CFLAGS+= -DSANE_PRECISION .if !defined(TRACEROUTE_NO_IPSEC) -DPADD= ${LIBIPSEC} -LDADD= -lipsec +LIBADD+= ipsec .endif CFLAGS+= -I${TRACEROUTE_DISTDIR} Index: usr.sbin/traceroute6/Makefile =================================================================== --- usr.sbin/traceroute6/Makefile (revision 274143) +++ usr.sbin/traceroute6/Makefile (working copy) @@ -27,7 +27,6 @@ WARNS?= 3 -DPADD= ${LIBIPSEC} -LDADD= -lipsec +LIBADD= ipsec .include Index: usr.sbin/tzsetup/Makefile =================================================================== --- usr.sbin/tzsetup/Makefile (revision 274143) +++ usr.sbin/tzsetup/Makefile (working copy) @@ -7,7 +7,6 @@ WARNS?= 3 -DPADD= ${LIBDIALOG} ${LIBNCURSESW} ${LIBM} -LDADD= -ldialog -lncursesw -lm +LIBADD= dialog ncursesw .include Index: usr.sbin/uhsoctl/Makefile =================================================================== --- usr.sbin/uhsoctl/Makefile (revision 274143) +++ usr.sbin/uhsoctl/Makefile (working copy) @@ -4,7 +4,6 @@ MAN= uhsoctl.1 WARNS?= 1 -DPADD= ${LIBUTIL} -LDADD= -lutil +LIBADD= util .include Index: usr.sbin/unbound/anchor/Makefile =================================================================== --- usr.sbin/unbound/anchor/Makefile (revision 274143) +++ usr.sbin/unbound/anchor/Makefile (working copy) @@ -10,9 +10,7 @@ PROG= unbound-anchor SRCS= unbound-anchor.c CFLAGS= -I${UNBOUNDDIR} -I${LDNSDIR} -I${EXPATDIR}/lib -DPADD= ${LIBUNBOUND} ${LIBLDNS} ${LIBUTIL} ${LIBBSDXML} ${LIBSSL} ${LIBCRYPTO} ${LIBPTHREAD} -LDADD= ${LDUNBOUND} ${LDLDNS} -lutil -lbsdxml -lssl -lcrypto -lpthread -USEPRIVATELIB= ldns +LIBADD= unbound bsdxml ssl crypto pthread MAN= unbound-anchor.8 .include Index: usr.sbin/unbound/checkconf/Makefile =================================================================== --- usr.sbin/unbound/checkconf/Makefile (revision 274143) +++ usr.sbin/unbound/checkconf/Makefile (working copy) @@ -9,9 +9,7 @@ PROG= unbound-checkconf SRCS= unbound-checkconf.c worker_cb.c CFLAGS= -I${UNBOUNDDIR} -I${LDNSDIR} -DPADD= ${LIBUNBOUND} ${LIBLDNS} ${LIBUTIL} ${LIBSSL} ${LIBCRYPTO} ${LIBPTHREAD} -LDADD= ${LDUNBOUND} ${LDLDNS} -lutil -lssl -lcrypto -lpthread -USEPRIVATELIB= ldns +LIBADD= unbound pthread MAN= unbound-checkconf.8 .include Index: usr.sbin/unbound/control/Makefile =================================================================== --- usr.sbin/unbound/control/Makefile (revision 274143) +++ usr.sbin/unbound/control/Makefile (working copy) @@ -10,9 +10,7 @@ SCRIPTS= unbound-control-setup.sh SRCS= unbound-control.c worker_cb.c CFLAGS= -I${UNBOUNDDIR} -I${LDNSDIR} -DPADD= ${LIBUNBOUND} ${LIBLDNS} ${LIBUTIL} ${LIBSSL} ${LIBCRYPTO} ${LIBPTHREAD} -LDADD= ${LDUNBOUND} ${LDLDNS} -lutil -lssl -lcrypto -lpthread -USEPRIVATELIB= ldns +LIBADD= unbound crypto ssl pthread MAN= unbound-control.8 .include Index: usr.sbin/unbound/daemon/Makefile =================================================================== --- usr.sbin/unbound/daemon/Makefile (revision 274143) +++ usr.sbin/unbound/daemon/Makefile (working copy) @@ -9,9 +9,7 @@ PROG= unbound SRCS= acl_list.c cachedump.c daemon.c remote.c stats.c unbound.c worker.c CFLAGS= -I${UNBOUNDDIR} -I${LDNSDIR} -DPADD= ${LIBUNBOUND} ${LIBLDNS} ${LIBUTIL} ${LIBSSL} ${LIBCRYPTO} ${LIBPTHREAD} -LDADD= ${LDUNBOUND} ${LDLDNS} -lutil -lssl -lcrypto -lpthread -USEPRIVATELIB= ldns +LIBADD= unbound util ssl crypto pthread MAN= unbound.8 unbound.conf.5 .include Index: usr.sbin/usbconfig/Makefile =================================================================== --- usr.sbin/usbconfig/Makefile (revision 274143) +++ usr.sbin/usbconfig/Makefile (working copy) @@ -4,7 +4,6 @@ PROG= usbconfig MAN= usbconfig.8 SRCS= usbconfig.c dump.c -DPADD+= ${LIBUSB} -LDADD+= -lusb +LIBADD= usb .include Index: usr.sbin/vipw/Makefile =================================================================== --- usr.sbin/vipw/Makefile (revision 274143) +++ usr.sbin/vipw/Makefile (working copy) @@ -4,7 +4,6 @@ PROG= vipw MAN= vipw.8 -DPADD= ${LIBUTIL} -LDADD= -lutil +LIBADD= util .include Index: usr.sbin/watch/Makefile =================================================================== --- usr.sbin/watch/Makefile (revision 274143) +++ usr.sbin/watch/Makefile (working copy) @@ -5,7 +5,6 @@ WARNS?= 2 -DPADD= ${LIBTERMCAPW} -LDADD= -ltermcapw +LIBADD= ncursesw .include Index: usr.sbin/watchdogd/Makefile =================================================================== --- usr.sbin/watchdogd/Makefile (revision 274143) +++ usr.sbin/watchdogd/Makefile (working copy) @@ -4,8 +4,7 @@ LINKS= ${BINDIR}/watchdogd ${BINDIR}/watchdog MAN= watchdogd.8 watchdog.8 -LDADD= -lutil -DPADD= ${LIBUTIL} +LIBADD= util .include Index: usr.sbin/wpa/hostapd/Makefile =================================================================== --- usr.sbin/wpa/hostapd/Makefile (revision 274143) +++ usr.sbin/wpa/hostapd/Makefile (working copy) @@ -46,8 +46,7 @@ CFLAGS+= -DCONFIG_IPV6 .endif #CFLAGS+= -g -DPADD+= ${LIBPCAP} ${LIBUTIL} -LDADD+= -lpcap -lutil +LIBADD= pcap util # User customizations for wpa_supplicant/hostapd build environment CFLAGS+=${HOSTAPD_CFLAGS} Index: usr.sbin/wpa/hostapd_cli/Makefile =================================================================== --- usr.sbin/wpa/hostapd_cli/Makefile (revision 274143) +++ usr.sbin/wpa/hostapd_cli/Makefile (working copy) @@ -10,8 +10,7 @@ CFLAGS+= -DCONFIG_CTRL_IFACE CFLAGS+= -DCONFIG_CTRL_IFACE_UNIX -DPADD+= ${LIBUTIL} -LDADD+= -lutil +LIBADD+= util MAN= hostapd_cli.8 Index: usr.sbin/wpa/wpa_cli/Makefile =================================================================== --- usr.sbin/wpa/wpa_cli/Makefile (revision 274143) +++ usr.sbin/wpa/wpa_cli/Makefile (working copy) @@ -14,8 +14,7 @@ # enable use of d_type to identify unix domain sockets CFLAGS+= -D_DIRENT_HAVE_D_TYPE -CFLAGS+= -DCONFIG_READLINE -I${DESTDIR}/${INCLUDEDIR}/edit -LDADD+= -ledit -ltermcapw -lutil -DPADD+= ${LIBEDIT} ${LIBTERMCAPW} ${LIBUTIL} +CFLAGS+= -DCONFIG_WPA_CLI_EDIT +LIBADD+= util .include Index: usr.sbin/wpa/wpa_passphrase/Makefile =================================================================== --- usr.sbin/wpa/wpa_passphrase/Makefile (revision 274143) +++ usr.sbin/wpa/wpa_passphrase/Makefile (working copy) @@ -11,8 +11,7 @@ CFLAGS+= -DINTERNAL_SHA1 CFLAGS+= -DINTERNAL_MD5 -DPADD+= ${LIBUTIL} -LDADD+= -lutil +LIBADD+= util MAN= wpa_passphrase.8 Index: usr.sbin/wpa/wpa_priv/Makefile =================================================================== --- usr.sbin/wpa/wpa_priv/Makefile (revision 274143) +++ usr.sbin/wpa/wpa_priv/Makefile (working copy) @@ -9,8 +9,7 @@ SRCS= drivers.c os_unix.c eloop.c common.c wpa_debug.c wpabuf.c wpa_priv.c \ driver_common.c l2_packet_freebsd.c -DPADD+= ${LIBPCAP} -LDADD+= -lpcap +LIBADD= pcap .include "${.CURDIR}/../Makefile.crypto" Index: usr.sbin/wpa/wpa_supplicant/Makefile =================================================================== --- usr.sbin/wpa/wpa_supplicant/Makefile (revision 274143) +++ usr.sbin/wpa/wpa_supplicant/Makefile (working copy) @@ -49,8 +49,7 @@ -DCONFIG_GAS \ -DPKCS12_FUNCS #CFLAGS+= -g -DPADD+= ${LIBPCAP} ${LIBUTIL} -LDADD+= -lpcap -lutil +LIBADD= pcap util # User customizations to the wpa_supplicant build environment CFLAGS+=${WPA_SUPPLICANT_CFLAGS} @@ -127,8 +126,8 @@ # .if !empty(CFLAGS:M*-DPCSC_FUNCS) SRCS+= pcsc_funcs.c -DPADD+=${LIBPTHREAD} -LDADD+=-lpcsclite -lpthread +LIBADD+= pthread +LDADD+=-lpcsclite .endif .if !empty(CFLAGS:M*-DEAP_GPSK) Index: usr.sbin/ypserv/Makefile =================================================================== --- usr.sbin/ypserv/Makefile (revision 274143) +++ usr.sbin/ypserv/Makefile (working copy) @@ -12,8 +12,7 @@ WARNS?= 0 -DPADD= ${LIBWRAP} -LDADD= -lwrap +LIBADD= wrap CLEANFILES= yp_svc.c ypxfr_clnt.c yp.h