head	1.7;
access;
symbols
	RELENG_8_4:1.7.0.2
	RELENG_9_1_0_RELEASE:1.6.16.1.4.2
	RELENG_9_1:1.6.16.1.0.4
	RELENG_9_1_BP:1.6.16.1
	RELENG_8_3_0_RELEASE:1.6.10.1.8.1
	RELENG_8_3:1.6.10.1.0.8
	RELENG_8_3_BP:1.6.10.1
	RELENG_9_0_0_RELEASE:1.6.16.1.2.1
	RELENG_9_0:1.6.16.1.0.2
	RELENG_9_0_BP:1.6.16.1
	RELENG_9:1.6.0.16
	RELENG_9_BP:1.6
	RELENG_7_4_0_RELEASE:1.6.14.1
	RELENG_8_2_0_RELEASE:1.6.10.1.6.1
	RELENG_7_4:1.6.0.14
	RELENG_7_4_BP:1.6
	RELENG_8_2:1.6.10.1.0.6
	RELENG_8_2_BP:1.6.10.1
	RELENG_8_1_0_RELEASE:1.6.10.1.4.1
	RELENG_8_1:1.6.10.1.0.4
	RELENG_8_1_BP:1.6.10.1
	RELENG_7_3_0_RELEASE:1.6.12.1
	RELENG_7_3:1.6.0.12
	RELENG_7_3_BP:1.6
	RELENG_8_0_0_RELEASE:1.6.10.1.2.1
	RELENG_8_0:1.6.10.1.0.2
	RELENG_8_0_BP:1.6.10.1
	RELENG_8:1.6.0.10
	RELENG_8_BP:1.6
	RELENG_7_2_0_RELEASE:1.6.8.1
	RELENG_7_2:1.6.0.8
	RELENG_7_2_BP:1.6
	RELENG_7_1_0_RELEASE:1.6.6.1
	RELENG_6_4_0_RELEASE:1.5.10.1.8.1
	RELENG_7_1:1.6.0.6
	RELENG_7_1_BP:1.6
	RELENG_6_4:1.5.10.1.0.8
	RELENG_6_4_BP:1.5.10.1
	RELENG_7_0_0_RELEASE:1.6
	RELENG_6_3_0_RELEASE:1.5.10.1
	RELENG_7_0:1.6.0.4
	RELENG_7_0_BP:1.6
	RELENG_6_3:1.5.10.1.0.6
	RELENG_6_3_BP:1.5.10.1
	RELENG_7:1.6.0.2
	RELENG_7_BP:1.6
	RELENG_6_2_0_RELEASE:1.5.10.1
	RELENG_6_2:1.5.10.1.0.4
	RELENG_6_2_BP:1.5.10.1
	RELENG_5_5_0_RELEASE:1.5
	RELENG_5_5:1.5.0.14
	RELENG_5_5_BP:1.5
	RELENG_6_1_0_RELEASE:1.5.10.1
	RELENG_6_1:1.5.10.1.0.2
	RELENG_6_1_BP:1.5.10.1
	RELENG_6_0_0_RELEASE:1.5
	RELENG_6_0:1.5.0.12
	RELENG_6_0_BP:1.5
	RELENG_6:1.5.0.10
	RELENG_6_BP:1.5
	RELENG_5_4_0_RELEASE:1.5
	RELENG_5_4:1.5.0.8
	RELENG_5_4_BP:1.5
	RELENG_4_11_0_RELEASE:1.3.2.1
	RELENG_4_11:1.3.2.1.0.8
	RELENG_4_11_BP:1.3.2.1
	RELENG_5_3_0_RELEASE:1.5
	RELENG_5_3:1.5.0.6
	RELENG_5_3_BP:1.5
	RELENG_5:1.5.0.4
	RELENG_5_BP:1.5
	RELENG_4_10_0_RELEASE:1.3.2.1
	RELENG_4_10:1.3.2.1.0.6
	RELENG_4_10_BP:1.3.2.1
	RELENG_5_2_1_RELEASE:1.5
	RELENG_5_2_0_RELEASE:1.5
	RELENG_5_2:1.5.0.2
	RELENG_5_2_BP:1.5
	RELENG_4_9_0_RELEASE:1.3.2.1
	RELENG_4_9:1.3.2.1.0.4
	RELENG_4_9_BP:1.3.2.1
	RELENG_5_1_0_RELEASE:1.4
	RELENG_5_1:1.4.0.2
	RELENG_5_1_BP:1.4
	RELENG_4_8_0_RELEASE:1.3.2.1
	RELENG_4_8:1.3.2.1.0.2
	RELENG_4_8_BP:1.3.2.1
	RELENG_5_0_0_RELEASE:1.3
	RELENG_5_0:1.3.0.4
	RELENG_5_0_BP:1.3
	RELENG_4:1.3.0.2;
