From owner-svn-src-user@FreeBSD.ORG  Tue Dec 30 03:47:45 2014
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@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 36292E29;
 Tue, 30 Dec 2014 03:47:45 +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 22146649EB;
 Tue, 30 Dec 2014 03:47:45 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBU3lj3K045379;
 Tue, 30 Dec 2014 03:47:45 GMT (envelope-from marcel@FreeBSD.org)
Received: (from marcel@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBU3licu045377;
 Tue, 30 Dec 2014 03:47:44 GMT (envelope-from marcel@FreeBSD.org)
Message-Id: <201412300347.sBU3licu045377@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: marcel set sender to
 marcel@FreeBSD.org using -f
From: Marcel Moolenaar <marcel@FreeBSD.org>
Date: Tue, 30 Dec 2014 03:47:44 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r276401 - in user/marcel/libvdsk: bhyve bhyveload
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
 src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 30 Dec 2014 03:47:45 -0000

Author: marcel
Date: Tue Dec 30 03:47:43 2014
New Revision: 276401
URL: https://svnweb.freebsd.org/changeset/base/276401

Log:
  LIBADD does not work outside the source tree.
  Revert back to DPADD and LDADD.

Modified:
  user/marcel/libvdsk/bhyve/Makefile
  user/marcel/libvdsk/bhyveload/Makefile

Modified: user/marcel/libvdsk/bhyve/Makefile
==============================================================================
--- user/marcel/libvdsk/bhyve/Makefile	Tue Dec 30 03:35:26 2014	(r276400)
+++ user/marcel/libvdsk/bhyve/Makefile	Tue Dec 30 03:47:43 2014	(r276401)
@@ -43,7 +43,8 @@ SRCS=	\
 .PATH:	/sys/amd64/vmm
 SRCS+=	vmm_instruction_emul.c
 
-LIBADD=	vdsk vmmapi md util pthread
+DPADD=	${LIBVDSK} ${LIBVMMAPI} ${LIBMD} ${LIBUTIL} ${LIBPTHREAD}
+LDADD=	-lvdsk -lvmmapi -lmd -lutil -lpthread
 
 WARNS?=	2
 

Modified: user/marcel/libvdsk/bhyveload/Makefile
==============================================================================
--- user/marcel/libvdsk/bhyveload/Makefile	Tue Dec 30 03:35:26 2014	(r276400)
+++ user/marcel/libvdsk/bhyveload/Makefile	Tue Dec 30 03:47:43 2014	(r276401)
@@ -4,7 +4,8 @@ PROG=	bhyveload
 SRCS=	bhyveload.c
 MAN=	bhyveload.8
 
-LIBADD=	vdsk vmmapi util
+DPADD+=	${LIBVDSK} ${LIBVMMAPI} ${LIBUTIL}
+LDADD+=	-lvdsk -lvmmapi -lutil
 
 WARNS?=	3