- Remove unused opt_foo.h headers.

- Don't mess with CFLAGS.
- Fix description of fwe module Makefile.

sys/modules/firewire/firewire/Makefile

@@ -6,15 +6,11 @@
 
 KMOD= firewire
 SRCS	= bus_if.h device_if.h pci_if.h \
-	  opt_bus.h opt_firewire.h \
 	  firewire.c firewire.h firewire_phy.h firewirebusreg.h firewirereg.h \
 	  fwohci.c fwohci_pci.c fwohcireg.h fwohcivar.h \
 	  iec13213.h iec68113.h \
 	  fwmem.c fwmem.h
 
-opt_firewire.h:
-	echo "#define FIREWIRE_FREEBSD_MODULE 1" > opt_firewire.h
-
 #EXPORT_SYMS= fw_asybusy	\
 #	fw_asyreq	\
 #	fw_bindadd	\

sys/modules/firewire/fwe/Makefile

@@ -1,19 +1,14 @@
 # $FreeBSD$
 
-# Makefile for the SBP-II (Serial Bus Protocol 2/SCSI over IEEE1394)
+# Makefile for the fwe(4) module (Ethernet over IEEE1394)
 
 .PATH: ${.CURDIR}/../../../dev/firewire
 
-CFLAGS+= -g
-
 KMOD	= if_fwe
-SRCS	= bus_if.h device_if.h\
-	  opt_bus.h opt_firewire.h opt_inet.h\
-	  if_fwe.c if_fwevar.h\
+SRCS	= bus_if.h device_if.h \
+	  opt_inet.h \
+	  if_fwe.c if_fwevar.h \
 	  firewire.h firewirereg.h
 
-opt_fwe.h:
-	echo "#define FIREWIRE_ETHEREMU_FREEBSD 1" > opt_fwe.h
-
 .include <bsd.kmod.mk>
 

sys/modules/firewire/sbp/Makefile

@@ -4,17 +4,12 @@
 
 .PATH: ${.CURDIR}/../../../dev/firewire
 
-CFLAGS+= -g
-
 KMOD	= sbp
-SRCS	= bus_if.h device_if.h\
-	  opt_bus.h opt_firewire.h opt_cam.h opt_scsi.h\
+SRCS	= bus_if.h device_if.h \
+	  opt_cam.h opt_scsi.h \
 	  sbp.c \
 	  firewire.h firewirereg.h \
 	  iec13213.h
 
-opt_sbp.h:
-	echo "#define SBP2_FREEBSD_MODULE 1" > opt_sbp.h
-
 .include <bsd.kmod.mk>