Zap some unused echo "#define NFOO 1" > foo.h style defunct stuff.

20 files changed, 40 insertions, 103 deletions

diff --git a/sys/modules/al/Makefile b/sys/modules/al/Makefile
index 79cdb3f..db65543 100644
--- a/sys/modules/al/Makefile
+++ b/sys/modules/al/Makefile
@@ -3,16 +3,13 @@
 S	= ${.CURDIR}/../..
 .PATH:	$S/pci
 KMOD	= al
-SRCS	= if_al.c al.h opt_bdg.h device_if.h bus_if.h pci_if.h
+SRCS	= if_al.c opt_bdg.h device_if.h bus_if.h pci_if.h
 SRCS	+= miibus_if.h
-CLEANFILES	+= al.h opt_bdg.h device_if.h bus_if.h pci_if.h
+CLEANFILES	+= opt_bdg.h device_if.h bus_if.h pci_if.h
 CLEANFILES	+= miibus_if.h
 CFLAGS	+= ${DEBUG_FLAGS}
 KMODDEPS = miibus
 
-al.h:
-	echo "#define NAL 1" > al.h
-
 opt_bdg.h:
 	touch opt_bdg.h
 
diff --git a/sys/modules/ax/Makefile b/sys/modules/ax/Makefile
index 09e7197..6f5eec3 100644
--- a/sys/modules/ax/Makefile
+++ b/sys/modules/ax/Makefile
@@ -3,13 +3,10 @@
 S	= ${.CURDIR}/../..
 .PATH:	$S/pci
 KMOD	= if_ax
-SRCS	= if_ax.c ax.h opt_bdg.h device_if.h bus_if.h pci_if.h
-CLEANFILES	+= ax.h opt_bdg.h device_if.h bus_if.h pci_if.h
+SRCS	= if_ax.c opt_bdg.h device_if.h bus_if.h pci_if.h
+CLEANFILES	+= opt_bdg.h device_if.h bus_if.h pci_if.h
 CFLAGS	+= ${DEBUG_FLAGS}
 
-ax.h:
-	echo "#define NAX 1" > ax.h
-
 opt_bdg.h:
 	touch opt_bdg.h
 
diff --git a/sys/modules/dm/Makefile b/sys/modules/dm/Makefile
index 711e5bd..6885c2d 100644
--- a/sys/modules/dm/Makefile
+++ b/sys/modules/dm/Makefile
@@ -3,16 +3,13 @@
 S	= ${.CURDIR}/../..
 .PATH:	$S/pci
 KMOD	= if_dm
-SRCS	= if_dm.c dm.h opt_bdg.h device_if.h bus_if.h pci_if.h
+SRCS	= if_dm.c opt_bdg.h device_if.h bus_if.h pci_if.h
 SRCS	+= miibus_if.h
-CLEANFILES	+= dm.h opt_bdg.h device_if.h bus_if.h pci_if.h
+CLEANFILES	+= opt_bdg.h device_if.h bus_if.h pci_if.h
 CLEANFILES	+= miibus_if.h
 CFLAGS	+= ${DEBUG_FLAGS}
 KMODDEPS = miibus
 
-dm.h:
-	echo "#define NDM 1" > dm.h
-
 opt_bdg.h:
 	touch opt_bdg.h
 
diff --git a/sys/modules/fxp/Makefile b/sys/modules/fxp/Makefile
index 7171508..42d41e7 100644
--- a/sys/modules/fxp/Makefile
+++ b/sys/modules/fxp/Makefile
@@ -3,13 +3,10 @@
 S	= ${.CURDIR}/../..
 .PATH:	$S/pci
 KMOD	= if_fxp
-SRCS	= if_fxp.c fxp.h opt_bdg.h device_if.h bus_if.h pci_if.h
-CLEANFILES	+= fxp.h opt_bdg.h device_if.h bus_if.h pci_if.h
+SRCS	= if_fxp.c opt_bdg.h device_if.h bus_if.h pci_if.h
+CLEANFILES	+= opt_bdg.h device_if.h bus_if.h pci_if.h
 CFLAGS	+= ${DEBUG_FLAGS}
 
