summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoreivind <eivind@FreeBSD.org>1998-01-08 23:50:27 +0000
committereivind <eivind@FreeBSD.org>1998-01-08 23:50:27 +0000
commitd0bda339f4e7c39f2e5ef86d6bec50b670000c20 (patch)
tree5ec27de9851870650c7b5b768b59150f7f578e9d
parentb4fb282bcf051f473e169c96839ab02b41327baf (diff)
downloadFreeBSD-src-d0bda339f4e7c39f2e5ef86d6bec50b670000c20.zip
FreeBSD-src-d0bda339f4e7c39f2e5ef86d6bec50b670000c20.tar.gz
Make the LKMs compile with the INET option as a newstyle option in
opt_inet.h.
-rw-r--r--lkm/if_disc/Makefile10
-rw-r--r--lkm/if_ppp/Makefile13
-rw-r--r--lkm/if_sl/Makefile9
-rw-r--r--lkm/if_tun/Makefile10
-rw-r--r--sys/modules/if_disc/Makefile10
-rw-r--r--sys/modules/if_ppp/Makefile13
-rw-r--r--sys/modules/if_sl/Makefile9
-rw-r--r--sys/modules/if_tun/Makefile10
8 files changed, 56 insertions, 28 deletions
diff --git a/lkm/if_disc/Makefile b/lkm/if_disc/Makefile
index 3f5935b..0d75aff 100644
--- a/lkm/if_disc/Makefile
+++ b/lkm/if_disc/Makefile
@@ -1,19 +1,21 @@
-# $Id$
+# $Id: Makefile,v 1.3 1997/02/22 12:48:04 peter Exp $
.PATH: ${.CURDIR}/../../sys/net
KMOD= if_disc_mod
-SRCS= if_disc.c bpfilter.h
+SRCS= if_disc.c bpfilter.h opt_inet.h
NOMAN=
PSEUDO_LKM=
CFLAGS+= -I.
NBPFILTER?= 0
-PROTOS?= -DINET
CFLAGS+= ${PROTOS}
-CLEANFILES+= bpfilter.h
+CLEANFILES+= bpfilter.h opt_inet.h
bpfilter.h:
echo "#define NBPFILTER ${NBPFILTER}" > bpfilter.h
+opt_inet.h:
+ echo "#define INET 1" > opt_inet.h
+
.include <bsd.kmod.mk>
diff --git a/lkm/if_ppp/Makefile b/lkm/if_ppp/Makefile
index 03dcd05..4a49e1d 100644
--- a/lkm/if_ppp/Makefile
+++ b/lkm/if_ppp/Makefile
@@ -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
KMOD= if_ppp_mod
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=
PSEUDO_LKM=
CFLAGS+= -I.
@@ -12,11 +12,12 @@ NPPP?= 2
PPP_BSDCOMP?= 1 # 0/1
PPP_DEFLATE?= 1 # 0/1
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
PROTOS?= -DINET # add -DIPX if you have IPX in the kernel
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:
echo "#define NBPFILTER ${PPP_FILTER}" > bpfilter.h
@@ -24,6 +25,12 @@ bpfilter.h:
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:
touch opt_ipx.h
.if ${PPP_IPX} > 0
diff --git a/lkm/if_sl/Makefile b/lkm/if_sl/Makefile
index 46f49ad..51f82f9 100644
--- a/lkm/if_sl/Makefile
+++ b/lkm/if_sl/Makefile
@@ -1,8 +1,8 @@
-# $Id$
+# $Id: Makefile,v 1.4 1997/02/22 12:48:08 peter Exp $
.PATH: ${.CURDIR}/../../sys/net
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=
PSEUDO_LKM=
CFLAGS+= -I.
@@ -12,11 +12,14 @@ NSL?= 2
PROTOS?= -DINET
CFLAGS+= ${PROTOS}
-CLEANFILES+= bpfilter.h sl.h
+CLEANFILES+= bpfilter.h opt_inet.h sl.h
bpfilter.h:
echo "#define NBPFILTER ${NBPFILTER}" > bpfilter.h
+opt_inet.h:
+ echo "#define INET 1" > opt_inet.h
+
sl.h:
echo "#define NSL ${NSL}" > sl.h
diff --git a/lkm/if_tun/Makefile b/lkm/if_tun/Makefile
index ced024f..14654e1 100644
--- a/lkm/if_tun/Makefile
+++ b/lkm/if_tun/Makefile
@@ -1,22 +1,24 @@
-# $Id$
+# $Id: Makefile,v 1.3 1997/02/22 12:48:10 peter Exp $
.PATH: ${.CURDIR}/../../sys/net
KMOD= if_tun_mod
-SRCS= if_tun.c bpfilter.h tun.h
+SRCS= if_tun.c bpfilter.h opt_inet.h tun.h
NOMAN=
PSEUDO_LKM=
CFLAGS+= -I.
NBPFILTER?= 0
NTUN?= 2
-PROTOS?= -DINET
CFLAGS+= ${PROTOS}
-CLEANFILES+= bpfilter.h tun.h
+CLEANFILES+= bpfilter.h opt_inet.h tun.h
bpfilter.h:
echo "#define NBPFILTER ${NBPFILTER}" > bpfilter.h
+opt_inet.h:
+ echo "#define INET 1" > opt_inet.h
+
tun.h:
echo "#define NTUN ${NTUN}" > tun.h
diff --git a/sys/modules/if_disc/Makefile b/sys/modules/if_disc/Makefile
index 3f5935b..0d75aff 100644
--- a/sys/modules/if_disc/Makefile
+++ b/sys/modules/if_disc/Makefile
@@ -1,19 +1,21 @@
-# $Id$
+# $Id: Makefile,v 1.3 1997/02/22 12:48:04 peter Exp $
.PATH: ${.CURDIR}/../../sys/net
KMOD= if_disc_mod
-SRCS= if_disc.c bpfilter.h
+SRCS= if_disc.c bpfilter.h opt_inet.h
NOMAN=
PSEUDO_LKM=
CFLAGS+= -I.
NBPFILTER?= 0
-PROTOS?= -DINET
CFLAGS+= ${PROTOS}
-CLEANFILES+= bpfilter.h
+CLEANFILES+= bpfilter.h opt_inet.h
bpfilter.h:
echo "#define NBPFILTER ${NBPFILTER}" > bpfilter.h
+opt_inet.h:
+ echo "#define INET 1" > opt_inet.h
+
.include <bsd.kmod.mk>
diff --git a/sys/modules/if_ppp/Makefile b/sys/modules/if_ppp/Makefile
index 03dcd05..4a49e1d 100644
--- a/sys/modules/if_ppp/Makefile
+++ b/sys/modules/if_ppp/Makefile
@@ -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
KMOD= if_ppp_mod
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=
PSEUDO_LKM=
CFLAGS+= -I.
@@ -12,11 +12,12 @@ NPPP?= 2
PPP_BSDCOMP?= 1 # 0/1
PPP_DEFLATE?= 1 # 0/1
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
PROTOS?= -DINET # add -DIPX if you have IPX in the kernel
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:
echo "#define NBPFILTER ${PPP_FILTER}" > bpfilter.h
@@ -24,6 +25,12 @@ bpfilter.h:
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:
touch opt_ipx.h
.if ${PPP_IPX} > 0
diff --git a/sys/modules/if_sl/Makefile b/sys/modules/if_sl/Makefile
index 46f49ad..51f82f9 100644
--- a/sys/modules/if_sl/Makefile
+++ b/sys/modules/if_sl/Makefile
@@ -1,8 +1,8 @@
-# $Id$
+# $Id: Makefile,v 1.4 1997/02/22 12:48:08 peter Exp $
.PATH: ${.CURDIR}/../../sys/net
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=
PSEUDO_LKM=
CFLAGS+= -I.
@@ -12,11 +12,14 @@ NSL?= 2
PROTOS?= -DINET
CFLAGS+= ${PROTOS}
-CLEANFILES+= bpfilter.h sl.h
+CLEANFILES+= bpfilter.h opt_inet.h sl.h
bpfilter.h:
echo "#define NBPFILTER ${NBPFILTER}" > bpfilter.h
+opt_inet.h:
+ echo "#define INET 1" > opt_inet.h
+
sl.h:
echo "#define NSL ${NSL}" > sl.h
diff --git a/sys/modules/if_tun/Makefile b/sys/modules/if_tun/Makefile
index ced024f..14654e1 100644
--- a/sys/modules/if_tun/Makefile
+++ b/sys/modules/if_tun/Makefile
@@ -1,22 +1,24 @@
-# $Id$
+# $Id: Makefile,v 1.3 1997/02/22 12:48:10 peter Exp $
.PATH: ${.CURDIR}/../../sys/net
KMOD= if_tun_mod
-SRCS= if_tun.c bpfilter.h tun.h
+SRCS= if_tun.c bpfilter.h opt_inet.h tun.h
NOMAN=
PSEUDO_LKM=
CFLAGS+= -I.
NBPFILTER?= 0
NTUN?= 2
-PROTOS?= -DINET
CFLAGS+= ${PROTOS}
-CLEANFILES+= bpfilter.h tun.h
+CLEANFILES+= bpfilter.h opt_inet.h tun.h
bpfilter.h:
echo "#define NBPFILTER ${NBPFILTER}" > bpfilter.h
+opt_inet.h:
+ echo "#define INET 1" > opt_inet.h
+
tun.h:
echo "#define NTUN ${NTUN}" > tun.h
OpenPOWER on IntegriCloud