locks; strict;
comment	@# @;


1.7
date	2012.11.17.01.52.56;	author svnexp;	state Exp;
branches
	1.7.2.1;
next	1.6;

1.6
date	2005.10.14.23.30.11;	author yar;	state Exp;
branches
	1.6.2.1
	1.6.6.1
	1.6.8.1
	1.6.10.1
	1.6.12.1
	1.6.14.1
	1.6.16.1;
next	1.5;

1.5
date	2003.11.14.20.58.00;	author bms;	state Exp;
branches
	1.5.10.1;
next	1.4;

1.4
date	2003.03.05.19.24.21;	author peter;	state Exp;
branches;
next	1.3;

1.3
date	2002.10.02.09.38.17;	author sobomax;	state Exp;
branches
	1.3.2.1;
next	1.2;

1.2
date	2002.09.10.10.19.03;	author sobomax;	state Exp;
branches;
next	1.1;

1.1
date	2002.09.06.17.17.33;	author sobomax;	state Exp;
branches;
next	;

1.7.2.1
date	2012.11.17.01.52.56;	author svnexp;	state dead;
branches;
next	1.7.2.2;

1.7.2.2
date	2013.03.28.13.05.20;	author svnexp;	state Exp;
branches;
next	;

1.6.2.1
date	2012.11.17.08.06.49;	author svnexp;	state Exp;
branches;
next	;

1.6.6.1
date	2008.11.25.02.59.29;	author kensmith;	state Exp;
branches;
next	;

1.6.8.1
date	2009.04.15.03.14.26;	author kensmith;	state Exp;
branches;
next	;

1.6.10.1
date	2009.08.03.08.13.06;	author kensmith;	state Exp;
branches
	1.6.10.1.2.1
	1.6.10.1.4.1
	1.6.10.1.6.1
	1.6.10.1.8.1;
next	1.6.10.2;

1.6.10.2
date	2012.11.17.10.36.56;	author svnexp;	state Exp;
branches;
next	;

1.6.10.1.2.1
date	2009.10.25.01.10.29;	author kensmith;	state Exp;
branches;
next	;

1.6.10.1.4.1
date	2010.06.14.02.09.06;	author kensmith;	state Exp;
branches;
next	;

1.6.10.1.6.1
date	2010.12.21.17.09.25;	author kensmith;	state Exp;
branches;
next	;

1.6.10.1.8.1
date	2012.03.03.06.15.13;	author kensmith;	state Exp;
branches;
next	1.6.10.1.8.2;

1.6.10.1.8.2
date	2012.11.17.08.25.33;	author svnexp;	state Exp;
branches;
next	;

1.6.12.1
date	2010.02.10.00.26.20;	author kensmith;	state Exp;
branches;
next	;

1.6.14.1
date	2010.12.21.17.10.29;	author kensmith;	state Exp;
branches;
next	1.6.14.2;

1.6.14.2
date	2012.11.17.08.17.27;	author svnexp;	state Exp;
branches;
next	;

1.6.16.1
date	2011.09.23.00.51.37;	author kensmith;	state Exp;
branches
	1.6.16.1.2.1
	1.6.16.1.4.1;
next	1.6.16.2;

1.6.16.2
date	2012.11.17.11.37.17;	author svnexp;	state Exp;
branches;
next	;

1.6.16.1.2.1
date	2011.11.11.04.20.22;	author kensmith;	state Exp;
branches;
next	1.6.16.1.2.2;

