Only compile in IPv6 support if ${USE_INET6} != "no"

MKINET6 is for providing IPv6 infrastructure.
USE_INET6 is for compiling IPv6 support into the programs (needs MKINET6).
This commit is contained in:
lukem 2005-01-10 02:58:58 +00:00
parent 8929bce61d
commit 7157011597
39 changed files with 209 additions and 68 deletions

View File

@ -1,14 +1,18 @@
# $NetBSD: Makefile.inc,v 1.8 2003/07/04 04:52:59 atatat Exp $ # $NetBSD: Makefile.inc,v 1.9 2005/01/10 02:58:58 lukem Exp $
WARNS?= 0 WARNS?= 0
CPPFLAGS+= -DNEWDB -DDNSMAP -DIP_SRCROUTE CPPFLAGS+= -DNEWDB -DDNSMAP -DIP_SRCROUTE
CPPFLAGS+= -DMAP_REGEX -DTCPWRAPPERS -DNETISO CPPFLAGS+= -DMAP_REGEX -DTCPWRAPPERS -DNETISO
CPPFLAGS+= -DNEEDSGETIPNODE -DNETINET6 CPPFLAGS+= -DNEEDSGETIPNODE
CPPFLAGS+= -DMILTER CPPFLAGS+= -DMILTER
CPPFLAGS+= -I. -I${.CURDIR}/../include \ CPPFLAGS+= -I. -I${.CURDIR}/../include \
-I${DIST}/sendmail/sendmail -I${DIST}/sendmail/include -I${DIST}/sendmail/sendmail -I${DIST}/sendmail/include
.if (${USE_INET6} != "no")
CPPFLAGS+= -DNETINET6
.endif
.if (${USE_YP} != "no") .if (${USE_YP} != "no")
CPPFLAGS+= -DNIS CPPFLAGS+= -DNIS
.endif .endif

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile.inc,v 1.66 2004/12/20 18:30:26 christos Exp $ # $NetBSD: Makefile.inc,v 1.67 2005/01/10 02:58:58 lukem Exp $
# @(#)Makefile.inc 8.2 (Berkeley) 9/5/93 # @(#)Makefile.inc 8.2 (Berkeley) 9/5/93
# net sources # net sources
@ -19,9 +19,8 @@ SRCS+= __cmsg_alignbytes.c base64.c ethers.c gethnamaddr.c getifaddrs.c \
SRCS+= hesiod.c SRCS+= hesiod.c
.endif .endif
# IPv6
SRCS+= getaddrinfo.c getnameinfo.c SRCS+= getaddrinfo.c getnameinfo.c
.if (${MKINET6} != "no") .if (${USE_INET6} != "no")
SRCS+= ip6opt.c rthdr.c vars6.c SRCS+= ip6opt.c rthdr.c vars6.c
.endif .endif
SRCS+= if_indextoname.c if_nameindex.c if_nametoindex.c SRCS+= if_indextoname.c if_nameindex.c if_nametoindex.c

View File

@ -1,10 +1,16 @@
# $NetBSD: Makefile,v 1.8 2002/08/19 14:55:15 lukem Exp $ # $NetBSD: Makefile,v 1.9 2005/01/10 02:58:58 lukem Exp $
USE_SHLIBDIR= yes USE_SHLIBDIR= yes
.include <bsd.own.mk>
LIB= ipsec LIB= ipsec
CFLAGS+=-g CFLAGS+=-g
CPPFLAGS+=-DIPSEC_DEBUG -DIPSEC -DINET6 -I${.CURDIR} -I. -DYY_NO_UNPUT CPPFLAGS+=-DIPSEC_DEBUG -DIPSEC -I${.CURDIR} -I. -DYY_NO_UNPUT
.if (${USE_INET6} != "no")
CPPFLAGS+=-DINET6
.endif
SRCS+= ipsec_strerror.c policy_parse.y policy_token.l SRCS+= ipsec_strerror.c policy_parse.y policy_token.l
SRCS+= ipsec_get_policylen.c ipsec_dump_policy.c SRCS+= ipsec_get_policylen.c ipsec_dump_policy.c

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.26 2004/09/27 23:02:53 dyoung Exp $ # $NetBSD: Makefile,v 1.27 2005/01/10 02:58:58 lukem Exp $
.include <bsd.own.mk> .include <bsd.own.mk>
@ -8,7 +8,6 @@ MAN= pcap.3
WARNS?= 1 WARNS?= 1
CPPFLAGS+=-I. -I${.CURDIR} -I${NETBSDSRCDIR}/sys/dist/pf -DYYBISON CPPFLAGS+=-I. -I${.CURDIR} -I${NETBSDSRCDIR}/sys/dist/pf -DYYBISON
CPPFLAGS+=-DINET6
CPPFLAGS+=-DHAVE_MALLOC_H=1 -DHAVE_SYS_IOCCOM_H=1 -DHAVE_SYS_SOCKIO_H=1 CPPFLAGS+=-DHAVE_MALLOC_H=1 -DHAVE_SYS_IOCCOM_H=1 -DHAVE_SYS_SOCKIO_H=1
CPPFLAGS+=-DHAVE_NETINET_IF_ETHER_H CPPFLAGS+=-DHAVE_NETINET_IF_ETHER_H
CPPFLAGS+=-DHAVE_ETHER_HOSTTON=1 -DHAVE_STRERROR=1 -DHAVE_SOCKADDR_SA_LEN=1 CPPFLAGS+=-DHAVE_ETHER_HOSTTON=1 -DHAVE_STRERROR=1 -DHAVE_SOCKADDR_SA_LEN=1
@ -20,6 +19,10 @@ LPREFIX=pcap_
YPREFIX=pcap_ YPREFIX=pcap_
YHEADER=1 YHEADER=1
.if (${USE_INET6} != "no")
CPPFLAGS+=-DINET6
.endif
SRCS= scanner.l savefile.c pcap.c pcap-bpf.c optimize.c nametoaddr.c \ SRCS= scanner.l savefile.c pcap.c pcap-bpf.c optimize.c nametoaddr.c \
inet.c grammar.y gencode.c fad-getad.c etherent.c bpf_image.c \ inet.c grammar.y gencode.c fad-getad.c etherent.c bpf_image.c \
bpf_dump.c bpf_dump.c

