o Remove @- from the ln and change it to a -sf. This was bogus, and

  regocnized as such at the time.  Now that the other bogons in the
  tree have been fixed, we can remove this ugly kludge.
o Remove stale/bogus opt_foo.h files.  These are left over from
  by-gone resources.  And they point to the need, yet again, to
  improve the build system so meta information is only in one place.

Submitted by: ru
Reviewed by: bde
Approved by: re@ (jhb)

9 files changed, 7 insertions, 9 deletions

diff --git a/sys/conf/kmod.mk b/sys/conf/kmod.mk
index 12146ae2695f..4854b2fbb0c5 100644
--- a/sys/conf/kmod.mk
+++ b/sys/conf/kmod.mk
@@ -250,7 +250,7 @@ CFLAGS += -I${KERNBUILDDIR}
 CLEANFILES+=	${_src}
 .if !target(${_src})
 ${_src}:
-	-@ln -s ${KERNBUILDDIR}/${_src} ${.TARGET}
+	ln -s ${KERNBUILDDIR}/${_src} ${.TARGET}
 .endif
 .endfor
 .else
diff --git a/sys/modules/linprocfs/Makefile b/sys/modules/linprocfs/Makefile
index d26c40b8e06f..a4e7add55a1a 100644
--- a/sys/modules/linprocfs/Makefile
+++ b/sys/modules/linprocfs/Makefile
@@ -4,7 +4,6 @@
 
 KMOD=	linprocfs
 SRCS=	vnode_if.h \
-	opt_linux.h \
 	linprocfs.c
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/linux/Makefile b/sys/modules/linux/Makefile
index 3cbaef3d1fd0..7cb1f4b48c20 100644
--- a/sys/modules/linux/Makefile
+++ b/sys/modules/linux/Makefile
@@ -8,7 +8,7 @@ KMOD=	linux
 SRCS=	linux_dummy.c linux_file.c linux_getcwd.c linux_ioctl.c linux_ipc.c \
 	linux_machdep.c linux_mib.c linux_misc.c linux_signal.c linux_socket.c \
 	linux_stats.c linux_sysctl.c linux_sysent.c linux_sysvec.c \
-	linux_util.c opt_compat.h opt_inet6.h opt_linux.h opt_mac.h \
+	linux_util.c opt_compat.h opt_inet6.h opt_mac.h \
 	opt_vmpage.h vnode_if.h
 OBJS=	linux_locore.o
 
diff --git a/sys/modules/nwfs/Makefile b/sys/modules/nwfs/Makefile
index 1c1e6a89b90c..04a5d4749ce0 100644
--- a/sys/modules/nwfs/Makefile
+++ b/sys/modules/nwfs/Makefile
@@ -6,7 +6,7 @@ KMOD=	nwfs
 
 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
+	nwfs_subr.c opt_ncp.h opt_vmpage.h
 
 .if defined(VNPRINT)
 CFLAGS+= -DVNPRINT
diff --git a/sys/modules/ppbus/Makefile b/sys/modules/ppbus/Makefile
index fb28f7ab22c3..1347e6482bcb 100644
--- a/sys/modules/ppbus/Makefile
+++ b/sys/modules/ppbus/Makefile
@@ -4,7 +4,7 @@
 .PATH:	${.CURDIR}/../../dev/ppbus
 KMOD=	ppbus
 SRCS=	bus_if.h device_if.h ppbus_if.h ppbus_if.c \
-	opt_ppb_1284.h opt_ppbus.h \
+	opt_ppb_1284.h \
 	ppb_1284.c ppb_base.c ppb_msq.c ppbconf.c
 
 EXPORT_SYMS=	ppb_attach_device	\
diff --git a/sys/modules/ppi/Makefile b/sys/modules/ppi/Makefile
index 79db29474c99..568fddfd4282 100644
--- a/sys/modules/ppi/Makefile
+++ b/sys/modules/ppi/Makefile
@@ -4,7 +4,7 @@
 .PATH:	${.CURDIR}/../../dev/ppbus
 KMOD=	ppi
 SRCS=	bus_if.h device_if.h ppbus_if.h \
-	opt_ppi.h opt_ppb_1284.h \
+	opt_ppb_1284.h \
 	ppi.c ppb_1284.c
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/pps/Makefile b/sys/modules/pps/Makefile
index 8b4927365f9c..7e70bb2973ad 100644
--- a/sys/modules/pps/Makefile
+++ b/sys/modules/pps/Makefile
@@ -4,7 +4,6 @@
 .PATH:	${.CURDIR}/../../dev/ppbus
 KMOD=	pps
 SRCS=	bus_if.h device_if.h ppbus_if.h \
-	opt_pps.h \
 	pps.c
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/smbfs/Makefile b/sys/modules/smbfs/Makefile
index 6f075bf45912..885c3c40ff13 100644
--- a/sys/modules/smbfs/Makefile
+++ b/sys/modules/smbfs/Makefile
@@ -11,7 +11,7 @@ KMOD=	smbfs
 
 SRCS=	vnode_if.h \
 	opt_inet.h opt_ipx.h \
-	opt_netsmb.h opt_smbfs.h opt_vmpage.h \
+	opt_netsmb.h opt_vmpage.h \
 	iconv_converter_if.h \
 	md4c.c \
 	smb_conn.c smb_dev.c smb_trantcp.c smb_smb.c smb_subr.c smb_rq.c \
diff --git a/sys/modules/streams/Makefile b/sys/modules/streams/Makefile
index b27942bf8b4e..ab343005eb9d 100644
--- a/sys/modules/streams/Makefile
+++ b/sys/modules/streams/Makefile
@@ -4,7 +4,7 @@ MAINTAINER=	newton@atdot.dotat.org
 .PATH: ${.CURDIR}/../../dev/streams
 
 KMOD=	streams
-SRCS=	streams.c opt_streams.h
+SRCS=	streams.c
 
 EXPORT_SYMS=	svr4_str_initialized	\
 		svr4_stream_get		\