svn commit: r281332 - in head: lib/libmt share/mk usr.bin/mt

[Baptiste Daroussin]

Author: bapt
Date: Thu Apr  9 21:26:38 2015
New Revision: 281332
URL: https://svnweb.freebsd.org/changeset/base/281332

Log:
  Convert mt(1) and libmt to LIBADD
  
  While here fix missing link to libbsdxml for libmt
  Fix overlinking in mt(1)
  Make add an indirect libmt dependency on bsdxml to allow static linking if
  needed

Modified:
  head/lib/libmt/Makefile
  head/share/mk/src.libnames.mk
  head/usr.bin/mt/Makefile

Modified: head/lib/libmt/Makefile
==============================================================================
--- head/lib/libmt/Makefile	Thu Apr  9 21:26:23 2015	(r281331)
+++ head/lib/libmt/Makefile	Thu Apr  9 21:26:38 2015	(r281332)
@@ -5,8 +5,7 @@ SHLIBDIR?=	/lib
 SRCS=		mtlib.c
 INCS=		mtlib.h
 
-DPADD=		${LIBSBUF}
-LDADD=		-lsbuf
+LIBADD=		sbuf bsdxml
 
 MAN=		mt.3
 

Modified: head/share/mk/src.libnames.mk
==============================================================================
--- head/share/mk/src.libnames.mk	Thu Apr  9 21:26:23 2015	(r281331)
+++ head/share/mk/src.libnames.mk	Thu Apr  9 21:26:38 2015	(r281332)
@@ -111,6 +111,7 @@ _LIBRARIES=	\
 		md \
 		memstat \
 		mp \
+		mt \
 		nandfs \
 		ncurses \
 		ncursesw \
@@ -199,6 +200,7 @@ _DP_proc+=	ctf
 _DP_mp=	crypto
 _DP_memstat=	kvm
 _DP_magic=	z
+_DP_mt=		bsdxml
 _DP_ldns=	crypto
 .if ${MK_OPENSSL} != "no"
 _DP_fetch=	ssl crypto
@@ -259,6 +261,9 @@ LDADD_atf_cxx+=	${LDADD_atf_c}
 DPADD_ipf+=	${DPADD_kvm}
 LDADD_ipf+=	${LDADD_kvm}
 
+DPADD_mt+=	${DPADD_sbuf}
+LDADD_mt+=	${LDADD_sbuf}
+
 # The following depends on libraries which are using pthread
 DPADD_hdb+=	${DPADD_pthread}
 LDADD_hdb+=	${LDADD_pthread}

Modified: head/usr.bin/mt/Makefile
==============================================================================
--- head/usr.bin/mt/Makefile	Thu Apr  9 21:26:23 2015	(r281331)
+++ head/usr.bin/mt/Makefile	Thu Apr  9 21:26:38 2015	(r281332)
@@ -2,7 +2,6 @@
 # $FreeBSD$
 
 PROG=	mt
-DPADD=	${LIBMT} ${LIBSBUF} ${LIBBSDXML}
-LDADD=	-lmt -lsbuf -lbsdxml
+LIBADD=	mt
 
 .include <bsd.prog.mk>