View File

@ -1,11 +1,14 @@
# $NetBSD: Makefile,v 1.10 2004/05/21 03:33:44 christos Exp $ # $NetBSD: Makefile,v 1.11 2005/01/10 02:58:58 lukem Exp $
# from: @(#)Makefile 5.1 (Berkeley) 6/5/90 # from: @(#)Makefile 5.1 (Berkeley) 6/5/90
.include <bsd.own.mk> .include <bsd.own.mk>
LIB=resolv LIB=resolv
CPPFLAGS+=-DLIBC_SCCS -I${NETBSDSRCDIR}/lib/libc/include -D_LIBC CPPFLAGS+=-DLIBC_SCCS -I${NETBSDSRCDIR}/lib/libc/include -D_LIBC
.if (${USE_INET6} != "no")
CPPFLAGS+=-DINET6 CPPFLAGS+=-DINET6
.endif
.PATH: ${NETBSDSRCDIR}/lib/libc/net ${NETBSDSRCDIR}/lib/libc/resolv .PATH: ${NETBSDSRCDIR}/lib/libc/net ${NETBSDSRCDIR}/lib/libc/resolv

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile.cflags,v 1.7 2002/05/24 05:38:20 itojun Exp $ # $NetBSD: Makefile.cflags,v 1.8 2005/01/10 02:58:58 lukem Exp $
.include <bsd.own.mk> .include <bsd.own.mk>
@ -18,5 +18,6 @@ CPPFLAGS+=-DNETGROUP
# tcpdmatch) that include this file. # tcpdmatch) that include this file.
#CPPFLAGS+=-DPARANOID #CPPFLAGS+=-DPARANOID
# IPv6 .if (${USE_INET6} != "no")
CPPFLAGS+=-DINET6 CPPFLAGS+=-DINET6
.endif

View File

@ -1,9 +1,13 @@
# $NetBSD: Makefile,v 1.8 1999/07/02 06:00:06 itojun Exp $ # $NetBSD: Makefile,v 1.9 2005/01/10 02:58:58 lukem Exp $
# from: @(#)Makefile 8.1 (Berkeley) 6/4/93 # from: @(#)Makefile 8.1 (Berkeley) 6/4/93
.include <bsd.own.mk>
PROG= fingerd PROG= fingerd
MAN= fingerd.8 MAN= fingerd.8
.if (${USE_INET6} != "no")
CPPFLAGS+=-DINET6 CPPFLAGS+=-DINET6
.endif
.include <bsd.prog.mk> .include <bsd.prog.mk>

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.51 2003/07/23 08:01:27 itojun Exp $ # $NetBSD: Makefile,v 1.52 2005/01/10 02:58:58 lukem Exp $
# @(#)Makefile 8.2 (Berkeley) 4/4/94 # @(#)Makefile 8.2 (Berkeley) 4/4/94
.include <bsd.own.mk> .include <bsd.own.mk>
@ -15,8 +15,9 @@ MLINKS= ftpusers.5 ftpchroot.5
SRCS+= ls.c cmp.c print.c stat_flags.c util.c SRCS+= ls.c cmp.c print.c stat_flags.c util.c
.PATH: ${NETBSDSRCDIR}/bin/ls .PATH: ${NETBSDSRCDIR}/bin/ls
.if (${USE_INET6} != "no")
CPPFLAGS+=-DINET6 CPPFLAGS+=-DINET6
.include <bsd.own.mk> .endif
WARNS=2 WARNS=2

View File

@ -1,12 +1,18 @@
# $NetBSD: Makefile,v 1.10 2004/11/15 20:45:52 christos Exp $ # $NetBSD: Makefile,v 1.11 2005/01/10 02:58:58 lukem Exp $
# from: @(#)Makefile 8.1 (Berkeley) 6/4/93 # from: @(#)Makefile 8.1 (Berkeley) 6/4/93
.include <bsd.own.mk>
WARNS= 3 WARNS= 3
PROG= rlogind PROG= rlogind
MAN= rlogind.8 MAN= rlogind.8
DPADD= ${LIBUTIL} DPADD= ${LIBUTIL}
LDADD= -lutil LDADD= -lutil
CPPFLAGS+= -DINET6 -DSUPPORT_UTMP -DSUPPORT_UTMPX CPPFLAGS+= -DSUPPORT_UTMP -DSUPPORT_UTMPX
.if (${USE_INET6} != "no")
CPPFLAGS+= -DINET6
.endif
.include <bsd.prog.mk> .include <bsd.prog.mk>

View File

@ -1,6 +1,8 @@
# $NetBSD: Makefile,v 1.13 2002/11/30 21:56:34 lukem Exp $ # $NetBSD: Makefile,v 1.14 2005/01/10 02:58:58 lukem Exp $
# from: @(#)Makefile 8.1 (Berkeley) 6/4/93 # from: @(#)Makefile 8.1 (Berkeley) 6/4/93
.include <bsd.own.mk>
PROG= rshd PROG= rshd
MAN= rshd.8 MAN= rshd.8
@ -9,6 +11,8 @@ LDADD+= -lutil
CPPFLAGS+=-DLOGIN_CAP CPPFLAGS+=-DLOGIN_CAP
.if (${USE_INET6} != "no")
CPPFLAGS+=-DINET6 CPPFLAGS+=-DINET6
.endif
.include <bsd.prog.mk> .include <bsd.prog.mk>

View File

@ -1,7 +1,14 @@
# $NetBSD: Makefile,v 1.1 2004/11/19 21:38:25 christos Exp $ # $NetBSD: Makefile,v 1.2 2005/01/10 02:58:58 lukem Exp $
NOMAN= # defined
.include <bsd.own.mk>
PROG= sockaddr_snprintf PROG= sockaddr_snprintf
NOMAN= # defined
.if (${USE_INET6} != "no")
CPPFLAGS+= -DINET6
.endif
regress: ${PROG} regress: ${PROG}
./${PROG} ./${PROG}

