From owner-svn-src-all@FreeBSD.ORG Thu Apr 9 21:26:40 2015 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 16ADB9B2; Thu, 9 Apr 2015 21:26:40 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id DBE42DC0; Thu, 9 Apr 2015 21:26:39 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t39LQdO8039565; Thu, 9 Apr 2015 21:26:39 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t39LQcDh039562; Thu, 9 Apr 2015 21:26:38 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201504092126.t39LQcDh039562@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Thu, 9 Apr 2015 21:26:38 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r281332 - in head: lib/libmt share/mk usr.bin/mt X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Apr 2015 21:26:40 -0000 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