Remove opt_mac.h generation for various kernel modules that no longer

require it.

Submitted by:	pjd

21 files changed, 19 insertions, 23 deletions

diff --git a/sys/modules/cxgb/tom/Makefile b/sys/modules/cxgb/tom/Makefile
index 2b8750a..4c22670 100644
--- a/sys/modules/cxgb/tom/Makefile
+++ b/sys/modules/cxgb/tom/Makefile
@@ -6,7 +6,7 @@ CXGB = ${.CURDIR}/../../../dev/cxgb
 KMOD=	tom
 SRCS=   cxgb_tom.c cxgb_cpl_io.c cxgb_listen.c cxgb_tom_sysctl.c cxgb_cpl_socket.c
 SRCS+=  cxgb_ddp.c cxgb_vm.c cxgb_l2t.c cxgb_tcp_offload.c
-SRCS+=	opt_compat.h opt_inet.h opt_inet6.h opt_ipsec.h opt_mac.h 
+SRCS+=	opt_compat.h opt_inet.h opt_inet6.h opt_ipsec.h
 SRCS+=	opt_tcpdebug.h opt_ddb.h opt_sched.h opt_global.h opt_ktr.h
 SRCS+=	device_if.h bus_if.h pci_if.h
 CFLAGS+= -g -I${CXGB}
diff --git a/sys/modules/firewire/fwip/Makefile b/sys/modules/firewire/fwip/Makefile
index ed2ca4a..a88a2b1 100644
--- a/sys/modules/firewire/fwip/Makefile
+++ b/sys/modules/firewire/fwip/Makefile
@@ -6,7 +6,7 @@
 
 KMOD    = if_fwip
 SRCS    = bus_if.h device_if.h \
-          opt_inet.h opt_inet6.h opt_mac.h \
+          opt_inet.h opt_inet6.h \
           if_fwip.c if_fwipvar.h \
           firewire.h firewirereg.h \
           if_fwsubr.c
diff --git a/sys/modules/ibcs2/Makefile b/sys/modules/ibcs2/Makefile
index f258fa9..9407cb4 100644
--- a/sys/modules/ibcs2/Makefile
+++ b/sys/modules/ibcs2/Makefile
@@ -8,7 +8,7 @@ SRCS=	ibcs2_errno.c ibcs2_ipc.c ibcs2_stat.c ibcs2_misc.c \
 	ibcs2_socksys.c ibcs2_util.c ibcs2_xenix.c ibcs2_xenix_sysent.c \
 	ibcs2_isc.c ibcs2_isc_sysent.c \
 	ibcs2_msg.c ibcs2_other.c ibcs2_sysi86.c ibcs2_sysvec.c \
-	vnode_if.h opt_mac.h opt_spx_hack.h
+	vnode_if.h opt_spx_hack.h
 
 CFLAGS+= -DCOMPAT_IBCS2
 
diff --git a/sys/modules/if_gif/Makefile b/sys/modules/if_gif/Makefile
index b608f55..1cde56c 100644
--- a/sys/modules/if_gif/Makefile
+++ b/sys/modules/if_gif/Makefile
@@ -5,8 +5,7 @@
 .PATH: ${.CURDIR}/../../net ${.CURDIR}/../../netinet ${.CURDIR}/../../netinet6
 
 KMOD=	if_gif
-SRCS=	if_gif.c in_gif.c opt_inet.h opt_inet6.h opt_mac.h \
-	opt_mrouting.h
+SRCS=	if_gif.c in_gif.c opt_inet.h opt_inet6.h opt_mrouting.h
 
 .if !defined(KERNBUILDDIR)
 opt_inet.h:
diff --git a/sys/modules/if_ppp/Makefile b/sys/modules/if_ppp/Makefile
index ce7bdb0..820acc2f 100644
--- a/sys/modules/if_ppp/Makefile
+++ b/sys/modules/if_ppp/Makefile
@@ -4,7 +4,7 @@
 
 KMOD=	if_ppp
 SRCS=	if_ppp.c ppp_tty.c slcompress.c \
-	opt_inet.h opt_inet6.h opt_ipx.h opt_mac.h opt_ppp.h
+	opt_inet.h opt_inet6.h opt_ipx.h opt_ppp.h
 
 PPP_BSDCOMP?=	1	# 0/1
 PPP_DEFLATE?=	1	# 0/1
diff --git a/sys/modules/if_stf/Makefile b/sys/modules/if_stf/Makefile
index c231b00..5e8bd2f 100644
--- a/sys/modules/if_stf/Makefile
+++ b/sys/modules/if_stf/Makefile
@@ -3,7 +3,7 @@
 .PATH: ${.CURDIR}/../../net
 
 KMOD=	if_stf
-SRCS=	if_stf.c opt_inet.h opt_inet6.h opt_mac.h
+SRCS=	if_stf.c opt_inet.h opt_inet6.h
 
 .if !defined(KERNBUILDDIR)
 opt_inet.h:
diff --git a/sys/modules/if_tun/Makefile b/sys/modules/if_tun/Makefile
index 17dbf33..22a833e 100644
--- a/sys/modules/if_tun/Makefile
+++ b/sys/modules/if_tun/Makefile
@@ -3,7 +3,7 @@
 .PATH: ${.CURDIR}/../../net
 
 KMOD=	if_tun
-SRCS=	if_tun.c opt_atalk.h opt_inet.h opt_inet6.h opt_ipx.h opt_mac.h
+SRCS=	if_tun.c opt_atalk.h opt_inet.h opt_inet6.h opt_ipx.h
 
 .if !defined(KERNBUILDDIR)
 opt_atalk.h:
diff --git a/sys/modules/ip6_mroute_mod/Makefile b/sys/modules/ip6_mroute_mod/Makefile
index f361c9d..943f9ab 100644
--- a/sys/modules/ip6_mroute_mod/Makefile
+++ b/sys/modules/ip6_mroute_mod/Makefile
@@ -7,7 +7,7 @@
 KMOD=	ip6_mroute
 
 SRCS=	ip6_mroute.c
-SRCS+=	opt_inet6.h opt_mac.h opt_mrouting.h
+SRCS+=	opt_inet6.h opt_mrouting.h
 
 .if !defined(KERNBUILDDIR)
 opt_inet6.h:
diff --git a/sys/modules/ip_mroute_mod/Makefile b/sys/modules/ip_mroute_mod/Makefile
index 141eceb..d3dcc7e 100644
--- a/sys/modules/ip_mroute_mod/Makefile
+++ b/sys/modules/ip_mroute_mod/Makefile
@@ -7,7 +7,7 @@
 KMOD=	ip_mroute
 
 SRCS=	ip_mroute.c
-SRCS+=	opt_inet.h opt_mac.h opt_mrouting.h opt_route.h
+SRCS+=	opt_inet.h opt_mrouting.h opt_route.h
 
 .if !defined(KERNBUILDDIR)
 opt_inet.h:
diff --git a/sys/modules/ipfw/Makefile b/sys/modules/ipfw/Makefile
index bc1bd08..e99c9eb 100644
--- a/sys/modules/ipfw/Makefile
+++ b/sys/modules/ipfw/Makefile
@@ -6,7 +6,7 @@
 
 KMOD=	ipfw
 SRCS=	ip_fw2.c ip_fw_pfil.c
-SRCS+=	opt_inet6.h opt_ipsec.h opt_mac.h opt_route.h
+SRCS+=	opt_inet6.h opt_ipsec.h opt_route.h
 
 CFLAGS+= -DIPFIREWALL
 CFLAGS+= -I${.CURDIR}/../../contrib/pf
diff --git a/sys/modules/linux/Makefile b/sys/modules/linux/Makefile
index 54502cf..7b49161 100644
--- a/sys/modules/linux/Makefile
+++ b/sys/modules/linux/Makefile
@@ -13,7 +13,7 @@ SRCS=	linux${SFX}_dummy.c linux_emul.c linux_file.c \
 	linux${SFX}_machdep.c linux_mib.c linux_misc.c linux_signal.c \
 	linux_socket.c linux_stats.c linux_sysctl.c linux${SFX}_sysent.c \
 	linux${SFX}_sysvec.c linux_uid16.c linux_util.c linux_time.c \
-	opt_inet6.h opt_route.h opt_mac.h opt_compat.h opt_posix.h vnode_if.h \
+	opt_inet6.h opt_route.h opt_compat.h opt_posix.h vnode_if.h \
 	device_if.h bus_if.h assym.s
 
 # XXX: for assym.s
diff --git a/sys/modules/mac_lomac/Makefile b/sys/modules/mac_lomac/Makefile
index 6216a57..333109b 100644
--- a/sys/modules/mac_lomac/Makefile
+++ b/sys/modules/mac_lomac/Makefile
@@ -4,7 +4,6 @@
 
 KMOD=	mac_lomac
 SRCS=	vnode_if.h \
-	opt_mac.h \
 	mac_lomac.c
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/nfsserver/Makefile b/sys/modules/nfsserver/Makefile
index 5532060..a85d29c 100644
--- a/sys/modules/nfsserver/Makefile
+++ b/sys/modules/nfsserver/Makefile
@@ -5,7 +5,6 @@ KMOD=	nfsserver
 SRCS=	vnode_if.h \
 	nfs_fha.c nfs_serv.c nfs_srvkrpc.c nfs_srvsock.c nfs_srvcache.c \
 	nfs_srvsubs.c nfs_syscalls.c nfs_common.c \
-	opt_mac.h \
 	opt_kgssapi.h \
 	opt_nfs.h
 SRCS+=	opt_inet6.h
diff --git a/sys/modules/pf/Makefile b/sys/modules/pf/Makefile
index 3b53050..e293058 100644
--- a/sys/modules/pf/Makefile
+++ b/sys/modules/pf/Makefile
@@ -9,7 +9,7 @@ KMOD=	pf
 SRCS = 	pf.c pf_if.c pf_subr.c pf_osfp.c pf_ioctl.c pf_norm.c pf_table.c \
 	pf_ruleset.c \
 	in4_cksum.c \
