From owner-svn-src-projects@FreeBSD.ORG  Mon Jan  3 23:00:52 2011
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 863101065670;
	Mon,  3 Jan 2011 23:00:52 +0000 (UTC)
	(envelope-from jeff@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 7626D8FC13;
	Mon,  3 Jan 2011 23:00:52 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p03N0qhG008251;
	Mon, 3 Jan 2011 23:00:52 GMT (envelope-from jeff@svn.freebsd.org)
Received: (from jeff@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p03N0qR4008249;
	Mon, 3 Jan 2011 23:00:52 GMT (envelope-from jeff@svn.freebsd.org)
Message-Id: <201101032300.p03N0qR4008249@svn.freebsd.org>
From: Jeff Roberson <jeff@FreeBSD.org>
Date: Mon, 3 Jan 2011 23:00:52 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r216937 - projects/ofed/head
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 03 Jan 2011 23:00:52 -0000

Author: jeff
Date: Mon Jan  3 23:00:52 2011
New Revision: 216937
URL: http://svn.freebsd.org/changeset/base/216937

Log:
   - Add contrib/ofed to the build.  This works for now but may not be
     the ultimate solution.
  
  Sponsored by:	Isilon Systems, iX Systems, and Panasas.

Modified:
  projects/ofed/head/Makefile.inc1

Modified: projects/ofed/head/Makefile.inc1
==============================================================================
--- projects/ofed/head/Makefile.inc1	Mon Jan  3 22:59:15 2011	(r216936)
+++ projects/ofed/head/Makefile.inc1	Mon Jan  3 23:00:52 2011	(r216937)
@@ -65,6 +65,9 @@ SUBDIR+=secure
 SUBDIR+=share
 .endif
 SUBDIR+=sys usr.bin usr.sbin
+.if !defined(MK_OFED) || ${MK_OFED} != "no"
+SUBDIR+=contrib/ofed
+.endif
 #
 # We must do etc/ last for install/distribute to work.
 #
@@ -1177,7 +1180,11 @@ _prebuild_libs=	${_kerberos5_lib_libasn1
 _lib_libthr=	lib/libthr
 .endif
 
-_generic_libs=	${_cddl_lib} gnu/lib ${_kerberos5_lib} lib ${_secure_lib} usr.bin/lex/lib
+.if !defined(MK_OFED) || ${MK_OFED} != "no"
+_ofed_lib=	contrib/ofed/usr.lib/
+.endif
+
+_generic_libs=	${_cddl_lib} gnu/lib ${_kerberos5_lib} lib ${_secure_lib} usr.bin/lex/lib ${_ofed_lib}
 
 lib/libopie__L lib/libtacplus__L: lib/libmd__L