From owner-svn-src-head@freebsd.org  Mon Mar 27 18:20:33 2017
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@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 ED026D20B38;
 Mon, 27 Mar 2017 18:20:33 +0000 (UTC)
 (envelope-from tuexen@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 A29618BF;
 Mon, 27 Mar 2017 18:20:33 +0000 (UTC)
 (envelope-from tuexen@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v2RIKWUx015220;
 Mon, 27 Mar 2017 18:20:32 GMT (envelope-from tuexen@FreeBSD.org)
Received: (from tuexen@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v2RIKW9E014994;
 Mon, 27 Mar 2017 18:20:32 GMT (envelope-from tuexen@FreeBSD.org)
Message-Id: <201703271820.v2RIKW9E014994@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: tuexen set sender to
 tuexen@FreeBSD.org using -f
From: Michael Tuexen <tuexen@FreeBSD.org>
Date: Mon, 27 Mar 2017 18:20:32 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r316038 - in head/sys/modules: . tcp
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Mar 2017 18:20:34 -0000

Author: tuexen
Date: Mon Mar 27 18:20:32 2017
New Revision: 316038
URL: https://svnweb.freebsd.org/changeset/base/316038

Log:
  Tweak the Makefiles a bit to allow using "tcp" in MODULES_OVERRIDE
  to build the tcp modules.
  
  Sponsored by:	Netflix, Inc.

Added:
  head/sys/modules/tcp/Makefile   (contents, props changed)
Modified:
  head/sys/modules/Makefile

Modified: head/sys/modules/Makefile
==============================================================================
--- head/sys/modules/Makefile	Mon Mar 27 17:27:46 2017	(r316037)
+++ head/sys/modules/Makefile	Mon Mar 27 18:20:32 2017	(r316038)
@@ -355,9 +355,8 @@ SUBDIR=	\
 	${_sym} \
 	${_syscons} \
 	sysvipc \
+	tcp \
 	${_ti} \
-	${_tcp_fastpath} \
-	${_tcpmd5} \
 	tests/framework \
 	tests/callout_test \
 	tl \
@@ -437,10 +436,6 @@ _random_other=	random_other
 SUBDIR+=	cuse
 .endif
 
-.if ${MK_EXTRA_TCP_STACKS} != "no" || defined(ALL_MODULES)
-_tcp_fastpath=	tcp/fastpath
-.endif
-
 .if (${MK_INET_SUPPORT} != "no" || ${MK_INET6_SUPPORT} != "no") || \
 	defined(ALL_MODULES)
 _carp=		carp
@@ -450,7 +445,6 @@ _if_gif=	if_gif
 _if_gre=	if_gre
 .if ${MK_IPSEC_SUPPORT} != "no"
 _ipsec=		ipsec
-_tcpmd5=	tcp/tcpmd5
 .endif
 .endif
 

Added: head/sys/modules/tcp/Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sys/modules/tcp/Makefile	Mon Mar 27 18:20:32 2017	(r316038)
@@ -0,0 +1,23 @@
+#
+# $FreeBSD$
+#
+
+SYSDIR?=${SRCTOP}/sys
+.include "${SYSDIR}/conf/kern.opts.mk"
+
+SUBDIR=	\
+	${_tcp_fastpath} \
+	${_tcpmd5} \
+
+.if ${MK_EXTRA_TCP_STACKS} != "no" || defined(ALL_MODULES)
+_tcp_fastpath=	fastpath
+.endif
+
+.if (${MK_INET_SUPPORT} != "no" || ${MK_INET6_SUPPORT} != "no") || \
+	defined(ALL_MODULES)
+.if ${MK_IPSEC_SUPPORT} != "no"
+_tcpmd5=	tcpmd5
+.endif
+.endif
+
+.include <bsd.subdir.mk>