View File

@ -1,4 +1,4 @@
/* $NetBSD: sockaddr_snprintf.c,v 1.1 2004/11/19 21:38:25 christos Exp $ */ /* $NetBSD: sockaddr_snprintf.c,v 1.2 2005/01/10 02:58:58 lukem Exp $ */
/*- /*-
* Copyright (c) 2004 The NetBSD Foundation, Inc. * Copyright (c) 2004 The NetBSD Foundation, Inc.
@ -67,6 +67,7 @@ in(void)
errx(1, "res='%s' != '%s'", buf, res); errx(1, "res='%s' != '%s'", buf, res);
} }
#ifdef INET6
static void static void
in6(void) in6(void)
{ {
@ -87,6 +88,7 @@ in6(void)
if (strcmp(res = "24 28 80 ff01::1", buf) != 0) if (strcmp(res = "24 28 80 ff01::1", buf) != 0)
errx(1, "res='%s' != '%s'", buf, res); errx(1, "res='%s' != '%s'", buf, res);
} }
#endif /* INET6 */
static void static void
un(void) un(void)
@ -158,7 +160,9 @@ int
main(int argc, char *argv[]) main(int argc, char *argv[])
{ {
in(); in();
#ifdef INET6
in6(); in6();
#endif
un(); un();
at(); at();
dl(); dl();

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.11 2004/08/20 11:01:03 tron Exp $ # $NetBSD: Makefile,v 1.12 2005/01/10 02:58:59 lukem Exp $
.include <bsd.own.mk> .include <bsd.own.mk>
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib" .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@ -22,6 +22,10 @@ LISTS+= ${.CURDIR}/list.${f}
.endif .endif
.endfor .endfor
.if ${USE_INET6} != "no"
LISTS+= lists.inet6
.endif
.if (${OBJECT_FMT} == "ELF") .if (${OBJECT_FMT} == "ELF")
PARSELISTENV+= LDD_CMD=ldd_elf PARSELISTENV+= LDD_CMD=ldd_elf
.else .else

View File

@ -1,4 +1,4 @@
# $NetBSD: list,v 1.12 2004/08/20 11:01:03 tron Exp $ # $NetBSD: list,v 1.13 2005/01/10 02:58:59 lukem Exp $
SRCDIRS bin SRCDIRS bin
@ -89,7 +89,6 @@ PROG newfs mount_mfs
PROG newfs_lfs PROG newfs_lfs
PROG newfs_msdos PROG newfs_msdos
PROG ping PROG ping
PROG ping6
PROG pppoectl ipppctl PROG pppoectl ipppctl
PROG raidctl PROG raidctl
PROG rcorder PROG rcorder
@ -98,7 +97,6 @@ PROG restore rrestore
PROG rndctl PROG rndctl
PROG route PROG route
PROG routed PROG routed
PROG rtsol
PROG savecore PROG savecore
PROG scsictl PROG scsictl
PROG setkey PROG setkey

4
rescue/list.inet6 Normal file
View File

@ -0,0 +1,4 @@
# $NetBSD: list.inet6,v 1.1 2005/01/10 02:58:59 lukem Exp $
PROG ping6
PROG rtsol

View File

@ -1,10 +1,14 @@
# $NetBSD: Makefile,v 1.15 2004/10/28 20:10:29 dsl Exp $ # $NetBSD: Makefile,v 1.16 2005/01/10 02:58:59 lukem Exp $
# @(#)Makefile 8.1 (Berkeley) 6/5/93 # @(#)Makefile 8.1 (Berkeley) 6/5/93
.include <bsd.own.mk>
PROG= ifconfig PROG= ifconfig
MAN= ifconfig.8 MAN= ifconfig.8
.if (${USE_INET6} != "no")
CPPFLAGS+=-DINET6 CPPFLAGS+=-DINET6
.endif
# KAME scope id hack # KAME scope id hack
CPPFLAGS+=-DKAME_SCOPEID CPPFLAGS+=-DKAME_SCOPEID

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.14 2003/04/11 17:39:09 christos Exp $ # $NetBSD: Makefile,v 1.15 2005/01/10 02:58:59 lukem Exp $
# @(#)Makefile 8.2 (Berkeley) 3/27/94 # @(#)Makefile 8.2 (Berkeley) 3/27/94
.include <bsd.own.mk> .include <bsd.own.mk>
@ -7,7 +7,11 @@ PROG= mount_nfs
SRCS= mount_nfs.c SRCS= mount_nfs.c
MAN= mount_nfs.8 MAN= mount_nfs.8
CPPFLAGS+= -DNFS -DINET6 CPPFLAGS+= -DNFS
.if (${USE_INET6} != "no")
CPPFLAGS+= -DINET6
.endif
.if defined(notdef) # XXX no kernel kerb NFS support! .if defined(notdef) # XXX no kernel kerb NFS support!
.if defined(KERBEROS) .if defined(KERBEROS)

View File

@ -1,11 +1,15 @@
# $NetBSD: Makefile,v 1.21 2003/10/26 07:25:35 lukem Exp $ # $NetBSD: Makefile,v 1.22 2005/01/10 02:58:59 lukem Exp $
# @(#)Makefile 8.1 (Berkeley) 6/5/93 # @(#)Makefile 8.1 (Berkeley) 6/5/93
.include <bsd.own.mk>
PROG= route PROG= route
MAN= route.8 MAN= route.8
SRCS= route.c show.c keywords.c ccitt_addr.c SRCS= route.c show.c keywords.c ccitt_addr.c
.if (${USE_INET6} != "no")
CPPFLAGS+=-DINET6 CPPFLAGS+=-DINET6
.endif
# The Makefile over in ../../distrib/utils/x_route # The Makefile over in ../../distrib/utils/x_route
# would like keywords.[ch] to always exist here, so # would like keywords.[ch] to always exist here, so

View File

@ -1,4 +1,4 @@
# $NetBSD: bsd.x11.mk,v 1.42 2004/12/02 16:33:47 fredb Exp $ # $NetBSD: bsd.x11.mk,v 1.43 2005/01/10 02:58:59 lukem Exp $
.include <bsd.init.mk> .include <bsd.init.mk>
@ -18,7 +18,11 @@ X11FLAGS.THREADLIB= ${X11FLAGS.THREADS} -DUSE_NBSD_THREADLIB
# CONNECTION_FLAGS # CONNECTION_FLAGS
X11FLAGS.CONNECTION= -DTCPCONN -DUNIXCONN -DHAS_STICKY_DIR_BIT \ X11FLAGS.CONNECTION= -DTCPCONN -DUNIXCONN -DHAS_STICKY_DIR_BIT \
-DHAS_FCHOWN -DIPv6 -DHAS_FCHOWN
.if (${USE_INET6} != "no")
X11FLAGS.CONNECTION+= -DIPv6
.endif
# EXT_DEFINES # EXT_DEFINES
X11FLAGS.EXTENSION= -DMITMISC -DXTEST -DXTRAP -DXSYNC -DXCMISC -DXRECORD \ X11FLAGS.EXTENSION= -DMITMISC -DXTEST -DXTRAP -DXSYNC -DXCMISC -DXRECORD \

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.9 2002/09/18 14:00:37 lukem Exp $ # $NetBSD: Makefile,v 1.10 2005/01/10 02:58:59 lukem Exp $
# from: @(#)Makefile 8.1 (Berkeley) 6/6/93 # from: @(#)Makefile 8.1 (Berkeley) 6/6/93
.include <bsd.own.mk> .include <bsd.own.mk>
@ -7,6 +7,10 @@ PROG= finger
SRCS= finger.c lprint.c net.c sprint.c util.c utmpentry.c SRCS= finger.c lprint.c net.c sprint.c util.c utmpentry.c
.PATH.c: ${NETBSDSRCDIR}/usr.bin/who .PATH.c: ${NETBSDSRCDIR}/usr.bin/who
CPPFLAGS+=-I${NETBSDSRCDIR}/usr.bin/who -DSUPPORT_UTMPX -DSUPPORT_UTMP -DINET6 CPPFLAGS+=-I${NETBSDSRCDIR}/usr.bin/who -DSUPPORT_UTMPX -DSUPPORT_UTMP
.if (${USE_INET6} != "no")
CPPFLAGS+=-DINET6
.endif
.include <bsd.prog.mk> .include <bsd.prog.mk>

View File

@ -1,6 +1,8 @@
# $NetBSD: Makefile,v 1.16 2004/12/12 22:41:03 christos Exp $ # $NetBSD: Makefile,v 1.17 2005/01/10 02:58:59 lukem Exp $
# from: @(#)Makefile 8.1 (Berkeley) 6/6/93 # from: @(#)Makefile 8.1 (Berkeley) 6/6/93
.include <bsd.own.mk>
PROG= fstat PROG= fstat
SRCS= fstat.c isofs.c ntfs.c ptyfs.c SRCS= fstat.c isofs.c ntfs.c ptyfs.c
DPADD= ${LIBKVM} DPADD= ${LIBKVM}
@ -9,6 +11,9 @@ BINGRP= kmem
BINMODE=2555 BINMODE=2555
CPPFLAGS+= -I${NETBSDSRCDIR}/sys CPPFLAGS+= -I${NETBSDSRCDIR}/sys
.if (${USE_INET6} != "no")
CPPFLAGS+=-DINET6 CPPFLAGS+=-DINET6
.endif
.include <bsd.prog.mk> .include <bsd.prog.mk>

View File

@ -1,6 +1,8 @@
# $NetBSD: Makefile,v 1.27 2004/06/06 01:37:41 christos Exp $ # $NetBSD: Makefile,v 1.28 2005/01/10 02:58:59 lukem Exp $
# from: @(#)Makefile 8.2 (Berkeley) 4/3/94 # from: @(#)Makefile 8.2 (Berkeley) 4/3/94
.include <bsd.own.mk>
PROG= ftp PROG= ftp
SRCS= cmds.c cmdtab.c complete.c domacro.c fetch.c ftp.c main.c \ SRCS= cmds.c cmdtab.c complete.c domacro.c fetch.c ftp.c main.c \
progressbar.c ruserpass.c util.c progressbar.c ruserpass.c util.c
@ -16,7 +18,7 @@ LDADD+= -ledit -ltermcap
DPADD+= ${LIBEDIT} ${LIBTERMCAP} DPADD+= ${LIBEDIT} ${LIBTERMCAP}
.endif .endif
.if !defined(SMALLPROG) || defined(SMALLPROG_INET6) .if (!defined(SMALLPROG) || defined(SMALLPROG_INET6)) && (${USE_INET6} != "no")
CPPFLAGS+= -DINET6 CPPFLAGS+= -DINET6
.endif .endif

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.23 2004/05/07 00:55:15 jonathan Exp $ # $NetBSD: Makefile,v 1.24 2005/01/10 02:58:59 lukem Exp $
# from: @(#)Makefile 8.1 (Berkeley) 6/12/93 # from: @(#)Makefile 8.1 (Berkeley) 6/12/93
.include <bsd.own.mk> .include <bsd.own.mk>
@ -12,6 +12,10 @@ BINGRP= kmem
BINMODE=2555 BINMODE=2555
LDADD= -lkvm LDADD= -lkvm
DPADD= ${LIBKVM} DPADD= ${LIBKVM}
CPPFLAGS+= -DINET6 -DIPSEC CPPFLAGS+= -DIPSEC
.if (${USE_INET6} != "no")
CPPFLAGS+= -DINET6
.endif
.include <bsd.prog.mk> .include <bsd.prog.mk>

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.7 2002/09/18 14:00:40 lukem Exp $ # $NetBSD: Makefile,v 1.8 2005/01/10 02:58:59 lukem Exp $
# from: @(#)Makefile 5.2 (Berkeley) 5/11/90 # from: @(#)Makefile 5.2 (Berkeley) 5/11/90
.include <bsd.own.mk> .include <bsd.own.mk>
@ -11,7 +11,11 @@ LIBCDIR= ${NETBSDSRCDIR}/lib/libc
LIBCRPCDIR= ${LIBCDIR}/rpc LIBCRPCDIR= ${LIBCDIR}/rpc
LIBCINCLUDE= ${LIBCDIR}/include LIBCINCLUDE= ${LIBCDIR}/include
CPPFLAGS+= -I${LIBCRPCDIR} -I${LIBCINCLUDE} -DPORTMAP -DINET6 CPPFLAGS+= -I${LIBCRPCDIR} -I${LIBCINCLUDE} -DPORTMAP
.if (${USE_INET6} != "no")
CPPFLAGS+= -DINET6
.endif
.PATH: ${LIBCRPCDIR} .PATH: ${LIBCRPCDIR}

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.27 2002/09/18 14:00:41 lukem Exp $ # $NetBSD: Makefile,v 1.28 2005/01/10 02:58:59 lukem Exp $
# @(#)Makefile 8.1 (Berkeley) 6/6/93 # @(#)Makefile 8.1 (Berkeley) 6/6/93
.include <bsd.own.mk> .include <bsd.own.mk>
@ -20,7 +20,12 @@ BINMODE=2555
LINKS= ${BINDIR}/systat ${BINDIR}/sysstat LINKS= ${BINDIR}/systat ${BINDIR}/sysstat
MLINKS+=systat.1 sysstat.1 MLINKS+=systat.1 sysstat.1
CPPFLAGS+=-DINET6 -DIPSEC CPPFLAGS+=-DIPSEC
SRCS+= ip6.c ipsec.c SRCS+= ipsec.c
.if (${USE_INET6} != "no")
CPPFLAGS+=-DINET6
SRCS+= ip6.c
.endif
.include <bsd.prog.mk> .include <bsd.prog.mk>

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.34 2004/12/22 01:25:05 lha Exp $ # $NetBSD: Makefile,v 1.35 2005/01/10 02:58:59 lukem Exp $
# #
# Copyright (c) 1990 The Regents of the University of California. # Copyright (c) 1990 The Regents of the University of California.
# All rights reserved. # All rights reserved.
@ -52,7 +52,9 @@ CPPFLAGS+=-DIPSEC
LDADD+= -lipsec LDADD+= -lipsec
DPADD+= ${LIBIPSEC} DPADD+= ${LIBIPSEC}
.if (${USE_INET6} != "no")
CPPFLAGS+=-DINET6 CPPFLAGS+=-DINET6
.endif
LIBTELNETDIR!= cd ${.CURDIR}/../../lib/libtelnet; ${PRINTOBJDIR} LIBTELNETDIR!= cd ${.CURDIR}/../../lib/libtelnet; ${PRINTOBJDIR}

View File

@ -1,7 +1,9 @@
# $NetBSD: Makefile,v 1.6 2004/05/23 02:24:51 lukem Exp $ # $NetBSD: Makefile,v 1.7 2005/01/10 02:58:59 lukem Exp $
MKPRIVATELIB= yes MKPRIVATELIB= yes
.include <bsd.own.mk>
#WARNS= 2 #WARNS= 2
LIB= altq LIB= altq
@ -9,6 +11,10 @@ SRCS= parser.c qop.c qop_blue.c qop_cbq.c qop_cdnr.c qop_conf.c \
qop_dummy.c qop_errlist.c qop_fifoq.c qop_hfsc.c qop_priq.c \ qop_dummy.c qop_errlist.c qop_fifoq.c qop_hfsc.c qop_priq.c \
qop_red.c qop_rio.c qop_wfq.c quip_server.c qop_red.c qop_rio.c qop_wfq.c quip_server.c
CPPFLAGS+= -DALTQ -DINET6 CPPFLAGS+= -DALTQ
.if (${USE_INET6} != "no")
CPPFLAGS+= -DINET6
.endif
.include <bsd.lib.mk> .include <bsd.lib.mk>

View File

@ -1,17 +1,23 @@
# from: @(#)Makefile 8.1 (Berkeley) 6/6/93 # from: @(#)Makefile 8.1 (Berkeley) 6/6/93
# $NetBSD: Makefile,v 1.19 2001/11/19 03:18:28 itojun Exp $ # $NetBSD: Makefile,v 1.20 2005/01/10 02:58:59 lukem Exp $
.include <bsd.own.mk>
PROG= inetd PROG= inetd
SRCS= inetd.c SRCS= inetd.c
MAN= inetd.8 MAN= inetd.8
MLINKS= inetd.8 inetd.conf.5 MLINKS= inetd.8 inetd.conf.5
CPPFLAGS+=-DLIBWRAP -DINET6 CPPFLAGS+=-DLIBWRAP
# Use LIBWRAP_INTERNAL for libwrap checking of inetd's `internal' services. # Use LIBWRAP_INTERNAL for libwrap checking of inetd's `internal' services.
#CPPFLAGS+=-DLIBWRAP_INTERNAL #CPPFLAGS+=-DLIBWRAP_INTERNAL
LDADD+= -lwrap -lutil LDADD+= -lwrap -lutil
DPADD+= ${LIBWRAP} ${LIBUTIL} DPADD+= ${LIBWRAP} ${LIBUTIL}
.if (${USE_INET6} != "no")
CPPFLAGS+=-DINET6
.endif
CPPFLAGS+=-DIPSEC CPPFLAGS+=-DIPSEC
SRCS+= ipsec.c SRCS+= ipsec.c
LDADD+= -lipsec LDADD+= -lipsec

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile.inc,v 1.14 2004/10/01 15:26:35 christos Exp $ # $NetBSD: Makefile.inc,v 1.15 2005/01/10 02:58:59 lukem Exp $
.include <bsd.own.mk> .include <bsd.own.mk>
@ -9,6 +9,10 @@ CPPFLAGS+= -I${NETBSDSRCDIR}/sys/dist/ipf
CPPFLAGS+= -I${NETBSDSRCDIR}/sys/dist/ipf/netinet CPPFLAGS+= -I${NETBSDSRCDIR}/sys/dist/ipf/netinet
CPPFLAGS+= -DSTATETOP -D__UIO_EXPOSE CPPFLAGS+= -DSTATETOP -D__UIO_EXPOSE
.if (${USE_INET6} == "no")
CPPFLAGS+= -DNOINET6
.endif
IPFOBJDIR!= cd $(.CURDIR)/../libipf && ${PRINTOBJDIR} IPFOBJDIR!= cd $(.CURDIR)/../libipf && ${PRINTOBJDIR}
DPADD+= ${IPFOBJDIR}/libipf.a ${LIBKVM} DPADD+= ${IPFOBJDIR}/libipf.a ${LIBKVM}
LDADD+= -L${IPFOBJDIR} -lipf -lkvm LDADD+= -L${IPFOBJDIR} -lipf -lkvm

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.17 2003/10/19 05:51:44 lukem Exp $ # $NetBSD: Makefile,v 1.18 2005/01/10 02:58:59 lukem Exp $
# @(#)Makefile 8.1 (Berkeley) 6/6/93 # @(#)Makefile 8.1 (Berkeley) 6/6/93
.include <bsd.own.mk> .include <bsd.own.mk>
@ -11,7 +11,9 @@ CPPFLAGS+=-DLIBWRAP
LDADD+= -lwrap LDADD+= -lwrap
DPADD+= ${LIBWRAP} DPADD+= ${LIBWRAP}
.if (${USE_INET6} != "no")
CPPFLAGS.rcmd.c= -DINET6 CPPFLAGS.rcmd.c= -DINET6
.endif
.PATH: ${NETBSDSRCDIR}/lib/libc/net .PATH: ${NETBSDSRCDIR}/lib/libc/net

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.32 2004/07/21 07:00:27 mycroft Exp $ # $NetBSD: Makefile,v 1.33 2005/01/10 02:58:59 lukem Exp $
.include <bsd.own.mk> .include <bsd.own.mk>
@ -19,6 +19,9 @@ DPADD= ${LIBPCAP} ${LIBCRYPT} ${LIBUTIL}
CPPFLAGS+= -I. -DHAVE_PATHS_H -DSUPPORT_UTMP -DSUPPORT_UTMPX -DPLUGIN CPPFLAGS+= -I. -DHAVE_PATHS_H -DSUPPORT_UTMP -DSUPPORT_UTMPX -DPLUGIN
CPPFLAGS+= -I${PCAPDIR} -DPPP_FILTER CPPFLAGS+= -I${PCAPDIR} -DPPP_FILTER
CPPFLAGS+= -DCBCP_SUPPORT -DCHAPMS -DUSE_CRYPT -DMSLANMAN CPPFLAGS+= -DCBCP_SUPPORT -DCHAPMS -DUSE_CRYPT -DMSLANMAN
.if (${USE_INET6} != "no")
CPPFLAGS+= -DINET6 CPPFLAGS+= -DINET6
.endif
.include <bsd.prog.mk> .include <bsd.prog.mk>

View File

@ -1,7 +1,12 @@
# $NetBSD: Makefile,v 1.1 1999/07/11 17:35:07 itojun Exp $ # $NetBSD: Makefile,v 1.2 2005/01/10 02:58:59 lukem Exp $
.include <bsd.own.mk>
PROG= pvcsif PROG= pvcsif
MAN= pvcsif.8 MAN= pvcsif.8
.if (${USE_INET6} != "no")
CPPFLAGS+=-DINET6 CPPFLAGS+=-DINET6
.endif
.include <bsd.prog.mk> .include <bsd.prog.mk>

View File

@ -1,7 +1,12 @@
# $NetBSD: Makefile,v 1.1 1999/07/11 17:35:08 itojun Exp $ # $NetBSD: Makefile,v 1.2 2005/01/10 02:58:59 lukem Exp $
.include <bsd.own.mk>
PROG= pvctxctl PROG= pvctxctl
MAN= pvctxctl.8 MAN= pvctxctl.8
.if (${USE_INET6} != "no")
CPPFLAGS+=-DINET6 CPPFLAGS+=-DINET6
.endif
.include <bsd.prog.mk> .include <bsd.prog.mk>

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.5 2004/05/23 02:24:52 lukem Exp $ # $NetBSD: Makefile,v 1.6 2005/01/10 02:58:59 lukem Exp $
MKPRIVATELIB= yes MKPRIVATELIB= yes
@ -6,7 +6,7 @@ MKPRIVATELIB= yes
LIB= pfkey LIB= pfkey
#CFLAGS+=-g -Wall -Werror #CFLAGS+=-g -Wall -Werror
CPPFLAGS+=-DIPSEC_DEBUG -DIPSEC -DINET6 -I. -DYY_NO_UNPUT -I${LIBPFKEYSRCDIR} CPPFLAGS+=-DIPSEC_DEBUG -DIPSEC -I. -DYY_NO_UNPUT -I${LIBPFKEYSRCDIR}
SRCS= pfkey.c pfkey_dump.c ipsec_strerror.c SRCS= pfkey.c pfkey_dump.c ipsec_strerror.c
SRCS+= key_debug.c SRCS+= key_debug.c
@ -14,6 +14,10 @@ SRCS+= key_debug.c
#LPREFIX=__libyy #LPREFIX=__libyy
#YHEADER=1 #YHEADER=1
.if (${USE_INET6} != "no")
CPPFLAGS+=-DINET6
.endif
#MAN= ipsec_set_policy.3 ipsec_strerror.3 #MAN= ipsec_set_policy.3 ipsec_strerror.3
#MLINKS+=ipsec_set_policy.3 ipsec_get_policylen.3 \ #MLINKS+=ipsec_set_policy.3 ipsec_get_policylen.3 \
# ipsec_set_policy.3 ipsec_dump_policy.3 # ipsec_set_policy.3 ipsec_dump_policy.3

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.21 2004/08/05 17:13:54 junyoung Exp $ # $NetBSD: Makefile,v 1.22 2005/01/10 02:58:59 lukem Exp $
.include <bsd.own.mk> .include <bsd.own.mk>
@ -37,10 +37,14 @@ LDADD+= ${LIBCRYPTO_RC5}
LDADD+= -lipsec -ly -ll -lcrypto LDADD+= -lipsec -ly -ll -lcrypto
DPADD+= ${LIBIPSEC} ${LIBY} ${LIBL} ${LIBCRYPTO} DPADD+= ${LIBIPSEC} ${LIBY} ${LIBL} ${LIBCRYPTO}
.if (${USE_INET6} != "no")
CPPFLAGS+=-DINET6
.endif
#CFLAGS+=-g #CFLAGS+=-g
CFLAGS+=-fno-strict-aliasing CFLAGS+=-fno-strict-aliasing
OPTFLAG+=-DHAVE_PFKEYV2 -DYIPS_DEBUG OPTFLAG+=-DHAVE_PFKEYV2 -DYIPS_DEBUG
CPPFLAGS+=-DINET6 -DHAVE_FUNCTION_MACRO=1 -DHAVE_LIBCRYPTO=1 -DHAVE_LIBL=1 -DHAVE_LIBY=1 -DENABLE_IPV6=1 -DADVAPI=1 -DHAVE_GETADDRINFO=1 -DHAVE_GETNAMEINFO=1 -DSTDC_HEADERS=1 -DHAVE_SYS_WAIT_H=1 -DHAVE_LIMITS_H=1 -DHAVE_SYS_TIME_H=1 -DHAVE_UNISTD_H=1 -DHAVE_STDARG_H=1 -DHAVE_VARARGS_H=1 -DTIME_WITH_SYS_TIME=1 -DRETSIGTYPE=void -DHAVE_VPRINTF=1 -DHAVE_GETTIMEOFDAY=1 -DHAVE_SELECT=1 -DHAVE_SOCKET=1 -DHAVE_STRERROR=1 -DHAVE_STRTOL=1 -DHAVE_STRTOUL=1 -DHAVE_STRDUP=1 -DHAVE_GETIFADDRS=1 -DHAVE_ARC4RANDOM=1 $(OPTFLAG) -DIPSEC -I. -I${RACOONSRCDIR} -DSYSCONFDIR=\"$(ETCDIR)\" CPPFLAGS+=-DHAVE_FUNCTION_MACRO=1 -DHAVE_LIBCRYPTO=1 -DHAVE_LIBL=1 -DHAVE_LIBY=1 -DENABLE_IPV6=1 -DADVAPI=1 -DHAVE_GETADDRINFO=1 -DHAVE_GETNAMEINFO=1 -DSTDC_HEADERS=1 -DHAVE_SYS_WAIT_H=1 -DHAVE_LIMITS_H=1 -DHAVE_SYS_TIME_H=1 -DHAVE_UNISTD_H=1 -DHAVE_STDARG_H=1 -DHAVE_VARARGS_H=1 -DTIME_WITH_SYS_TIME=1 -DRETSIGTYPE=void -DHAVE_VPRINTF=1 -DHAVE_GETTIMEOFDAY=1 -DHAVE_SELECT=1 -DHAVE_SOCKET=1 -DHAVE_STRERROR=1 -DHAVE_STRTOL=1 -DHAVE_STRTOUL=1 -DHAVE_STRDUP=1 -DHAVE_GETIFADDRS=1 -DHAVE_ARC4RANDOM=1 $(OPTFLAG) -DIPSEC -I. -I${RACOONSRCDIR} -DSYSCONFDIR=\"$(ETCDIR)\"
CPPFLAGS+=-DHAVE_OPENSSL_OPENSSLV_H=1 CPPFLAGS+=-DHAVE_OPENSSL_OPENSSLV_H=1
CPPFLAGS+=-DYY_NO_UNPUT CPPFLAGS+=-DYY_NO_UNPUT
CPPFLAGS+=-I${LIBPFKEYSRCDIR} CPPFLAGS+=-I${LIBPFKEYSRCDIR}

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.5 2003/12/07 21:57:22 matt Exp $ # $NetBSD: Makefile,v 1.6 2005/01/10 02:58:59 lukem Exp $
.include <bsd.own.mk> .include <bsd.own.mk>
@ -13,7 +13,8 @@ LIBCRPCDIR= ${LIBCDIR}/rpc
LIBCINCLUDE= ${LIBCDIR}/include LIBCINCLUDE= ${LIBCDIR}/include
CPPFLAGS+= -I${LIBCRPCDIR} -I${LIBCINCLUDE} -DPORTMAP -DLIBWRAP CPPFLAGS+= -I${LIBCRPCDIR} -I${LIBCINCLUDE} -DPORTMAP -DLIBWRAP
.if (${MKINET6} != "no")
.if (${USE_INET6} != "no")
CPPFLAGS+= -DINET6 CPPFLAGS+= -DINET6
.endif .endif

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.18 2002/09/18 03:54:37 lukem Exp $ # $NetBSD: Makefile,v 1.19 2005/01/10 02:58:59 lukem Exp $
# from: @(#)Makefile 8.1 (Berkeley) 6/6/93 # from: @(#)Makefile 8.1 (Berkeley) 6/6/93
.include <bsd.own.mk> .include <bsd.own.mk>
@ -10,10 +10,13 @@ DPADD+=${LIBUTIL}
LDADD+=-lutil LDADD+=-lutil
#make symlink to old socket location for transitional period #make symlink to old socket location for transitional period
SYMLINKS= /var/run/log /dev/log SYMLINKS= /var/run/log /dev/log
CPPFLAGS+=-DINET6
.PATH.c: ${NETBSDSRCDIR}/usr.bin/who .PATH.c: ${NETBSDSRCDIR}/usr.bin/who
CPPFLAGS+=-I${NETBSDSRCDIR}/usr.bin/who -DSUPPORT_UTMPX -DSUPPORT_UTMP CPPFLAGS+=-I${NETBSDSRCDIR}/usr.bin/who -DSUPPORT_UTMPX -DSUPPORT_UTMP
.if (${USE_INET6} != "no")
CPPFLAGS+=-DINET6
.endif
CPPFLAGS+=-DLIBWRAP CPPFLAGS+=-DLIBWRAP
LDADD+= -lwrap LDADD+= -lwrap
DPADD+= ${LIBWRAP} DPADD+= ${LIBWRAP}

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.37 2004/09/30 06:40:19 dyoung Exp $ # $NetBSD: Makefile,v 1.38 2005/01/10 02:58:59 lukem Exp $
.include <bsd.own.mk> .include <bsd.own.mk>
@ -29,9 +29,6 @@ SRCS= addrtoname.c cpack.c gmpls.c gmt2local.c machdep.c oui.c parsenfsfh.c \
print-udp.c print-vjc.c print-vrrp.c print-wb.c print-zephyr.c \ print-udp.c print-vjc.c print-vrrp.c print-wb.c print-zephyr.c \
setsignal.c smbutil.c tcpdump.c util.c setsignal.c smbutil.c tcpdump.c util.c
SRCS+= print-ip6.c print-ip6opts.c print-ripng.c print-icmp6.c print-frag6.c \
print-rt6.c print-ospf6.c print-dhcp6.c
SRCS+= bpf_dump.c SRCS+= bpf_dump.c
SRCS+= version.c SRCS+= version.c
@ -52,11 +49,11 @@ AWKS= atime.awk packetdat.awk stime.awk send-ack.awk
CPPFLAGS+= \ CPPFLAGS+= \
-DHAVE___ATTRIBUTE__=1 -DHAVE_FCNTL_H=1 -DHAVE_RPC_RPCENT_H=1 \ -DHAVE___ATTRIBUTE__=1 -DHAVE_FCNTL_H=1 -DHAVE_RPC_RPCENT_H=1 \
-DHAVE_NETINET_IF_ETHER_H=1 -DTIME_WITH_SYS_TIME=1 -DINET6=1 \ -DHAVE_NETINET_IF_ETHER_H=1 -DTIME_WITH_SYS_TIME=1 \
-DHAVE_GETADDRINFO=1 -DHAVE_GETNAMEINFO=1 -DHAVE_SOCKADDR_SA_LEN=1 \ -DHAVE_GETADDRINFO=1 -DHAVE_GETNAMEINFO=1 -DHAVE_SOCKADDR_SA_LEN=1 \
-DSIZEOF_CHAR=1 -DSIZEOF_SHORT=2 -DSIZEOF_INT=4 -DSIZEOF_LONG=4 \ -DSIZEOF_CHAR=1 -DSIZEOF_SHORT=2 -DSIZEOF_INT=4 -DSIZEOF_LONG=4 \
-DHAVE_ADDRINFO=1 -DHAVE_SOCKADDR_STORAGE=1 -DHAVE_INADDRSZ=1 \ -DHAVE_ADDRINFO=1 -DHAVE_SOCKADDR_STORAGE=1 -DHAVE_INADDRSZ=1 \
-DHAVE_IN6ADDRSZ=1 -DHAVE_RES_USE_INET6=1 -DHAVE_VFPRINTF=1 \ -DHAVE_IN6ADDRSZ=1 -DHAVE_VFPRINTF=1 \
-DHAVE_STRCASECMP=1 -DHAVE_STRLCAT=1 -DHAVE_STRLCPY=1 \ -DHAVE_STRCASECMP=1 -DHAVE_STRLCAT=1 -DHAVE_STRLCPY=1 \
-DHAVE_STRDUP=1 -DHAVE_ETHER_NTOHOST=1 -DUSE_ETHER_NTOHOST=1 \ -DHAVE_STRDUP=1 -DHAVE_ETHER_NTOHOST=1 -DUSE_ETHER_NTOHOST=1 \
-DHAVE_SETLINEBUF=1 -DHAVE_VSNPRINTF=1 -DHAVE_SNPRINTF=1 \ -DHAVE_SETLINEBUF=1 -DHAVE_VSNPRINTF=1 -DHAVE_SNPRINTF=1 \
@ -67,6 +64,13 @@ CPPFLAGS+=-DLBL_ALIGN=1
CPPFLAGS+=-DTCPDUMP_DO_SMB=1 CPPFLAGS+=-DTCPDUMP_DO_SMB=1
CPPFLAGS+=-D_U_="__attribute__((unused))" CPPFLAGS+=-D_U_="__attribute__((unused))"
.if (${USE_INET6} != "no")
SRCS+= print-ip6.c print-ip6opts.c print-ripng.c print-icmp6.c print-frag6.c \
print-rt6.c print-ospf6.c print-dhcp6.c
CPPFLAGS+=-DINET6=1 -DHAVE_RES_USE_INET6=1
.endif
.if (${MKCRYPTO} != "no") .if (${MKCRYPTO} != "no")
CPPFLAGS+=-DHAVE_LIBCRYPTO=1 CPPFLAGS+=-DHAVE_LIBCRYPTO=1
LDADD+= -lcrypto LDADD+= -lcrypto

View File

@ -1,5 +1,7 @@
# @(#)Makefile 8.1 (Berkeley) 6/6/93 # @(#)Makefile 8.1 (Berkeley) 6/6/93
# $NetBSD: Makefile,v 1.7 1999/07/01 19:15:03 itojun Exp $ # $NetBSD: Makefile,v 1.8 2005/01/10 02:59:00 lukem Exp $
.include <bsd.own.mk>
PROG= trpt PROG= trpt
MAN= trpt.8 MAN= trpt.8
@ -10,6 +12,8 @@ BINMODE=2555
DPADD= ${LIBKVM} DPADD= ${LIBKVM}
LDADD= -lkvm LDADD= -lkvm
.if (${USE_INET6} != "no")
CPPFLAGS+= -DINET6 CPPFLAGS+= -DINET6
.endif
.include <bsd.prog.mk> .include <bsd.prog.mk>