Move adding -DPC98 to CFLAGS from each modules to sys/modules/Makefile.inc.

2002-11-06 13:47:00 +00:00 · 2002-11-06 13:47:00 +00:00 · 0499bbb049
commit 0499bbb049
parent 0541d566d8
21 changed files with 4 additions and 59 deletions
--- a/sys/modules/Makefile.inc
+++ b/sys/modules/Makefile.inc
@ -1,2 +1,6 @@
 # $FreeBSD$

+.if ${MACHINE} == "pc98"
+CFLAGS+= -DPC98
+.endif
+
--- a/sys/modules/aic/Makefile
+++ b/sys/modules/aic/Makefile
@ -9,7 +9,6 @@ SRCS+=	opt_cam.h opt_scsi.h

 .if ${MACHINE} == "pc98"
 SRCS+=	aic_cbus.c
-CFLAGS+= -DPC98
 .else
 SRCS+=	aic_isa.c
 .endif
--- a/sys/modules/apm/Makefile
+++ b/sys/modules/apm/Makefile
@ -2,7 +2,6 @@

 .if ${MACHINE} == "pc98"
 .PATH: ${.CURDIR}/../../pc98/apm
-CFLAGS+= -DPC98
 .else
 .PATH: ${.CURDIR}/../../i386/apm
 .endif
--- a/sys/modules/cam/Makefile
+++ b/sys/modules/cam/Makefile
@ -7,10 +7,6 @@ S=	${.CURDIR}/../..

 KMOD=	cam

-.if ${MACHINE} == "pc98"
-CFLAGS+= -DPC98
-.endif
-
 # See sys/conf/options for the flags that go into the different opt_*.h files.
 SRCS=	opt_cam.h
 SRCS+=	opt_scsi.h
--- a/sys/modules/ed/Makefile
+++ b/sys/modules/ed/Makefile
@ -7,7 +7,6 @@ SRCS=	if_ed.c if_ed_pccard.c if_ed_pci.c

 .if ${MACHINE} == "pc98"
 SRCS+=	if_ed_cbus.c
-CFLAGS+= -DPC98
 .else
 SRCS+=	if_ed_isa.c
 .endif
--- a/sys/modules/ep/Makefile
+++ b/sys/modules/ep/Makefile
@ -10,8 +10,4 @@ SRCS+=	if_ep_isa.c
 #SRCS+=	if_ep_mca.c
 SRCS+=	opt_bdg.h bus_if.h card_if.h device_if.h isa_if.h pci_if.h

-.if ${MACHINE} == "pc98"
-CFLAGS+= -DPC98
-.endif
-
 .include <bsd.kmod.mk>
--- a/sys/modules/fdc/Makefile
+++ b/sys/modules/fdc/Makefile
@ -2,7 +2,6 @@

 .if ${MACHINE} == "pc98"
 .PATH:  ${.CURDIR}/../../pc98/pc98
-CFLAGS+= -DPC98
 .else
 .PATH:  ${.CURDIR}/../../isa
 .endif
--- a/sys/modules/fe/Makefile
+++ b/sys/modules/fe/Makefile
@ -7,7 +7,6 @@ SRCS=	if_fe.c if_fe_pccard.c

 .if ${MACHINE} == "pc98"
 SRCS+=	if_fe_cbus.c
-CFLAGS+= -DPC98
 .else
 SRCS+=	if_fe_isa.c
 .endif
--- a/sys/modules/lnc/Makefile
+++ b/sys/modules/lnc/Makefile
@ -13,8 +13,5 @@ SRCS+=	opt_inet.h device_if.h bus_if.h isa_if.h pci_if.h
 #SRCS+=	miibus_if.h

 CFLAGS+= -g -I${.CURDIR}/../../dev/lnc
-.if ${MACHINE} == "pc98"
-CFLAGS+= -DPC98
-.endif

 .include <bsd.kmod.mk>
--- a/sys/modules/msdosfs/Makefile
+++ b/sys/modules/msdosfs/Makefile
@ -7,8 +7,4 @@ SRCS=	vnode_if.h \
 	msdosfs_conv.c msdosfs_denode.c msdosfs_fat.c msdosfs_lookup.c \
 	msdosfs_vfsops.c msdosfs_vnops.c

-.if ${MACHINE} == "pc98"
-CFLAGS+= -DPC98
-.endif
-
 .include <bsd.kmod.mk>
