From owner-svn-soc-all@freebsd.org  Thu Aug 13 15:40:45 2015
Return-Path: <owner-svn-soc-all@freebsd.org>
Delivered-To: svn-soc-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 22C729A0DD5
 for <svn-soc-all@mailman.ysv.freebsd.org>;
 Thu, 13 Aug 2015 15:40:45 +0000 (UTC)
 (envelope-from stefano@FreeBSD.org)
Received: from socsvn.freebsd.org (socsvn.freebsd.org
 [IPv6:2001:1900:2254:206a::50:2])
 (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 13C49D12
 for <svn-soc-all@FreeBSD.org>; Thu, 13 Aug 2015 15:40:45 +0000 (UTC)
 (envelope-from stefano@FreeBSD.org)
Received: from socsvn.freebsd.org ([127.0.1.124])
 by socsvn.freebsd.org (8.15.2/8.15.2) with ESMTP id t7DFei7b012944
 for <svn-soc-all@FreeBSD.org>; Thu, 13 Aug 2015 15:40:44 GMT
 (envelope-from stefano@FreeBSD.org)
Received: (from www@localhost)
 by socsvn.freebsd.org (8.15.2/8.15.2/Submit) id t7DFeiJH012926
 for svn-soc-all@FreeBSD.org; Thu, 13 Aug 2015 15:40:44 GMT
 (envelope-from stefano@FreeBSD.org)
Date: Thu, 13 Aug 2015 15:40:44 GMT
Message-Id: <201508131540.t7DFeiJH012926@socsvn.freebsd.org>
X-Authentication-Warning: socsvn.freebsd.org: www set sender to
 stefano@FreeBSD.org using -f
From: stefano@FreeBSD.org
To: svn-soc-all@FreeBSD.org
Subject: socsvn commit: r289698 -
 soc2015/stefano/ptnetmap/stable/10/usr.sbin/bhyve
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-soc-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the entire Summer of Code repository
 <svn-soc-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-soc-all/>
List-Post: <mailto:svn-soc-all@freebsd.org>
List-Help: <mailto:svn-soc-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 13 Aug 2015 15:40:45 -0000

Author: stefano
Date: Thu Aug 13 15:40:43 2015
New Revision: 289698
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=289698

Log:
  bhyve: restore original Makefile

Modified:
  soc2015/stefano/ptnetmap/stable/10/usr.sbin/bhyve/Makefile

Modified: soc2015/stefano/ptnetmap/stable/10/usr.sbin/bhyve/Makefile
==============================================================================
--- soc2015/stefano/ptnetmap/stable/10/usr.sbin/bhyve/Makefile	Thu Aug 13 15:37:03 2015	(r289697)
+++ soc2015/stefano/ptnetmap/stable/10/usr.sbin/bhyve/Makefile	Thu Aug 13 15:40:43 2015	(r289698)
@@ -4,7 +4,7 @@
 
 PROG=	bhyve
 
-DEBUG_FLAGS= -g -O0
+DEBUG_FLAGS= -g -O0 
 
 MAN=	bhyve.8
 
@@ -45,14 +45,7 @@
 .PATH:	${.CURDIR}/../../sys/amd64/vmm
 SRCS+=	vmm_instruction_emul.c
 
-.ifdef CROSS_BUILD
-BASEDIR=/home/stefano/repos
-S=${BASEDIR}/freebsd
-M=${BASEDIR}/obj_head${S}/tmp/usr
-.PATH: ${S}/sys/amd64/vmm
-CFLAGS = -I${BASEDIR}/netmap/sys -I${M}/include -I/${S}/sys -L${M}/lib
-.endif
-
+CFLAGS = -I${.CURDIR}/../../sys
 DPADD=	${LIBVMMAPI} ${LIBMD} ${LIBUTIL} ${LIBPTHREAD}
 LDADD=	-lvmmapi -lmd -lutil -lpthread