From ab3626d51a1d3db8cef3fe4c9b19182278e553b4 Mon Sep 17 00:00:00 2001 From: Yoshihiro Takahashi Date: Wed, 6 Nov 2002 13:47:00 +0000 Subject: [PATCH] Move adding -DPC98 to CFLAGS from each modules to sys/modules/Makefile.inc. --- sys/modules/Makefile.inc | 4 ++++ sys/modules/aic/Makefile | 1 - sys/modules/apm/Makefile | 1 - sys/modules/cam/Makefile | 4 ---- sys/modules/ed/Makefile | 1 - sys/modules/ep/Makefile | 4 ---- sys/modules/fdc/Makefile | 1 - sys/modules/fe/Makefile | 1 - sys/modules/lnc/Makefile | 3 --- sys/modules/msdosfs/Makefile | 4 ---- sys/modules/oldcard/Makefile | 1 - sys/modules/pcspeaker/Makefile | 2 -- sys/modules/pmc/Makefile | 4 ---- sys/modules/sound/driver/mss/Makefile | 4 ---- sys/modules/sound/driver/sbc/Makefile | 4 ---- sys/modules/splash/bmp/Makefile | 4 ---- sys/modules/syscons/apm/Makefile | 4 ---- sys/modules/syscons/daemon/Makefile | 4 ---- sys/modules/syscons/dragon/Makefile | 4 ---- sys/modules/syscons/snake/Makefile | 4 ---- sys/modules/syscons/star/Makefile | 4 ---- 21 files changed, 4 insertions(+), 59 deletions(-) diff --git a/sys/modules/Makefile.inc b/sys/modules/Makefile.inc index b720e3de68b..9dc38af9623 100644 --- a/sys/modules/Makefile.inc +++ b/sys/modules/Makefile.inc @@ -1,2 +1,6 @@ # $FreeBSD$ +.if ${MACHINE} == "pc98" +CFLAGS+= -DPC98 +.endif + diff --git a/sys/modules/aic/Makefile b/sys/modules/aic/Makefile index 5a42be82cbe..60df81a265c 100644 --- 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 diff --git a/sys/modules/apm/Makefile b/sys/modules/apm/Makefile index ab09cd900db..6a6e734fab7 100644 --- 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 diff --git a/sys/modules/cam/Makefile b/sys/modules/cam/Makefile index 8a4358bb6d8..633668d5c19 100644 --- 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 diff --git a/sys/modules/ed/Makefile b/sys/modules/ed/Makefile index 4e30ddcb5d2..ea8ac04e08f 100644 --- 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 diff --git a/sys/modules/ep/Makefile b/sys/modules/ep/Makefile index 23edb129655..cd82a01bd49 100644 --- 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 diff --git a/sys/modules/fdc/Makefile b/sys/modules/fdc/Makefile index 880d6908917..8e6a7dc852d 100644 --- 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 diff --git a/sys/modules/fe/Makefile b/sys/modules/fe/Makefile index 9df18be17ae..bbebe86144c 100644 --- 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 diff --git a/sys/modules/lnc/Makefile b/sys/modules/lnc/Makefile index fdc56c4f2f8..69d9dbaaed0 100644 --- 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 diff --git a/sys/modules/msdosfs/Makefile b/sys/modules/msdosfs/Makefile index ffa2e1d13e2..59b40907c31 100644 --- 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 diff --git a/sys/modules/oldcard/Makefile b/sys/modules/oldcard/Makefile index 04cf35fe430..8a94ab669d5 100644 --- 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 diff --git a/sys/modules/pcspeaker/Makefile b/sys/modules/pcspeaker/Makefile index 7f50c85b780..ff0f64f7a8d 100644 --- 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 diff --git a/sys/modules/pmc/Makefile b/sys/modules/pmc/Makefile index 59994a0090c..30c1581b049 100644 --- 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 diff --git a/sys/modules/sound/driver/mss/Makefile b/sys/modules/sound/driver/mss/Makefile index 6dc7df601d6..44880788998 100644 --- 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 diff --git a/sys/modules/sound/driver/sbc/Makefile b/sys/modules/sound/driver/sbc/Makefile index c512c8f2a8f..8e2343df266 100644 --- 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 diff --git a/sys/modules/splash/bmp/Makefile b/sys/modules/splash/bmp/Makefile index c1b6af44c30..834ed767152 100644 --- 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 diff --git a/sys/modules/syscons/apm/Makefile b/sys/modules/syscons/apm/Makefile index 4ac0d883868..d2e31d8c15b 100644 --- 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 diff --git a/sys/modules/syscons/daemon/Makefile b/sys/modules/syscons/daemon/Makefile index 90e4d04df7f..b027972c8d8 100644 --- 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 diff --git a/sys/modules/syscons/dragon/Makefile b/sys/modules/syscons/dragon/Makefile index b22c05fd7f4..ce113fea8a5 100644 --- 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 diff --git a/sys/modules/syscons/snake/Makefile b/sys/modules/syscons/snake/Makefile index 29023628817..9edf8300681 100644 --- 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 diff --git a/sys/modules/syscons/star/Makefile b/sys/modules/syscons/star/Makefile index edbeeae7305..ca3075fe1e8 100644 --- 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 -- 2.45.2