Make the LKMs compile with the INET option as a newstyle option in

opt_inet.h.
This commit is contained in:
eivind 1998-01-08 23:50:27 +00:00
parent b4fb282bcf
commit d0bda339f4
8 changed files with 56 additions and 28 deletions

View File

@ -1,19 +1,21 @@
# $Id$ # $Id: Makefile,v 1.3 1997/02/22 12:48:04 peter Exp $
.PATH: ${.CURDIR}/../../sys/net .PATH: ${.CURDIR}/../../sys/net
KMOD= if_disc_mod KMOD= if_disc_mod
SRCS= if_disc.c bpfilter.h SRCS= if_disc.c bpfilter.h opt_inet.h
NOMAN= NOMAN=
PSEUDO_LKM= PSEUDO_LKM=
CFLAGS+= -I. CFLAGS+= -I.
NBPFILTER?= 0 NBPFILTER?= 0
PROTOS?= -DINET
CFLAGS+= ${PROTOS} CFLAGS+= ${PROTOS}
CLEANFILES+= bpfilter.h CLEANFILES+= bpfilter.h opt_inet.h
bpfilter.h: bpfilter.h:
echo "#define NBPFILTER ${NBPFILTER}" > bpfilter.h echo "#define NBPFILTER ${NBPFILTER}" > bpfilter.h
opt_inet.h:
echo "#define INET 1" > opt_inet.h
.include <bsd.kmod.mk> .include <bsd.kmod.mk>

View File

@ -1,9 +1,9 @@
# $Id: Makefile,v 1.9 1997/12/16 18:28:07 eivind Exp $ # $Id: Makefile,v 1.10 1997/12/16 22:50:18 eivind Exp $
.PATH: ${.CURDIR}/../../sys/net .PATH: ${.CURDIR}/../../sys/net
KMOD= if_ppp_mod KMOD= if_ppp_mod
SRCS= bsd_comp.c if_ppp.c ppp_tty.c slcompress.c bpfilter.h ppp.h \ SRCS= bsd_comp.c if_ppp.c ppp_tty.c slcompress.c bpfilter.h ppp.h \
opt_ipx.h opt_ppp.h opt_inet.h opt_ipx.h opt_ppp.h
NOMAN= NOMAN=
PSEUDO_LKM= PSEUDO_LKM=
CFLAGS+= -I. CFLAGS+= -I.
@ -12,11 +12,12 @@ NPPP?= 2
PPP_BSDCOMP?= 1 # 0/1 PPP_BSDCOMP?= 1 # 0/1
PPP_DEFLATE?= 1 # 0/1 PPP_DEFLATE?= 1 # 0/1
PPP_FILTER?= 0 # 0/1 - requires bpf to be configured in kernel PPP_FILTER?= 0 # 0/1 - requires bpf to be configured in kernel
PPP_INET?= 1 # 0/1 - requires INET to be configured in kernel
PPP_IPX?= 0 # 0/1 - requires IPX to be configured in kernel PPP_IPX?= 0 # 0/1 - requires IPX to be configured in kernel
PROTOS?= -DINET # add -DIPX if you have IPX in the kernel PROTOS?= -DINET # add -DIPX if you have IPX in the kernel
CFLAGS+= ${PROTOS} CFLAGS+= ${PROTOS}
CLEANFILES+= bpfilter.h ppp.h opt_ipx.h opt_ppp.h CLEANFILES+= bpfilter.h opt_inet.h opt_ipx.h opt_ppp.h ppp.h
bpfilter.h: bpfilter.h:
echo "#define NBPFILTER ${PPP_FILTER}" > bpfilter.h echo "#define NBPFILTER ${PPP_FILTER}" > bpfilter.h
@ -24,6 +25,12 @@ bpfilter.h:
ppp.h: ppp.h:
echo "#define NPPP ${NPPP}" > ppp.h echo "#define NPPP ${NPPP}" > ppp.h
opt_inet.h:
touch opt_inet.h
.if ${PPP_INET} > 0
echo "#define IPX ${PPP_INET}" > opt_inet.h
.endif
opt_ipx.h: opt_ipx.h:
touch opt_ipx.h touch opt_ipx.h
.if ${PPP_IPX} > 0 .if ${PPP_IPX} > 0

View File

