Convert usr.sbin to LIBADD

Reduce overlinking

8 files changed, 9 insertions, 28 deletions

diff --git a/usr.sbin/ntp/Makefile.inc b/usr.sbin/ntp/Makefile.inc
index cadd4c7..755fbee 100644
--- a/usr.sbin/ntp/Makefile.inc
+++ b/usr.sbin/ntp/Makefile.inc
@@ -14,10 +14,6 @@ CFLAGS+= ${NTPDEFS} ${DEFS_LOCAL} ${CLOCKDEFS}
 CFLAGS+= -DOPENSSL
 .endif
 
-LIBOPTS=	${.OBJDIR}/../libopts/libopts.a
-LIBPARSE=	${.OBJDIR}/../libparse/libparse.a
-LIBNTP=	${.OBJDIR}/../libntp/libntp.a
-
 WARNS?=	0
 
 .include "../Makefile.inc"
diff --git a/usr.sbin/ntp/ntp-keygen/Makefile b/usr.sbin/ntp/ntp-keygen/Makefile
index 78308fa..4091b89 100644
--- a/usr.sbin/ntp/ntp-keygen/Makefile
+++ b/usr.sbin/ntp/ntp-keygen/Makefile
@@ -13,12 +13,10 @@ SRCS=	ntp-keygen.c ntp-keygen-opts.c
 CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include -I${.CURDIR}/../ \
 	-I${.CURDIR}/../../../contrib/ntp/libopts
 
-DPADD=	${LIBNTP} ${LIBOPTS}
-LDADD=	${LIBNTP} ${LIBOPTS}
+LIBADD+=	ntp opts
 
 .if ${MK_OPENSSL} != "no"
-DPADD+=	${LIBMD} ${LIBCRYPTO}
-LDADD+=	-lmd -lcrypto
+LIBADD+=	md crypto
 .endif
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/ntp/ntpd/Makefile b/usr.sbin/ntp/ntpd/Makefile
index 87b2d72..58f35de 100644
--- a/usr.sbin/ntp/ntpd/Makefile
+++ b/usr.sbin/ntp/ntpd/Makefile
@@ -32,12 +32,10 @@ SRCS=	cmd_args.c	ntp_config.c \
 CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include -I${.CURDIR}/../ \
 	-I${.CURDIR}/../../../contrib/ntp/libopts -I${.CURDIR}
 
-DPADD=	${LIBPARSE} ${LIBNTP} ${LIBM} ${LIBMD} ${LIBRT} ${LIBOPTS}
-LDADD=	${LIBPARSE} ${LIBNTP} -lm -lmd -lrt ${LIBOPTS}
+LIBADD=	parse ntp m rt opts md
 
 .if ${MK_OPENSSL} != "no"
-DPADD+=	${LIBCRYPTO}
-LDADD+=	-lcrypto
+LIBADD+=	crypto
 .endif
 
 CLEANFILES+= .version version.c
diff --git a/usr.sbin/ntp/ntpdate/Makefile b/usr.sbin/ntp/ntpdate/Makefile
index f55ec92..7a45835 100644
--- a/usr.sbin/ntp/ntpdate/Makefile
+++ b/usr.sbin/ntp/ntpdate/Makefile
@@ -8,8 +8,7 @@ SRCS=	ntpdate.c version.c
 
 CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include -I${.CURDIR}/../
 
-DPADD=	${LIBNTP} ${LIBM} ${LIBMD} ${LIBRT}
-LDADD=	${LIBNTP} -lm -lmd -lrt
+LIBADD=	md rt ntp
 
 CLEANFILES+= .version version.c
 
diff --git a/usr.sbin/ntp/ntpdc/Makefile b/usr.sbin/ntp/ntpdc/Makefile
index d3c37e1..cda51d4 100644
--- a/usr.sbin/ntp/ntpdc/Makefile
+++ b/usr.sbin/ntp/ntpdc/Makefile
@@ -12,11 +12,7 @@ SRCS= 	ntpdc.c ntpdc_ops.c ntpdc-opts.c version.c
 CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include -I${.CURDIR}/../ \
 	-I${.CURDIR}/../../../contrib/ntp/libopts
 
-DPADD=	${LIBNTP} ${LIBM} ${LIBMD} ${LIBOPTS}
-LDADD=	${LIBNTP} -lm -lmd ${LIBOPTS}
-
-DPADD+=		${LIBEDIT} ${LIBTERMCAPW}
-LDADD+=		-ledit -ltermcapw
+LIBADD=	edit md ntp opts
 CFLAGS+=	-DHAVE_LIBEDIT -DHAVE_READLINE_READLINE_H \
 		-I${DESTDIR}/${INCLUDEDIR}/edit
 
diff --git a/usr.sbin/ntp/ntpq/Makefile b/usr.sbin/ntp/ntpq/Makefile
index 369bd58..95e3296 100644
--- a/usr.sbin/ntp/ntpq/Makefile
+++ b/usr.sbin/ntp/ntpq/Makefile
@@ -14,11 +14,7 @@ SRCS= 	ntpq.c ntpq-opts.c ntpq-subs.c version.c
 CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include -I${.CURDIR}/../ \
 	-I${.CURDIR}/../../../contrib/ntp/libopts
 
-DPADD=	${LIBNTP} ${LIBM} ${LIBMD} ${LIBOPTS}
-LDADD=	${LIBNTP} -lm -lmd ${LIBOPTS}
-
-DPADD+=		${LIBEDIT} ${LIBTERMCAPW}
-LDADD+=		-ledit -ltermcapw
+LIBADD+=	edit md ntp opts
 CFLAGS+=	-DHAVE_LIBEDIT -DHAVE_READLINE_READLINE_H \
 		-I${DESTDIR}/${INCLUDEDIR}/edit
 
diff --git a/usr.sbin/ntp/ntptime/Makefile b/usr.sbin/ntp/ntptime/Makefile
index d3bf7a7..65f1a71 100644
--- a/usr.sbin/ntp/ntptime/Makefile
+++ b/usr.sbin/ntp/ntptime/Makefile
@@ -7,7 +7,6 @@ MAN=
 
 CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include -I${.CURDIR}/../
 
-DPADD=	${LIBNTP}
-LDADD=	${LIBNTP}
+LIBADD=	ntp
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/ntp/sntp/Makefile b/usr.sbin/ntp/sntp/Makefile
index 11316c5..a2eede1 100644
--- a/usr.sbin/ntp/sntp/Makefile
+++ b/usr.sbin/ntp/sntp/Makefile
@@ -10,7 +10,6 @@ CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include -I${.CURDIR}/../ \
 	-DPACKAGE=\"sntp\" -DVERSION=\"1.6\" \
 	-I${.CURDIR}/../../../contrib/ntp/libopts
 
-DPADD=	${LIBM} ${LIBOPTS}
-LDADD=	-lm ${LIBOPTS}
+LIBADD=	m opts
 
 .include <bsd.prog.mk>