-fxp.h:
-	echo "#define NFXP 1" > fxp.h
-
 opt_bdg.h:
 	touch opt_bdg.h
 
diff --git a/sys/modules/if_tun/Makefile b/sys/modules/if_tun/Makefile
index fe5ee29..d1d9c8e 100644
--- a/sys/modules/if_tun/Makefile
+++ b/sys/modules/if_tun/Makefile
@@ -2,7 +2,7 @@
 
 .PATH:  ${.CURDIR}/../../net
 KMOD=   if_tun
-SRCS=   if_tun.c opt_devfs.h opt_inet.h tun.h vnode_if.h
+SRCS=   if_tun.c opt_devfs.h opt_inet.h vnode_if.h
 NOMAN=
 CLEANFILES+=	vnode_if.h vnode_if.c
 
@@ -10,7 +10,7 @@ NBPF?=	1
 NTUN?=		2
 
 CFLAGS+= ${PROTOS}
-CLEANFILES+=	opt_devfs.h opt_inet.h tun.h
+CLEANFILES+=	opt_devfs.h opt_inet.h
 
 opt_devfs.h:
 	touch opt_devfs.h
@@ -18,7 +18,4 @@ opt_devfs.h:
 opt_inet.h:
 	echo "#define INET 1" > opt_inet.h
 
-tun.h:
-	echo "#define NTUN ${NTUN}" > tun.h
-
 .include <bsd.kmod.mk>
diff --git a/sys/modules/joy/Makefile b/sys/modules/joy/Makefile
index a54ef87..eefed22 100644
--- a/sys/modules/joy/Makefile
+++ b/sys/modules/joy/Makefile
@@ -2,14 +2,11 @@
 
 .PATH:	${.CURDIR}/../../i386/isa
 KMOD	= joy
-SRCS	= joy.c joy.h opt_devfs.h
+SRCS	= joy.c opt_devfs.h
 MAN8	= joy.8
 
 CFLAGS		+= -DJOY_MODULE
-CLEANFILES	+= joy.h opt_devfs.h
-
-joy.h:
-	echo "#define NJOY 1" > joy.h
+CLEANFILES	+= opt_devfs.h
 
 opt_devfs.h:
 	touch opt_devfs.h
diff --git a/sys/modules/mx/Makefile b/sys/modules/mx/Makefile
index a44c6f2..8cbcad5 100644
--- a/sys/modules/mx/Makefile
+++ b/sys/modules/mx/Makefile
@@ -3,13 +3,10 @@
 S	= ${.CURDIR}/../..
 .PATH:	$S/pci
 KMOD	= if_mx
-SRCS	= if_mx.c mx.h opt_bdg.h device_if.h bus_if.h pci_if.h
-CLEANFILES	+= mx.h opt_bdg.h device_if.h bus_if.h pci_if.h
+SRCS	= if_mx.c opt_bdg.h device_if.h bus_if.h pci_if.h
+CLEANFILES	+= opt_bdg.h device_if.h bus_if.h pci_if.h
 CFLAGS	+= ${DEBUG_FLAGS}
 
-mx.h:
-	echo "#define NMX 1" > mx.h
-
 opt_bdg.h:
 	touch opt_bdg.h
 
diff --git a/sys/modules/pn/Makefile b/sys/modules/pn/Makefile
index d07b1d8..31da119 100644
--- a/sys/modules/pn/Makefile
+++ b/sys/modules/pn/Makefile
@@ -3,13 +3,10 @@
 S	= ${.CURDIR}/../..
 .PATH:	$S/pci
 KMOD	= if_pn
-SRCS	= if_pn.c pn.h opt_bdg.h device_if.h bus_if.h pci_if.h
-CLEANFILES	+= pn.h opt_bdg.h device_if.h bus_if.h pci_if.h
+SRCS	= if_pn.c opt_bdg.h device_if.h bus_if.h pci_if.h
+CLEANFILES	+= opt_bdg.h device_if.h bus_if.h pci_if.h
 CFLAGS	+= ${DEBUG_FLAGS}
 
-pn.h:
-	echo "#define NFXP 1" > pn.h
-
 opt_bdg.h:
 	touch opt_bdg.h
 