1.6.16.1.2.2
date	2012.11.17.08.37.13;	author svnexp;	state Exp;
branches;
next	;

1.6.16.1.4.1
date	2012.08.05.23.54.33;	author kensmith;	state Exp;
branches;
next	1.6.16.1.4.2;

1.6.16.1.4.2
date	2012.11.17.08.48.04;	author svnexp;	state Exp;
branches;
next	;

1.5.10.1
date	2006.02.10.00.38.02;	author yar;	state Exp;
branches
	1.5.10.1.8.1;
next	1.5.10.2;

1.5.10.2
date	2012.11.17.07.44.19;	author svnexp;	state Exp;
branches;
next	;

1.5.10.1.8.1
date	2008.10.02.02.57.24;	author kensmith;	state Exp;
branches;
next	;

1.3.2.1
date	2002.12.01.14.03.10;	author sobomax;	state Exp;
branches;
next	1.3.2.2;

1.3.2.2
date	2012.11.17.07.26.31;	author svnexp;	state Exp;
branches;
next	;


desc
@@


1.7
log
@Switching exporter and resync
@
text
@# $FreeBSD: head/sys/modules/if_gre/Makefile 151350 2005-10-14 23:30:17Z yar $

.PATH: ${.CURDIR}/../../net ${.CURDIR}/../../netinet ${.CURDIR}/../../netinet6

KMOD=	if_gre
SRCS=	if_gre.c ip_gre.c opt_inet.h opt_inet6.h opt_atalk.h

.if !defined(KERNBUILDDIR)
opt_inet.h:
	echo "#define INET 1" > ${.TARGET}

opt_inet6.h:
	echo "#define INET6 1" > ${.TARGET}

opt_atalk.h:
	echo "#define NETATALK 1" > ${.TARGET}
.endif

.include <bsd.kmod.mk>
@


1.7.2.1
log
@file Makefile was added on branch RELENG_8_4 on 2013-03-28 13:05:20 +0000
@
text
@d1 19
@


1.7.2.2
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/248810
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@a0 19
# $FreeBSD: releng/8.4/sys/modules/if_gre/Makefile 151350 2005-10-14 23:30:17Z yar $

.PATH: ${.CURDIR}/../../net ${.CURDIR}/../../netinet ${.CURDIR}/../../netinet6

KMOD=	if_gre
SRCS=	if_gre.c ip_gre.c opt_inet.h opt_inet6.h opt_atalk.h

.if !defined(KERNBUILDDIR)
opt_inet.h:
	echo "#define INET 1" > ${.TARGET}

opt_inet6.h:
	echo "#define INET6 1" > ${.TARGET}

opt_atalk.h:
	echo "#define NETATALK 1" > ${.TARGET}
.endif

.include <bsd.kmod.mk>
@


1.6
log
@Let modules use the kernel's opt_*.h files if built along with
the kernel by wrapping all targets for fake opt_*.h files in
.if defined(KERNBUILDDIR).  Thus, such fake files won't be
created at all if modules are built with the kernel.

Some modules undergo cleanup like removing unused or unneeded
options or .h files, without which they wouldn't build this way
or the other.

Reviewed by:	ru
Tested by:	no binary changes in modules built alone
Tested on:	i386 sparc64 amd64
@
text
@d1 1
a1 1
# $FreeBSD$
@


1.6.2.1
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/7/sys/modules/if_gre/Makefile 151350 2005-10-14 23:30:17Z yar $
@


1.6.16.1
log
@SVN rev 225736 on 2011-09-23 00:51:37Z by kensmith

Copy head to stable/9 as part of 9.0-RELEASE release cycle.

Approved by:	re (implicit)
@
text
@@


