svn commit: r277373 - in stable/10/contrib/ofed: usr.bin usr.lib

[Garrett Cooper]

Author: ngie
Date: Mon Jan 19 07:29:28 2015
New Revision: 277373
URL: https://svnweb.freebsd.org/changeset/base/277373

Log:
  MFC r276805:
  
  X-MFC note: the svn:mergeinfo for this MFC was accidentally committed via
              r277371
  
  r276805 (by ngie):
  
    Build contrib/ofed/usr.{bin,lib} in parallel
  
    Sponsored by: EMC / Isilon Storage Division

Modified:
  stable/10/contrib/ofed/usr.bin/Makefile
  stable/10/contrib/ofed/usr.lib/Makefile

Modified: stable/10/contrib/ofed/usr.bin/Makefile
==============================================================================
--- stable/10/contrib/ofed/usr.bin/Makefile	Mon Jan 19 07:29:07 2015	(r277372)
+++ stable/10/contrib/ofed/usr.bin/Makefile	Mon Jan 19 07:29:28 2015	(r277373)
@@ -8,4 +8,6 @@ SUBDIR= ibaddr ibnetdiscover ibping ibpo
 SUBDIR+= osmtest
 .endif
 
+SUBDIR_PARALLEL=
+
 .include <bsd.subdir.mk>

Modified: stable/10/contrib/ofed/usr.lib/Makefile
==============================================================================
--- stable/10/contrib/ofed/usr.lib/Makefile	Mon Jan 19 07:29:07 2015	(r277372)
+++ stable/10/contrib/ofed/usr.lib/Makefile	Mon Jan 19 07:29:28 2015	(r277373)
@@ -1,6 +1,6 @@
-.include <bsd.own.mk>
-
 SUBDIR=	libibcommon libibmad libibumad libibverbs libmlx4 libmthca \
 	libopensm libosmcomp libosmvendor libibcm librdmacm libsdp
 
+SUBDIR_PARALLEL=
+
 .include <bsd.subdir.mk>