diff --git a/sys/modules/rl/Makefile b/sys/modules/rl/Makefile
index b230d99..ef27144 100644
--- a/sys/modules/rl/Makefile
+++ b/sys/modules/rl/Makefile
@@ -3,17 +3,14 @@
 S	= ${.CURDIR}/../..
 .PATH:	$S/pci
 KMOD	= if_rl
-SRCS	= if_rl.c rl.h opt_bdg.h device_if.h bus_if.h pci_if.h
+SRCS	= if_rl.c opt_bdg.h device_if.h bus_if.h pci_if.h
 SRCS	+= miibus_if.h
-CLEANFILES	+= rl.h opt_bdg.h device_if.h bus_if.h pci_if.h
+CLEANFILES	+= opt_bdg.h device_if.h bus_if.h pci_if.h
 CLEANFILES	+= miibus_if.h
 KMODDEPS = miibus
 
 CFLAGS	+= ${DEBUG_FLAGS}
 
-rl.h:
-	echo "#define NRL 1" > rl.h
-
 opt_bdg.h:
 	touch opt_bdg.h
 
diff --git a/sys/modules/sf/Makefile b/sys/modules/sf/Makefile
index 2239014..40c8234 100644
--- a/sys/modules/sf/Makefile
+++ b/sys/modules/sf/Makefile
@@ -3,17 +3,14 @@
 S	= ${.CURDIR}/../..
 .PATH:	$S/pci
 KMOD	= if_sf
-SRCS	= if_sf.c sf.h opt_bdg.h device_if.h bus_if.h pci_if.h
+SRCS	= if_sf.c opt_bdg.h device_if.h bus_if.h pci_if.h
 SRCS	+= miibus_if.h
-CLEANFILES	+= sf.h opt_bdg.h device_if.h bus_if.h pci_if.h
+CLEANFILES	+= opt_bdg.h device_if.h bus_if.h pci_if.h
 CLEANFILES	+= miibus_if.h
 KMODDEPS = miibus
 
 CFLAGS	+= ${DEBUG_FLAGS}
 
-sf.h:
-	echo "#define NSF 1" > sf.h
-
 opt_bdg.h:
 	touch opt_bdg.h
 
diff --git a/sys/modules/sis/Makefile b/sys/modules/sis/Makefile
index f2a2466..e4c868c 100644
--- a/sys/modules/sis/Makefile
+++ b/sys/modules/sis/Makefile
@@ -3,16 +3,13 @@
 S	= ${.CURDIR}/../..
 .PATH:	$S/pci
 KMOD	= if_sis
-SRCS	= if_sis.c sis.h opt_bdg.h device_if.h bus_if.h pci_if.h
+SRCS	= if_sis.c opt_bdg.h device_if.h bus_if.h pci_if.h
 SRCS	+= miibus_if.h
-CLEANFILES	+= sis.h opt_bdg.h device_if.h bus_if.h pci_if.h
+CLEANFILES	+= opt_bdg.h device_if.h bus_if.h pci_if.h
 CLEANFILES	+= miibus_if.h
 CFLAGS	+= ${DEBUG_FLAGS}
 KMODDEPS = miibus
 
-sis.h:
-	echo "#define NSIS 1" > sis.h
-
 opt_bdg.h:
 	touch opt_bdg.h
 
diff --git a/sys/modules/sk/Makefile b/sys/modules/sk/Makefile
index c282093..5614a10 100644
--- a/sys/modules/sk/Makefile
+++ b/sys/modules/sk/Makefile
@@ -3,13 +3,10 @@
 S	= ${.CURDIR}/../..
 .PATH:	$S/pci
 KMOD	= if_sk
-SRCS	= if_sk.c sk.h opt_bdg.h device_if.h bus_if.h pci_if.h
-CLEANFILES	+= sk.h opt_bdg.h device_if.h bus_if.h pci_if.h
+SRCS	= if_sk.c opt_bdg.h device_if.h bus_if.h pci_if.h
+CLEANFILES	+= opt_bdg.h device_if.h bus_if.h pci_if.h
 CFLAGS	+= ${DEBUG_FLAGS}
 
-sk.h:
-	echo "#define NSK 1" > sk.h
-
 opt_bdg.h:
 	touch opt_bdg.h
 
