Date: Tue, 25 Nov 2014 16:57:28 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r275054 - in head/usr.sbin: acpi/acpidb amd amd/amd amd/amq amd/fixmount amd/fsinfo amd/hlfsd amd/mk-amd-map amd/pawd amd/wire-test ancontrol apmd asf audit auditd auditdistd auditreduc... Message-ID: <201411251657.sAPGvSBD062652@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Tue Nov 25 16:57:27 2014 New Revision: 275054 URL: https://svnweb.freebsd.org/changeset/base/275054 Log: Convert usr.sbin to LIBADD Reduce overlinking Deleted: head/usr.sbin/cron/Makefile.inc head/usr.sbin/fifolog/Makefile.inc Modified: head/usr.sbin/acpi/acpidb/Makefile head/usr.sbin/amd/Makefile.inc head/usr.sbin/amd/amd/Makefile head/usr.sbin/amd/amq/Makefile head/usr.sbin/amd/fixmount/Makefile head/usr.sbin/amd/fsinfo/Makefile head/usr.sbin/amd/hlfsd/Makefile head/usr.sbin/amd/mk-amd-map/Makefile head/usr.sbin/amd/pawd/Makefile head/usr.sbin/amd/wire-test/Makefile head/usr.sbin/ancontrol/Makefile head/usr.sbin/apmd/Makefile head/usr.sbin/asf/Makefile head/usr.sbin/audit/Makefile head/usr.sbin/auditd/Makefile head/usr.sbin/auditdistd/Makefile head/usr.sbin/auditreduce/Makefile head/usr.sbin/authpf/Makefile head/usr.sbin/autofs/Makefile head/usr.sbin/bhyve/Makefile head/usr.sbin/bhyvectl/Makefile head/usr.sbin/bhyveload/Makefile head/usr.sbin/bluetooth/ath3kfw/Makefile head/usr.sbin/bluetooth/bt3cfw/Makefile head/usr.sbin/bluetooth/bthidcontrol/Makefile head/usr.sbin/bluetooth/bthidd/Makefile head/usr.sbin/bluetooth/btpand/Makefile head/usr.sbin/bluetooth/hccontrol/Makefile head/usr.sbin/bluetooth/hcsecd/Makefile head/usr.sbin/bluetooth/hcseriald/Makefile head/usr.sbin/bluetooth/l2control/Makefile head/usr.sbin/bluetooth/l2ping/Makefile head/usr.sbin/bluetooth/rfcomm_pppd/Makefile head/usr.sbin/bluetooth/sdpcontrol/Makefile head/usr.sbin/boot0cfg/Makefile head/usr.sbin/boot98cfg/Makefile head/usr.sbin/bsdinstall/distextract/Makefile head/usr.sbin/bsdinstall/distfetch/Makefile head/usr.sbin/bsdinstall/partedit/Makefile head/usr.sbin/bsnmpd/bsnmpd/Makefile head/usr.sbin/bsnmpd/modules/snmp_hast/Makefile head/usr.sbin/bsnmpd/modules/snmp_hostres/Makefile head/usr.sbin/bsnmpd/modules/snmp_netgraph/Makefile head/usr.sbin/bsnmpd/tools/bsnmptools/Makefile head/usr.sbin/cdcontrol/Makefile head/usr.sbin/ckdist/Makefile head/usr.sbin/clear_locks/Makefile head/usr.sbin/config/Makefile head/usr.sbin/cron/cron/Makefile head/usr.sbin/cron/crontab/Makefile head/usr.sbin/ctladm/Makefile head/usr.sbin/ctld/Makefile head/usr.sbin/ctm/ctm/Makefile head/usr.sbin/ctm/mkCTM/Makefile head/usr.sbin/daemon/Makefile head/usr.sbin/dconschat/Makefile head/usr.sbin/devinfo/Makefile head/usr.sbin/diskinfo/Makefile head/usr.sbin/editmap/Makefile head/usr.sbin/edquota/Makefile head/usr.sbin/fifolog/fifolog_create/Makefile head/usr.sbin/fifolog/fifolog_reader/Makefile head/usr.sbin/fifolog/fifolog_writer/Makefile head/usr.sbin/flowctl/Makefile head/usr.sbin/ftp-proxy/Makefile head/usr.sbin/gssd/Makefile head/usr.sbin/gstat/Makefile head/usr.sbin/ifmcstat/Makefile head/usr.sbin/inetd/Makefile head/usr.sbin/iostat/Makefile head/usr.sbin/ipfwpcap/Makefile head/usr.sbin/iscsid/Makefile head/usr.sbin/jail/Makefile head/usr.sbin/jexec/Makefile head/usr.sbin/jls/Makefile head/usr.sbin/kbdcontrol/Makefile head/usr.sbin/keyserv/Makefile head/usr.sbin/kgmon/Makefile head/usr.sbin/lmcconfig/Makefile head/usr.sbin/lpr/Makefile.inc head/usr.sbin/lpr/chkprintcap/Makefile head/usr.sbin/lpr/lpc/Makefile head/usr.sbin/lpr/lpd/Makefile head/usr.sbin/lpr/lpq/Makefile head/usr.sbin/lpr/lpr/Makefile head/usr.sbin/lpr/lprm/Makefile head/usr.sbin/lpr/pac/Makefile head/usr.sbin/mailstats/Makefile head/usr.sbin/mailwrapper/Makefile head/usr.sbin/makemap/Makefile head/usr.sbin/mfiutil/Makefile head/usr.sbin/mount_smbfs/Makefile head/usr.sbin/mountd/Makefile head/usr.sbin/moused/Makefile head/usr.sbin/mptutil/Makefile head/usr.sbin/mtree/Makefile head/usr.sbin/nandtool/Makefile head/usr.sbin/ndiscvt/Makefile head/usr.sbin/ngctl/Makefile head/usr.sbin/nghook/Makefile head/usr.sbin/nmtree/Makefile head/usr.sbin/nscd/Makefile head/usr.sbin/ntp/Makefile.inc head/usr.sbin/ntp/ntp-keygen/Makefile head/usr.sbin/ntp/ntpd/Makefile head/usr.sbin/ntp/ntpdate/Makefile head/usr.sbin/ntp/ntpdc/Makefile head/usr.sbin/ntp/ntpq/Makefile head/usr.sbin/ntp/ntptime/Makefile head/usr.sbin/ntp/sntp/Makefile head/usr.sbin/pkg/Makefile head/usr.sbin/pmccontrol/Makefile head/usr.sbin/pmcstat/Makefile head/usr.sbin/powerd/Makefile head/usr.sbin/ppp/Makefile head/usr.sbin/pppctl/Makefile head/usr.sbin/praliases/Makefile head/usr.sbin/praudit/Makefile head/usr.sbin/pstat/Makefile head/usr.sbin/quotaon/Makefile head/usr.sbin/rarpd/Makefile head/usr.sbin/repquota/Makefile head/usr.sbin/rpc.lockd/Makefile head/usr.sbin/rpc.statd/Makefile head/usr.sbin/rpc.yppasswdd/Makefile head/usr.sbin/rpc.ypupdated/Makefile head/usr.sbin/rpc.ypxfrd/Makefile head/usr.sbin/rpcbind/Makefile head/usr.sbin/rrenumd/Makefile head/usr.sbin/rtadvd/Makefile head/usr.sbin/rtsold/Makefile head/usr.sbin/sendmail/Makefile head/usr.sbin/services_mkdb/Makefile head/usr.sbin/snapinfo/Makefile head/usr.sbin/spray/Makefile head/usr.sbin/syslogd/Makefile head/usr.sbin/tcpdchk/Makefile head/usr.sbin/tcpdmatch/Makefile head/usr.sbin/tcpdump/tcpdump/Makefile head/usr.sbin/timed/timed/Makefile head/usr.sbin/traceroute/Makefile head/usr.sbin/traceroute6/Makefile head/usr.sbin/tzsetup/Makefile head/usr.sbin/ugidfw/Makefile head/usr.sbin/uhsoctl/Makefile head/usr.sbin/unbound/anchor/Makefile head/usr.sbin/unbound/checkconf/Makefile head/usr.sbin/unbound/control/Makefile head/usr.sbin/unbound/daemon/Makefile head/usr.sbin/usbconfig/Makefile head/usr.sbin/vipw/Makefile head/usr.sbin/watch/Makefile head/usr.sbin/watchdogd/Makefile head/usr.sbin/wpa/Makefile.crypto head/usr.sbin/wpa/hostapd/Makefile head/usr.sbin/wpa/hostapd_cli/Makefile head/usr.sbin/wpa/wpa_cli/Makefile head/usr.sbin/wpa/wpa_passphrase/Makefile head/usr.sbin/wpa/wpa_priv/Makefile head/usr.sbin/wpa/wpa_supplicant/Makefile head/usr.sbin/ypserv/Makefile Modified: head/usr.sbin/acpi/acpidb/Makefile ============================================================================== --- head/usr.sbin/acpi/acpidb/Makefile Tue Nov 25 16:53:22 2014 (r275053) +++ head/usr.sbin/acpi/acpidb/Makefile Tue Nov 25 16:57:27 2014 (r275054) @@ -74,7 +74,6 @@ MAN= acpidb.8 WARNS?= 3 CFLAGS+= -DACPI_EXEC_APP -fno-strict-aliasing -DPADD= ${LIBPTHREAD} -LDADD= -lpthread +LIBADD= pthread .include <bsd.prog.mk> Modified: head/usr.sbin/amd/Makefile.inc ============================================================================== --- head/usr.sbin/amd/Makefile.inc Tue Nov 25 16:53:22 2014 (r275053) +++ head/usr.sbin/amd/Makefile.inc Tue Nov 25 16:57:27 2014 (r275054) @@ -29,13 +29,6 @@ CFLAGS+= -DYES_HESIOD CFLAGS+= -DHOST_CPU=\"${MACHINE_CPUARCH}\" -DHOST_ARCH=\"${MACHINE_ARCH}\" -.if exists(${.OBJDIR}/../libamu) -LIBAMUDIR= ${.OBJDIR}/../libamu -.else -LIBAMUDIR= ${.CURDIR}/../libamu -.endif -LIBAMU= ${LIBAMUDIR}/libamu.a - RPCCOM= RPCGEN_CPP=${CPP:Q} rpcgen MOUNT_X= ${DESTDIR}/usr/include/rpcsvc/mount.x NFS_PROT_X= ${DESTDIR}/usr/include/rpcsvc/nfs_prot.x Modified: head/usr.sbin/amd/amd/Makefile ============================================================================== --- head/usr.sbin/amd/amd/Makefile Tue Nov 25 16:53:22 2014 (r275053) +++ head/usr.sbin/amd/amd/Makefile Tue Nov 25 16:57:27 2014 (r275054) @@ -27,8 +27,7 @@ SRCS+= srvr_amfs_auto.c srvr_nfs.c CFLAGS+= -I${.CURDIR}/../../../contrib/amd/amd \ -I${DESTDIR}/usr/include/rpcsvc -DPADD= ${LIBAMU} ${LIBWRAP} -LDADD= ${LIBAMU} -lwrap +LIBADD= amu wrap CLEANFILES+= conf_parse.c conf_parse.h conf_tok.c Modified: head/usr.sbin/amd/amq/Makefile ============================================================================== --- head/usr.sbin/amd/amq/Makefile Tue Nov 25 16:53:22 2014 (r275053) +++ head/usr.sbin/amd/amq/Makefile Tue Nov 25 16:57:27 2014 (r275054) @@ -14,7 +14,6 @@ SRCS= amq.c amq_clnt.c amq_xdr.c CFLAGS+= -I${.CURDIR}/../../../contrib/amd/amq -DPADD= ${LIBAMU} -LDADD= ${LIBAMU} +LIBADD= amu .include <bsd.prog.mk> Modified: head/usr.sbin/amd/fixmount/Makefile ============================================================================== --- head/usr.sbin/amd/fixmount/Makefile Tue Nov 25 16:53:22 2014 (r275053) +++ head/usr.sbin/amd/fixmount/Makefile Tue Nov 25 16:57:27 2014 (r275054) @@ -10,12 +10,11 @@ PROG= fixmount MAN= fixmount.8 -SRCS= fixmount.c +SRCS= fixmount.c # These would be links created by the GNU-style configure SRCS+= checkmount_bsd44.c -DPADD= ${LIBAMU} ${LIBRPCSVC} -LDADD= ${LIBAMU} -lrpcsvc +LIBADD+= amu rpcsvc .include <bsd.prog.mk> Modified: head/usr.sbin/amd/fsinfo/Makefile ============================================================================== --- head/usr.sbin/amd/fsinfo/Makefile Tue Nov 25 16:53:22 2014 (r275053) +++ head/usr.sbin/amd/fsinfo/Makefile Tue Nov 25 16:57:27 2014 (r275054) @@ -15,8 +15,7 @@ SRCS+= wr_bparam.c wr_dumpset.c wr_expor CFLAGS+= -I${.CURDIR}/../../../contrib/amd/fsinfo -DPADD= ${LIBAMU} -LDADD= ${LIBAMU} +LIBADD= amu CLEANFILES+= fsi_gram.c fsi_gram.h fsi_lex.c Modified: head/usr.sbin/amd/hlfsd/Makefile ============================================================================== --- head/usr.sbin/amd/hlfsd/Makefile Tue Nov 25 16:53:22 2014 (r275053) +++ head/usr.sbin/amd/hlfsd/Makefile Tue Nov 25 16:57:27 2014 (r275054) @@ -13,7 +13,6 @@ SRCS= hlfsd.c homedir.c nfs_prot_svc.c s CFLAGS+= -I${.CURDIR}/../../../contrib/amd/hlfsd -DPADD= ${LIBAMU} -LDADD= ${LIBAMU} +LIBADD= amu .include <bsd.prog.mk> Modified: head/usr.sbin/amd/mk-amd-map/Makefile ============================================================================== --- head/usr.sbin/amd/mk-amd-map/Makefile Tue Nov 25 16:53:22 2014 (r275053) +++ head/usr.sbin/amd/mk-amd-map/Makefile Tue Nov 25 16:57:27 2014 (r275054) @@ -10,7 +10,6 @@ PROG= mk-amd-map MAN= mk-amd-map.8 -DPADD= ${LIBAMU} -LDADD= ${LIBAMU} +LIBADD= amu .include <bsd.prog.mk> Modified: head/usr.sbin/amd/pawd/Makefile ============================================================================== --- head/usr.sbin/amd/pawd/Makefile Tue Nov 25 16:53:22 2014 (r275053) +++ head/usr.sbin/amd/pawd/Makefile Tue Nov 25 16:57:27 2014 (r275054) @@ -14,7 +14,6 @@ SRCS= pawd.c amq_clnt.c amq_xdr.c CFLAGS+= -I${.CURDIR}/../../../contrib/amd/amq -DPADD= ${LIBAMU} -LDADD= ${LIBAMU} +LIBADD= amu .include <bsd.prog.mk> Modified: head/usr.sbin/amd/wire-test/Makefile ============================================================================== --- head/usr.sbin/amd/wire-test/Makefile Tue Nov 25 16:53:22 2014 (r275053) +++ head/usr.sbin/amd/wire-test/Makefile Tue Nov 25 16:57:27 2014 (r275054) @@ -10,7 +10,6 @@ PROG= wire-test MAN= wire-test.8 -DPADD= ${LIBAMU} -LDADD= ${LIBAMU} +LIBADD= amu .include <bsd.prog.mk> Modified: head/usr.sbin/ancontrol/Makefile ============================================================================== --- head/usr.sbin/ancontrol/Makefile Tue Nov 25 16:53:22 2014 (r275053) +++ head/usr.sbin/ancontrol/Makefile Tue Nov 25 16:57:27 2014 (r275054) @@ -6,7 +6,6 @@ MAN= ancontrol.8 WARNS?= 3 CFLAGS+= -DANCACHE -I${.CURDIR}/../../sys -DPADD= ${LIBMD} -LDADD= -lmd +LIBADD= md .include <bsd.prog.mk> Modified: head/usr.sbin/apmd/Makefile ============================================================================== --- head/usr.sbin/apmd/Makefile Tue Nov 25 16:53:22 2014 (r275053) +++ head/usr.sbin/apmd/Makefile Tue Nov 25 16:57:27 2014 (r275054) @@ -7,8 +7,7 @@ SRCS= apmd.c apmdlex.l apmdparse.y y.tab WARNS?= 3 -DPADD= ${LIBL} -LDADD= -ll +LIBADD= l CFLAGS+= -I${.CURDIR} Modified: head/usr.sbin/asf/Makefile ============================================================================== --- head/usr.sbin/asf/Makefile Tue Nov 25 16:53:22 2014 (r275053) +++ head/usr.sbin/asf/Makefile Tue Nov 25 16:57:27 2014 (r275054) @@ -4,7 +4,6 @@ PROG= asf SRCS= asf.c asf_kld.c asf_kvm.c asf_prog.c MAN= asf.8 -DPADD= ${LIBKVM} -LDADD= -lkvm +LIBADD= kvm .include <bsd.prog.mk> Modified: head/usr.sbin/audit/Makefile ============================================================================== --- head/usr.sbin/audit/Makefile Tue Nov 25 16:53:22 2014 (r275053) +++ head/usr.sbin/audit/Makefile Tue Nov 25 16:57:27 2014 (r275054) @@ -10,8 +10,7 @@ CFLAGS+= -I${OPENBSMDIR} PROG= audit MAN= audit.8 -DPADD= ${LIBBSM} -LDADD= -lbsm +LIBADD= bsm WARNS?= 5 Modified: head/usr.sbin/auditd/Makefile ============================================================================== --- head/usr.sbin/auditd/Makefile Tue Nov 25 16:53:22 2014 (r275053) +++ head/usr.sbin/auditd/Makefile Tue Nov 25 16:57:27 2014 (r275054) @@ -11,8 +11,7 @@ PROG= auditd SRCS= auditd.c audit_warn.c auditd_fbsd.c MAN= auditd.8 -DPADD= ${LIBAUDITD} ${LIBBSM} -LDADD= -lauditd -lbsm +LIBADD= auditd bsm WARNS?= 3 Modified: head/usr.sbin/auditdistd/Makefile ============================================================================== --- head/usr.sbin/auditdistd/Makefile Tue Nov 25 16:53:22 2014 (r275053) +++ head/usr.sbin/auditdistd/Makefile Tue Nov 25 16:57:27 2014 (r275054) @@ -21,10 +21,7 @@ SRCS+= sandbox.c sender.c subr.c SRCS+= token.l trail.c MAN= auditdistd.8 auditdistd.conf.5 -DPADD= ${LIBL} ${LIBPTHREAD} ${LIBUTIL} -LDADD= -ll -lpthread -lutil -DPADD+= ${LIBCRYPTO} ${LIBSSL} -LDADD+= -lcrypto -lssl +LIBADD+= l pthread util crypto ssl YFLAGS+=-v Modified: head/usr.sbin/auditreduce/Makefile ============================================================================== --- head/usr.sbin/auditreduce/Makefile Tue Nov 25 16:53:22 2014 (r275053) +++ head/usr.sbin/auditreduce/Makefile Tue Nov 25 16:57:27 2014 (r275054) @@ -10,8 +10,7 @@ CFLAGS+= -I${OPENBSMDIR} PROG= auditreduce MAN= auditreduce.1 -DPADD= ${LIBBSM} -LDADD= -lbsm +LIBADD= bsm WARNS?= 3 Modified: head/usr.sbin/authpf/Makefile ============================================================================== --- head/usr.sbin/authpf/Makefile Tue Nov 25 16:53:22 2014 (r275053) +++ head/usr.sbin/authpf/Makefile Tue Nov 25 16:57:27 2014 (r275054) @@ -13,8 +13,7 @@ SRCS= authpf.c # XXX ALTQ: CFLAGS+= -DENABLE_ALTQ -LDADD+= -lm -lmd -lutil -DPADD+= ${LIBM} ${LIBMD} ${LIBUTIL} +LIBADD= m md util WARNS?= 3 Modified: head/usr.sbin/autofs/Makefile ============================================================================== --- head/usr.sbin/autofs/Makefile Tue Nov 25 16:53:22 2014 (r275053) +++ head/usr.sbin/autofs/Makefile Tue Nov 25 16:57:27 2014 (r275054) @@ -16,8 +16,7 @@ CFLAGS+=-I${.CURDIR}/../../sys/fs/autofs MAN= automount.8 automountd.8 autounmountd.8 auto_master.5 -DPADD= ${LIBUTIL} -LDADD= -lutil +LIBADD= util # Needed for getmntopts.c MOUNT= ${.CURDIR}/../../sbin/mount Modified: head/usr.sbin/bhyve/Makefile ============================================================================== --- head/usr.sbin/bhyve/Makefile Tue Nov 25 16:53:22 2014 (r275053) +++ head/usr.sbin/bhyve/Makefile Tue Nov 25 16:57:27 2014 (r275054) @@ -4,7 +4,7 @@ PROG= bhyve -DEBUG_FLAGS= -g -O0 +DEBUG_FLAGS= -g -O0 MAN= bhyve.8 @@ -43,8 +43,7 @@ SRCS= \ .PATH: ${.CURDIR}/../../sys/amd64/vmm SRCS+= vmm_instruction_emul.c -DPADD= ${LIBVMMAPI} ${LIBMD} ${LIBUTIL} ${LIBPTHREAD} -LDADD= -lvmmapi -lmd -lutil -lpthread +LIBADD= vmmapi md util pthread WARNS?= 2 Modified: head/usr.sbin/bhyvectl/Makefile ============================================================================== --- head/usr.sbin/bhyvectl/Makefile Tue Nov 25 16:53:22 2014 (r275053) +++ head/usr.sbin/bhyvectl/Makefile Tue Nov 25 16:57:27 2014 (r275054) @@ -7,8 +7,7 @@ SRCS= bhyvectl.c MAN= -DPADD= ${LIBVMMAPI} ${LIBUTIL} -LDADD= -lvmmapi -lutil +LIBADD= vmmapi util WARNS?= 3 Modified: head/usr.sbin/bhyveload/Makefile ============================================================================== --- head/usr.sbin/bhyveload/Makefile Tue Nov 25 16:53:22 2014 (r275053) +++ head/usr.sbin/bhyveload/Makefile Tue Nov 25 16:57:27 2014 (r275054) @@ -4,8 +4,7 @@ PROG= bhyveload SRCS= bhyveload.c MAN= bhyveload.8 -DPADD+= ${LIBVMMAPI} ${LIBUTIL} -LDADD+= -lvmmapi -lutil +LIBADD= vmmapi util WARNS?= 3 Modified: head/usr.sbin/bluetooth/ath3kfw/Makefile ============================================================================== --- head/usr.sbin/bluetooth/ath3kfw/Makefile Tue Nov 25 16:53:22 2014 (r275053) +++ head/usr.sbin/bluetooth/ath3kfw/Makefile Tue Nov 25 16:57:27 2014 (r275054) @@ -2,7 +2,6 @@ PROG= ath3kfw MAN= ath3kfw.8 -DPADD+= ${LIBUSB} -LDADD+= -lusb +LIBADD+= usb .include <bsd.prog.mk> Modified: head/usr.sbin/bluetooth/bt3cfw/Makefile ============================================================================== --- head/usr.sbin/bluetooth/bt3cfw/Makefile Tue Nov 25 16:53:22 2014 (r275053) +++ head/usr.sbin/bluetooth/bt3cfw/Makefile Tue Nov 25 16:57:27 2014 (r275054) @@ -5,7 +5,6 @@ PROG= bt3cfw MAN= bt3cfw.8 WARNS?= 2 -DPADD= ${LIBNETGRAPH} -LDADD= -lnetgraph +LIBADD+= netgraph .include <bsd.prog.mk> Modified: head/usr.sbin/bluetooth/bthidcontrol/Makefile ============================================================================== --- head/usr.sbin/bluetooth/bthidcontrol/Makefile Tue Nov 25 16:53:22 2014 (r275053) +++ head/usr.sbin/bluetooth/bthidcontrol/Makefile Tue Nov 25 16:57:27 2014 (r275054) @@ -9,7 +9,6 @@ SRCS= bthidcontrol.c hid.c lexer.l par WARNS?= 1 CFLAGS+= -DBTHIDCONTROL=1 -I${.CURDIR}/../bthidd -DPADD= ${LIBBLUETOOTH} ${LIBSDP} ${LIBUSBHID} -LDADD= -lbluetooth -lsdp -lusbhid +LIBADD+= bluetooth sdp usbhid .include <bsd.prog.mk> Modified: head/usr.sbin/bluetooth/bthidd/Makefile ============================================================================== --- head/usr.sbin/bluetooth/bthidd/Makefile Tue Nov 25 16:53:22 2014 (r275053) +++ head/usr.sbin/bluetooth/bthidd/Makefile Tue Nov 25 16:57:27 2014 (r275054) @@ -10,8 +10,7 @@ SRCS= bthidd.c client.c hid.c kbd.c lex CFLAGS+= -I${.CURDIR} DEBUG_FLAGS= -g -DPADD= ${LIBBLUETOOTH} ${LIBUSBHID} -LDADD= -lbluetooth -lusbhid +LIBADD+= bluetooth usbhid NO_WMISSING_VARIABLE_DECLARATIONS= Modified: head/usr.sbin/bluetooth/btpand/Makefile ============================================================================== --- head/usr.sbin/bluetooth/btpand/Makefile Tue Nov 25 16:53:22 2014 (r275053) +++ head/usr.sbin/bluetooth/btpand/Makefile Tue Nov 25 16:57:27 2014 (r275054) @@ -7,7 +7,6 @@ SRCS= btpand.c bnep.c channel.c client.c WARNS?= 3 -DPADD+= ${LIBBLUETOOTH} ${LIBSDP} ${LIBUTIL} -LDADD+= -lbluetooth -lsdp -lutil +LIBADD= bluetooth sdp util .include <bsd.prog.mk> Modified: head/usr.sbin/bluetooth/hccontrol/Makefile ============================================================================== --- head/usr.sbin/bluetooth/hccontrol/Makefile Tue Nov 25 16:53:22 2014 (r275053) +++ head/usr.sbin/bluetooth/hccontrol/Makefile Tue Nov 25 16:57:27 2014 (r275054) @@ -8,7 +8,6 @@ SRCS= send_recv.c link_policy.c link_co util.c WARNS?= 2 -DPADD= ${LIBBLUETOOTH} -LDADD= -lbluetooth +LIBADD= bluetooth .include <bsd.prog.mk> Modified: head/usr.sbin/bluetooth/hcsecd/Makefile ============================================================================== --- head/usr.sbin/bluetooth/hcsecd/Makefile Tue Nov 25 16:53:22 2014 (r275053) +++ head/usr.sbin/bluetooth/hcsecd/Makefile Tue Nov 25 16:57:27 2014 (r275054) @@ -7,7 +7,6 @@ SRCS= hcsecd.c lexer.l parser.y WARNS?= 2 CFLAGS+= -I${.CURDIR} -DPADD= ${LIBBLUETOOTH} -LDADD= -lbluetooth +LIBADD= bluetooth .include <bsd.prog.mk> Modified: head/usr.sbin/bluetooth/hcseriald/Makefile ============================================================================== --- head/usr.sbin/bluetooth/hcseriald/Makefile Tue Nov 25 16:53:22 2014 (r275053) +++ head/usr.sbin/bluetooth/hcseriald/Makefile Tue Nov 25 16:57:27 2014 (r275054) @@ -5,7 +5,6 @@ PROG= hcseriald MAN= hcseriald.8 WARNS?= 2 -DPADD= ${LIBNETGRAPH} -LDADD= -lnetgraph +LIBADD= netgraph .include <bsd.prog.mk> Modified: head/usr.sbin/bluetooth/l2control/Makefile ============================================================================== --- head/usr.sbin/bluetooth/l2control/Makefile Tue Nov 25 16:53:22 2014 (r275053) +++ head/usr.sbin/bluetooth/l2control/Makefile Tue Nov 25 16:57:27 2014 (r275054) @@ -6,7 +6,6 @@ MAN= l2control.8 SRCS= l2cap.c l2control.c WARNS?= 2 -DPADD= ${LIBBLUETOOTH} -LDADD= -lbluetooth +LIBADD= bluetooth .include <bsd.prog.mk> Modified: head/usr.sbin/bluetooth/l2ping/Makefile ============================================================================== --- head/usr.sbin/bluetooth/l2ping/Makefile Tue Nov 25 16:53:22 2014 (r275053) +++ head/usr.sbin/bluetooth/l2ping/Makefile Tue Nov 25 16:57:27 2014 (r275054) @@ -5,7 +5,6 @@ PROG= l2ping MAN= l2ping.8 WARNS?= 2 -DPADD= ${LIBBLUETOOTH} -LDADD= -lbluetooth +LIBADD= bluetooth .include <bsd.prog.mk> Modified: head/usr.sbin/bluetooth/rfcomm_pppd/Makefile ============================================================================== --- head/usr.sbin/bluetooth/rfcomm_pppd/Makefile Tue Nov 25 16:53:22 2014 (r275053) +++ head/usr.sbin/bluetooth/rfcomm_pppd/Makefile Tue Nov 25 16:57:27 2014 (r275054) @@ -8,7 +8,6 @@ MAN= rfcomm_pppd.8 SRCS= rfcomm_pppd.c rfcomm_sdp.c WARNS?= 2 -DPADD= ${LIBBLUETOOTH} ${LIBSDP} -LDADD= -lbluetooth -lsdp +LIBADD= bluetooth sdp .include <bsd.prog.mk> Modified: head/usr.sbin/bluetooth/sdpcontrol/Makefile ============================================================================== --- head/usr.sbin/bluetooth/sdpcontrol/Makefile Tue Nov 25 16:53:22 2014 (r275053) +++ head/usr.sbin/bluetooth/sdpcontrol/Makefile Tue Nov 25 16:57:27 2014 (r275054) @@ -6,7 +6,6 @@ MAN= sdpcontrol.8 SRCS= sdpcontrol.c search.c WARNS?= 2 -DPADD= ${LIBBLUETOOTH} ${LIBSDP} -LDADD= -lbluetooth -lsdp +LIBADD= bluetooth sdp .include <bsd.prog.mk> Modified: head/usr.sbin/boot0cfg/Makefile ============================================================================== --- head/usr.sbin/boot0cfg/Makefile Tue Nov 25 16:53:22 2014 (r275053) +++ head/usr.sbin/boot0cfg/Makefile Tue Nov 25 16:57:27 2014 (r275054) @@ -3,8 +3,7 @@ PROG= boot0cfg MAN= boot0cfg.8 -DPADD= ${LIBGEOM} ${LIBBSDXML} ${LIBSBUF} -LDADD= -lgeom -lbsdxml -lsbuf +LIBADD= geom NO_WCAST_ALIGN= Modified: head/usr.sbin/boot98cfg/Makefile ============================================================================== --- head/usr.sbin/boot98cfg/Makefile Tue Nov 25 16:53:22 2014 (r275053) +++ head/usr.sbin/boot98cfg/Makefile Tue Nov 25 16:57:27 2014 (r275054) @@ -5,7 +5,6 @@ MAN= boot98cfg.8 WARNS?= 2 -DPADD= ${LIBGEOM} -LDADD= -lgeom +LIBADD= geom .include <bsd.prog.mk> Modified: head/usr.sbin/bsdinstall/distextract/Makefile ============================================================================== --- head/usr.sbin/bsdinstall/distextract/Makefile Tue Nov 25 16:53:22 2014 (r275053) +++ head/usr.sbin/bsdinstall/distextract/Makefile Tue Nov 25 16:57:27 2014 (r275054) @@ -2,8 +2,7 @@ BINDIR= /usr/libexec/bsdinstall PROG= distextract -DPADD= ${LIBARCHIVE} ${LIBNCURSESW} ${LIBDIALOG} ${LIBM} -LDADD= -larchive -lncursesw -ldialog -lm +LIBADD= archive ncursesw dialog m WARNS?= 6 MAN= Modified: head/usr.sbin/bsdinstall/distfetch/Makefile ============================================================================== --- head/usr.sbin/bsdinstall/distfetch/Makefile Tue Nov 25 16:53:22 2014 (r275053) +++ head/usr.sbin/bsdinstall/distfetch/Makefile Tue Nov 25 16:57:27 2014 (r275054) @@ -2,8 +2,7 @@ BINDIR= /usr/libexec/bsdinstall PROG= distfetch -DPADD= ${LIBFETCH} ${LIBNCURSESW} ${LIBDIALOG} ${LIBM} -LDADD= -lfetch -lncursesw -ldialog -lm +LIBADD= fetch ncursesw dialog m WARNS?= 6 MAN= Modified: head/usr.sbin/bsdinstall/partedit/Makefile ============================================================================== --- head/usr.sbin/bsdinstall/partedit/Makefile Tue Nov 25 16:53:22 2014 (r275053) +++ head/usr.sbin/bsdinstall/partedit/Makefile Tue Nov 25 16:57:27 2014 (r275054) @@ -5,8 +5,7 @@ PROG= partedit LINKS= ${BINDIR}/partedit ${BINDIR}/autopart \ ${BINDIR}/partedit ${BINDIR}/scriptedpart SYMLINKS= ${BINDIR}/partedit /usr/sbin/sade -DPADD= ${LIBGEOM} ${LIBNCURSESW} ${LIBUTIL} ${LIBDIALOG} ${LIBM} -LDADD= -lgeom -lncursesw -lutil -ldialog -lm +LIBADD+= geom ncursesw util dialog m PARTEDIT_ARCH= ${MACHINE} .if ${MACHINE} == "i386" || ${MACHINE} == "amd64" Modified: head/usr.sbin/bsnmpd/bsnmpd/Makefile ============================================================================== --- head/usr.sbin/bsnmpd/bsnmpd/Makefile Tue Nov 25 16:53:22 2014 (r275053) +++ head/usr.sbin/bsnmpd/bsnmpd/Makefile Tue Nov 25 16:57:27 2014 (r275054) @@ -29,8 +29,7 @@ CFLAGS+= -DSNMPTREE_TYPES CFLAGS+= -I${CONTRIB}/lib -I${CONTRIB}/snmpd -I. -DUSE_LIBBEGEMOT CFLAGS+= -DUSE_TCPWRAPPERS -DQUADFMT='"llu"' -DQUADXFMT='"llx"' CFLAGS+= -DHAVE_STDINT_H -DHAVE_INTTYPES_H -DHAVE_ERR_H -DHAVE_STRLCPY -DPADD= ${LIBBEGEMOT} ${LIBBSNMP} ${LIBWRAP} -LDADD= -lbegemot -lbsnmp -lwrap +LIBADD= begemot bsnmp wrap LDFLAGS= -Wl,-export-dynamic Modified: head/usr.sbin/bsnmpd/modules/snmp_hast/Makefile ============================================================================== --- head/usr.sbin/bsnmpd/modules/snmp_hast/Makefile Tue Nov 25 16:53:22 2014 (r275053) +++ head/usr.sbin/bsnmpd/modules/snmp_hast/Makefile Tue Nov 25 16:57:27 2014 (r275054) @@ -29,8 +29,7 @@ CFLAGS+=-DYY_NO_UNPUT CFLAGS+=-DYY_NO_INPUT CFLAGS+= -DSNMPTREE_TYPES -DPADD= ${LIBUTIL} -LDADD= -lutil +LIBADD= util XSYM= begemotHast DEFS= ${MOD}_tree.def Modified: head/usr.sbin/bsnmpd/modules/snmp_hostres/Makefile ============================================================================== --- head/usr.sbin/bsnmpd/modules/snmp_hostres/Makefile Tue Nov 25 16:53:22 2014 (r275053) +++ head/usr.sbin/bsnmpd/modules/snmp_hostres/Makefile Tue Nov 25 16:57:27 2014 (r275054) @@ -69,8 +69,7 @@ MAN= snmp_hostres.3 DEFS= ${MOD}_tree.def BMIBS= BEGEMOT-HOSTRES-MIB.txt -DPADD= ${LIBKVM} ${LIBDEVINFO} ${LIBM} ${LIBGEOM} ${LIBMEMSTAT} -LDADD= -lkvm -ldevinfo -lm -lgeom -lmemstat +LIBADD= kvm devinfo m geom memstat .include <bsd.snmpmod.mk> Modified: head/usr.sbin/bsnmpd/modules/snmp_netgraph/Makefile ============================================================================== --- head/usr.sbin/bsnmpd/modules/snmp_netgraph/Makefile Tue Nov 25 16:53:22 2014 (r275053) +++ head/usr.sbin/bsnmpd/modules/snmp_netgraph/Makefile Tue Nov 25 16:57:27 2014 (r275054) @@ -11,7 +11,6 @@ BMIBS= BEGEMOT-NETGRAPH.txt DEFS= ${MOD}_tree.def INCS= snmp_${MOD}.h -DPADD= ${LIBNETGRAPH} -LDADD= -lnetgraph +LIBADD= netgraph .include <bsd.snmpmod.mk> Modified: head/usr.sbin/bsnmpd/tools/bsnmptools/Makefile ============================================================================== --- head/usr.sbin/bsnmpd/tools/bsnmptools/Makefile Tue Nov 25 16:53:22 2014 (r275053) +++ head/usr.sbin/bsnmpd/tools/bsnmptools/Makefile Tue Nov 25 16:57:27 2014 (r275054) @@ -7,14 +7,11 @@ PROG= bsnmpget -DPADD+= ${LIBBSNMP} ${LIBBSNMPTOOLS} -LDADD+= -lbsnmp -lbsnmptools +LIBADD= bsnmp bsnmptools CFLAGS+= -I${.CURDIR}/../libbsnmptools -LDFLAGS+= -L${LIBBSNMPTOOLSDIR} .if ${MK_OPENSSL} != "no" -DPADD+= ${LIBCRYPTO} -LDADD+= -lcrypto +LIBADD+= crypto .endif LINKS= ${BINDIR}/bsnmpget ${BINDIR}/bsnmpwalk Modified: head/usr.sbin/cdcontrol/Makefile ============================================================================== --- head/usr.sbin/cdcontrol/Makefile Tue Nov 25 16:53:22 2014 (r275053) +++ head/usr.sbin/cdcontrol/Makefile Tue Nov 25 16:57:27 2014 (r275054) @@ -2,7 +2,6 @@ PROG= cdcontrol -DPADD= ${LIBEDIT} ${LIBTERMCAPW} -LDADD= -ledit -ltermcapw +LIBADD= edit .include <bsd.prog.mk> Modified: head/usr.sbin/ckdist/Makefile ============================================================================== --- head/usr.sbin/ckdist/Makefile Tue Nov 25 16:53:22 2014 (r275053) +++ head/usr.sbin/ckdist/Makefile Tue Nov 25 16:57:27 2014 (r275054) @@ -5,7 +5,6 @@ PROG= ckdist SRCS= ckdist.c crc.c -DPADD= ${LIBMD} -LDADD= -lmd +LIBADD= md .include <bsd.prog.mk> Modified: head/usr.sbin/clear_locks/Makefile ============================================================================== --- head/usr.sbin/clear_locks/Makefile Tue Nov 25 16:53:22 2014 (r275053) +++ head/usr.sbin/clear_locks/Makefile Tue Nov 25 16:57:27 2014 (r275054) @@ -2,7 +2,6 @@ PROG= clear_locks MAN= clear_locks.8 -DPADD= ${LIBRPCSVC} -LDADD= -lrpcsvc +LIBADD= rpcsvc .include <bsd.prog.mk> Modified: head/usr.sbin/config/Makefile ============================================================================== --- head/usr.sbin/config/Makefile Tue Nov 25 16:53:22 2014 (r275053) +++ head/usr.sbin/config/Makefile Tue Nov 25 16:57:27 2014 (r275054) @@ -13,8 +13,7 @@ CFLAGS+= -I. -I${.CURDIR} NO_WMISSING_VARIABLE_DECLARATIONS= -DPADD= ${LIBL} ${LIBSBUF} -LDADD= -ll -lsbuf +LIBADD= l sbuf CLEANFILES+= kernconf.c Modified: head/usr.sbin/cron/cron/Makefile ============================================================================== --- head/usr.sbin/cron/cron/Makefile Tue Nov 25 16:53:22 2014 (r275053) +++ head/usr.sbin/cron/cron/Makefile Tue Nov 25 16:57:27 2014 (r275054) @@ -6,8 +6,7 @@ SRCS= cron.c database.c do_command.c job CFLAGS+= -DLOGIN_CAP -DPAM -DPADD= ${LIBCRON} ${LIBPAM} ${LIBUTIL} -LDADD= ${LIBCRON} ${MINUSLPAM} -lutil +LIBADD= cron pam util WARNS?= 2 Modified: head/usr.sbin/cron/crontab/Makefile ============================================================================== --- head/usr.sbin/cron/crontab/Makefile Tue Nov 25 16:53:22 2014 (r275053) +++ head/usr.sbin/cron/crontab/Makefile Tue Nov 25 16:57:27 2014 (r275054) @@ -12,7 +12,6 @@ WARNS?= 3 CFLAGS+= -I${.CURDIR}/../cron -DPADD= ${LIBCRON} ${LIBMD} ${LIBUTIL} -LDADD= ${LIBCRON} -lmd -lutil +LIBADD= cron md util .include <bsd.prog.mk> Modified: head/usr.sbin/ctladm/Makefile ============================================================================== --- head/usr.sbin/ctladm/Makefile Tue Nov 25 16:53:22 2014 (r275053) +++ head/usr.sbin/ctladm/Makefile Tue Nov 25 16:57:27 2014 (r275054) @@ -14,8 +14,7 @@ CFLAGS+= -I${SDIR} WARNS?= 3 .endif -DPADD= ${LIBCAM} ${LIBSBUF} ${LIBBSDXML} ${LIBUTIL} -LDADD= -lcam -lsbuf -lbsdxml -lutil +LIBADD= cam sbuf bsdxml util MAN= ctladm.8 .include <bsd.prog.mk> Modified: head/usr.sbin/ctld/Makefile ============================================================================== --- head/usr.sbin/ctld/Makefile Tue Nov 25 16:53:22 2014 (r275053) +++ head/usr.sbin/ctld/Makefile Tue Nov 25 16:57:27 2014 (r275054) @@ -10,8 +10,7 @@ CFLAGS+= -I${.CURDIR}/../../sys/dev/iscs #CFLAGS+= -DICL_KERNEL_PROXY MAN= ctld.8 ctl.conf.5 -DPADD= ${LIBBSDXML} ${LIBCRYPTO} ${LIBL} ${LIBSBUF} ${LIBUTIL} -LDADD= -lbsdxml -lcrypto -ll -lsbuf -lutil +LIBADD= bsdxml crypto l sbuf util YFLAGS+= -v CLEANFILES= y.tab.c y.tab.h y.output Modified: head/usr.sbin/ctm/ctm/Makefile ============================================================================== --- head/usr.sbin/ctm/ctm/Makefile Tue Nov 25 16:53:22 2014 (r275053) +++ head/usr.sbin/ctm/ctm/Makefile Tue Nov 25 16:57:27 2014 (r275054) @@ -14,8 +14,7 @@ SRCS= ctm.c ctm_input.c ctm_pass1.c ct NOTYET= ctm_ed.c -LDADD= -lmd -DPADD= ${LIBMD} +LIBADD= md WARNS?= 2 Modified: head/usr.sbin/ctm/mkCTM/Makefile ============================================================================== --- head/usr.sbin/ctm/mkCTM/Makefile Tue Nov 25 16:53:22 2014 (r275053) +++ head/usr.sbin/ctm/mkCTM/Makefile Tue Nov 25 16:57:27 2014 (r275054) @@ -3,8 +3,7 @@ PROG= mkctm MAN= -DPADD= ${LIBMD} -LDADD= -lmd +LIBADD= md test: mkctm rm -f tst.out* Modified: head/usr.sbin/daemon/Makefile ============================================================================== --- head/usr.sbin/daemon/Makefile Tue Nov 25 16:53:22 2014 (r275053) +++ head/usr.sbin/daemon/Makefile Tue Nov 25 16:57:27 2014 (r275054) @@ -3,7 +3,6 @@ PROG= daemon MAN= daemon.8 -DPADD= ${LIBUTIL} -LDADD= -lutil +LIBADD= util .include <bsd.prog.mk> Modified: head/usr.sbin/dconschat/Makefile ============================================================================== --- head/usr.sbin/dconschat/Makefile Tue Nov 25 16:53:22 2014 (r275053) +++ head/usr.sbin/dconschat/Makefile Tue Nov 25 16:57:27 2014 (r275054) @@ -5,8 +5,7 @@ MAN= dconschat.8 CFLAGS+= -I${.CURDIR}/../../sys -DPADD= ${LIBKVM} -LDADD= -lkvm +LIBADD= kvm WARNS?= 1 Modified: head/usr.sbin/devinfo/Makefile ============================================================================== --- head/usr.sbin/devinfo/Makefile Tue Nov 25 16:53:22 2014 (r275053) +++ head/usr.sbin/devinfo/Makefile Tue Nov 25 16:57:27 2014 (r275054) @@ -3,7 +3,6 @@ PROG= devinfo MAN= devinfo.8 -DPADD= ${LIBDEVINFO} -LDADD= -ldevinfo +LIBADD= devinfo .include <bsd.prog.mk> Modified: head/usr.sbin/diskinfo/Makefile ============================================================================== --- head/usr.sbin/diskinfo/Makefile Tue Nov 25 16:53:22 2014 (r275053) +++ head/usr.sbin/diskinfo/Makefile Tue Nov 25 16:57:27 2014 (r275054) @@ -3,8 +3,7 @@ PROG= diskinfo MAN= diskinfo.8 -DPADD= ${LIBUTIL} -LDADD= -lutil +LIBADD= util .include <bsd.prog.mk> Modified: head/usr.sbin/editmap/Makefile ============================================================================== --- head/usr.sbin/editmap/Makefile Tue Nov 25 16:53:22 2014 (r275053) +++ head/usr.sbin/editmap/Makefile Tue Nov 25 16:57:27 2014 (r275054) @@ -12,17 +12,7 @@ CFLAGS+= -DNEWDB -DNOT_SENDMAIL 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 Modified: head/usr.sbin/edquota/Makefile ============================================================================== --- head/usr.sbin/edquota/Makefile Tue Nov 25 16:53:22 2014 (r275053) +++ head/usr.sbin/edquota/Makefile Tue Nov 25 16:57:27 2014 (r275054) @@ -7,7 +7,6 @@ MAN= edquota.8 CSTD= gnu99 WARNS?= 4 -DPADD= ${LIBUTIL} -LDADD= -lutil +LIBADD= util .include <bsd.prog.mk> Modified: head/usr.sbin/fifolog/fifolog_create/Makefile ============================================================================== --- head/usr.sbin/fifolog/fifolog_create/Makefile Tue Nov 25 16:53:22 2014 (r275053) +++ head/usr.sbin/fifolog/fifolog_create/Makefile Tue Nov 25 16:57:27 2014 (r275054) @@ -4,8 +4,7 @@ PROG= fifolog_create CFLAGS+= -I${.CURDIR}/../lib -DPADD= ${LIBFIFOLOG} ${LIBUTIL} -LDADD= ${LIBFIFOLOG} -lutil +LIBADD= util fifolog MAN= fifolog.1 MLINKS= fifolog.1 fifolog_create.1 \ Modified: head/usr.sbin/fifolog/fifolog_reader/Makefile ============================================================================== --- head/usr.sbin/fifolog/fifolog_reader/Makefile Tue Nov 25 16:53:22 2014 (r275053) +++ head/usr.sbin/fifolog/fifolog_reader/Makefile Tue Nov 25 16:57:27 2014 (r275054) @@ -6,8 +6,7 @@ CFLAGS+= -I${.CURDIR}/../lib MAN= -DPADD= ${LIBFIFOLOG} ${LIBZ} -LDADD= ${LIBFIFOLOG} -lz +LIBADD= z fifolog regress: ./${PROG} /tmp/fifolog.0 Modified: head/usr.sbin/fifolog/fifolog_writer/Makefile ============================================================================== --- head/usr.sbin/fifolog/fifolog_writer/Makefile Tue Nov 25 16:53:22 2014 (r275053) +++ head/usr.sbin/fifolog/fifolog_writer/Makefile Tue Nov 25 16:57:27 2014 (r275054) @@ -6,8 +6,7 @@ CFLAGS+= -I${.CURDIR}/../lib MAN= -DPADD= ${LIBFIFOLOG} ${LIBZ} -LDADD= ${LIBFIFOLOG} -lz +LIBADD= z fifolog regress: date | ./${PROG} -z 0 /tmp/fifolog.0 Modified: head/usr.sbin/flowctl/Makefile ============================================================================== --- head/usr.sbin/flowctl/Makefile Tue Nov 25 16:53:22 2014 (r275053) +++ head/usr.sbin/flowctl/Makefile Tue Nov 25 16:57:27 2014 (r275054) @@ -8,8 +8,7 @@ PROG= flowctl MAN= flowctl.8 WARNS?= 2 -DPADD= ${LIBNETGRAPH} -LDADD= -lnetgraph +LIBADD= netgraph .if ${MK_INET6_SUPPORT} != "no" CFLAGS+= -DINET6 Modified: head/usr.sbin/ftp-proxy/Makefile ============================================================================== --- head/usr.sbin/ftp-proxy/Makefile Tue Nov 25 16:53:22 2014 (r275053) +++ head/usr.sbin/ftp-proxy/Makefile Tue Nov 25 16:57:27 2014 (r275054) @@ -9,8 +9,7 @@ SRCS= ftp-proxy.c filter.c CFLAGS+=-I${.CURDIR}/../../contrib/pf/libevent -LDADD+= ${LIBEVENT} -DPADD+= ${LIBEVENT} +LIBADD= event WARNS?= 3 Modified: head/usr.sbin/gssd/Makefile ============================================================================== --- head/usr.sbin/gssd/Makefile Tue Nov 25 16:53:22 2014 (r275053) +++ head/usr.sbin/gssd/Makefile Tue Nov 25 16:57:27 2014 (r275054) @@ -9,11 +9,9 @@ SRCS= gssd.c gssd.h gssd_svc.c gssd_xdr. CFLAGS+= -I. WARNS?= 1 -DPADD= ${LIBGSSAPI} -LDADD= -lgssapi +LIBADD= gssapi .if ${MK_KERBEROS_SUPPORT} != "no" -DPADD+= ${LIBKRB5} ${LIBHX509} ${LIBASN1} ${LIBROKEN} ${LIBCOM_ERR} ${LIBCRYPT} ${LIBCRYPTO} -LDADD+= -lkrb5 -lhx509 -lasn1 -lroken -lcom_err -lcrypt -lcrypto +LIBADD+= krb5 roken .else CFLAGS+= -DWITHOUT_KERBEROS .endif Modified: head/usr.sbin/gstat/Makefile ============================================================================== --- head/usr.sbin/gstat/Makefile Tue Nov 25 16:53:22 2014 (r275053) +++ head/usr.sbin/gstat/Makefile Tue Nov 25 16:57:27 2014 (r275054) @@ -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 <bsd.prog.mk> Modified: head/usr.sbin/ifmcstat/Makefile ============================================================================== --- head/usr.sbin/ifmcstat/Makefile Tue Nov 25 16:53:22 2014 (r275053) +++ head/usr.sbin/ifmcstat/Makefile Tue Nov 25 16:57:27 2014 (r275054) @@ -17,8 +17,7 @@ CFLAGS+=-DINET6 .if ${MK_KVM_SUPPORT} != "no" CFLAGS+=-DWITH_KVM -DPADD= ${LIBKVM} -LDADD= -lkvm +LIBADD= kvm .endif .include <bsd.prog.mk> Modified: head/usr.sbin/inetd/Makefile ============================================================================== --- head/usr.sbin/inetd/Makefile Tue Nov 25 16:53:22 2014 (r275053) +++ head/usr.sbin/inetd/Makefile Tue Nov 25 16:57:27 2014 (r275054) @@ -16,14 +16,12 @@ CFLAGS+= -DLOGIN_CAP 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 <bsd.prog.mk> Modified: head/usr.sbin/iostat/Makefile ============================================================================== --- head/usr.sbin/iostat/Makefile Tue Nov 25 16:53:22 2014 (r275053) +++ head/usr.sbin/iostat/Makefile Tue Nov 25 16:57:27 2014 (r275054) @@ -4,8 +4,7 @@ PROG= iostat MAN= iostat.8 -DPADD= ${LIBDEVSTAT} ${LIBKVM} ${LIBM} -LDADD= -ldevstat -lkvm -lm +LIBADD= devstat kvm m WARNS?= 1 Modified: head/usr.sbin/ipfwpcap/Makefile ============================================================================== --- head/usr.sbin/ipfwpcap/Makefile Tue Nov 25 16:53:22 2014 (r275053) +++ head/usr.sbin/ipfwpcap/Makefile Tue Nov 25 16:57:27 2014 (r275054) @@ -6,8 +6,7 @@ PROG= ipfwpcap -LDADD= -lpcap -DPADD= ${LIBPCAP} +LIBADD= pcap MAN= ipfwpcap.8 Modified: head/usr.sbin/iscsid/Makefile ============================================================================== --- head/usr.sbin/iscsid/Makefile Tue Nov 25 16:53:22 2014 (r275053) +++ head/usr.sbin/iscsid/Makefile Tue Nov 25 16:57:27 2014 (r275054) @@ -8,8 +8,7 @@ CFLAGS+= -I${.CURDIR}/../../sys/dev/iscs #CFLAGS+= -DICL_KERNEL_PROXY MAN= iscsid.8 -DPADD= ${LIBCRYPTO} ${LIBUTIL} -LDADD= -lcrypto -lutil +LIBADD= crypto util WARNS= 6 Modified: head/usr.sbin/jail/Makefile ============================================================================== --- head/usr.sbin/jail/Makefile Tue Nov 25 16:53:22 2014 (r275053) +++ head/usr.sbin/jail/Makefile Tue Nov 25 16:57:27 2014 (r275054) @@ -6,8 +6,7 @@ PROG= jail 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= Modified: head/usr.sbin/jexec/Makefile ============================================================================== --- head/usr.sbin/jexec/Makefile Tue Nov 25 16:53:22 2014 (r275053) +++ head/usr.sbin/jexec/Makefile Tue Nov 25 16:57:27 2014 (r275054) @@ -2,7 +2,6 @@ PROG= jexec MAN= jexec.8 -DPADD= ${LIBJAIL} ${LIBUTIL} -LDADD= -ljail -lutil +LIBADD= jail util .include <bsd.prog.mk> Modified: head/usr.sbin/jls/Makefile ============================================================================== --- head/usr.sbin/jls/Makefile Tue Nov 25 16:53:22 2014 (r275053) +++ head/usr.sbin/jls/Makefile Tue Nov 25 16:57:27 2014 (r275054) @@ -4,8 +4,7 @@ PROG= jls MAN= jls.8 -DPADD= ${LIBJAIL} -LDADD= -ljail +LIBADD= jail .if ${MK_INET6_SUPPORT} != "no" CFLAGS+= -DINET6 Modified: head/usr.sbin/kbdcontrol/Makefile ============================================================================== --- head/usr.sbin/kbdcontrol/Makefile Tue Nov 25 16:53:22 2014 (r275053) +++ head/usr.sbin/kbdcontrol/Makefile Tue Nov 25 16:57:27 2014 (r275054) @@ -8,7 +8,6 @@ SRCS= kbdcontrol.c lex.l WARNS?= 4 CFLAGS+= -I${.CURDIR} -DPADD= ${LIBL} -LDADD= -ll +LIBADD= l .include <bsd.prog.mk> Modified: head/usr.sbin/keyserv/Makefile ============================================================================== --- head/usr.sbin/keyserv/Makefile Tue Nov 25 16:53:22 2014 (r275053) +++ head/usr.sbin/keyserv/Makefile Tue Nov 25 16:57:27 2014 (r275054) @@ -6,8 +6,7 @@ SRCS= keyserv.c setkey.c crypt_svc.c cry CFLAGS+= -DKEYSERV_RANDOM -DBROKEN_DES -I. -DPADD= ${LIBMP} ${LIBCRYPTO} ${LIBRPCSVC} -LDADD= -lmp -lcrypto -lrpcsvc +LIBADD= mp rpcsvc WARNS?= 1 Modified: head/usr.sbin/kgmon/Makefile ============================================================================== --- head/usr.sbin/kgmon/Makefile Tue Nov 25 16:53:22 2014 (r275053) +++ head/usr.sbin/kgmon/Makefile Tue Nov 25 16:57:27 2014 (r275054) @@ -11,7 +11,6 @@ WARNS?= 2 #BINOWN=root #BINMODE=4555 -DPADD= ${LIBKVM} -LDADD= -lkvm +LIBADD= kvm .include <bsd.prog.mk> Modified: head/usr.sbin/lmcconfig/Makefile ============================================================================== --- head/usr.sbin/lmcconfig/Makefile Tue Nov 25 16:53:22 2014 (r275053) +++ head/usr.sbin/lmcconfig/Makefile Tue Nov 25 16:57:27 2014 (r275054) @@ -3,8 +3,7 @@ PROG= lmcconfig MAN= lmcconfig.8 -DPADD= ${LIBNETGRAPH} -LDADD= -lnetgraph +LIBADD= netgraph WARNS?= 3 Modified: head/usr.sbin/lpr/Makefile.inc ============================================================================== --- head/usr.sbin/lpr/Makefile.inc Tue Nov 25 16:53:22 2014 (r275053) +++ head/usr.sbin/lpr/Makefile.inc Tue Nov 25 16:57:27 2014 (r275054) @@ -6,6 +6,4 @@ CFLAGS+= -DINET6 .endif -LIBLPR= ${.OBJDIR}/../common_source/liblpr.a - .include "../Makefile.inc" Modified: head/usr.sbin/lpr/chkprintcap/Makefile ============================================================================== --- head/usr.sbin/lpr/chkprintcap/Makefile Tue Nov 25 16:53:22 2014 (r275053) +++ head/usr.sbin/lpr/chkprintcap/Makefile Tue Nov 25 16:57:27 2014 (r275054) @@ -8,7 +8,6 @@ SRCS= chkprintcap.c skimprintcap.c CFLAGS+= -I${.CURDIR}/../common_source -DPADD= ${LIBLPR} -LDADD= ${LIBLPR} +LIBADD= lpr .include <bsd.prog.mk> Modified: head/usr.sbin/lpr/lpc/Makefile ============================================================================== --- head/usr.sbin/lpr/lpc/Makefile Tue Nov 25 16:53:22 2014 (r275053) +++ head/usr.sbin/lpr/lpc/Makefile Tue Nov 25 16:57:27 2014 (r275054) @@ -5,7 +5,7 @@ PROG= lpc MAN= lpc.8 -SRCS= lpc.c cmds.c cmdtab.c movejobs.c +SRCS= lpc.c cmds.c cmdtab.c movejobs.c BINGRP= daemon BINMODE= 2555 @@ -13,7 +13,6 @@ CFLAGS+= -I${.CURDIR}/../common_source WARNS?= 0 -DPADD= ${LIBLPR} ${LIBEDIT} ${LIBTERMCAPW} -LDADD= ${LIBLPR} -ledit -ltermcapw *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201411251657.sAPGvSBD062652>