From owner-svn-src-all@FreeBSD.ORG  Mon Nov 24 22:15:31 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
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 6E865710;
 Mon, 24 Nov 2014 22:15:31 +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 5AAEDB75;
 Mon, 24 Nov 2014 22:15:31 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAOMFVJ2023824;
 Mon, 24 Nov 2014 22:15:31 GMT (envelope-from bapt@FreeBSD.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAOMFUqQ023822;
 Mon, 24 Nov 2014 22:15:30 GMT (envelope-from bapt@FreeBSD.org)
Message-Id: <201411242215.sAOMFUqQ023822@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: bapt set sender to bapt@FreeBSD.org
 using -f
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Mon, 24 Nov 2014 22:15:30 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r274990 - in head: share/mk usr.sbin/makefs
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 &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 24 Nov 2014 22:15:31 -0000

Author: bapt
Date: Mon Nov 24 22:15:30 2014
New Revision: 274990
URL: https://svnweb.freebsd.org/changeset/base/274990

Log:
  Convert makefs to LIBADD
  
  Add definition of libnetbsd in src.libnames.mk

Modified:
  head/share/mk/src.libnames.mk
  head/usr.sbin/makefs/Makefile

Modified: head/share/mk/src.libnames.mk
==============================================================================
--- head/share/mk/src.libnames.mk	Mon Nov 24 22:12:27 2014	(r274989)
+++ head/share/mk/src.libnames.mk	Mon Nov 24 22:15:30 2014	(r274990)
@@ -22,6 +22,7 @@ _PRIVATELIBS=	\
 		unbound
 _INTERNALIBS=	\
 		mandoc \
+		netbsd \
 		ohash \
 		readline \
 		sm
@@ -68,6 +69,7 @@ _LIBRARIES=	\
 		mp \
 		nandfs \
 		ncursesw \
+		netbsd \
 		nv \
 		opie \
 		pam \
@@ -242,3 +244,6 @@ LIBMANDOC?=	${LIBMANDOCDIR}/libmandoc.a
 LIBSMDIR=	${ROOTOBJDIR}/lib/libsm
 LDSM?=		${LIBSMDIR}/libsm.a
 LIBSM?=		${LIBSMDIR}/libsm.a
+
+LIBNETBSDDIR=	${ROOTOBJDIR}/lib/libnetbsd
+LIBNETBSD=	${ROOTOBJDIR}/libnetbsd.a

Modified: head/usr.sbin/makefs/Makefile
==============================================================================
--- head/usr.sbin/makefs/Makefile	Mon Nov 24 22:12:27 2014	(r274989)
+++ head/usr.sbin/makefs/Makefile	Mon Nov 24 22:15:30 2014	(r274990)
@@ -30,12 +30,6 @@ SRCS+=	pack_dev.c
 SRCS+=	ffs_tables.c
 
 CFLAGS+=	-I${.CURDIR}/../../lib/libnetbsd
-LIBNETBSDDIR=	${.OBJDIR}/../../lib/libnetbsd
-LIBNETBSD=	${LIBNETBSDDIR}/libnetbsd.a
-DPADD+=		${LIBNETBSD}
-LDADD+=		${LIBNETBSD}
-
-DPADD+=  ${LIBSBUF} ${LIBUTIL}
-LDADD+=  -lsbuf -lutil
+LIBADD=		netbsd util sbuf
 
 .include <bsd.prog.mk>