diff --git a/sys/modules/ste/Makefile b/sys/modules/ste/Makefile
index 302e82b..4dd2d1a 100644
--- a/sys/modules/ste/Makefile
+++ b/sys/modules/ste/Makefile
@@ -3,16 +3,13 @@
 S	= ${.CURDIR}/../..
 .PATH:	$S/pci
 KMOD	= if_ste
-SRCS	= if_ste.c ste.h opt_bdg.h device_if.h bus_if.h pci_if.h
+SRCS	= if_ste.c opt_bdg.h device_if.h bus_if.h pci_if.h
 SRCS	+= miibus_if.h
-CLEANFILES	+= ste.h opt_bdg.h device_if.h bus_if.h pci_if.h
+CLEANFILES	+= opt_bdg.h device_if.h bus_if.h pci_if.h
 CLEANFILES	+= miibus_if.h
 CFLAGS	+= ${DEBUG_FLAGS}
 KMODDEPS = miibus
 
-ste.h:
-	echo "#define NSTE 1" > ste.h
-
 opt_bdg.h:
 	touch opt_bdg.h
 
diff --git a/sys/modules/streams/Makefile b/sys/modules/streams/Makefile
index 0298460..6248101 100644
--- a/sys/modules/streams/Makefile
+++ b/sys/modules/streams/Makefile
@@ -8,18 +8,13 @@ CFLAGS+= -DDEBUG_SVR4
 
 .PATH:  ${SOURCE}
 KMOD=   streams
-SRCS=   streams.c streams.h opt_streams.h opt_devfs.h
+SRCS=   streams.c opt_streams.h opt_devfs.h
 
 NOMAN=
 
 CFLAGS+=	-O
 
-CLEANFILES+=    vnode_if.h vnode_if.c streams.h opt_streams.h opt_devfs.h
-
-all:
-
-streams.h:
-	@echo "#define NSTREAMS 1" > streams.h
+CLEANFILES+=    vnode_if.h vnode_if.c opt_streams.h opt_devfs.h
 
 opt_streams.h:
 	@touch opt_streams.h
diff --git a/sys/modules/ti/Makefile b/sys/modules/ti/Makefile
index 1691477..945bf40 100644
--- a/sys/modules/ti/Makefile
+++ b/sys/modules/ti/Makefile
@@ -3,13 +3,10 @@
 S	= ${.CURDIR}/../..
 .PATH:	$S/pci
 KMOD	= if_ti
-SRCS	= if_ti.c ti.h opt_bdg.h vlan.h device_if.h bus_if.h pci_if.h
-CLEANFILES	+= ti.h opt_bdg.h vlan.h device_if.h bus_if.h pci_if.h
+SRCS	= if_ti.c opt_bdg.h vlan.h device_if.h bus_if.h pci_if.h
+CLEANFILES	+= opt_bdg.h vlan.h device_if.h bus_if.h pci_if.h
 CFLAGS	+= ${DEBUG_FLAGS}
 
-ti.h:
-	echo "#define NTI 1" > ti.h
-
 opt_bdg.h:
 	touch opt_bdg.h
 
diff --git a/sys/modules/tl/Makefile b/sys/modules/tl/Makefile
index 5d0587e..c69cf09 100644
--- a/sys/modules/tl/Makefile
+++ b/sys/modules/tl/Makefile
@@ -3,16 +3,13 @@
 S	= ${.CURDIR}/../..
 .PATH:	$S/pci
 KMOD	= if_tl
-SRCS	= if_tl.c tl.h opt_bdg.h device_if.h bus_if.h pci_if.h
+SRCS	= if_tl.c opt_bdg.h device_if.h bus_if.h pci_if.h
 SRCS	+= miibus_if.h
-CLEANFILES	+= tl.h opt_bdg.h device_if.h bus_if.h pci_if.h
+CLEANFILES	+= opt_bdg.h device_if.h bus_if.h pci_if.h
 CLEANFILEs	+= miibus_if.h
 CFLAGS	+= ${DEBUG_FLAGS}
 KMODDEPS = miibus
 
