aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRuslan Ermilov <ru@FreeBSD.org>2002-01-11 15:49:02 +0000
committerRuslan Ermilov <ru@FreeBSD.org>2002-01-11 15:49:02 +0000
commit17d6c636720d00f77e5d098daf4c278f89d84f7b (patch)
treed969e0da9d8f2f1a8ed4d8b51e09352160bdd7ae
parentafac94af5c1933e2fa7c943d31c8a5af8ced8491 (diff)
downloadsrc-17d6c636720d00f77e5d098daf4c278f89d84f7b.tar.gz
src-17d6c636720d00f77e5d098daf4c278f89d84f7b.zip
Drop <bsd.man.mk> support from <bsd.kmod.mk>.
Not objected to by: -current
Notes
Notes: svn path=/head/; revision=89260
-rw-r--r--sys/conf/kmod.mk18
-rw-r--r--sys/modules/apm/Makefile1
-rw-r--r--sys/modules/bridge/Makefile1
-rw-r--r--sys/modules/cam/Makefile2
-rw-r--r--sys/modules/cardbus/Makefile1
-rw-r--r--sys/modules/cbb/Makefile1
-rw-r--r--sys/modules/ccd/Makefile1
-rw-r--r--sys/modules/cd9660/Makefile1
-rw-r--r--sys/modules/coda/Makefile1
-rw-r--r--sys/modules/coff/Makefile1
-rw-r--r--sys/modules/dummynet/Makefile1
-rw-r--r--sys/modules/ext2fs/Makefile1
-rw-r--r--sys/modules/fdc/Makefile1
-rw-r--r--sys/modules/fdescfs/Makefile1
-rw-r--r--sys/modules/fpu/Makefile1
-rw-r--r--sys/modules/gnufpu/Makefile1
-rw-r--r--sys/modules/hpfs/Makefile1
-rw-r--r--sys/modules/if_disc/Makefile1
-rw-r--r--sys/modules/if_ef/Makefile1
-rw-r--r--sys/modules/if_faith/Makefile1
-rw-r--r--sys/modules/if_gif/Makefile1
-rw-r--r--sys/modules/if_ppp/Makefile1
-rw-r--r--sys/modules/if_sl/Makefile1
-rw-r--r--sys/modules/if_stf/Makefile1
-rw-r--r--sys/modules/if_tun/Makefile1
-rw-r--r--sys/modules/if_vlan/Makefile1
-rw-r--r--sys/modules/ip6fw/Makefile1
-rw-r--r--sys/modules/ip_mroute_mod/Makefile1
-rw-r--r--sys/modules/ipfilter/Makefile1
-rw-r--r--sys/modules/ipfw/Makefile1
-rw-r--r--sys/modules/libiconv/Makefile1
-rw-r--r--sys/modules/lomac/Makefile1
-rw-r--r--sys/modules/lomac/plm/Makefile1
-rw-r--r--sys/modules/lomac/syscall_gate/Makefile1
-rw-r--r--sys/modules/lpt/Makefile1
-rw-r--r--sys/modules/md/Makefile1
-rw-r--r--sys/modules/msdosfs/Makefile1
-rw-r--r--sys/modules/ncp/Makefile2
-rw-r--r--sys/modules/netgraph/UI/Makefile1
-rw-r--r--sys/modules/netgraph/async/Makefile1
-rw-r--r--sys/modules/netgraph/bpf/Makefile1
-rw-r--r--sys/modules/netgraph/bridge/Makefile1
-rw-r--r--sys/modules/netgraph/cisco/Makefile1
-rw-r--r--sys/modules/netgraph/echo/Makefile1
-rw-r--r--sys/modules/netgraph/eiface/Makefile1
-rw-r--r--sys/modules/netgraph/etf/Makefile1
-rw-r--r--sys/modules/netgraph/frame_relay/Makefile1
-rw-r--r--sys/modules/netgraph/hole/Makefile1
-rw-r--r--sys/modules/netgraph/iface/Makefile1
-rw-r--r--sys/modules/netgraph/ip_input/Makefile1
-rw-r--r--sys/modules/netgraph/ksocket/Makefile1
-rw-r--r--sys/modules/netgraph/lmi/Makefile1
-rw-r--r--sys/modules/netgraph/mppc/Makefile1
-rw-r--r--sys/modules/netgraph/netgraph/Makefile1
-rw-r--r--sys/modules/netgraph/one2many/Makefile1
-rw-r--r--sys/modules/netgraph/ppp/Makefile1
-rw-r--r--sys/modules/netgraph/pppoe/Makefile1
-rw-r--r--sys/modules/netgraph/pptpgre/Makefile1
-rw-r--r--sys/modules/netgraph/rfc1490/Makefile1
-rw-r--r--sys/modules/netgraph/sample/Makefile1
-rw-r--r--sys/modules/netgraph/socket/Makefile1
-rw-r--r--sys/modules/netgraph/split/Makefile1
-rw-r--r--sys/modules/netgraph/tee/Makefile1
-rw-r--r--sys/modules/netgraph/tty/Makefile1
-rw-r--r--sys/modules/netgraph/vjc/Makefile1
-rw-r--r--sys/modules/nfsclient/Makefile1
-rw-r--r--sys/modules/nfsserver/Makefile2
-rw-r--r--sys/modules/ntfs/Makefile1
-rw-r--r--sys/modules/nullfs/Makefile1
-rw-r--r--sys/modules/nwfs/Makefile2
-rw-r--r--sys/modules/oldcard/Makefile1
-rw-r--r--sys/modules/oltr/Makefile1
-rw-r--r--sys/modules/pccard/Makefile1
-rw-r--r--sys/modules/pcic/Makefile1
-rw-r--r--sys/modules/plip/Makefile1
-rw-r--r--sys/modules/portalfs/Makefile1
-rw-r--r--sys/modules/ppbus/Makefile1
-rw-r--r--sys/modules/ppi/Makefile1
-rw-r--r--sys/modules/pps/Makefile1
-rw-r--r--sys/modules/random/Makefile1
-rw-r--r--sys/modules/ray/Makefile1
-rw-r--r--sys/modules/smbfs/Makefile2
-rw-r--r--sys/modules/snp/Makefile1
-rw-r--r--sys/modules/splash/bmp/Makefile1
-rw-r--r--sys/modules/splash/pcx/Makefile1
-rw-r--r--sys/modules/sppp/Makefile1
-rw-r--r--sys/modules/streams/Makefile1
-rw-r--r--sys/modules/syscons/apm/Makefile1
-rw-r--r--sys/modules/syscons/blank/Makefile1
-rw-r--r--sys/modules/syscons/daemon/Makefile1
-rw-r--r--sys/modules/syscons/fade/Makefile1
-rw-r--r--sys/modules/syscons/fire/Makefile1
-rw-r--r--sys/modules/syscons/green/Makefile1
-rw-r--r--sys/modules/syscons/logo/Makefile1
-rw-r--r--sys/modules/syscons/rain/Makefile1
-rw-r--r--sys/modules/syscons/snake/Makefile1
-rw-r--r--sys/modules/syscons/star/Makefile1
-rw-r--r--sys/modules/syscons/warp/Makefile1
-rw-r--r--sys/modules/udbp/Makefile1
-rw-r--r--sys/modules/ugen/Makefile1
-rw-r--r--sys/modules/uhid/Makefile1
-rw-r--r--sys/modules/ukbd/Makefile1
-rw-r--r--sys/modules/ulpt/Makefile1
-rw-r--r--sys/modules/umapfs/Makefile1
-rw-r--r--sys/modules/umass/Makefile1
-rw-r--r--sys/modules/umodem/Makefile1
-rw-r--r--sys/modules/ums/Makefile1
-rw-r--r--sys/modules/unionfs/Makefile1
-rw-r--r--sys/modules/urio/Makefile1
-rw-r--r--sys/modules/usb/Makefile2
-rw-r--r--sys/modules/uscanner/Makefile1
-rw-r--r--sys/modules/vesa/Makefile1
-rw-r--r--sys/modules/vinum/Makefile1
-rw-r--r--sys/modules/vpo/Makefile1
114 files changed, 2 insertions, 135 deletions
diff --git a/sys/conf/kmod.mk b/sys/conf/kmod.mk
index dbec48f6a43a..09e89e17aafb 100644
--- a/sys/conf/kmod.mk
+++ b/sys/conf/kmod.mk
@@ -32,8 +32,6 @@
#
# KMODUNLOAD Command to unload a kernel module [/sbin/kldunload]
#
-# NOMAN KLD does not have a manual page if set.
-#
# PROG The name of the kernel module to build.
# If not supplied, ${KMOD}.o is used.
#
@@ -63,7 +61,7 @@
# put the stuff into the right "distribution".
#
# install:
-# install the program and its manual pages; if the Makefile
+# install the kernel module; if the Makefile
# does not itself define the target install, the targets
# beforeinstall and afterinstall may also be used to cause
# actions immediately before and after the install target
@@ -77,7 +75,6 @@
#
# bsd.obj.mk: clean, cleandir and obj
# bsd.dep.mk: cleandepend, depend and tags
-# bsd.man.mk: maninstall
#
KMODLOAD?= /sbin/kldload
@@ -176,24 +173,17 @@ ${KMOD}.kld: ${OBJS}
.endif
-.if !defined(NOMAN)
-.if 0
-MAN?= ${KMOD}.4
-.endif
-.include <bsd.man.mk>
-.else
.if !target(all-man)
all-man: _SUBDIR
.endif
.if !target(maninstall)
maninstall: _SUBDIR
.endif
-.endif
_ILINKS=@ machine
.MAIN: all
-all: objwarn ${PROG} all-man _SUBDIR
+all: objwarn ${PROG} _SUBDIR
beforedepend: ${_ILINKS}
@rm -f .depend
@@ -276,11 +266,7 @@ realinstall: _SUBDIR
.endif
install: afterinstall _SUBDIR
-.if !defined(NOMAN)
-afterinstall: realinstall maninstall
-.else
afterinstall: realinstall
-.endif
realinstall: beforeinstall
.endif
diff --git a/sys/modules/apm/Makefile b/sys/modules/apm/Makefile
index a92abc77dd85..ab09cd900dbe 100644
--- a/sys/modules/apm/Makefile
+++ b/sys/modules/apm/Makefile
@@ -10,7 +10,6 @@ CFLAGS+= -DPC98
KMOD= apm
SRCS= apm.c apm.h \
device_if.h bus_if.h
-NOMAN=
EXPORT_SYMS= apm_display \
apm_softc
diff --git a/sys/modules/bridge/Makefile b/sys/modules/bridge/Makefile
index 7f9835adb340..d2c1e32391da 100644
--- a/sys/modules/bridge/Makefile
+++ b/sys/modules/bridge/Makefile
@@ -3,6 +3,5 @@
.PATH: ${.CURDIR}/../../net
KMOD= bridge
SRCS= bridge.c
-NOMAN=
.include <bsd.kmod.mk>
diff --git a/sys/modules/cam/Makefile b/sys/modules/cam/Makefile
index ddf66559a64d..3ce605435ad8 100644
--- a/sys/modules/cam/Makefile
+++ b/sys/modules/cam/Makefile
@@ -30,8 +30,6 @@ SRCS+= scsi_sa.c
SRCS+= scsi_ses.c
SRCS+= scsi_targ_bh.c scsi_target.c
-NOMAN=
-
EXPORT_SYMS= YES # XXX evaluate
opt_scsi.h:
diff --git a/sys/modules/cardbus/Makefile b/sys/modules/cardbus/Makefile
index 075275599012..fe49a199ddbd 100644
--- a/sys/modules/cardbus/Makefile
+++ b/sys/modules/cardbus/Makefile
@@ -5,7 +5,6 @@
KMOD= cardbus
SRCS= cardbus.c cardbus_cis.c \
device_if.h bus_if.h card_if.h power_if.h pci_if.h pcib_if.h
-NOMAN=
EXPORT_SYMS= YES # XXX evaluate
diff --git a/sys/modules/cbb/Makefile b/sys/modules/cbb/Makefile
index 16ab0d86c780..d887cd21c1b2 100644
--- a/sys/modules/cbb/Makefile
+++ b/sys/modules/cbb/Makefile
@@ -5,7 +5,6 @@
KMOD= cbb
SRCS= pccbb.c \
device_if.h bus_if.h
-NOMAN=
EXPORT_SYMS= YES # XXX evaluate
diff --git a/sys/modules/ccd/Makefile b/sys/modules/ccd/Makefile
index 6ec2fa61c091..8bfc1daaf240 100644
--- a/sys/modules/ccd/Makefile
+++ b/sys/modules/ccd/Makefile
@@ -4,6 +4,5 @@
KMOD= ccd
SRCS= ccd.c vnode_if.h
-NOMAN=
.include <bsd.kmod.mk>
diff --git a/sys/modules/cd9660/Makefile b/sys/modules/cd9660/Makefile
index 94d012c17479..769ac7ec2476 100644
--- a/sys/modules/cd9660/Makefile
+++ b/sys/modules/cd9660/Makefile
@@ -7,6 +7,5 @@ SRCS= vnode_if.h \
cd9660_bmap.c cd9660_lookup.c cd9660_node.c cd9660_rrip.c \
cd9660_util.c cd9660_vfsops.c cd9660_vnops.c
EXPORT_SYMS= cd9660_wchar2char
-NOMAN=
.include <bsd.kmod.mk>
diff --git a/sys/modules/coda/Makefile b/sys/modules/coda/Makefile
index d46dba216990..c04d1a1c4875 100644
--- a/sys/modules/coda/Makefile
+++ b/sys/modules/coda/Makefile
@@ -6,7 +6,6 @@ KMOD= coda
SRCS= vnode_if.h \
coda_fbsd.c coda_namecache.c coda_psdev.c coda_subr.c \
coda_venus.c coda_vfsops.c coda_vnops.c vcoda.h
-NOMAN=
CLEANFILES= vcoda.h
diff --git a/sys/modules/coff/Makefile b/sys/modules/coff/Makefile
index a1e9a81261d3..95956e5c9784 100644
--- a/sys/modules/coff/Makefile
+++ b/sys/modules/coff/Makefile
@@ -4,7 +4,6 @@
KMOD= ibcs2_coff
SRCS= imgact_coff.c vnode_if.h
-NOMAN=
CFLAGS+= -DCOMPAT_IBCS2
diff --git a/sys/modules/dummynet/Makefile b/sys/modules/dummynet/Makefile
index 9454ba11cbcf..18f6eedfefd8 100644
--- a/sys/modules/dummynet/Makefile
+++ b/sys/modules/dummynet/Makefile
@@ -3,6 +3,5 @@
.PATH: ${.CURDIR}/../../netinet
KMOD= dummynet
SRCS= ip_dummynet.c opt_bdg.h
-NOMAN=
.include <bsd.kmod.mk>
diff --git a/sys/modules/ext2fs/Makefile b/sys/modules/ext2fs/Makefile
index 03b28aa107cd..232e313f2cbc 100644
--- a/sys/modules/ext2fs/Makefile
+++ b/sys/modules/ext2fs/Makefile
@@ -6,7 +6,6 @@ SRCS= vnode_if.h opt_quota.h opt_ddb.h opt_suiddir.h \
ext2_alloc.c ext2_balloc.c ext2_inode.c ext2_inode_cnv.c \
ext2_linux_balloc.c ext2_linux_ialloc.c ext2_lookup.c ext2_subr.c \
ext2_vfsops.c ext2_vnops.c
-NOMAN=
.include <bsd.kmod.mk>
# DO NOT DELETE
diff --git a/sys/modules/fdc/Makefile b/sys/modules/fdc/Makefile
index e95a44b0de6d..880d69089176 100644
--- a/sys/modules/fdc/Makefile
+++ b/sys/modules/fdc/Makefile
@@ -11,7 +11,6 @@ KMOD= fdc
SRCS= fd.c \
opt_fdc.h card.h \
bus_if.h card_if.h device_if.h isa_if.h
-NOMAN=
FDC_DEBUG?= 0 # 0/1
FDC_PCCARD?= 1 # 0/1 whether pccard support (i. e. Y-E DATA PCMCIA
diff --git a/sys/modules/fdescfs/Makefile b/sys/modules/fdescfs/Makefile
index dc8b6dbce3b4..eead3ec0862b 100644
--- a/sys/modules/fdescfs/Makefile
+++ b/sys/modules/fdescfs/Makefile
@@ -5,6 +5,5 @@
KMOD= fdescfs
SRCS= vnode_if.h \
fdesc_vfsops.c fdesc_vnops.c
-NOMAN=
.include <bsd.kmod.mk>
diff --git a/sys/modules/fpu/Makefile b/sys/modules/fpu/Makefile
index 33b12cf430ae..a8e78b74fe6f 100644
--- a/sys/modules/fpu/Makefile
+++ b/sys/modules/fpu/Makefile
@@ -4,6 +4,5 @@
KMOD= fpu
SRCS= math_emulate.c
-NOMAN=
.include <bsd.kmod.mk>
diff --git a/sys/modules/gnufpu/Makefile b/sys/modules/gnufpu/Makefile
index 858c7d2992f8..f3767f79e1df 100644
--- a/sys/modules/gnufpu/Makefile
+++ b/sys/modules/gnufpu/Makefile
@@ -8,7 +8,6 @@ SRCS= div_small.s errors.c fpu_arith.c fpu_aux.c fpu_entry.c fpu_etc.c \
poly_div.s poly_l2.c poly_mul64.s poly_sin.c poly_tan.c \
polynomial.s reg_add_sub.c reg_compare.c reg_constant.c reg_div.s \
reg_ld_str.c reg_u_mul.s reg_u_sub.s wm_shrx.s wm_sqrt.s
-NOMAN=
EXPORT_SYMS= math_emulate
diff --git a/sys/modules/hpfs/Makefile b/sys/modules/hpfs/Makefile
index 41f9f2b1abeb..438860307914 100644
--- a/sys/modules/hpfs/Makefile
+++ b/sys/modules/hpfs/Makefile
@@ -6,6 +6,5 @@ KMOD= hpfs
SRCS= vnode_if.h \
hpfs_vfsops.c hpfs_vnops.c hpfs_hash.c hpfs_subr.c hpfs_lookup.c \
hpfs_alsubr.c
-NOMAN=
.include <bsd.kmod.mk>
diff --git a/sys/modules/if_disc/Makefile b/sys/modules/if_disc/Makefile
index a284e7fd8683..f88df14eb649 100644
--- a/sys/modules/if_disc/Makefile
+++ b/sys/modules/if_disc/Makefile
@@ -4,7 +4,6 @@
KMOD= if_disc
SRCS= if_disc.c opt_inet.h opt_inet6.h
-NOMAN=
opt_inet.h:
echo "#define INET 1" > ${.TARGET}
diff --git a/sys/modules/if_ef/Makefile b/sys/modules/if_ef/Makefile
index 7ea9351fdc03..ff84ced5e2be 100644
--- a/sys/modules/if_ef/Makefile
+++ b/sys/modules/if_ef/Makefile
@@ -4,7 +4,6 @@
KMOD= if_ef
SRCS= if_ef.c opt_ipx.h opt_inet.h opt_ef.h
-NOMAN=
# If you need only limited number of frames comment out unneeded ones
# this will reduce number of visible devices
diff --git a/sys/modules/if_faith/Makefile b/sys/modules/if_faith/Makefile
index 1f6e4a9cb9c3..959d5e287fc0 100644
--- a/sys/modules/if_faith/Makefile
+++ b/sys/modules/if_faith/Makefile
@@ -4,7 +4,6 @@
KMOD= if_faith
SRCS= if_faith.c opt_inet.h opt_inet6.h
-NOMAN=
opt_inet.h:
echo "#define INET 1" > ${.TARGET}
diff --git a/sys/modules/if_gif/Makefile b/sys/modules/if_gif/Makefile
index 29195bd01e3a..cb63fa171503 100644
--- a/sys/modules/if_gif/Makefile
+++ b/sys/modules/if_gif/Makefile
@@ -4,7 +4,6 @@
KMOD= if_gif
SRCS= if_gif.c in_gif.c in6_gif.c opt_inet.h opt_inet6.h opt_mrouting.h
-NOMAN=
opt_inet.h:
echo "#define INET 1" > ${.TARGET}
diff --git a/sys/modules/if_ppp/Makefile b/sys/modules/if_ppp/Makefile
index c845db23bf4e..e3ba2f053a8b 100644
--- a/sys/modules/if_ppp/Makefile
+++ b/sys/modules/if_ppp/Makefile
@@ -5,7 +5,6 @@
KMOD= if_ppp
SRCS= if_ppp.c ppp_tty.c slcompress.c \
opt_inet.h opt_ipx.h opt_ppp.h ppp.h vnode_if.h
-NOMAN=
NPPP?= 2
PPP_BSDCOMP?= 1 # 0/1
diff --git a/sys/modules/if_sl/Makefile b/sys/modules/if_sl/Makefile
index 4bf75207b31f..e57301317f08 100644
--- a/sys/modules/if_sl/Makefile
+++ b/sys/modules/if_sl/Makefile
@@ -4,7 +4,6 @@
KMOD= if_sl
SRCS= if_sl.c slcompress.c opt_inet.h opt_slip.h
-NOMAN=
opt_inet.h:
echo "#define INET 1" > ${.TARGET}
diff --git a/sys/modules/if_stf/Makefile b/sys/modules/if_stf/Makefile
index 5bdb0cbc1b9d..32af67a369ae 100644
--- a/sys/modules/if_stf/Makefile
+++ b/sys/modules/if_stf/Makefile
@@ -4,7 +4,6 @@
KMOD= if_stf
SRCS= if_stf.c opt_inet.h opt_inet6.h
-NOMAN=
opt_inet.h:
echo "#define INET 1" > ${.TARGET}
diff --git a/sys/modules/if_tun/Makefile b/sys/modules/if_tun/Makefile
index 1b6e3b390c71..e849c1534669 100644
--- a/sys/modules/if_tun/Makefile
+++ b/sys/modules/if_tun/Makefile
@@ -4,7 +4,6 @@
KMOD= if_tun
SRCS= if_tun.c opt_inet.h vnode_if.h
-NOMAN=
opt_inet.h:
echo "#define INET 1" > ${.TARGET}
diff --git a/sys/modules/if_vlan/Makefile b/sys/modules/if_vlan/Makefile
index 45dc153af9ab..797ece457eda 100644
--- a/sys/modules/if_vlan/Makefile
+++ b/sys/modules/if_vlan/Makefile
@@ -4,7 +4,6 @@
KMOD= if_vlan
SRCS= if_vlan.c opt_inet.h
-NOMAN=
opt_inet.h:
echo "#define INET 1" > ${.TARGET}
diff --git a/sys/modules/ip6fw/Makefile b/sys/modules/ip6fw/Makefile
index ca39dc91c9bd..42ca025507cc 100644
--- a/sys/modules/ip6fw/Makefile
+++ b/sys/modules/ip6fw/Makefile
@@ -4,7 +4,6 @@
KMOD= ip6fw
SRCS= ip6_fw.c
-NOMAN=
CFLAGS+= -DIPV6FIREWALL
diff --git a/sys/modules/ip_mroute_mod/Makefile b/sys/modules/ip_mroute_mod/Makefile
index d1e2d16dc339..4755078849e4 100644
--- a/sys/modules/ip_mroute_mod/Makefile
+++ b/sys/modules/ip_mroute_mod/Makefile
@@ -4,7 +4,6 @@
KMOD= ip_mroute
SRCS= ip_mroute.c opt_mrouting.h opt_random_ip_id.h
-NOMAN=
CFLAGS+= -DMROUTE_KLD
diff --git a/sys/modules/ipfilter/Makefile b/sys/modules/ipfilter/Makefile
index b7526b914181..c8bd0908e166 100644
--- a/sys/modules/ipfilter/Makefile
+++ b/sys/modules/ipfilter/Makefile
@@ -5,7 +5,6 @@
KMOD= ipl
SRCS= mlfk_ipl.c ip_nat.c ip_frag.c ip_state.c ip_proxy.c ip_auth.c \
ip_log.c ip_fil.c fil.c
-NOMAN=
CFLAGS+= -I${.CURDIR}/../../contrib/ipfilter
CFLAGS+= -DIPFILTER=1 -DIPFILTER_LKM -DIPFILTER_LOG
diff --git a/sys/modules/ipfw/Makefile b/sys/modules/ipfw/Makefile
index 6ac704d322f3..bc0871acc52f 100644
--- a/sys/modules/ipfw/Makefile
+++ b/sys/modules/ipfw/Makefile
@@ -4,7 +4,6 @@
KMOD= ipfw
SRCS= ip_fw.c
-NOMAN=
CFLAGS+= -DIPFIREWALL
#
diff --git a/sys/modules/libiconv/Makefile b/sys/modules/libiconv/Makefile
index 2fb25d2e3c17..ea157a42b97c 100644
--- a/sys/modules/libiconv/Makefile
+++ b/sys/modules/libiconv/Makefile
@@ -7,7 +7,6 @@ SRCS= iconv.c iconv_xlat.c
SRCS+= iconv.h
SRCS+= iconv_converter_if.c iconv_converter_if.h
MFILES= libkern/iconv_converter_if.m
-NOMAN= true
EXPORT_SYMS= iconv_open \
iconv_close \
diff --git a/sys/modules/lomac/Makefile b/sys/modules/lomac/Makefile
index 883698b55a37..e661792b578d 100644
--- a/sys/modules/lomac/Makefile
+++ b/sys/modules/lomac/Makefile
@@ -5,7 +5,6 @@ SRCS= vnode_if.h kernel_lkm.c kernel_interface.c kernel_util.c \
kernel_log.c kernel_mediate.c lomacfs_vfsops.c lomacfs_vnops.c \
lomacfs_subr.c kernel_monitor.c kernel_mmap.c kernel_pipe.c \
kernel_socket.c
-NOMAN= yes
SUBDIR+= syscall_gate
SUBDIR+= plm
CFLAGS+= -I${.CURDIR}/../../security/lomac
diff --git a/sys/modules/lomac/plm/Makefile b/sys/modules/lomac/plm/Makefile
index d18961763286..2dac4b871219 100644
--- a/sys/modules/lomac/plm/Makefile
+++ b/sys/modules/lomac/plm/Makefile
@@ -2,7 +2,6 @@
KMOD= lomac_plm
SRCS= vnode_if.h kernel_plm.c
-NOMAN= yes
CFLAGS+= -I${.CURDIR}/../../../security/lomac
EXPORT_SYMS= lomac_node_entry_root \
diff --git a/sys/modules/lomac/syscall_gate/Makefile b/sys/modules/lomac/syscall_gate/Makefile
index 54c5d083d85f..d74fe922468a 100644
--- a/sys/modules/lomac/syscall_gate/Makefile
+++ b/sys/modules/lomac/syscall_gate/Makefile
@@ -2,7 +2,6 @@
KMOD= syscall_gate
SRCS= syscall_gate.c
-NOMAN= yes
CFLAGS+= -I${.CURDIR}/../../../security/lomac
EXPORT_SYMS= syscall_gate_register \
diff --git a/sys/modules/lpt/Makefile b/sys/modules/lpt/Makefile
index 85523c7a006d..b57960d572f4 100644
--- a/sys/modules/lpt/Makefile
+++ b/sys/modules/lpt/Makefile
@@ -6,6 +6,5 @@ KMOD= lpt
SRCS= bus_if.h device_if.h ppbus_if.h \
opt_lpt.h \
lpt.c
-NOMAN=
.include <bsd.kmod.mk>
diff --git a/sys/modules/md/Makefile b/sys/modules/md/Makefile
index c28d0038d913..f7c127d5e24d 100644
--- a/sys/modules/md/Makefile
+++ b/sys/modules/md/Makefile
@@ -4,6 +4,5 @@
KMOD= md
SRCS= md.c opt_md.h vnode_if.h
-NOMAN=
.include <bsd.kmod.mk>
diff --git a/sys/modules/msdosfs/Makefile b/sys/modules/msdosfs/Makefile
index 62a9ba900e73..ffa2e1d13e2f 100644
--- a/sys/modules/msdosfs/Makefile
+++ b/sys/modules/msdosfs/Makefile
@@ -6,7 +6,6 @@ KMOD= msdosfs
SRCS= vnode_if.h \
msdosfs_conv.c msdosfs_denode.c msdosfs_fat.c msdosfs_lookup.c \
msdosfs_vfsops.c msdosfs_vnops.c
-NOMAN=
.if ${MACHINE} == "pc98"
CFLAGS+= -DPC98
diff --git a/sys/modules/ncp/Makefile b/sys/modules/ncp/Makefile
index 256a5bf73010..dfcedb9c72b6 100644
--- a/sys/modules/ncp/Makefile
+++ b/sys/modules/ncp/Makefile
@@ -12,8 +12,6 @@ SRCS+= ncp_burst.c
CFLAGS+= -DNCPBURST
.endif
-NOMAN=
-
load: ${KMOD}.ko
kldload ./${KMOD}.ko
diff --git a/sys/modules/netgraph/UI/Makefile b/sys/modules/netgraph/UI/Makefile
index 49eb908413b8..413308c13812 100644
--- a/sys/modules/netgraph/UI/Makefile
+++ b/sys/modules/netgraph/UI/Makefile
@@ -3,6 +3,5 @@
KMOD= ng_UI
SRCS= ng_UI.c
-NOMAN=
.include <bsd.kmod.mk>
diff --git a/sys/modules/netgraph/async/Makefile b/sys/modules/netgraph/async/Makefile
index cb0e01c89730..921eabcf2727 100644
--- a/sys/modules/netgraph/async/Makefile
+++ b/sys/modules/netgraph/async/Makefile
@@ -3,6 +3,5 @@
KMOD= ng_async
SRCS= ng_async.c
-NOMAN=
.include <bsd.kmod.mk>
diff --git a/sys/modules/netgraph/bpf/Makefile b/sys/modules/netgraph/bpf/Makefile
index 40d25fed4fee..0bde4f25e198 100644
--- a/sys/modules/netgraph/bpf/Makefile
+++ b/sys/modules/netgraph/bpf/Makefile
@@ -5,6 +5,5 @@
KMOD= ng_bpf
SRCS= ng_bpf.c bpf_filter.c
-NOMAN=
.include <bsd.kmod.mk>
diff --git a/sys/modules/netgraph/bridge/Makefile b/sys/modules/netgraph/bridge/Makefile
index 91f4df947124..318142900c91 100644
--- a/sys/modules/netgraph/bridge/Makefile
+++ b/sys/modules/netgraph/bridge/Makefile
@@ -2,6 +2,5 @@
KMOD= ng_bridge
SRCS= ng_bridge.c
-NOMAN=
.include <bsd.kmod.mk>
diff --git a/sys/modules/netgraph/cisco/Makefile b/sys/modules/netgraph/cisco/Makefile
index fdadaf30511b..2e3000dd3bf5 100644
--- a/sys/modules/netgraph/cisco/Makefile
+++ b/sys/modules/netgraph/cisco/Makefile
@@ -3,6 +3,5 @@
KMOD= ng_cisco
SRCS= ng_cisco.c
-NOMAN=
.include <bsd.kmod.mk>
diff --git a/sys/modules/netgraph/echo/Makefile b/sys/modules/netgraph/echo/Makefile
index 1fa83ac5e939..d7cce8d461ef 100644
--- a/sys/modules/netgraph/echo/Makefile
+++ b/sys/modules/netgraph/echo/Makefile
@@ -3,6 +3,5 @@
KMOD= ng_echo
SRCS= ng_echo.c
-NOMAN=
.include <bsd.kmod.mk>
diff --git a/sys/modules/netgraph/eiface/Makefile b/sys/modules/netgraph/eiface/Makefile
index c10175c3ee76..6e8b800c8ec4 100644
--- a/sys/modules/netgraph/eiface/Makefile
+++ b/sys/modules/netgraph/eiface/Makefile
@@ -2,6 +2,5 @@
KMOD= ng_eiface
SRCS= ng_eiface.c
-NOMAN=
.include <bsd.kmod.mk>
diff --git a/sys/modules/netgraph/etf/Makefile b/sys/modules/netgraph/etf/Makefile
index 423aacb32949..7340ceca96cd 100644
--- a/sys/modules/netgraph/etf/Makefile
+++ b/sys/modules/netgraph/etf/Makefile
@@ -5,6 +5,5 @@ COPTS+=-g
KMOD= ng_etf
SRCS= ng_etf.c
-NOMAN=
.include <bsd.kmod.mk>
diff --git a/sys/modules/netgraph/frame_relay/Makefile b/sys/modules/netgraph/frame_relay/Makefile
index d662fe17d03d..81a2a96aeeb9 100644
--- a/sys/modules/netgraph/frame_relay/Makefile
+++ b/sys/modules/netgraph/frame_relay/Makefile
@@ -3,6 +3,5 @@
KMOD= ng_frame_relay
SRCS= ng_frame_relay.c
-NOMAN=
.include <bsd.kmod.mk>
diff --git a/sys/modules/netgraph/hole/Makefile b/sys/modules/netgraph/hole/Makefile
index f95f1f1dd13e..c7502bfccf85 100644
--- a/sys/modules/netgraph/hole/Makefile
+++ b/sys/modules/netgraph/hole/Makefile
@@ -3,6 +3,5 @@
KMOD= ng_hole
SRCS= ng_hole.c
-NOMAN=
.include <bsd.kmod.mk>
diff --git a/sys/modules/netgraph/iface/Makefile b/sys/modules/netgraph/iface/Makefile
index ec2d9116939e..12c6b006a483 100644
--- a/sys/modules/netgraph/iface/Makefile
+++ b/sys/modules/netgraph/iface/Makefile
@@ -3,6 +3,5 @@
KMOD= ng_iface
SRCS= ng_iface.c
-NOMAN=
.include <bsd.kmod.mk>
diff --git a/sys/modules/netgraph/ip_input/Makefile b/sys/modules/netgraph/ip_input/Makefile
index 8421f55cc7bf..7a40c45c2dc8 100644
--- a/sys/modules/netgraph/ip_input/Makefile
+++ b/sys/modules/netgraph/ip_input/Makefile
@@ -2,6 +2,5 @@
KMOD= ng_ip_input
SRCS= ng_ip_input.c
-NOMAN=
.include <bsd.kmod.mk>
diff --git a/sys/modules/netgraph/ksocket/Makefile b/sys/modules/netgraph/ksocket/Makefile
index 582b353c32f4..f8fd73f87568 100644
--- a/sys/modules/netgraph/ksocket/Makefile
+++ b/sys/modules/netgraph/ksocket/Makefile
@@ -2,6 +2,5 @@
KMOD= ng_ksocket
SRCS= ng_ksocket.c
-NOMAN=
.include <bsd.kmod.mk>
diff --git a/sys/modules/netgraph/lmi/Makefile b/sys/modules/netgraph/lmi/Makefile
index 97ce92948b84..e1b08876d1b1 100644
--- a/sys/modules/netgraph/lmi/Makefile
+++ b/sys/modules/netgraph/lmi/Makefile
@@ -3,6 +3,5 @@
KMOD= ng_lmi
SRCS= ng_lmi.c
-NOMAN=
.include <bsd.kmod.mk>
diff --git a/sys/modules/netgraph/mppc/Makefile b/sys/modules/netgraph/mppc/Makefile
index 84086d51749b..645781fb0149 100644
--- a/sys/modules/netgraph/mppc/Makefile
+++ b/sys/modules/netgraph/mppc/Makefile
@@ -3,7 +3,6 @@
KMOD= ng_mppc
SRCS= ng_mppc.c opt_netgraph.h
-NOMAN=
NETGRAPH_MPPC_COMPRESSION?= 0
NETGRAPH_MPPC_ENCRYPTION?= 1
diff --git a/sys/modules/netgraph/netgraph/Makefile b/sys/modules/netgraph/netgraph/Makefile
index 765155d423e4..a34d6164c908 100644
--- a/sys/modules/netgraph/netgraph/Makefile
+++ b/sys/modules/netgraph/netgraph/Makefile
@@ -3,6 +3,5 @@
KMOD= netgraph
SRCS= ng_base.c ng_parse.c
-NOMAN=
.include <bsd.kmod.mk>
diff --git a/sys/modules/netgraph/one2many/Makefile b/sys/modules/netgraph/one2many/Makefile
index fb7a64398b6d..74a0a6c6273e 100644
--- a/sys/modules/netgraph/one2many/Makefile
+++ b/sys/modules/netgraph/one2many/Makefile
@@ -2,6 +2,5 @@
KMOD= ng_one2many
SRCS= ng_one2many.c
-NOMAN=
.include <bsd.kmod.mk>
diff --git a/sys/modules/netgraph/ppp/Makefile b/sys/modules/netgraph/ppp/Makefile
index f7633416ecc9..6ce720ab9587 100644
--- a/sys/modules/netgraph/ppp/Makefile
+++ b/sys/modules/netgraph/ppp/Makefile
@@ -3,6 +3,5 @@
KMOD= ng_ppp
SRCS= ng_ppp.c
-NOMAN=
.include <bsd.kmod.mk>
diff --git a/sys/modules/netgraph/pppoe/Makefile b/sys/modules/netgraph/pppoe/Makefile
index df5c7f010707..642dbdde2106 100644
--- a/sys/modules/netgraph/pppoe/Makefile
+++ b/sys/modules/netgraph/pppoe/Makefile
@@ -3,6 +3,5 @@
KMOD= ng_pppoe
SRCS= ng_pppoe.c
-NOMAN=
.include <bsd.kmod.mk>
diff --git a/sys/modules/netgraph/pptpgre/Makefile b/sys/modules/netgraph/pptpgre/Makefile
index 391b3f8be62a..34cbbf6e2867 100644
--- a/sys/modules/netgraph/pptpgre/Makefile
+++ b/sys/modules/netgraph/pptpgre/Makefile
@@ -3,6 +3,5 @@
KMOD= ng_pptpgre
SRCS= ng_pptpgre.c
-NOMAN=
.include <bsd.kmod.mk>
diff --git a/sys/modules/netgraph/rfc1490/Makefile b/sys/modules/netgraph/rfc1490/Makefile
index 325ce6cf060e..6ba065345129 100644
--- a/sys/modules/netgraph/rfc1490/Makefile
+++ b/sys/modules/netgraph/rfc1490/Makefile
@@ -3,6 +3,5 @@
KMOD= ng_rfc1490
SRCS= ng_rfc1490.c
-NOMAN=
.include <bsd.kmod.mk>
diff --git a/sys/modules/netgraph/sample/Makefile b/sys/modules/netgraph/sample/Makefile
index 156cc6fcdade..701752662ed5 100644
--- a/sys/modules/netgraph/sample/Makefile
+++ b/sys/modules/netgraph/sample/Makefile
@@ -2,6 +2,5 @@
KMOD= ng_sample
SRCS= ng_sample.c
-NOMAN=
.include <bsd.kmod.mk>
diff --git a/sys/modules/netgraph/socket/Makefile b/sys/modules/netgraph/socket/Makefile
index 53fe8e9c3ed4..a44ba0ff6330 100644
--- a/sys/modules/netgraph/socket/Makefile
+++ b/sys/modules/netgraph/socket/Makefile
@@ -3,6 +3,5 @@
KMOD= ng_socket
SRCS= ng_socket.c
-NOMAN=
.include <bsd.kmod.mk>
diff --git a/sys/modules/netgraph/split/Makefile b/sys/modules/netgraph/split/Makefile
index 90226c0f809a..2eb4fa399b4a 100644
--- a/sys/modules/netgraph/split/Makefile
+++ b/sys/modules/netgraph/split/Makefile
@@ -3,6 +3,5 @@
KMOD= ng_split
SRCS= ng_split.c
-NOMAN=
.include <bsd.kmod.mk>
diff --git a/sys/modules/netgraph/tee/Makefile b/sys/modules/netgraph/tee/Makefile
index df8fa2226664..7d5115831a49 100644
--- a/sys/modules/netgraph/tee/Makefile
+++ b/sys/modules/netgraph/tee/Makefile
@@ -3,6 +3,5 @@
KMOD= ng_tee
SRCS= ng_tee.c
-NOMAN=
.include <bsd.kmod.mk>
diff --git a/sys/modules/netgraph/tty/Makefile b/sys/modules/netgraph/tty/Makefile
index daa615e5b816..3f19a7cd4e41 100644
--- a/sys/modules/netgraph/tty/Makefile
+++ b/sys/modules/netgraph/tty/Makefile
@@ -3,6 +3,5 @@
KMOD= ng_tty
SRCS= ng_tty.c
-NOMAN=
.include <bsd.kmod.mk>
diff --git a/sys/modules/netgraph/vjc/Makefile b/sys/modules/netgraph/vjc/Makefile
index e17fda8cbac0..4921ac953bb2 100644
--- a/sys/modules/netgraph/vjc/Makefile
+++ b/sys/modules/netgraph/vjc/Makefile
@@ -5,6 +5,5 @@
KMOD= ng_vjc
SRCS= ng_vjc.c slcompress.c
-NOMAN=
.include <bsd.kmod.mk>
diff --git a/sys/modules/nfsclient/Makefile b/sys/modules/nfsclient/Makefile
index 9ef1e30ef3be..55fcd880334e 100644
--- a/sys/modules/nfsclient/Makefile
+++ b/sys/modules/nfsclient/Makefile
@@ -8,7 +8,6 @@ SRCS= vnode_if.h \
opt_inet.h opt_nfs.h opt_bootp.h
NFS_INET?= 1 # 0/1 - requires INET to be configured in kernel
-NOMAN=
opt_inet.h:
touch ${.TARGET}
diff --git a/sys/modules/nfsserver/Makefile b/sys/modules/nfsserver/Makefile
index 9c9808d3a9b9..89d9664754d7 100644
--- a/sys/modules/nfsserver/Makefile
+++ b/sys/modules/nfsserver/Makefile
@@ -7,6 +7,4 @@ SRCS= vnode_if.h \
nfs_common.c \
opt_nfs.h
-NOMAN=
-
.include <bsd.kmod.mk>
diff --git a/sys/modules/ntfs/Makefile b/sys/modules/ntfs/Makefile
index 99d1a6edf110..48837b7a2fba 100644
--- a/sys/modules/ntfs/Makefile
+++ b/sys/modules/ntfs/Makefile
@@ -6,6 +6,5 @@ KMOD= ntfs
SRCS= vnode_if.h \
ntfs_vfsops.c ntfs_vnops.c ntfs_subr.c ntfs_ihash.c \
ntfs_compr.c
-NOMAN=
.include <bsd.kmod.mk>
diff --git a/sys/modules/nullfs/Makefile b/sys/modules/nullfs/Makefile
index d41ac2131a7d..22cbf003afbd 100644
--- a/sys/modules/nullfs/Makefile
+++ b/sys/modules/nullfs/Makefile
@@ -5,6 +5,5 @@
KMOD= nullfs
SRCS= vnode_if.h \
null_subr.c null_vfsops.c null_vnops.c
-NOMAN=
.include <bsd.kmod.mk>
diff --git a/sys/modules/nwfs/Makefile b/sys/modules/nwfs/Makefile
index d272cb0b3e77..1c1e6a89b90c 100644
--- a/sys/modules/nwfs/Makefile
+++ b/sys/modules/nwfs/Makefile
@@ -8,8 +8,6 @@ SRCS= vnode_if.h \
nwfs_node.c nwfs_ioctl.c nwfs_io.c nwfs_vfsops.c nwfs_vnops.c \
nwfs_subr.c opt_ncp.h opt_nwfs.h opt_vmpage.h
-NOMAN= true
-
.if defined(VNPRINT)
CFLAGS+= -DVNPRINT
.endif
diff --git a/sys/modules/oldcard/Makefile b/sys/modules/oldcard/Makefile
index c0bef69b8294..990eb77bf1f7 100644
--- a/sys/modules/oldcard/Makefile
+++ b/sys/modules/oldcard/Makefile
@@ -6,7 +6,6 @@ KMOD= oldcard
SRCS= pccard.c pcic.c pccard_beep.c pccard_nbk.c pcic_pci.c pcic_isa.c \
opt_pcic.h device_if.h bus_if.h isa_if.h pci_if.h \
power_if.h card_if.h power_if.c card_if.c
-NOMAN=
EXPORT_SYMS= YES # XXX evaluate
diff --git a/sys/modules/oltr/Makefile b/sys/modules/oltr/Makefile
index 2087aaad62a6..aac495b2da42 100644
--- a/sys/modules/oltr/Makefile
+++ b/sys/modules/oltr/Makefile
@@ -5,7 +5,6 @@ KMOD = if_oltr
SRCS = if_oltr.c trlldbm.c trlldhm.c trlldmac.c if_iso88025subr.c \
opt_inet.h opt_inet6.h opt_ipx.h device_if.h bus_if.h pci_if.h
OBJS+= trlld.o
-NOMAN=
TR_INET?= 1 # 0/1 requires INET to be configured in the kernel
TR_INET6?= 0 # 0/1 requires INET6 to be configured in the kernel
diff --git a/sys/modules/pccard/Makefile b/sys/modules/pccard/Makefile
index 1943a408bf54..ce2200f839af 100644
--- a/sys/modules/pccard/Makefile
+++ b/sys/modules/pccard/Makefile
@@ -5,7 +5,6 @@
KMOD= pccard
SRCS= pccard.c pccard_cis.c pccard_cis_quirks.c \
device_if.h bus_if.h card_if.h power_if.h
-NOMAN=
EXPORT_SYMS= YES # XXX evaluate
diff --git a/sys/modules/pcic/Makefile b/sys/modules/pcic/Makefile
index d5c98a6b72b7..c4a8b64d0382 100644
--- a/sys/modules/pcic/Makefile
+++ b/sys/modules/pcic/Makefile
@@ -5,7 +5,6 @@
KMOD= pcic
SRCS= i82365.c i82365_isa.c device_if.h bus_if.h isa_if.h \
power_if.h card_if.h power_if.c card_if.c
-NOMAN=
EXPORT_SYMS= YES # XXX evaluate
diff --git a/sys/modules/plip/Makefile b/sys/modules/plip/Makefile
index ea5dbd09ef00..9aa5bd41c378 100644
--- a/sys/modules/plip/Makefile
+++ b/sys/modules/plip/Makefile
@@ -6,6 +6,5 @@ KMOD= plip
SRCS= bus_if.h device_if.h ppbus_if.h \
opt_plip.h \
if_plip.c
-NOMAN=
.include <bsd.kmod.mk>
diff --git a/sys/modules/portalfs/Makefile b/sys/modules/portalfs/Makefile
index f23e69e3a5d4..ef6955b5d141 100644
--- a/sys/modules/portalfs/Makefile
+++ b/sys/modules/portalfs/Makefile
@@ -5,6 +5,5 @@
KMOD= portalfs
SRCS= vnode_if.h \
portal_vfsops.c portal_vnops.c
-NOMAN=
.include <bsd.kmod.mk>
diff --git a/sys/modules/ppbus/Makefile b/sys/modules/ppbus/Makefile
index 9f62f039dae1..fc0162a65c56 100644
--- a/sys/modules/ppbus/Makefile
+++ b/sys/modules/ppbus/Makefile
@@ -6,7 +6,6 @@ KMOD= ppbus
SRCS= bus_if.h device_if.h ppbus_if.h \
opt_ppb_1284.h opt_ppbus.h \
ppb_1284.c ppb_base.c ppb_msq.c ppbconf.c
-NOMAN=
EXPORT_SYMS= ppb_attach_device \
ppb_request_bus \
diff --git a/sys/modules/ppi/Makefile b/sys/modules/ppi/Makefile
index d6a158c2fcab..79db29474c99 100644
--- a/sys/modules/ppi/Makefile
+++ b/sys/modules/ppi/Makefile
@@ -6,6 +6,5 @@ KMOD= ppi
SRCS= bus_if.h device_if.h ppbus_if.h \
opt_ppi.h opt_ppb_1284.h \
ppi.c ppb_1284.c
-NOMAN=
.include <bsd.kmod.mk>
diff --git a/sys/modules/pps/Makefile b/sys/modules/pps/Makefile
index afb3168ebff4..8b4927365f9c 100644
--- a/sys/modules/pps/Makefile
+++ b/sys/modules/pps/Makefile
@@ -6,6 +6,5 @@ KMOD= pps
SRCS= bus_if.h device_if.h ppbus_if.h \
opt_pps.h \
pps.c
-NOMAN=
.include <bsd.kmod.mk>
diff --git a/sys/modules/random/Makefile b/sys/modules/random/Makefile
index e3a68be74a4f..d88a19b22a80 100644
--- a/sys/modules/random/Makefile
+++ b/sys/modules/random/Makefile
@@ -7,7 +7,6 @@ KMOD= random
SRCS= randomdev.c yarrow.c hash.c
SRCS+= rijndael-alg-fst.c rijndael-api-fst.c
SRCS+= bus_if.h device_if.h vnode_if.h
-NOMAN= yes
CFLAGS+= -I${.CURDIR}/../..
diff --git a/sys/modules/ray/Makefile b/sys/modules/ray/Makefile
index 7ba08399eb2b..2d9f5fca3579 100644
--- a/sys/modules/ray/Makefile
+++ b/sys/modules/ray/Makefile
@@ -5,6 +5,5 @@
KMOD= if_ray
SRCS= if_ray.c
SRCS+= device_if.h bus_if.h card_if.h opt_inet.h
-NOMAN=
.include <bsd.kmod.mk>
diff --git a/sys/modules/smbfs/Makefile b/sys/modules/smbfs/Makefile
index 800a634747e8..b067eddee89d 100644
--- a/sys/modules/smbfs/Makefile
+++ b/sys/modules/smbfs/Makefile
@@ -18,8 +18,6 @@ SRCS= vnode_if.h \
smbfs_vfsops.c smbfs_node.c smbfs_io.c smbfs_vnops.c \
smbfs_subr.c smbfs_smb.c
-NOMAN=true
-
NETSMBCRYPTO=yes
.if defined(NETSMBCRYPTO)
diff --git a/sys/modules/snp/Makefile b/sys/modules/snp/Makefile
index 6a450b23b5b0..9cafd330e7b6 100644
--- a/sys/modules/snp/Makefile
+++ b/sys/modules/snp/Makefile
@@ -4,6 +4,5 @@
KMOD= snp
SRCS= snp.c vnode_if.h
-NOMAN=
.include <bsd.kmod.mk>
diff --git a/sys/modules/splash/bmp/Makefile b/sys/modules/splash/bmp/Makefile
index 950c93078422..c1b6af44c304 100644
--- a/sys/modules/splash/bmp/Makefile
+++ b/sys/modules/splash/bmp/Makefile
@@ -2,7 +2,6 @@
KMOD= splash_bmp
SRCS= splash_bmp.c
-NOMAN=
.if ${MACHINE} == "pc98"
CFLAGS+= -DPC98
diff --git a/sys/modules/splash/pcx/Makefile b/sys/modules/splash/pcx/Makefile
index a64a61864db2..597852cc4192 100644
--- a/sys/modules/splash/pcx/Makefile
+++ b/sys/modules/splash/pcx/Makefile
@@ -2,6 +2,5 @@
KMOD= splash_pcx
SRCS= splash_pcx.c
-NOMAN=
.include <bsd.kmod.mk>
diff --git a/sys/modules/sppp/Makefile b/sys/modules/sppp/Makefile
index ec41649bdecc..53b6fce2cc94 100644
--- a/sys/modules/sppp/Makefile
+++ b/sys/modules/sppp/Makefile
@@ -5,7 +5,6 @@
KMOD= sppp
SRCS= if_spppsubr.c
SRCS+= opt_inet.h opt_inet6.h opt_ipx.h
-NOMAN=
EXPORT_SYMS= sppp_attach \
sppp_detach \
diff --git a/sys/modules/streams/Makefile b/sys/modules/streams/Makefile
index be92d1a6d575..b27942bf8b4e 100644
--- a/sys/modules/streams/Makefile
+++ b/sys/modules/streams/Makefile
@@ -5,7 +5,6 @@ MAINTAINER= newton@atdot.dotat.org
KMOD= streams
SRCS= streams.c opt_streams.h
-NOMAN=
EXPORT_SYMS= svr4_str_initialized \
svr4_stream_get \
diff --git a/sys/modules/syscons/apm/Makefile b/sys/modules/syscons/apm/Makefile
index 80338e2c655c..4ac0d8838688 100644
--- a/sys/modules/syscons/apm/Makefile
+++ b/sys/modules/syscons/apm/Makefile
@@ -4,7 +4,6 @@
KMOD= apm_saver
SRCS= apm_saver.c
-NOMAN=
.if ${MACHINE} == "pc98"
CFLAGS+= -DPC98
diff --git a/sys/modules/syscons/blank/Makefile b/sys/modules/syscons/blank/Makefile
index 5dba5188b0d9..673b6bd2ff55 100644
--- a/sys/modules/syscons/blank/Makefile
+++ b/sys/modules/syscons/blank/Makefile
@@ -4,6 +4,5 @@
KMOD= blank_saver
SRCS= blank_saver.c
-NOMAN=
.include <bsd.kmod.mk>
diff --git a/sys/modules/syscons/daemon/Makefile b/sys/modules/syscons/daemon/Makefile
index d8d85eb7b93d..90e4d04df7f4 100644
--- a/sys/modules/syscons/daemon/Makefile
+++ b/sys/modules/syscons/daemon/Makefile
@@ -4,7 +4,6 @@
KMOD= daemon_saver
SRCS= daemon_saver.c
-NOMAN=
.if ${MACHINE} == "pc98"
CFLAGS+= -DPC98
diff --git a/sys/modules/syscons/fade/Makefile b/sys/modules/syscons/fade/Makefile
index 1f983c651cc8..76919617dae8 100644
--- a/sys/modules/syscons/fade/Makefile
+++ b/sys/modules/syscons/fade/Makefile
@@ -4,6 +4,5 @@
KMOD= fade_saver
SRCS= fade_saver.c
-NOMAN=
.include <bsd.kmod.mk>
diff --git a/sys/modules/syscons/fire/Makefile b/sys/modules/syscons/fire/Makefile
index cf69150b6a31..306184b88434 100644
--- a/sys/modules/syscons/fire/Makefile
+++ b/sys/modules/syscons/fire/Makefile
@@ -4,7 +4,6 @@
KMOD= fire_saver
SRCS= fire_saver.c
-NOMAN=
CWARNFLAGS= -Wall -pedantic
diff --git a/sys/modules/syscons/green/Makefile b/sys/modules/syscons/green/Makefile
index 5cdae27b72c3..255171ebb445 100644
--- a/sys/modules/syscons/green/Makefile
+++ b/sys/modules/syscons/green/Makefile
@@ -4,6 +4,5 @@
KMOD= green_saver
SRCS= green_saver.c
-NOMAN=
.include <bsd.kmod.mk>
diff --git a/sys/modules/syscons/logo/Makefile b/sys/modules/syscons/logo/Makefile
index e6325ecee302..b4439f2ddb99 100644
--- a/sys/modules/syscons/logo/Makefile
+++ b/sys/modules/syscons/logo/Makefile
@@ -4,6 +4,5 @@
KMOD= logo_saver
SRCS= logo_saver.c logo.c
-NOMAN=
.include <bsd.kmod.mk>
diff --git a/sys/modules/syscons/rain/Makefile b/sys/modules/syscons/rain/Makefile
index c356ae44dff5..ef9937ba1c52 100644
--- a/sys/modules/syscons/rain/Makefile
+++ b/sys/modules/syscons/rain/Makefile
@@ -4,7 +4,6 @@
KMOD= rain_saver
SRCS= rain_saver.c
-NOMAN=
CWARNFLAGS= -Wall -pedantic
diff --git a/sys/modules/syscons/snake/Makefile b/sys/modules/syscons/snake/Makefile
index 6ea4ebb5d458..290236288174 100644
--- a/sys/modules/syscons/snake/Makefile
+++ b/sys/modules/syscons/snake/Makefile
@@ -4,7 +4,6 @@
KMOD= snake_saver
SRCS= snake_saver.c
-NOMAN=
.if ${MACHINE} == "pc98"
CFLAGS+= -DPC98
diff --git a/sys/modules/syscons/star/Makefile b/sys/modules/syscons/star/Makefile
index d3a66f584857..edbeeae73054 100644
--- a/sys/modules/syscons/star/Makefile
+++ b/sys/modules/syscons/star/Makefile
@@ -4,7 +4,6 @@
KMOD= star_saver
SRCS= star_saver.c
-NOMAN=
.if ${MACHINE} == "pc98"
CFLAGS+= -DPC98
diff --git a/sys/modules/syscons/warp/Makefile b/sys/modules/syscons/warp/Makefile
index 1186dc6c8172..4b7259dd5495 100644
--- a/sys/modules/syscons/warp/Makefile
+++ b/sys/modules/syscons/warp/Makefile
@@ -4,7 +4,6 @@
KMOD= warp_saver
SRCS= warp_saver.c
-NOMAN=
CWARNFLAGS= -Wall -pedantic
diff --git a/sys/modules/udbp/Makefile b/sys/modules/udbp/Makefile
index 8f5b81bb458c..8ddbb5dab9da 100644
--- a/sys/modules/udbp/Makefile
+++ b/sys/modules/udbp/Makefile
@@ -8,6 +8,5 @@ KMOD= udbp
SRCS= bus_if.h device_if.h \
opt_usb.h \
udbp.c
-NOMAN=
.include <bsd.kmod.mk>
diff --git a/sys/modules/ugen/Makefile b/sys/modules/ugen/Makefile
index a342f4f39563..777b04b10163 100644
--- a/sys/modules/ugen/Makefile
+++ b/sys/modules/ugen/Makefile
@@ -6,6 +6,5 @@ MAINTAINER= n_hibma@freebsd.org
KMOD= ugen
SRCS= bus_if.h device_if.h vnode_if.h opt_usb.h ugen.c
-NOMAN=
.include <bsd.kmod.mk>
diff --git a/sys/modules/uhid/Makefile b/sys/modules/uhid/Makefile
index df771a5374e1..7475f82da703 100644
--- a/sys/modules/uhid/Makefile
+++ b/sys/modules/uhid/Makefile
@@ -6,6 +6,5 @@ MAINTAINER= n_hibma@freebsd.org
KMOD= uhid
SRCS= bus_if.h device_if.h vnode_if.h opt_usb.h uhid.c
-NOMAN=
.include <bsd.kmod.mk>
diff --git a/sys/modules/ukbd/Makefile b/sys/modules/ukbd/Makefile
index a73e8ec52044..d6ca0487494d 100644
--- a/sys/modules/ukbd/Makefile
+++ b/sys/modules/ukbd/Makefile
@@ -7,7 +7,6 @@ KMOD= ukbd
SRCS= bus_if.h device_if.h vnode_if.h \
opt_usb.h opt_kbd.h opt_ukbd.h \
ukbd.c
-NOMAN=
opt_kbd.h:
echo '#define KBD_INSTALL_CDEV 1' > opt_kbd.h
diff --git a/sys/modules/ulpt/Makefile b/sys/modules/ulpt/Makefile
index 266e78dd5fa0..aa0f091400c8 100644
--- a/sys/modules/ulpt/Makefile
+++ b/sys/modules/ulpt/Makefile
@@ -6,6 +6,5 @@ MAINTAINER= n_hibma@freebsd.org
KMOD= ulpt
SRCS= bus_if.h device_if.h vnode_if.h opt_usb.h ulpt.c
-NOMAN=
.include <bsd.kmod.mk>
diff --git a/sys/modules/umapfs/Makefile b/sys/modules/umapfs/Makefile
index ad9935ebe548..761d588dba22 100644
--- a/sys/modules/umapfs/Makefile
+++ b/sys/modules/umapfs/Makefile
@@ -5,6 +5,5 @@
KMOD= umapfs
SRCS= vnode_if.h \
umap_subr.c umap_vfsops.c umap_vnops.c
-NOMAN=
.include <bsd.kmod.mk>
diff --git a/sys/modules/umass/Makefile b/sys/modules/umass/Makefile
index 28dcd55ab2d0..94922ac0a178 100644
--- a/sys/modules/umass/Makefile
+++ b/sys/modules/umass/Makefile
@@ -8,6 +8,5 @@ KMOD= umass
SRCS= bus_if.h device_if.h \
opt_usb.h opt_cam.h opt_scsi.h \
umass.c
-NOMAN=
.include <bsd.kmod.mk>
diff --git a/sys/modules/umodem/Makefile b/sys/modules/umodem/Makefile
index f002ba025ec4..e3c395f2b054 100644
--- a/sys/modules/umodem/Makefile
+++ b/sys/modules/umodem/Makefile
@@ -6,6 +6,5 @@ MAINTAINER= n_hibma@freebsd.org
KMOD= umodem
SRCS= bus_if.h device_if.h vnode_if.h opt_usb.h umodem.c
-NOMAN=
.include <bsd.kmod.mk>
diff --git a/sys/modules/ums/Makefile b/sys/modules/ums/Makefile
index de8f23aeb387..f5163312e788 100644
--- a/sys/modules/ums/Makefile
+++ b/sys/modules/ums/Makefile
@@ -6,6 +6,5 @@ MAINTAINER= n_hibma@freebsd.org
KMOD= ums
SRCS= bus_if.h device_if.h vnode_if.h opt_usb.h ums.c
-NOMAN=
.include <bsd.kmod.mk>
diff --git a/sys/modules/unionfs/Makefile b/sys/modules/unionfs/Makefile
index 2f80909f73c4..64d38c5f2a82 100644
--- a/sys/modules/unionfs/Makefile
+++ b/sys/modules/unionfs/Makefile
@@ -5,6 +5,5 @@
KMOD= unionfs
SRCS= vnode_if.h \
union_subr.c union_vfsops.c union_vnops.c
-NOMAN=
.include <bsd.kmod.mk>
diff --git a/sys/modules/urio/Makefile b/sys/modules/urio/Makefile
index e5eb45bf5440..93c6fc7acca2 100644
--- a/sys/modules/urio/Makefile
+++ b/sys/modules/urio/Makefile
@@ -6,6 +6,5 @@ MAINTAINER= Iwasa Kazmi <kzmi@ca2.so-net.ne.jp>
KMOD= urio
SRCS= bus_if.h device_if.h vnode_if.h opt_usb.h urio.c
-NOMAN=
.include <bsd.kmod.mk>
diff --git a/sys/modules/usb/Makefile b/sys/modules/usb/Makefile
index a03d2cc0a6f5..b7d931d71595 100644
--- a/sys/modules/usb/Makefile
+++ b/sys/modules/usb/Makefile
@@ -26,6 +26,4 @@ SRCS+= uhci_pci.c uhci.c uhcireg.h uhcivar.h
SRCS+= ohci_pci.c ohci.c ohcireg.h ohcivar.h
SRCS+= opt_bus.h pci_if.h
-NOMAN=
-
.include <bsd.kmod.mk>
diff --git a/sys/modules/uscanner/Makefile b/sys/modules/uscanner/Makefile
index 239aafe82290..d6abda3370ad 100644
--- a/sys/modules/uscanner/Makefile
+++ b/sys/modules/uscanner/Makefile
@@ -6,7 +6,6 @@ MAINTAINER= n_hibma@freebsd.org
KMOD= uscanner
SRCS= bus_if.h device_if.h vnode_if.h opt_usb.h uscanner.c
-NOMAN=
CFLAGS+= -g
diff --git a/sys/modules/vesa/Makefile b/sys/modules/vesa/Makefile
index 44375318d9a9..eb49f933c9ba 100644
--- a/sys/modules/vesa/Makefile
+++ b/sys/modules/vesa/Makefile
@@ -4,6 +4,5 @@
KMOD= vesa
SRCS= vesa.c scvesactl.c opt_vga.h opt_vesa.h
-NOMAN=
.include <bsd.kmod.mk>
diff --git a/sys/modules/vinum/Makefile b/sys/modules/vinum/Makefile
index 2a7e46b37318..f48c7a659032 100644
--- a/sys/modules/vinum/Makefile
+++ b/sys/modules/vinum/Makefile
@@ -8,7 +8,6 @@ SRCS= opt_vinum.h request.h vinum.c vinumconfig.c vinumdaemon.c \
vinumioctl.c vinumkw.h vinumlock.c vinummemory.c vinumobj.h vinumparser.c \
vinumraid5.c vinumrequest.c vinumrevive.c vinumstate.c \
vinumstate.h vinumutil.c vinumvar.h vnode_if.h
-NOMAN=
# If you remove -DVINUMDEBUG here, you must also do it in src/sbin/Makefile.
# Otherwise a number of ioctls will fail.
diff --git a/sys/modules/vpo/Makefile b/sys/modules/vpo/Makefile
index f63e610f9485..cad169a856fb 100644
--- a/sys/modules/vpo/Makefile
+++ b/sys/modules/vpo/Makefile
@@ -6,6 +6,5 @@ KMOD= vpo
SRCS= bus_if.h device_if.h ppbus_if.h \
opt_cam.h opt_scsi.h opt_vpo.h \
immio.c vpo.c vpoio.c
-NOMAN=
.include <bsd.kmod.mk>