diff options
Diffstat (limited to 'sys/conf')
-rw-r--r-- | sys/conf/files.alpha | 4 | ||||
-rw-r--r-- | sys/conf/files.i386 | 2 | ||||
-rw-r--r-- | sys/conf/files.ia64 | 4 | ||||
-rw-r--r-- | sys/conf/files.pc98 | 2 | ||||
-rw-r--r-- | sys/conf/options.i386 | 3 | ||||
-rw-r--r-- | sys/conf/options.pc98 | 3 |
6 files changed, 6 insertions, 12 deletions
diff --git a/sys/conf/files.alpha b/sys/conf/files.alpha index 553c3cb..505824f 100644 --- a/sys/conf/files.alpha +++ b/sys/conf/files.alpha @@ -24,10 +24,6 @@ font8x16.o optional std8x16font \ compile-with "uudecode < /usr/share/syscons/fonts/${STD8X16FONT}-8x16.fnt && file2c 'unsigned char font_16[16*256] = {' '};' < ${STD8X16FONT}-8x16 > font8x16.c && ${CC} -c ${CFLAGS} font8x16.c" \ no-implicit-rule before-depend \ clean "${STD8X16FONT}-8x16 font8x16.c" -# make sure apm.h gets made correctly -apm.h standard \ - compile-with "echo '#define NAPM 0' > apm.h" \ - no-obj no-implicit-rule before-depend # atkbdmap.h optional atkbd_dflt_keymap \ compile-with "/usr/sbin/kbdcontrol -L ${ATKBD_DFLT_KEYMAP} | sed -e 's/^static keymap_t.* = /static keymap_t key_map = /' -e 's/^static accentmap_t.* = /static accentmap_t accent_map = /' > atkbdmap.h" \ diff --git a/sys/conf/files.i386 b/sys/conf/files.i386 index a9540eb..ad5a724 100644 --- a/sys/conf/files.i386 +++ b/sys/conf/files.i386 @@ -147,7 +147,7 @@ gnu/i386/fpemul/reg_u_mul.s optional gpl_math_emulate gnu/i386/fpemul/reg_u_sub.s optional gpl_math_emulate gnu/i386/fpemul/wm_shrx.s optional gpl_math_emulate gnu/i386/fpemul/wm_sqrt.s optional gpl_math_emulate -i386/apm/apm.c count apm +i386/apm/apm.c optional apm i386/i386/atomic.c standard \ compile-with "${CC} -c ${CFLAGS} ${DEFINED_PROF:S/^$/-fomit-frame-pointer/} ${.IMPSRC}" i386/i386/autoconf.c standard diff --git a/sys/conf/files.ia64 b/sys/conf/files.ia64 index de03a66..dc5505c 100644 --- a/sys/conf/files.ia64 +++ b/sys/conf/files.ia64 @@ -12,10 +12,6 @@ font8x16.o optional std8x16font \ compile-with "uudecode < /usr/share/syscons/fonts/${STD8X16FONT}-8x16.fnt && file2c 'unsigned char font_16[16*256] = {' '};' < ${STD8X16FONT}-8x16 > font8x16.c && ${CC} -c ${CFLAGS} font8x16.c" \ no-implicit-rule before-depend \ clean "${STD8X16FONT}-8x16 font8x16.c" -# make sure apm.h gets made correctly -apm.h standard \ - compile-with "echo '#define NAPM 0' > apm.h" \ - no-obj no-implicit-rule before-depend # atkbdmap.h optional atkbd_dflt_keymap \ compile-with "/usr/sbin/kbdcontrol -L ${ATKBD_DFLT_KEYMAP} | sed -e 's/^static keymap_t.* = /static keymap_t key_map = /' -e 's/^static accentmap_t.* = /static accentmap_t accent_map = /' > atkbdmap.h" \ diff --git a/sys/conf/files.pc98 b/sys/conf/files.pc98 index 8e34481..e1f2b06 100644 --- a/sys/conf/files.pc98 +++ b/sys/conf/files.pc98 @@ -140,7 +140,7 @@ gnu/i386/fpemul/reg_u_mul.s optional gpl_math_emulate gnu/i386/fpemul/reg_u_sub.s optional gpl_math_emulate gnu/i386/fpemul/wm_shrx.s optional gpl_math_emulate gnu/i386/fpemul/wm_sqrt.s optional gpl_math_emulate -i386/apm/apm.c count apm +i386/apm/apm.c optional apm i386/i386/atomic.c standard \ compile-with "${CC} -c ${CFLAGS} ${DEFINED_PROF:S/^$/-fomit-frame-pointer/} ${.IMPSRC}" i386/i386/autoconf.c standard diff --git a/sys/conf/options.i386 b/sys/conf/options.i386 index 5b63914..6d55187 100644 --- a/sys/conf/options.i386 +++ b/sys/conf/options.i386 @@ -193,8 +193,9 @@ OLTR_NO_BULLSEYE_MAC opt_oltr.h # Defaults to NDGB*16. NDGBPORTS opt_dgb.h -# NPX options +# Device options DEV_NPX opt_npx.h +DEV_APM opt_apm.h # ------------------------------- # EOF diff --git a/sys/conf/options.pc98 b/sys/conf/options.pc98 index 43d5d82..e6be8b0 100644 --- a/sys/conf/options.pc98 +++ b/sys/conf/options.pc98 @@ -196,8 +196,9 @@ EPSON_BOUNCEDMA opt_pc98.h EPSON_MEMWIN opt_pc98.h LINE30 opt_syscons.h -# NPX options +# Device options DEV_NPX opt_npx.h +DEV_APM opt_apm.h # ------------------------------- # EOF |