1.6.16.2
log
@## SVN ##
## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/ 242902
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r242902 | dteske | 2012-11-11 23:29:45 +0000 (Sun, 11 Nov 2012) | 10 lines
## SVN ##
## SVN ## Fix a regression introduced by SVN r211417 that saw the breakage of a feature
## SVN ## documented in usr.sbin/sysinstall/help/shortcuts.hlp (reproduced below):
## SVN ##
## SVN ## If /usr/sbin/sysinstall is linked to another filename, say
## SVN ## `/usr/local/bin/configPackages', then the basename will be used
## SVN ## as an implicit command name.
## SVN ##
## SVN ## Reviewed by:	adrian (co-mentor)
## SVN ## Approved by:	adrian (co-mentor)
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@d1 1
a1 1
# $FreeBSD: stable/9/sys/modules/if_gre/Makefile 151350 2005-10-14 23:30:17Z yar $
@


1.6.16.1.4.1
log
@SVN rev 239080 on 2012-08-05 23:54:33Z by kensmith

Copy stable/9 to releng/9.1 as part of the 9.1-RELEASE release process.

Approved by:	re (implicit)
@
text
@@


1.6.16.1.4.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/9.1/sys/modules/if_gre/Makefile 151350 2005-10-14 23:30:17Z yar $
@


1.6.16.1.2.1
log
@SVN rev 227445 on 2011-11-11 04:20:22Z by kensmith

Copy stable/9 to releng/9.0 as part of the FreeBSD 9.0-RELEASE release
cycle.

Approved by:	re (implicit)
@
text
@@


1.6.16.1.2.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/9.0/sys/modules/if_gre/Makefile 151350 2005-10-14 23:30:17Z yar $
@


1.6.14.1
log
@SVN rev 216618 on 2010-12-21 17:10:29Z by kensmith

Copy stable/7 to releng/7.4 in preparation for FreeBSD-7.4 release.

Approved by:	re (implicit)
@
text
@@


1.6.14.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/7.4/sys/modules/if_gre/Makefile 151350 2005-10-14 23:30:17Z yar $
@


1.6.12.1
log
@SVN rev 203736 on 2010-02-10 00:26:20Z by kensmith

Copy stable/7 to releng/7.3 as part of the 7.3-RELEASE process.

Approved by:	re (implicit)
@
text
@@


1.6.10.1
log
@SVN rev 196045 on 2009-08-03 08:13:06Z by kensmith

Copy head to stable/8 as part of 8.0 Release cycle.

Approved by:	re (Implicit)
@
text
@@


1.6.10.2
log
@## SVN ##
## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/ 242909
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r242909 | dim | 2012-11-12 07:47:19 +0000 (Mon, 12 Nov 2012) | 20 lines
## SVN ##
## SVN ## MFC r242625:
## SVN ##
## SVN ## Remove duplicate const specifiers in many drivers (I hope I got all of
## SVN ## them, please let me know if not).  Most of these are of the form:
## SVN ##
## SVN ## static const struct bzzt_type {
## SVN ##       [...list of members...]
## SVN ## } const bzzt_devs[] = {
## SVN ##       [...list of initializers...]
## SVN ## };
## SVN ##
## SVN ## The second const is unnecessary, as arrays cannot be modified anyway,
## SVN ## and if the elements are const, the whole thing is const automatically
## SVN ## (e.g. it is placed in .rodata).
## SVN ##
## SVN ## I have verified this does not change the binary output of a full kernel
## SVN ## build (except for build timestamps embedded in the object files).
## SVN ##
## SVN ## Reviewed by:	yongari, marius
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@d1 1
a1 1
# $FreeBSD: stable/8/sys/modules/if_gre/Makefile 151350 2005-10-14 23:30:17Z yar $
@


1.6.10.1.8.1
log
@SVN rev 232438 on 2012-03-03 06:15:13Z by kensmith

Copy stable/8 to releng/8.3 as part of 8.3-RELEASE release cycle.

Approved by:	re (implicit)
@
text
@@


1.6.10.1.8.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: releng/8.3/sys/modules/if_gre/Makefile 151350 2005-10-14 23:30:17Z yar $
@


1.6.10.1.6.1
log
@SVN rev 216617 on 2010-12-21 17:09:25Z by kensmith

Copy stable/8 to releng/8.2 in preparation for FreeBSD-8.2 release.

Approved by:	re (implicit)
@
text
@@


1.6.10.1.4.1
log
@SVN rev 209145 on 2010-06-14 02:09:06Z by kensmith

