From owner-svn-src-head@FreeBSD.ORG  Wed Feb 18 15:25:26 2015
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id CD4D05BC;
 Wed, 18 Feb 2015 15:25:26 +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 B86697D7;
 Wed, 18 Feb 2015 15:25:26 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1IFPQu7031024;
 Wed, 18 Feb 2015 15:25:26 GMT (envelope-from imp@FreeBSD.org)
Received: (from imp@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1IFPQkL031022;
 Wed, 18 Feb 2015 15:25:26 GMT (envelope-from imp@FreeBSD.org)
Message-Id: <201502181525.t1IFPQkL031022@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: imp set sender to imp@FreeBSD.org
 using -f
From: Warner Losh <imp@FreeBSD.org>
Date: Wed, 18 Feb 2015 15:25:26 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r278960 - in head/sys/modules: if_gif if_gre
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.18-1
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://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: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 18 Feb 2015 15:25:26 -0000

Author: imp
Date: Wed Feb 18 15:25:25 2015
New Revision: 278960
URL: https://svnweb.freebsd.org/changeset/base/278960

Log:
  Clean up a bit of the INET/INET6 mess wrt options.

Modified:
  head/sys/modules/if_gif/Makefile
  head/sys/modules/if_gre/Makefile

Modified: head/sys/modules/if_gif/Makefile
==============================================================================
--- head/sys/modules/if_gif/Makefile	Wed Feb 18 15:25:22 2015	(r278959)
+++ head/sys/modules/if_gif/Makefile	Wed Feb 18 15:25:25 2015	(r278960)
@@ -7,13 +7,7 @@ SYSDIR?=${.CURDIR}/../..
 
 KMOD=	if_gif
 SRCS=	if_gif.c opt_inet.h opt_inet6.h
-
-.if ${MK_INET_SUPPORT} != "no"
-SRCS+=	in_gif.c
-.endif
-
-.if ${MK_INET6_SUPPORT} != "no"
-SRCS+=	in6_gif.c
-.endif
+SRCS.INET=in_gif.c
+SRCS.INET6=in6_gif.c
 
 .include <bsd.kmod.mk>

Modified: head/sys/modules/if_gre/Makefile
==============================================================================
--- head/sys/modules/if_gre/Makefile	Wed Feb 18 15:25:22 2015	(r278959)
+++ head/sys/modules/if_gre/Makefile	Wed Feb 18 15:25:25 2015	(r278960)
@@ -6,13 +6,7 @@ SYSDIR?=${.CURDIR}/../..
 
 KMOD=	if_gre
 SRCS=	if_gre.c opt_inet.h opt_inet6.h
-
-.if ${MK_INET_SUPPORT} != "no"
-SRCS+=	ip_gre.c
-.endif
-
-.if ${MK_INET6_SUPPORT} != "no"
-SRCS+=	ip6_gre.c
-.endif
+SRCS.INET=	ip_gre.c
+SRCS.INET6=	ip6_gre.c
 
 .include <bsd.kmod.mk>