Author: bapt
Date: Tue Nov 25 11:23:12 2014
New Revision: 275030
URL: https://svnweb.freebsd.org/changeset/base/275030
Log:
Convert sbin/ to LIBADD
Reduce overlinking
Modified:
head/sbin/atm/atmconfig/Makefile
head/sbin/badsect/Makefile
head/sbin/bsdlabel/Makefile
head/sbin/camcontrol/Makefile
head/sbin/casperd/Makefile
head/sbin/ccdconfig/Makefile
head/sbin/ddb/Makefile
head/sbin/devd/Makefile
head/sbin/dhclient/Makefile
head/sbin/dmesg/Makefile
head/sbin/dumpfs/Makefile
head/sbin/fdisk/Makefile
head/sbin/fdisk_pc98/Makefile
head/sbin/ffsinfo/Makefile
head/sbin/fsck_ffs/Makefile
head/sbin/fsck_ffs/dir.c
head/sbin/fsdb/Makefile
head/sbin/gbde/Makefile
head/sbin/geom/Makefile
head/sbin/geom/class/eli/Makefile
head/sbin/geom/class/journal/Makefile
head/sbin/geom/class/mirror/Makefile
head/sbin/geom/class/part/Makefile
head/sbin/geom/class/raid/Makefile
head/sbin/geom/class/raid3/Makefile
head/sbin/geom/core/Makefile
head/sbin/ggate/ggatec/Makefile
head/sbin/ggate/ggated/Makefile
head/sbin/ggate/ggatel/Makefile
head/sbin/growfs/Makefile
head/sbin/gvinum/Makefile
head/sbin/hastctl/Makefile
head/sbin/hastd/Makefile
head/sbin/ifconfig/Makefile
head/sbin/init/Makefile
head/sbin/ipf/Makefile.inc
head/sbin/ipf/ipf/Makefile
head/sbin/ipf/ipfstat/Makefile
head/sbin/ipf/ipsend/Makefile
head/sbin/ipfw/Makefile
head/sbin/iscontrol/Makefile
head/sbin/md5/Makefile
head/sbin/mdconfig/Makefile
head/sbin/mount/Makefile
head/sbin/mount_cd9660/Makefile
head/sbin/mount_msdosfs/Makefile
head/sbin/mount_udf/Makefile
head/sbin/nandfs/Makefile
head/sbin/natd/Makefile
head/sbin/newfs/Makefile
head/sbin/newfs_nandfs/Makefile
head/sbin/pfctl/Makefile
head/sbin/pflogd/Makefile
head/sbin/ping/Makefile
head/sbin/ping6/Makefile
head/sbin/quotacheck/Makefile
head/sbin/rcorder/Makefile
head/sbin/routed/Makefile
head/sbin/routed/rtquery/Makefile
head/sbin/savecore/Makefile
head/sbin/setkey/Makefile
head/sbin/sunlabel/Makefile
head/sbin/swapon/Makefile
head/sbin/tunefs/Makefile
Modified: head/sbin/atm/atmconfig/Makefile
==============================================================================
--- head/sbin/atm/atmconfig/Makefile Tue Nov 25 11:22:28 2014
(r275029)
+++ head/sbin/atm/atmconfig/Makefile Tue Nov 25 11:23:12 2014
(r275030)
@@ -17,11 +17,9 @@ CFLAGS+= -I${.OBJDIR}
.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
Modified: head/sbin/badsect/Makefile
==============================================================================
--- head/sbin/badsect/Makefile Tue Nov 25 11:22:28 2014 (r275029)
+++ head/sbin/badsect/Makefile Tue Nov 25 11:23:12 2014 (r275030)
@@ -2,8 +2,7 @@
# $FreeBSD$
PROG= badsect
-DPADD= ${LIBUFS}
-LDADD= -lufs
+LIBADD= ufs
MAN= badsect.8
WARNS?= 2
Modified: head/sbin/bsdlabel/Makefile
==============================================================================
--- head/sbin/bsdlabel/Makefile Tue Nov 25 11:22:28 2014 (r275029)
+++ head/sbin/bsdlabel/Makefile Tue Nov 25 11:23:12 2014 (r275030)
@@ -12,7 +12,6 @@ LINKS= ${BINDIR}/bsdlabel ${BINDIR}/disk
MLINKS= bsdlabel.8 disklabel.8
.endif
-DPADD= ${LIBGEOM} ${LIBBSDXML} ${LIBSBUF}
-LDADD= -lgeom -lbsdxml -lsbuf
+LIBADD= geom
.include <bsd.prog.mk>
Modified: head/sbin/camcontrol/Makefile
==============================================================================
--- head/sbin/camcontrol/Makefile Tue Nov 25 11:22:28 2014
(r275029)
+++ head/sbin/camcontrol/Makefile Tue Nov 25 11:23:12 2014
(r275030)
@@ -11,8 +11,7 @@ CFLAGS+= -DMINIMALISTIC
.if ${MACHINE_CPUARCH} == "arm"
WARNS?= 3
.endif
-DPADD= ${LIBCAM} ${LIBSBUF} ${LIBUTIL}
-LDADD= -lcam -lsbuf -lutil
+LIBADD= cam sbuf util
MAN= camcontrol.8
.include <bsd.prog.mk>
Modified: head/sbin/casperd/Makefile
==============================================================================
--- head/sbin/casperd/Makefile Tue Nov 25 11:22:28 2014 (r275029)
+++ head/sbin/casperd/Makefile Tue Nov 25 11:23:12 2014 (r275030)
@@ -4,8 +4,7 @@ PROG= casperd
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
Modified: head/sbin/ccdconfig/Makefile
==============================================================================
--- head/sbin/ccdconfig/Makefile Tue Nov 25 11:22:28 2014
(r275029)
+++ head/sbin/ccdconfig/Makefile Tue Nov 25 11:23:12 2014
(r275030)
@@ -3,7 +3,6 @@
PROG= ccdconfig
MAN= ccdconfig.8
-DPADD= ${LIBGEOM}
-LDADD= -lgeom
+LIBADD= geom
.include <bsd.prog.mk>
Modified: head/sbin/ddb/Makefile
==============================================================================
--- head/sbin/ddb/Makefile Tue Nov 25 11:22:28 2014 (r275029)
+++ head/sbin/ddb/Makefile Tue Nov 25 11:23:12 2014 (r275030)
@@ -5,7 +5,6 @@ SRCS= ddb.c ddb_capture.c ddb_script.c
MAN= ddb.8
WARNS?= 3
-DPADD= ${LIBKVM}
-LDADD= -lkvm
+LIBADD= kvm
.include <bsd.prog.mk>
Modified: head/sbin/devd/Makefile
==============================================================================
--- head/sbin/devd/Makefile Tue Nov 25 11:22:28 2014 (r275029)
+++ head/sbin/devd/Makefile Tue Nov 25 11:23:12 2014 (r275030)
@@ -10,8 +10,7 @@ WARNS?= 3
NO_SHARED?=YES
-DPADD= ${LIBL} ${LIBUTIL}
-LDADD= -ll -lutil
+LIBADD= l util
YFLAGS+=-v
CFLAGS+=-I. -I${.CURDIR}
Modified: head/sbin/dhclient/Makefile
==============================================================================
--- head/sbin/dhclient/Makefile Tue Nov 25 11:22:28 2014 (r275029)
+++ head/sbin/dhclient/Makefile Tue Nov 25 11:23:12 2014 (r275030)
@@ -41,8 +41,7 @@ PROG= dhclient
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
Modified: head/sbin/dmesg/Makefile
==============================================================================
--- head/sbin/dmesg/Makefile Tue Nov 25 11:22:28 2014 (r275029)
+++ head/sbin/dmesg/Makefile Tue Nov 25 11:23:12 2014 (r275030)
@@ -4,7 +4,6 @@
PROG= dmesg
MAN= dmesg.8
-LDADD= -lkvm
-DPADD= ${LIBKVM}
+LIBADD= kvm
.include <bsd.prog.mk>
Modified: head/sbin/dumpfs/Makefile
==============================================================================
--- head/sbin/dumpfs/Makefile Tue Nov 25 11:22:28 2014 (r275029)
+++ head/sbin/dumpfs/Makefile Tue Nov 25 11:23:12 2014 (r275030)
@@ -3,8 +3,7 @@
PROG= dumpfs
WARNS?= 2
-DPADD= ${LIBUFS}
-LDADD= -lufs
+LIBADD= ufs
MAN= dumpfs.8
.include <bsd.prog.mk>
Modified: head/sbin/fdisk/Makefile
==============================================================================
--- head/sbin/fdisk/Makefile Tue Nov 25 11:22:28 2014 (r275029)
+++ head/sbin/fdisk/Makefile Tue Nov 25 11:23:12 2014 (r275030)
@@ -7,8 +7,7 @@ MAN= fdisk.8
.PATH: ${.CURDIR}/../../sys/geom
-DPADD+= ${LIBGEOM} ${LIBBSDXML} ${LIBSBUF}
-LDADD+= -lgeom -lbsdxml -lsbuf
+LIBADD= geom
.include <bsd.prog.mk>
Modified: head/sbin/fdisk_pc98/Makefile
==============================================================================
--- head/sbin/fdisk_pc98/Makefile Tue Nov 25 11:22:28 2014
(r275029)
+++ head/sbin/fdisk_pc98/Makefile Tue Nov 25 11:23:12 2014
(r275030)
@@ -7,7 +7,6 @@ MAN= fdisk.8
.PATH: ${.CURDIR}/../../sys/geom
-DPADD+= ${LIBGEOM} ${LIBBSDXML} ${LIBSBUF}
-LDADD+= -lgeom -lbsdxml -lsbuf
+LIBADD= geom
.include <bsd.prog.mk>
Modified: head/sbin/ffsinfo/Makefile
==============================================================================
--- head/sbin/ffsinfo/Makefile Tue Nov 25 11:22:28 2014 (r275029)
+++ head/sbin/ffsinfo/Makefile Tue Nov 25 11:23:12 2014 (r275030)
@@ -13,7 +13,6 @@ MAN= ffsinfo.8
WARNS?= 1
CFLAGS+=-DFS_DEBUG -I${GROWFS}
-DPADD= ${LIBUFS}
-LDADD= -lufs
+LIBADD= ufs
.include <bsd.prog.mk>
Modified: head/sbin/fsck_ffs/Makefile
==============================================================================
--- head/sbin/fsck_ffs/Makefile Tue Nov 25 11:22:28 2014 (r275029)
+++ head/sbin/fsck_ffs/Makefile Tue Nov 25 11:23:12 2014 (r275030)
@@ -9,8 +9,7 @@ MLINKS= fsck_ffs.8 fsck_ufs.8 fsck_ffs.8
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
Modified: head/sbin/fsck_ffs/dir.c
==============================================================================
--- head/sbin/fsck_ffs/dir.c Tue Nov 25 11:22:28 2014 (r275029)
+++ head/sbin/fsck_ffs/dir.c Tue Nov 25 11:23:12 2014 (r275030)
@@ -37,6 +37,7 @@ __FBSDID("$FreeBSD$");
#include <sys/param.h>
#include <sys/time.h>
+#include <sys/types.h>
#include <sys/sysctl.h>
#include <ufs/ufs/dinode.h>
Modified: head/sbin/fsdb/Makefile
==============================================================================
--- head/sbin/fsdb/Makefile Tue Nov 25 11:22:28 2014 (r275029)
+++ head/sbin/fsdb/Makefile Tue Nov 25 11:23:12 2014 (r275030)
@@ -9,8 +9,7 @@ SRCS= fsdb.c fsdbutil.c \
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 <bsd.prog.mk>
Modified: head/sbin/gbde/Makefile
==============================================================================
--- head/sbin/gbde/Makefile Tue Nov 25 11:22:28 2014 (r275029)
+++ head/sbin/gbde/Makefile Tue Nov 25 11:23:12 2014 (r275030)
@@ -20,8 +20,7 @@ CFLAGS+= -I${.CURDIR}/../../sys
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};' \
Modified: head/sbin/geom/Makefile
==============================================================================
--- head/sbin/geom/Makefile Tue Nov 25 11:22:28 2014 (r275029)
+++ head/sbin/geom/Makefile Tue Nov 25 11:23:12 2014 (r275030)
@@ -14,8 +14,7 @@ MAN=
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 <bsd.prog.mk>
Modified: head/sbin/geom/class/eli/Makefile
==============================================================================
--- head/sbin/geom/class/eli/Makefile Tue Nov 25 11:22:28 2014
(r275029)
+++ head/sbin/geom/class/eli/Makefile Tue Nov 25 11:23:12 2014
(r275030)
@@ -8,8 +8,7 @@ SRCS+= g_eli_key.c
SRCS+= pkcs5v2.c
SRCS+= sha2.c
-DPADD= ${LIBMD} ${LIBCRYPTO}
-LDADD= -lmd -lcrypto
+LIBADD= md crypto
WARNS?= 3
Modified: head/sbin/geom/class/journal/Makefile
==============================================================================
--- head/sbin/geom/class/journal/Makefile Tue Nov 25 11:22:28 2014
(r275029)
+++ head/sbin/geom/class/journal/Makefile Tue Nov 25 11:23:12 2014
(r275030)
@@ -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
Modified: head/sbin/geom/class/mirror/Makefile
==============================================================================
--- head/sbin/geom/class/mirror/Makefile Tue Nov 25 11:22:28 2014
(r275029)
+++ head/sbin/geom/class/mirror/Makefile Tue Nov 25 11:23:12 2014
(r275030)
@@ -4,7 +4,6 @@
GEOM_CLASS= mirror
-DPADD= ${LIBMD}
-LDADD= -lmd
+LIBADD= md
.include <bsd.lib.mk>
Modified: head/sbin/geom/class/part/Makefile
==============================================================================
--- head/sbin/geom/class/part/Makefile Tue Nov 25 11:22:28 2014
(r275029)
+++ head/sbin/geom/class/part/Makefile Tue Nov 25 11:23:12 2014
(r275030)
@@ -4,7 +4,6 @@
GEOM_CLASS= part
-DPADD= ${LIBUTIL}
-LDADD= -lutil
+LIBADD= util
.include <bsd.lib.mk>
Modified: head/sbin/geom/class/raid/Makefile
==============================================================================
--- head/sbin/geom/class/raid/Makefile Tue Nov 25 11:22:28 2014
(r275029)
+++ head/sbin/geom/class/raid/Makefile Tue Nov 25 11:23:12 2014
(r275030)
@@ -4,7 +4,6 @@
GEOM_CLASS= raid
-DPADD= ${LIBMD}
-LDADD= -lmd
+LIBADD= md
.include <bsd.lib.mk>
Modified: head/sbin/geom/class/raid3/Makefile
==============================================================================
--- head/sbin/geom/class/raid3/Makefile Tue Nov 25 11:22:28 2014
(r275029)
+++ head/sbin/geom/class/raid3/Makefile Tue Nov 25 11:23:12 2014
(r275030)
@@ -4,7 +4,6 @@
GEOM_CLASS= raid3
-DPADD= ${LIBMD}
-LDADD= -lmd
+LIBADD= md
.include <bsd.lib.mk>
Modified: head/sbin/geom/core/Makefile
==============================================================================
--- head/sbin/geom/core/Makefile Tue Nov 25 11:22:28 2014
(r275029)
+++ head/sbin/geom/core/Makefile Tue Nov 25 11:23:12 2014
(r275030)
@@ -11,7 +11,6 @@ NO_SHARED=NO
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 <bsd.prog.mk>
Modified: head/sbin/ggate/ggatec/Makefile
==============================================================================
--- head/sbin/ggate/ggatec/Makefile Tue Nov 25 11:22:28 2014
(r275029)
+++ head/sbin/ggate/ggatec/Makefile Tue Nov 25 11:23:12 2014
(r275030)
@@ -10,7 +10,6 @@ CFLAGS+= -DMAX_SEND_SIZE=32768
CFLAGS+= -DLIBGEOM
CFLAGS+= -I${.CURDIR}/../shared
-DPADD= ${LIBGEOM} ${LIBSBUF} ${LIBBSDXML} ${LIBUTIL} ${LIBPTHREAD}
-LDADD= -lgeom -lsbuf -lbsdxml -lutil -lpthread
+LIBADD= geom util pthread
.include <bsd.prog.mk>
Modified: head/sbin/ggate/ggated/Makefile
==============================================================================
--- head/sbin/ggate/ggated/Makefile Tue Nov 25 11:22:28 2014
(r275029)
+++ head/sbin/ggate/ggated/Makefile Tue Nov 25 11:23:12 2014
(r275030)
@@ -6,8 +6,7 @@ PROG= ggated
MAN= ggated.8
SRCS= ggated.c ggate.c
-DPADD= ${LIBPTHREAD}
-LDADD= -lpthread
+LIBADD= pthread
CFLAGS+= -I${.CURDIR}/../shared
Modified: head/sbin/ggate/ggatel/Makefile
==============================================================================
--- head/sbin/ggate/ggatel/Makefile Tue Nov 25 11:22:28 2014
(r275029)
+++ head/sbin/ggate/ggatel/Makefile Tue Nov 25 11:23:12 2014
(r275030)
@@ -9,7 +9,6 @@ SRCS= ggatel.c ggate.c
CFLAGS+= -DLIBGEOM
CFLAGS+= -I${.CURDIR}/../shared
-DPADD= ${LIBGEOM} ${LIBSBUF} ${LIBBSDXML} ${LIBUTIL}
-LDADD= -lgeom -lsbuf -lbsdxml -lutil
+LIBADD= geom util
.include <bsd.prog.mk>
Modified: head/sbin/growfs/Makefile
==============================================================================
--- head/sbin/growfs/Makefile Tue Nov 25 11:22:28 2014 (r275029)
+++ head/sbin/growfs/Makefile Tue Nov 25 11:23:12 2014 (r275030)
@@ -19,11 +19,10 @@ CFLAGS+=-I${.CURDIR}/../mount
SRCS+= debug.c
.endif
-DPADD= ${LIBUTIL}
-LDADD= -lutil
+LIBADD= util
.if ${MK_TESTS} != "no"
SUBDIR+= tests
.endif
-.include <bsd.prog.mk>
+.include <bsd.prog.mk>
Modified: head/sbin/gvinum/Makefile
==============================================================================
--- head/sbin/gvinum/Makefile Tue Nov 25 11:22:28 2014 (r275029)
+++ head/sbin/gvinum/Makefile Tue Nov 25 11:23:12 2014 (r275030)
@@ -7,8 +7,7 @@ MAN= gvinum.8
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
Modified: head/sbin/hastctl/Makefile
==============================================================================
--- head/sbin/hastctl/Makefile Tue Nov 25 11:22:28 2014 (r275029)
+++ head/sbin/hastctl/Makefile Tue Nov 25 11:23:12 2014 (r275030)
@@ -32,11 +32,9 @@ CFLAGS+=-DINET6
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
Modified: head/sbin/hastd/Makefile
==============================================================================
--- head/sbin/hastd/Makefile Tue Nov 25 11:22:28 2014 (r275029)
+++ head/sbin/hastd/Makefile Tue Nov 25 11:23:12 2014 (r275030)
@@ -30,11 +30,9 @@ CFLAGS+=-DINET
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
Modified: head/sbin/ifconfig/Makefile
==============================================================================
--- head/sbin/ifconfig/Makefile Tue Nov 25 11:22:28 2014 (r275029)
+++ head/sbin/ifconfig/Makefile Tue Nov 25 11:23:12 2014 (r275030)
@@ -35,12 +35,10 @@ SRCS+= ifgre.c # GRE keys etc
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 @@ CFLAGS+= -DINET
.endif
.if ${MK_JAIL} != "no" && !defined(RELEASE_CRUNCH) && !defined(RESCUE)
CFLAGS+= -DJAIL
-DPADD+= ${LIBJAIL}
-LDADD+= -ljail
+LIBADD+= jail
.endif
MAN= ifconfig.8
Modified: head/sbin/init/Makefile
==============================================================================
--- head/sbin/init/Makefile Tue Nov 25 11:22:28 2014 (r275029)
+++ head/sbin/init/Makefile Tue Nov 25 11:23:12 2014 (r275030)
@@ -6,8 +6,7 @@ MAN= init.8
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
Modified: head/sbin/ipf/Makefile.inc
==============================================================================
--- head/sbin/ipf/Makefile.inc Tue Nov 25 11:22:28 2014 (r275029)
+++ head/sbin/ipf/Makefile.inc Tue Nov 25 11:23:12 2014 (r275030)
@@ -18,9 +18,7 @@ CFLAGS+= -DUSE_INET6
CFLAGS+= -DNOINET6
.endif
-LIBIPF= ${.OBJDIR}/../libipf/libipf.a
-DPADD+= ${LIBIPF} ${LIBKVM}
-LDADD+= ${LIBIPF} -lkvm
+LIBADD+= ipf
CLEANFILES+= y.tab.c y.tab.h
Modified: head/sbin/ipf/ipf/Makefile
==============================================================================
--- head/sbin/ipf/ipf/Makefile Tue Nov 25 11:22:28 2014 (r275029)
+++ head/sbin/ipf/ipf/Makefile Tue Nov 25 11:23:12 2014 (r275030)
@@ -35,8 +35,7 @@ ipf_l.h: lexer.h
LIBIPF_SRCS!= cd ${.CURDIR}/../libipf && ${MAKE} -V SRCS
SRCS+= ${LIBIPF_SRCS}
.else
-DPADD+= ${LIBPCAP}
-LDADD+= -lpcap
+LIBADD+= pcap
.endif
.include <bsd.prog.mk>
Modified: head/sbin/ipf/ipfstat/Makefile
==============================================================================
--- head/sbin/ipf/ipfstat/Makefile Tue Nov 25 11:22:28 2014
(r275029)
+++ head/sbin/ipf/ipfstat/Makefile Tue Nov 25 11:23:12 2014
(r275030)
@@ -5,7 +5,6 @@ NOGCCERROR= # defined
PROG= ipfstat
SRCS= ipfstat.c
MAN= ipfstat.8
-DPADD+= ${LIBCURSES}
-LDADD+= -lcurses
+LIBADD+= ncursesw
.include <bsd.prog.mk>
Modified: head/sbin/ipf/ipsend/Makefile
==============================================================================
--- head/sbin/ipf/ipsend/Makefile Tue Nov 25 11:22:28 2014
(r275029)
+++ head/sbin/ipf/ipsend/Makefile Tue Nov 25 11:23:12 2014
(r275030)
@@ -8,8 +8,7 @@ PROG= ipsend
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
Modified: head/sbin/ipfw/Makefile
==============================================================================
--- head/sbin/ipfw/Makefile Tue Nov 25 11:22:28 2014 (r275029)
+++ head/sbin/ipfw/Makefile Tue Nov 25 11:23:12 2014 (r275030)
@@ -11,8 +11,7 @@ SRCS+= altq.c
CFLAGS+=-DPF
.endif
-DPADD= ${LIBUTIL}
-LDADD= -lutil
+LIBADD= util
MAN= ipfw.8
.include <bsd.prog.mk>
Modified: head/sbin/iscontrol/Makefile
==============================================================================
--- head/sbin/iscontrol/Makefile Tue Nov 25 11:22:28 2014
(r275029)
+++ head/sbin/iscontrol/Makefile Tue Nov 25 11:23:12 2014
(r275030)
@@ -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
Modified: head/sbin/md5/Makefile
==============================================================================
--- head/sbin/md5/Makefile Tue Nov 25 11:22:28 2014 (r275029)
+++ head/sbin/md5/Makefile Tue Nov 25 11:23:12 2014 (r275030)
@@ -16,7 +16,6 @@ MLINKS= md5.1 rmd160.1 \
NO_WMISSING_VARIABLE_DECLARATIONS=
WFORMAT?= 1
-DPADD= ${LIBMD}
-LDADD= -lmd
+LIBADD= md
.include <bsd.prog.mk>
Modified: head/sbin/mdconfig/Makefile
==============================================================================
--- head/sbin/mdconfig/Makefile Tue Nov 25 11:22:28 2014 (r275029)
+++ head/sbin/mdconfig/Makefile Tue Nov 25 11:23:12 2014 (r275030)
@@ -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
Modified: head/sbin/mount/Makefile
==============================================================================
--- head/sbin/mount/Makefile Tue Nov 25 11:22:28 2014 (r275029)
+++ head/sbin/mount/Makefile Tue Nov 25 11:23:12 2014 (r275030)
@@ -6,7 +6,6 @@ SRCS= mount.c mount_fs.c getmntopts.c vf
MAN= mount.8 mount.conf.8
# We do NOT install the getmntopts.3 man page.
-DPADD= ${LIBUTIL}
-LDADD= -lutil
+LIBADD= util
.include <bsd.prog.mk>
Modified: head/sbin/mount_cd9660/Makefile
==============================================================================
--- head/sbin/mount_cd9660/Makefile Tue Nov 25 11:22:28 2014
(r275029)
+++ head/sbin/mount_cd9660/Makefile Tue Nov 25 11:23:12 2014
(r275030)
@@ -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}
Modified: head/sbin/mount_msdosfs/Makefile
==============================================================================
--- head/sbin/mount_msdosfs/Makefile Tue Nov 25 11:22:28 2014
(r275029)
+++ head/sbin/mount_msdosfs/Makefile Tue Nov 25 11:23:12 2014
(r275030)
@@ -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}
Modified: head/sbin/mount_udf/Makefile
==============================================================================
--- head/sbin/mount_udf/Makefile Tue Nov 25 11:22:28 2014
(r275029)
+++ head/sbin/mount_udf/Makefile Tue Nov 25 11:23:12 2014
(r275030)
@@ -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
Modified: head/sbin/nandfs/Makefile
==============================================================================
--- head/sbin/nandfs/Makefile Tue Nov 25 11:22:28 2014 (r275029)
+++ head/sbin/nandfs/Makefile Tue Nov 25 11:23:12 2014 (r275030)
@@ -4,7 +4,6 @@ PROG= nandfs
SRCS= nandfs.c lssnap.c mksnap.c rmsnap.c
MAN= nandfs.8
-DPADD= ${LIBNANDFS}
-LDADD= -lnandfs
+LIBADD= nandfs
.include <bsd.prog.mk>
Modified: head/sbin/natd/Makefile
==============================================================================
--- head/sbin/natd/Makefile Tue Nov 25 11:22:28 2014 (r275029)
+++ head/sbin/natd/Makefile Tue Nov 25 11:23:12 2014 (r275030)
@@ -3,8 +3,7 @@
PROG = natd
SRCS = natd.c icmp.c
WARNS?= 3
-LDADD = -lalias
-DPADD = ${LIBALIAS}
+LIBADD = alias
MAN = natd.8
.include <bsd.prog.mk>
Modified: head/sbin/newfs/Makefile
==============================================================================
--- head/sbin/newfs/Makefile Tue Nov 25 11:22:28 2014 (r275029)
+++ head/sbin/newfs/Makefile Tue Nov 25 11:23:12 2014 (r275030)
@@ -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
Modified: head/sbin/newfs_nandfs/Makefile
==============================================================================
--- head/sbin/newfs_nandfs/Makefile Tue Nov 25 11:22:28 2014
(r275029)
+++ head/sbin/newfs_nandfs/Makefile Tue Nov 25 11:23:12 2014
(r275030)
@@ -3,7 +3,6 @@
PROG= newfs_nandfs
MAN= newfs_nandfs.8
-LDADD+= -lgeom
-DPADD+= ${LIBGEOM}
+LIBADD= geom
.include <bsd.prog.mk>
Modified: head/sbin/pfctl/Makefile
==============================================================================
--- head/sbin/pfctl/Makefile Tue Nov 25 11:22:28 2014 (r275029)
+++ head/sbin/pfctl/Makefile Tue Nov 25 11:23:12 2014 (r275030)
@@ -28,7 +28,6 @@ CFLAGS+= -DWITH_INET
YFLAGS=
-LDADD+= -lm -lmd
-DPADD+= ${LIBM} ${LIBMD}
+LIBADD= m md
.include <bsd.prog.mk>
Modified: head/sbin/pflogd/Makefile
==============================================================================
--- head/sbin/pflogd/Makefile Tue Nov 25 11:22:28 2014 (r275029)
+++ head/sbin/pflogd/Makefile Tue Nov 25 11:23:12 2014 (r275030)
@@ -8,8 +8,7 @@ MAN= pflogd.8
CFLAGS+=-include ${.CURDIR}/../../lib/libpcap/config.h
-LDADD= -lpcap
-DPADD= ${LIBPCAP}
+LIBADD= pcap
WARNS?= 2
Modified: head/sbin/ping/Makefile
==============================================================================
--- head/sbin/ping/Makefile Tue Nov 25 11:22:28 2014 (r275029)
+++ head/sbin/ping/Makefile Tue Nov 25 11:23:12 2014 (r275030)
@@ -8,19 +8,16 @@ MAN= ping.8
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 <bsd.prog.mk>
Modified: head/sbin/ping6/Makefile
==============================================================================
--- head/sbin/ping6/Makefile Tue Nov 25 11:22:28 2014 (r275029)
+++ head/sbin/ping6/Makefile Tue Nov 25 11:23:12 2014 (r275030)
@@ -10,7 +10,6 @@ WARNS?= 3
BINOWN= root
BINMODE=4555
-LDADD= -lipsec -lm -lmd
-DPADD= ${LIBIPSEC} ${LIBM} ${LIBMD}
+LIBADD= ipsec m md
.include <bsd.prog.mk>
Modified: head/sbin/quotacheck/Makefile
==============================================================================
--- head/sbin/quotacheck/Makefile Tue Nov 25 11:22:28 2014
(r275029)
+++ head/sbin/quotacheck/Makefile Tue Nov 25 11:23:12 2014
(r275030)
@@ -5,8 +5,7 @@ PROG= quotacheck
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
Modified: head/sbin/rcorder/Makefile
==============================================================================
--- head/sbin/rcorder/Makefile Tue Nov 25 11:22:28 2014 (r275029)
+++ head/sbin/rcorder/Makefile Tue Nov 25 11:23:12 2014 (r275030)
@@ -5,8 +5,7 @@ PROG= rcorder
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.
Modified: head/sbin/routed/Makefile
==============================================================================
--- head/sbin/routed/Makefile Tue Nov 25 11:22:28 2014 (r275029)
+++ head/sbin/routed/Makefile Tue Nov 25 11:23:12 2014 (r275030)
@@ -5,8 +5,7 @@ PROG= routed
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
Modified: head/sbin/routed/rtquery/Makefile
==============================================================================
--- head/sbin/routed/rtquery/Makefile Tue Nov 25 11:22:28 2014
(r275029)
+++ head/sbin/routed/rtquery/Makefile Tue Nov 25 11:23:12 2014
(r275030)
@@ -4,8 +4,7 @@
PROG= rtquery
MAN= rtquery.8
-LDADD= -lmd
-DPADD= ${LIBMD}
+LIBADD= md
WARNS?= 3
NO_WARRAY_BOUNDS=
Modified: head/sbin/savecore/Makefile
==============================================================================
--- head/sbin/savecore/Makefile Tue Nov 25 11:22:28 2014 (r275029)
+++ head/sbin/savecore/Makefile Tue Nov 25 11:23:12 2014 (r275030)
@@ -1,8 +1,7 @@
# $FreeBSD$
PROG= savecore
-DPADD= ${LIBZ}
-LDADD= -lz
+LIBADD= z
MAN= savecore.8
.include <bsd.prog.mk>
Modified: head/sbin/setkey/Makefile
==============================================================================
--- head/sbin/setkey/Makefile Tue Nov 25 11:22:28 2014 (r275029)
+++ head/sbin/setkey/Makefile Tue Nov 25 11:23:12 2014 (r275030)
@@ -37,8 +37,7 @@ WARNS?= 1
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+= -DIPSEC_DEBUG -DYY_NO_UNPUT
CFLAGS+= -DINET6
.endif
CFLAGS+= -I.
-DPADD+= ${LIBIPSEC}
-LDADD+= -lipsec
+LIBADD+= ipsec
CLEANFILES+= scriptdump y.tab.h
#SCRIPTS= scriptdump
Modified: head/sbin/sunlabel/Makefile
==============================================================================
--- head/sbin/sunlabel/Makefile Tue Nov 25 11:22:28 2014 (r275029)
+++ head/sbin/sunlabel/Makefile Tue Nov 25 11:23:12 2014 (r275030)
@@ -11,8 +11,7 @@ LINKS= ${BINDIR}/sunlabel ${BINDIR}/disk
MLINKS= sunlabel.8 disklabel.8
.endif
-DPADD= ${LIBGEOM}
-LDADD= -lgeom
+LIBADD= geom
.include <bsd.prog.mk>
Modified: head/sbin/swapon/Makefile
==============================================================================
--- head/sbin/swapon/Makefile Tue Nov 25 11:22:28 2014 (r275029)
+++ head/sbin/swapon/Makefile Tue Nov 25 11:23:12 2014 (r275030)
@@ -8,7 +8,6 @@ LINKS+= ${BINDIR}/swapon ${BINDIR}/swapc
MLINKS= swapon.8 swapoff.8
MLINKS+=swapon.8 swapctl.8
-DPADD= ${LIBUTIL}
-LDADD= -lutil
+LIBADD= util
.include <bsd.prog.mk>
Modified: head/sbin/tunefs/Makefile
==============================================================================
--- head/sbin/tunefs/Makefile Tue Nov 25 11:22:28 2014 (r275029)
+++ head/sbin/tunefs/Makefile Tue Nov 25 11:23:12 2014 (r275030)
@@ -2,8 +2,7 @@
# $FreeBSD$
PROG= tunefs
-DPADD= ${LIBUFS}
-LDADD= -lufs
+LIBADD= ufs
MAN= tunefs.8
WARNS= 3
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