-	opt_pf.h opt_inet.h opt_inet6.h opt_bpf.h opt_mac.h opt_route.h
+	opt_pf.h opt_inet.h opt_inet6.h opt_bpf.h opt_route.h
 
 CFLAGS+=  -I${.CURDIR}/../../contrib/pf
 
diff --git a/sys/modules/pseudofs/Makefile b/sys/modules/pseudofs/Makefile
index b04bffb..d5696c5 100644
--- a/sys/modules/pseudofs/Makefile
+++ b/sys/modules/pseudofs/Makefile
@@ -3,8 +3,7 @@
 .PATH: ${.CURDIR}/../../fs/pseudofs
 
 KMOD=	pseudofs
-SRCS=	opt_mac.h \
-	opt_pseudofs.h \
+SRCS=	opt_pseudofs.h \
 	vnode_if.h \
 	pseudofs.c \
 	pseudofs_fileno.c \
diff --git a/sys/modules/sem/Makefile b/sys/modules/sem/Makefile
index 26178b0..833a0c1 100644
--- a/sys/modules/sem/Makefile
+++ b/sys/modules/sem/Makefile
@@ -3,6 +3,6 @@
 .PATH: ${.CURDIR}/../../kern
 
 KMOD=	sem
-SRCS=	uipc_sem.c opt_mac.h opt_posix.h vnode_if.h
+SRCS=	uipc_sem.c opt_posix.h vnode_if.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/svr4/Makefile b/sys/modules/svr4/Makefile
index 9b96949..819118f 100644
--- a/sys/modules/svr4/Makefile
+++ b/sys/modules/svr4/Makefile
@@ -2,7 +2,7 @@
 
 .PATH:	${.CURDIR}/../../${MACHINE_ARCH}/svr4 ${.CURDIR}/../../compat/svr4
 KMOD=	svr4
-SRCS=	svr4_sysent.c svr4_sysvec.c opt_compat.h opt_mac.h opt_svr4.h \
+SRCS=	svr4_sysent.c svr4_sysvec.c opt_compat.h opt_svr4.h \
 	vnode_if.h imgact_svr4.c svr4_signal.c svr4_fcntl.c \
 	svr4_misc.c svr4_ioctl.c svr4_stat.c svr4_filio.c \
 	svr4_termios.c svr4_stream.c svr4_socket.c svr4_sockio.c \
diff --git a/sys/modules/sysvipc/sysvmsg/Makefile b/sys/modules/sysvipc/sysvmsg/Makefile
index 3e48b31..e60b8a2 100644
--- a/sys/modules/sysvipc/sysvmsg/Makefile
+++ b/sys/modules/sysvipc/sysvmsg/Makefile
@@ -3,6 +3,6 @@
 .PATH: ${.CURDIR}/../../../kern
 
 KMOD=	sysvmsg
-SRCS=	sysv_msg.c opt_mac.h opt_sysvipc.h
+SRCS=	sysv_msg.c opt_sysvipc.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/sysvipc/sysvsem/Makefile b/sys/modules/sysvipc/sysvsem/Makefile
index 22d97ee..13fe06a 100644
--- a/sys/modules/sysvipc/sysvsem/Makefile
+++ b/sys/modules/sysvipc/sysvsem/Makefile
@@ -3,6 +3,6 @@
 .PATH: ${.CURDIR}/../../../kern
 
 KMOD=	sysvsem
-SRCS=	sysv_sem.c opt_mac.h opt_sysvipc.h
+SRCS=	sysv_sem.c opt_sysvipc.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/sysvipc/sysvshm/Makefile b/sys/modules/sysvipc/sysvshm/Makefile
index 760a6a2..fde9d34 100644
--- a/sys/modules/sysvipc/sysvshm/Makefile
+++ b/sys/modules/sysvipc/sysvshm/Makefile
@@ -3,6 +3,6 @@
 .PATH: ${.CURDIR}/../../../kern
 
 KMOD=	sysvshm
-SRCS=	sysv_shm.c opt_mac.h opt_sysvipc.h opt_compat.h
+SRCS=	sysv_shm.c opt_sysvipc.h opt_compat.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/ufs/Makefile b/sys/modules/ufs/Makefile
index 9c5927c..0fe7b4c 100644
--- a/sys/modules/ufs/Makefile
+++ b/sys/modules/ufs/Makefile
@@ -3,7 +3,7 @@
 .PATH:	${.CURDIR}/../../ufs/ufs ${.CURDIR}/../../ufs/ffs
 
 KMOD=	ufs
-SRCS=	opt_ddb.h opt_directio.h opt_ffs.h opt_ffs_broken_fixme.h opt_mac.h \
+SRCS=	opt_ddb.h opt_directio.h opt_ffs.h opt_ffs_broken_fixme.h \
 	opt_quota.h opt_suiddir.h opt_ufs.h \
 	vnode_if.h ufs_acl.c ufs_bmap.c ufs_dirhash.c ufs_extattr.c \
 	ufs_gjournal.c ufs_inode.c ufs_lookup.c ufs_quota.c ufs_vfsops.c \