-tl.h:
-	echo "#define NTL 1" > tl.h
-
 opt_bdg.h:
 	touch opt_bdg.h
 
diff --git a/sys/modules/vn/Makefile b/sys/modules/vn/Makefile
index 929969d..36da945 100644
--- a/sys/modules/vn/Makefile
+++ b/sys/modules/vn/Makefile
@@ -2,14 +2,10 @@
 
 .PATH:  ${.CURDIR}/../../dev/vn
 KMOD=   vn
-SRCS=   vn.c vn.h vnode_if.h opt_devfs.h
+SRCS=   vn.c vnode_if.h opt_devfs.h
 NOMAN=
 
-NVN?=		8
-CLEANFILES+=	vn.h vnode_if.h vnode_if.c opt_devfs.h
-
-vn.h:
-	echo "#define NVN ${NVN}" > vn.h
+CLEANFILES+=	vnode_if.h vnode_if.c opt_devfs.h
 
 opt_devfs.h:
 	touch opt_devfs.h
diff --git a/sys/modules/vr/Makefile b/sys/modules/vr/Makefile
index 034175c..6fc98ee 100644
--- a/sys/modules/vr/Makefile
+++ b/sys/modules/vr/Makefile
@@ -3,17 +3,14 @@
 S	= ${.CURDIR}/../..
 .PATH:	$S/pci
 KMOD	= if_vr
-SRCS	= if_vr.c vr.h opt_bdg.h device_if.h bus_if.h pci_if.h
+SRCS	= if_vr.c opt_bdg.h device_if.h bus_if.h pci_if.h
 SRCS	+= miibus_if.h
-CLEANFILES	+= vr.h opt_bdg.h device_if.h bus_if.h pci_if.h
+CLEANFILES	+= opt_bdg.h device_if.h bus_if.h pci_if.h
 CLEANFILES	+= miibus_if.h
 KMODDEPS = miibus
 
 CFLAGS	+= ${DEBUG_FLAGS}
 
-vr.h:
-	echo "#define NVR 1" > vr.h
-
 opt_bdg.h:
 	touch opt_bdg.h
 
diff --git a/sys/modules/wb/Makefile b/sys/modules/wb/Makefile
index c76f3df..f45d1b0 100644
--- a/sys/modules/wb/Makefile
+++ b/sys/modules/wb/Makefile
@@ -3,16 +3,13 @@
 S	= ${.CURDIR}/../..
 .PATH:	$S/pci
 KMOD	= if_wb
-SRCS	= if_wb.c wb.h opt_bdg.h device_if.h
+SRCS	= if_wb.c opt_bdg.h device_if.h
 SRCS	+= bus_if.h miibus_if.h pci_if.h
-CLEANFILES	+= wb.h opt_bdg.h device_if.h
+CLEANFILES	+= opt_bdg.h device_if.h
 CLEANFILES	+= bus_if.h miibus_if.h pci_if.h
 CFLAGS	+= ${DEBUG_FLAGS}
 KMODDEPS = miibus
 
-wb.h:
-	echo "#define NWB 1" > wb.h
-
 opt_bdg.h:
 	touch opt_bdg.h
 
diff --git a/sys/modules/xl/Makefile b/sys/modules/xl/Makefile
index ffdb37f9..797b807 100644
--- a/sys/modules/xl/Makefile
+++ b/sys/modules/xl/Makefile
@@ -3,16 +3,13 @@
 S	= ${.CURDIR}/../..
 .PATH:	$S/pci
 KMOD	= if_xl
-SRCS	= if_xl.c xl.h opt_bdg.h device_if.h bus_if.h pci_if.h
+SRCS	= if_xl.c opt_bdg.h device_if.h bus_if.h pci_if.h
 SRCS	+= miibus_if.h
-CLEANFILES	+= xl.h opt_bdg.h device_if.h bus_if.h pci_if.h
+CLEANFILES	+= opt_bdg.h device_if.h bus_if.h pci_if.h
 CLEANFILES	+= miibus_if.h
 CFLAGS	+= ${DEBUG_FLAGS}
 KMODDEPS = miibus
 
-xl.h:
-	echo "#define NXL 1" > xl.h
-
 opt_bdg.h:
 	touch opt_bdg.h