Copy stable/8 to releng/8.1 in preparation for 8.1-RC1.

Approved by:	re (implicit)
@
text
@@


1.6.10.1.2.1
log
@SVN rev 198460 on 2009-10-25 01:10:29Z by kensmith

Copy stable/8 to releng/8.0 as part of 8.0-RELEASE release procedure.

Approved by:	re (implicit)
@
text
@@


1.6.8.1
log
@SVN rev 191087 on 2009-04-15 03:14:26Z by kensmith

Create releng/7.2 from stable/7 in preparation for 7.2-RELEASE.

Approved by:	re (implicit)
@
text
@@


1.6.6.1
log
@SVN rev 185281 on 2008-11-25 02:59:29Z by kensmith

Create releng/7.1 in preparation for moving into RC phase of 7.1 release
cycle.

Approved by:	re (implicit)
@
text
@@


1.5
log
@Fix a bug whereby the physical endpoints of a gre(4) tunnel would not
be printed, if the module were loaded into a kernel which had INET6 enabled.

The gre(4) driver does not use INET6, nor is it specified for IPv6. The
tunnel_status() function in ifconfig(8) is somewhat overzealous and assumes
that all tunnel interfaces speak KAME ifioctls.

This fix follows the path of least resistance, by teaching gre(4) about
the two KAME ifioctls concerned.

PR:	bin/56341
@
text
@d8 1
d17 1
@


1.5.10.1
log
@MFC:
Avoid creating (and subsequently using) fake opt_*.h files
when the modules are built with the kernel and hence actual
opt_*.h files are available in ${KERNBUILDDIR}.  Fix a few
small bugs that would prevent this from working.

At last the build options of the modules become consistent
with those of the kernel unless the MODULES_WITH_WORLD way
still is used.

Approved by:	re (kensmith, scottl)
Requested by:	ru
Tested on:	amd64 i386 sparc64
Tested by:	md5
@
text
@a7 1
.if !defined(KERNBUILDDIR)
a15 1
.endif
@


1.5.10.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/6/sys/modules/if_gre/Makefile 155500 2006-02-10 00:38:08Z yar $
@


1.5.10.1.8.1
log
@SVN rev 183531 on 2008-10-02 02:57:24Z by kensmith

Create releng/6.4 from stable/6 in preparation for 6.4-RC1.

Approved by:	re (implicit)
@
text
@@


1.4
log
@Finish driving a stake through the heart of netns and the associated
ifdefs scattered around the place - its dead Jim!

The SMB stuff had stolen AF_NS, make it official.
@
text
@d3 1
a3 1
.PATH: ${.CURDIR}/../../net ${.CURDIR}/../../netinet 
d6 1
a6 1
SRCS=	if_gre.c ip_gre.c opt_inet.h opt_atalk.h
d10 3
@


1.3
log
@Since bpf is no longer an optional component, remove associated ifdef's.

Submitted by:	don't quite remember - the name of the sender disappeared
		with the rest of my inbox. :(
@
text
@d6 1
a6 1
SRCS=	if_gre.c ip_gre.c opt_inet.h opt_ns.h opt_atalk.h
a9 3

opt_ns.h:
	echo "#define NS 1" > ${.TARGET}
@


1.3.2.1
log
@MFC: gre(4) kernel driver and associated changes.
@
text
@@


1.3.2.2
log
@Switch importer
@
text
@d1 1
a1 1
# $FreeBSD: stable/4/sys/modules/if_gre/Makefile 107448 2002-12-01 14:03:11Z sobomax $
@


1.2
log
@Cosmetics: #define NETATALK --> #define NETATALK 1, so that it is in line with
other #define FOO.
@
text
@d6 1
a6 3
SRCS=	if_gre.c ip_gre.c opt_inet.h opt_ns.h opt_atalk.h bpf.h

CLEANFILES+=bpf.h
a15 3

bpf.h:
	echo "#define NBPF 1" > ${.TARGET}
@


1.1
log
@Add if_gre module glue.
@
text
@d17 1
a17 1
	echo "#define NETATALK" > ${.TARGET}
@

