Author: imp
Date: Wed Feb 18 15:25:22 2015
New Revision: 278959
URL: https://svnweb.freebsd.org/changeset/base/278959
Log:
Cleanup the way we include some files (in this case EISA) based on
kernel config. Also tidy up the ed options.
Modified:
head/sys/modules/dpt/Makefile
head/sys/modules/ed/Makefile
head/sys/modules/ep/Makefile
head/sys/modules/si/Makefile
head/sys/modules/vx/Makefile
Modified: head/sys/modules/dpt/Makefile
==============================================================================
--- head/sys/modules/dpt/Makefile Wed Feb 18 15:25:19 2015
(r278958)
+++ head/sys/modules/dpt/Makefile Wed Feb 18 15:25:22 2015
(r278959)
@@ -11,24 +11,6 @@ SRCS= dpt_scsi.c dpt.h \
opt_cam.h opt_scsi.h \
device_if.h bus_if.h
-.if ${MK_EISA} == "no"
-# Create an empty opt_eisa.h in order to keep kmod.mk from linking in an
-# existing one from KERNBUILDDIR which possibly has DEV_EISA defined so
-# dpt.ko is always built without EISA support.
-opt_eisa.h:
- :> ${.TARGET}
-.else
-.if !defined(KERNBUILDDIR)
-SRCS+= dpt_eisa.c eisa_if.h
-
-opt_eisa.h:
- echo "#define DEV_EISA 1" > ${.TARGET}
-.else
-DEV_EISA!= sed -n '/DEV_EISA/p' ${KERNBUILDDIR}/opt_eisa.h
-.if !empty(DEV_EISA)
-SRCS+= dpt_eisa.c eisa_if.h
-.endif
-.endif
-.endif
+SRCS.DEV_EISA= dpt_eisa.c eisa_if.h
.include <bsd.kmod.mk>
Modified: head/sys/modules/ed/Makefile
==============================================================================
--- head/sys/modules/ed/Makefile Wed Feb 18 15:25:19 2015
(r278958)
+++ head/sys/modules/ed/Makefile Wed Feb 18 15:25:22 2015
(r278959)
@@ -8,10 +8,13 @@ SRCS+= if_ed_novell.c if_ed_wd80x3.c if_
.if ${MACHINE} == "pc98"
SRCS+= if_ed_cbus.c
.else
-SRCS+= if_ed_isa.c if_ed_3c503.c if_ed_hpp.c if_ed_sic.c
+SRCS+= if_ed_isa.c
+SRCS.ED_HPP=if_ed_hpp.c
+SRCS.ED_SIC=if_ed_sic.c
+SRCS.ED_3C503=if_ed_3c503.c
.endif
SRCS+= if_ed_pccard.c pccarddevs.h card_if.h
-SRCS+= if_ed_pci.c pci_if.h
+SRCS.DEV_PCI=if_ed_pci.c pci_if.h
SRCS+= opt_ed.h bus_if.h device_if.h miibus_if.h
Modified: head/sys/modules/ep/Makefile
==============================================================================
--- head/sys/modules/ep/Makefile Wed Feb 18 15:25:19 2015
(r278958)
+++ head/sys/modules/ep/Makefile Wed Feb 18 15:25:22 2015
(r278959)
@@ -9,10 +9,7 @@ KMOD= if_ep
SRCS= if_ep.c
SRCS+= if_ep_pccard.c pccarddevs.h card_if.h
SRCS+= if_ep_isa.c isa_if.h
-.if ${MK_EISA} != "no"
-SRCS+= if_ep_eisa.c eisa_if.h
-.endif
-#SRCS+= if_ep_mca.c
+SRCS.DEV_EISA= if_ep_eisa.c eisa_if.h
SRCS+= bus_if.h device_if.h
.include <bsd.kmod.mk>
Modified: head/sys/modules/si/Makefile
==============================================================================
--- head/sys/modules/si/Makefile Wed Feb 18 15:25:19 2015
(r278958)
+++ head/sys/modules/si/Makefile Wed Feb 18 15:25:22 2015
(r278959)
@@ -3,8 +3,9 @@
.PATH: ${.CURDIR}/../../dev/si
KMOD= si
-SRCS= si.c si2_z280.c si3_t225.c si_eisa.c si_isa.c si_pci.c
-SRCS+= bus_if.h device_if.h eisa_if.h isa_if.h pci_if.h
+SRCS= si.c si2_z280.c si3_t225.c si_isa.c si_pci.c
+SRCS+= bus_if.h device_if.h isa_if.h pci_if.h
SRCS+= opt_compat.h opt_debug_si.h opt_eisa.h
+SRCS.DEV_EISA=si_eisa.c eisa_if.h
.include <bsd.kmod.mk>
Modified: head/sys/modules/vx/Makefile
==============================================================================
--- head/sys/modules/vx/Makefile Wed Feb 18 15:25:19 2015
(r278958)
+++ head/sys/modules/vx/Makefile Wed Feb 18 15:25:22 2015
(r278959)
@@ -7,9 +7,7 @@ SYSDIR?=${.CURDIR}/../..
KMOD= if_vx
SRCS= if_vx.c if_vx_pci.c
-.if ${MK_EISA} != "no"
-SRCS+= if_vx_eisa.c
-.endif
-SRCS+= device_if.h bus_if.h pci_if.h eisa_if.h
+SRCS.DEV_EISA= if_vx_eisa.c eisa_if.h
+SRCS+= device_if.h bus_if.h pci_if.h
.include <bsd.kmod.mk>
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "[email protected]"