@ -1,8 +1,8 @@
# $Id$ # $Id: Makefile,v 1.4 1997/02/22 12:48:08 peter Exp $
.PATH: ${.CURDIR}/../../sys/net .PATH: ${.CURDIR}/../../sys/net
KMOD= if_sl_mod KMOD= if_sl_mod
SRCS= if_sl.c slcompress.c bpfilter.h sl.h SRCS= if_sl.c slcompress.c bpfilter.h opt_inet.h sl.h
NOMAN= NOMAN=
PSEUDO_LKM= PSEUDO_LKM=
CFLAGS+= -I. CFLAGS+= -I.
@ -12,11 +12,14 @@ NSL?= 2
PROTOS?= -DINET PROTOS?= -DINET
CFLAGS+= ${PROTOS} CFLAGS+= ${PROTOS}
CLEANFILES+= bpfilter.h sl.h CLEANFILES+= bpfilter.h opt_inet.h sl.h
bpfilter.h: bpfilter.h:
echo "#define NBPFILTER ${NBPFILTER}" > bpfilter.h echo "#define NBPFILTER ${NBPFILTER}" > bpfilter.h
opt_inet.h:
echo "#define INET 1" > opt_inet.h
sl.h: sl.h:
echo "#define NSL ${NSL}" > sl.h echo "#define NSL ${NSL}" > sl.h

View File

@ -1,22 +1,24 @@
# $Id$ # $Id: Makefile,v 1.3 1997/02/22 12:48:10 peter Exp $
.PATH: ${.CURDIR}/../../sys/net .PATH: ${.CURDIR}/../../sys/net
KMOD= if_tun_mod KMOD= if_tun_mod
SRCS= if_tun.c bpfilter.h tun.h SRCS= if_tun.c bpfilter.h opt_inet.h tun.h
NOMAN= NOMAN=
PSEUDO_LKM= PSEUDO_LKM=
CFLAGS+= -I. CFLAGS+= -I.
NBPFILTER?= 0 NBPFILTER?= 0
NTUN?= 2 NTUN?= 2
PROTOS?= -DINET
CFLAGS+= ${PROTOS} CFLAGS+= ${PROTOS}
CLEANFILES+= bpfilter.h tun.h CLEANFILES+= bpfilter.h opt_inet.h tun.h
bpfilter.h: bpfilter.h:
echo "#define NBPFILTER ${NBPFILTER}" > bpfilter.h echo "#define NBPFILTER ${NBPFILTER}" > bpfilter.h
opt_inet.h:
echo "#define INET 1" > opt_inet.h
tun.h: tun.h:
echo "#define NTUN ${NTUN}" > tun.h echo "#define NTUN ${NTUN}" > tun.h

View File

@ -1,19 +1,21 @@
# $Id$ # $Id: Makefile,v 1.3 1997/02/22 12:48:04 peter Exp $
.PATH: ${.CURDIR}/../../sys/net .PATH: ${.CURDIR}/../../sys/net
KMOD= if_disc_mod KMOD= if_disc_mod
SRCS= if_disc.c bpfilter.h SRCS= if_disc.c bpfilter.h opt_inet.h
NOMAN= NOMAN=
PSEUDO_LKM= PSEUDO_LKM=
CFLAGS+= -I. CFLAGS+= -I.
NBPFILTER?= 0 NBPFILTER?= 0
PROTOS?= -DINET
CFLAGS+= ${PROTOS} CFLAGS+= ${PROTOS}
CLEANFILES+= bpfilter.h CLEANFILES+= bpfilter.h opt_inet.h
bpfilter.h: bpfilter.h:
echo "#define NBPFILTER ${NBPFILTER}" > bpfilter.h echo "#define NBPFILTER ${NBPFILTER}" > bpfilter.h
opt_inet.h:
echo "#define INET 1" > opt_inet.h
.include <bsd.kmod.mk> .include <bsd.kmod.mk>

View File

