diff options
author | bz <bz@FreeBSD.org> | 2009-06-08 19:57:35 +0000 |
---|---|---|
committer | bz <bz@FreeBSD.org> | 2009-06-08 19:57:35 +0000 |
commit | b7ff2bdc204ec5e815f8123552bb0bee31638f8e (patch) | |
tree | 536b4d1a8634a3cd973f0d7a5ca23ef93ec76029 /sys/modules | |
parent | 76bed24408b9f5914c9baaeb5a369e4495450a5c (diff) | |
download | FreeBSD-src-b7ff2bdc204ec5e815f8123552bb0bee31638f8e.zip FreeBSD-src-b7ff2bdc204ec5e815f8123552bb0bee31638f8e.tar.gz |
After r193232 rt_tables in vnet.h are no longer indirectly dependent on
the ROUTETABLES kernel option thus there is no need to include opt_route.h
anymore in all consumers of vnet.h and no longer depend on it for module
builds.
Remove the hidden include in flowtable.h as well and leave the two
explicit #includes in ip_input.c and ip_output.c.
Diffstat (limited to 'sys/modules')
-rw-r--r-- | sys/modules/bridgestp/Makefile | 2 | ||||
-rw-r--r-- | sys/modules/cxgb/iw_cxgb/Makefile | 2 | ||||
-rw-r--r-- | sys/modules/if_ef/Makefile | 2 | ||||
-rw-r--r-- | sys/modules/if_vlan/Makefile | 2 | ||||
-rw-r--r-- | sys/modules/ip_mroute_mod/Makefile | 2 | ||||
-rw-r--r-- | sys/modules/ipfw/Makefile | 2 | ||||
-rw-r--r-- | sys/modules/linprocfs/Makefile | 3 | ||||
-rw-r--r-- | sys/modules/linux/Makefile | 2 | ||||
-rw-r--r-- | sys/modules/netgraph/atm/atm/Makefile | 2 | ||||
-rw-r--r-- | sys/modules/netgraph/ether/Makefile | 2 | ||||
-rw-r--r-- | sys/modules/netgraph/gif/Makefile | 2 | ||||
-rw-r--r-- | sys/modules/nfsclient/Makefile | 2 | ||||
-rw-r--r-- | sys/modules/pf/Makefile | 2 | ||||
-rw-r--r-- | sys/modules/svr4/Makefile | 2 | ||||
-rw-r--r-- | sys/modules/wlan/Makefile | 3 |
15 files changed, 15 insertions, 17 deletions
diff --git a/sys/modules/bridgestp/Makefile b/sys/modules/bridgestp/Makefile index e27bbc3e..3cfc6e3 100644 --- a/sys/modules/bridgestp/Makefile +++ b/sys/modules/bridgestp/Makefile @@ -3,6 +3,6 @@ .PATH: ${.CURDIR}/../../net KMOD= bridgestp -SRCS= bridgestp.c opt_route.h +SRCS= bridgestp.c .include <bsd.kmod.mk> diff --git a/sys/modules/cxgb/iw_cxgb/Makefile b/sys/modules/cxgb/iw_cxgb/Makefile index e7f0523..2cf2ef8 100644 --- a/sys/modules/cxgb/iw_cxgb/Makefile +++ b/sys/modules/cxgb/iw_cxgb/Makefile @@ -8,7 +8,7 @@ SRCS= iw_cxgb.c iw_cxgb_cm.c iw_cxgb_hal.c SRCS+= iw_cxgb_provider.c iw_cxgb_qp.c iw_cxgb_resource.c SRCS+= iw_cxgb_ev.c iw_cxgb_mem.c iw_cxgb_dbg.c iw_cxgb_cq.c SRCS+= bus_if.h device_if.h opt_sched.h pci_if.h pcib_if.h opt_ktr.h -SRCS+= opt_inet.h opt_route.h +SRCS+= opt_inet.h CFLAGS+= -g -I${CXGB} #CFLAGS+= -DDEBUG diff --git a/sys/modules/if_ef/Makefile b/sys/modules/if_ef/Makefile index 79a0081..dc40213 100644 --- a/sys/modules/if_ef/Makefile +++ b/sys/modules/if_ef/Makefile @@ -3,7 +3,7 @@ .PATH: ${.CURDIR}/../../net KMOD= if_ef -SRCS= if_ef.c opt_ipx.h opt_inet.h opt_ef.h opt_route.h +SRCS= if_ef.c opt_ipx.h opt_inet.h opt_ef.h .if defined(EFDEBUG) CFLAGS+= -DEF_DEBUG diff --git a/sys/modules/if_vlan/Makefile b/sys/modules/if_vlan/Makefile index 65ed060..9842619 100644 --- a/sys/modules/if_vlan/Makefile +++ b/sys/modules/if_vlan/Makefile @@ -4,6 +4,6 @@ KMOD= if_vlan SRCS= if_vlan.c -SRCS+= opt_inet.h opt_vlan.h opt_route.h +SRCS+= opt_inet.h opt_vlan.h .include <bsd.kmod.mk> diff --git a/sys/modules/ip_mroute_mod/Makefile b/sys/modules/ip_mroute_mod/Makefile index d3dcc7e..df5424b 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_mrouting.h opt_route.h +SRCS+= opt_inet.h opt_mrouting.h .if !defined(KERNBUILDDIR) opt_inet.h: diff --git a/sys/modules/ipfw/Makefile b/sys/modules/ipfw/Makefile index e99c9eb..dd31d7e 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_route.h +SRCS+= opt_inet6.h opt_ipsec.h CFLAGS+= -DIPFIREWALL CFLAGS+= -I${.CURDIR}/../../contrib/pf diff --git a/sys/modules/linprocfs/Makefile b/sys/modules/linprocfs/Makefile index 62af13e..f0f00cb 100644 --- a/sys/modules/linprocfs/Makefile +++ b/sys/modules/linprocfs/Makefile @@ -6,8 +6,7 @@ KMOD= linprocfs SRCS= vnode_if.h \ device_if.h bus_if.h \ linprocfs.c \ - opt_compat.h \ - opt_route.h + opt_compat.h .if ${MACHINE_ARCH} == "amd64" CFLAGS+=-DCOMPAT_LINUX32 diff --git a/sys/modules/linux/Makefile b/sys/modules/linux/Makefile index 7b49161..a24b6b2 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_compat.h opt_posix.h vnode_if.h \ + opt_inet6.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/netgraph/atm/atm/Makefile b/sys/modules/netgraph/atm/atm/Makefile index fff3230b..ebd94e1 100644 --- a/sys/modules/netgraph/atm/atm/Makefile +++ b/sys/modules/netgraph/atm/atm/Makefile @@ -5,7 +5,7 @@ .PATH: ${.CURDIR}/../../../../netgraph/atm KMOD= ng_atm -SRCS= ng_atm.c opt_route.h +SRCS= ng_atm.c # CFLAGS+= -DNGATM_DEBUG .include <bsd.kmod.mk> diff --git a/sys/modules/netgraph/ether/Makefile b/sys/modules/netgraph/ether/Makefile index 49f2bb6..7a3950e 100644 --- a/sys/modules/netgraph/ether/Makefile +++ b/sys/modules/netgraph/ether/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ KMOD= ng_ether -SRCS= ng_ether.c opt_route.h +SRCS= ng_ether.c .include <bsd.kmod.mk> diff --git a/sys/modules/netgraph/gif/Makefile b/sys/modules/netgraph/gif/Makefile index 121cfa9..acf4373 100644 --- a/sys/modules/netgraph/gif/Makefile +++ b/sys/modules/netgraph/gif/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ KMOD= ng_gif -SRCS= ng_gif.c opt_inet.h opt_inet6.h opt_route.h +SRCS= ng_gif.c opt_inet.h opt_inet6.h .if !defined(KERNBUILDDIR) opt_inet.h: diff --git a/sys/modules/nfsclient/Makefile b/sys/modules/nfsclient/Makefile index af02f6a..cab161f 100644 --- a/sys/modules/nfsclient/Makefile +++ b/sys/modules/nfsclient/Makefile @@ -7,7 +7,7 @@ SRCS= vnode_if.h \ nfs_bio.c nfs_lock.c nfs_node.c nfs_socket.c nfs_subs.c nfs_nfsiod.c \ nfs_vfsops.c nfs_vnops.c nfs_common.c nfs_krpc.c \ opt_inet.h opt_nfs.h opt_bootp.h opt_nfsroot.h -SRCS+= opt_inet6.h opt_kdtrace.h opt_kgssapi.h opt_route.h +SRCS+= opt_inet6.h opt_kdtrace.h opt_kgssapi.h .if !defined(KERNBUILDDIR) NFS_INET?= 1 # 0/1 - requires INET to be configured in kernel diff --git a/sys/modules/pf/Makefile b/sys/modules/pf/Makefile index e293058..c921f80 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_route.h + opt_pf.h opt_inet.h opt_inet6.h opt_bpf.h CFLAGS+= -I${.CURDIR}/../../contrib/pf diff --git a/sys/modules/svr4/Makefile b/sys/modules/svr4/Makefile index 819118f..5055098 100644 --- a/sys/modules/svr4/Makefile +++ b/sys/modules/svr4/Makefile @@ -9,7 +9,7 @@ SRCS= svr4_sysent.c svr4_sysvec.c opt_compat.h opt_svr4.h \ svr4_machdep.c svr4_resource.c svr4_ipc.c OBJS= svr4_locore.o -SRCS+= opt_ktrace.h opt_sysvipc.h opt_route.h +SRCS+= opt_ktrace.h opt_sysvipc.h CLEANFILES= svr4_assym.h svr4_genassym.o diff --git a/sys/modules/wlan/Makefile b/sys/modules/wlan/Makefile index bc39c29..c5c788a 100644 --- a/sys/modules/wlan/Makefile +++ b/sys/modules/wlan/Makefile @@ -10,8 +10,7 @@ SRCS= ieee80211.c ieee80211_crypto.c ieee80211_crypto_none.c ieee80211_dfs.c \ ieee80211_radiotap.c ieee80211_regdomain.c ieee80211_ht.c \ ieee80211_adhoc.c ieee80211_hostap.c ieee80211_monitor.c \ ieee80211_sta.c ieee80211_wds.c ieee80211_ddb.c -SRCS+= bus_if.h device_if.h opt_inet.h opt_ipx.h opt_wlan.h opt_ddb.h \ - opt_route.h +SRCS+= bus_if.h device_if.h opt_inet.h opt_ipx.h opt_wlan.h opt_ddb.h .if !defined(KERNBUILDDIR) opt_wlan.h: |