--- a/sys/modules/oldcard/Makefile
+++ b/sys/modules/oldcard/Makefile
@ -10,7 +10,6 @@ SRCS=	pccard.c pcic.c pccard_beep.c pccard_nbk.c pcic_pci.c pcic_isa.c \
 EXPORT_SYMS=	YES	# XXX evaluate

 .if ${MACHINE} == "pc98"
-CFLAGS += -DPC98
 SRCS += mecia.c
 .endif

--- a/sys/modules/pcspeaker/Makefile
+++ b/sys/modules/pcspeaker/Makefile
@ -6,6 +6,4 @@ KMOD=	pcspeaker
 SRCS=	spkr.c
 SRCS+=	bus_if.h device_if.h isa_if.h

-CFLAGS+= -DPC98
-
 .include <bsd.kmod.mk>
--- a/sys/modules/pmc/Makefile
+++ b/sys/modules/pmc/Makefile
@ -6,8 +6,4 @@ KMOD=	pmc
 SRCS=	pmc.c
 SRCS+=	bus_if.h device_if.h isa_if.h

-.if ${MACHINE} == "pc98"
-CFLAGS+= -DPC98
-.endif
-
 .include <bsd.kmod.mk>
--- a/sys/modules/sound/driver/mss/Makefile
+++ b/sys/modules/sound/driver/mss/Makefile
@ -6,8 +6,4 @@ KMOD=	snd_mss
 SRCS=	device_if.h bus_if.h isa_if.h pci_if.h
 SRCS+=	mss.c gusc.c

-.if ${MACHINE} == "pc98"
-CFLAGS+= -DPC98
-.endif
-
 .include <bsd.kmod.mk>
--- a/sys/modules/sound/driver/sbc/Makefile
+++ b/sys/modules/sound/driver/sbc/Makefile
@ -6,8 +6,4 @@ KMOD=	snd_sbc
 SRCS=	device_if.h bus_if.h isa_if.h pci_if.h
 SRCS+=	sbc.c

-.if ${MACHINE} == "pc98"
-CFLAGS+= -DPC98
-.endif
-
 .include <bsd.kmod.mk>
--- a/sys/modules/splash/bmp/Makefile
+++ b/sys/modules/splash/bmp/Makefile
@ -3,8 +3,4 @@
 KMOD=	splash_bmp
 SRCS= 	splash_bmp.c

-.if ${MACHINE} == "pc98"
-CFLAGS+= -DPC98
-.endif
-
 .include <bsd.kmod.mk>
--- a/sys/modules/syscons/apm/Makefile
+++ b/sys/modules/syscons/apm/Makefile
@ -5,8 +5,4 @@
 KMOD=	apm_saver
 SRCS= 	apm_saver.c

-.if ${MACHINE} == "pc98"
-CFLAGS+= -DPC98
-.endif
-
 .include <bsd.kmod.mk>
--- a/sys/modules/syscons/daemon/Makefile
+++ b/sys/modules/syscons/daemon/Makefile
@ -5,8 +5,4 @@
 KMOD=	daemon_saver
 SRCS=	daemon_saver.c

-.if ${MACHINE} == "pc98"
-CFLAGS+= -DPC98
-.endif
-
 .include <bsd.kmod.mk>
--- a/sys/modules/syscons/dragon/Makefile
+++ b/sys/modules/syscons/dragon/Makefile
@ -7,8 +7,4 @@ SRCS= 	dragon_saver.c

 #CWARNFLAGS= -Wall -Wno-long-long -pedantic

-.if ${MACHINE} == "pc98"
-CFLAGS+= -DPC98
-.endif
-
 .include <bsd.kmod.mk>
--- a/sys/modules/syscons/snake/Makefile
+++ b/sys/modules/syscons/snake/Makefile
@ -5,8 +5,4 @@
 KMOD=	snake_saver
 SRCS=	snake_saver.c

-.if ${MACHINE} == "pc98"
-CFLAGS+= -DPC98
-.endif
-
 .include <bsd.kmod.mk>
--- a/sys/modules/syscons/star/Makefile
+++ b/sys/modules/syscons/star/Makefile
@ -5,8 +5,4 @@
 KMOD=	star_saver
 SRCS=	star_saver.c

-.if ${MACHINE} == "pc98"
-CFLAGS+= -DPC98
-.endif
-
 .include <bsd.kmod.mk>