@ -1,9 +1,9 @@
# $Id: Makefile,v 1.9 1997/12/16 18:28:07 eivind Exp $ # $Id: Makefile,v 1.10 1997/12/16 22:50:18 eivind Exp $
.PATH: ${.CURDIR}/../../sys/net .PATH: ${.CURDIR}/../../sys/net
KMOD= if_ppp_mod KMOD= if_ppp_mod
SRCS= bsd_comp.c if_ppp.c ppp_tty.c slcompress.c bpfilter.h ppp.h \ SRCS= bsd_comp.c if_ppp.c ppp_tty.c slcompress.c bpfilter.h ppp.h \
opt_ipx.h opt_ppp.h opt_inet.h opt_ipx.h opt_ppp.h
NOMAN= NOMAN=
PSEUDO_LKM= PSEUDO_LKM=
CFLAGS+= -I. CFLAGS+= -I.
@ -12,11 +12,12 @@ NPPP?= 2
PPP_BSDCOMP?= 1 # 0/1 PPP_BSDCOMP?= 1 # 0/1
PPP_DEFLATE?= 1 # 0/1 PPP_DEFLATE?= 1 # 0/1
PPP_FILTER?= 0 # 0/1 - requires bpf to be configured in kernel PPP_FILTER?= 0 # 0/1 - requires bpf to be configured in kernel
PPP_INET?= 1 # 0/1 - requires INET to be configured in kernel
PPP_IPX?= 0 # 0/1 - requires IPX to be configured in kernel PPP_IPX?= 0 # 0/1 - requires IPX to be configured in kernel
PROTOS?= -DINET # add -DIPX if you have IPX in the kernel PROTOS?= -DINET # add -DIPX if you have IPX in the kernel
CFLAGS+= ${PROTOS} CFLAGS+= ${PROTOS}
CLEANFILES+= bpfilter.h ppp.h opt_ipx.h opt_ppp.h CLEANFILES+= bpfilter.h opt_inet.h opt_ipx.h opt_ppp.h ppp.h
bpfilter.h: bpfilter.h:
echo "#define NBPFILTER ${PPP_FILTER}" > bpfilter.h echo "#define NBPFILTER ${PPP_FILTER}" > bpfilter.h
@ -24,6 +25,12 @@ bpfilter.h:
ppp.h: ppp.h:
echo "#define NPPP ${NPPP}" > ppp.h echo "#define NPPP ${NPPP}" > ppp.h
opt_inet.h:
touch opt_inet.h
.if ${PPP_INET} > 0
echo "#define IPX ${PPP_INET}" > opt_inet.h
.endif
opt_ipx.h: opt_ipx.h:
touch opt_ipx.h touch opt_ipx.h
.if ${PPP_IPX} > 0 .if ${PPP_IPX} > 0

View File

@ -1,8 +1,8 @@
# $Id$ # $Id: Makefile,v 1.4 1997/02/22 12:48:08 peter Exp $
.PATH: ${.CURDIR}/../../sys/net .PATH: ${.CURDIR}/../../sys/net
KMOD= if_sl_mod KMOD= if_sl_mod
SRCS= if_sl.c slcompress.c bpfilter.h sl.h SRCS= if_sl.c slcompress.c bpfilter.h opt_inet.h sl.h
NOMAN= NOMAN=
PSEUDO_LKM= PSEUDO_LKM=
CFLAGS+= -I. CFLAGS+= -I.
@ -12,11 +12,14 @@ NSL?= 2
PROTOS?= -DINET PROTOS?= -DINET
CFLAGS+= ${PROTOS} CFLAGS+= ${PROTOS}
CLEANFILES+= bpfilter.h sl.h CLEANFILES+= bpfilter.h opt_inet.h sl.h
bpfilter.h: bpfilter.h:
echo "#define NBPFILTER ${NBPFILTER}" > bpfilter.h echo "#define NBPFILTER ${NBPFILTER}" > bpfilter.h
opt_inet.h:
echo "#define INET 1" > opt_inet.h
sl.h: sl.h:
echo "#define NSL ${NSL}" > sl.h echo "#define NSL ${NSL}" > sl.h

View File

@ -1,22 +1,24 @@
# $Id$ # $Id: Makefile,v 1.3 1997/02/22 12:48:10 peter Exp $
.PATH: ${.CURDIR}/../../sys/net .PATH: ${.CURDIR}/../../sys/net
KMOD= if_tun_mod KMOD= if_tun_mod
SRCS= if_tun.c bpfilter.h tun.h SRCS= if_tun.c bpfilter.h opt_inet.h tun.h
NOMAN= NOMAN=
PSEUDO_LKM= PSEUDO_LKM=
CFLAGS+= -I. CFLAGS+= -I.
NBPFILTER?= 0 NBPFILTER?= 0
NTUN?= 2 NTUN?= 2
PROTOS?= -DINET
CFLAGS+= ${PROTOS} CFLAGS+= ${PROTOS}
CLEANFILES+= bpfilter.h tun.h CLEANFILES+= bpfilter.h opt_inet.h tun.h
bpfilter.h: bpfilter.h:
echo "#define NBPFILTER ${NBPFILTER}" > bpfilter.h echo "#define NBPFILTER ${NBPFILTER}" > bpfilter.h
opt_inet.h:
echo "#define INET 1" > opt_inet.h
tun.h: tun.h:
echo "#define NTUN ${NTUN}" > tun.h echo "#define NTUN ${NTUN}" > tun.h