diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2010-04-26 20:50:18 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2010-04-26 20:50:18 +0000 |
| commit | 7d8335af25d63232cdab8f6874bc2b72488d3ca8 (patch) | |
| tree | e3849c30a7aed831288698c9a98e45d4f9a8ddc8 /sys/arch/i386 | |
| parent | 708629cd0c05ab438fc3b9af3268459de7d4a8e6 (diff) | |
next unification step: move all MD naming _mach, _machdir, _arch, and _archdir
ok miod drahn
Diffstat (limited to 'sys/arch/i386')
| -rw-r--r-- | sys/arch/i386/conf/Makefile.i386 | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/sys/arch/i386/conf/Makefile.i386 b/sys/arch/i386/conf/Makefile.i386 index 57d15b77790..83cacdc8924 100644 --- a/sys/arch/i386/conf/Makefile.i386 +++ b/sys/arch/i386/conf/Makefile.i386 @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.i386,v 1.55 2010/04/26 18:58:30 deraadt Exp $ +# $OpenBSD: Makefile.i386,v 1.56 2010/04/26 20:50:16 deraadt Exp $ # This makefile is constructed from a machine description: # config machineid @@ -29,10 +29,14 @@ STRIP?= strip .ifndef S S!= cd ../../../..; pwd .endif -I386= $S/arch/i386 + +_mach?= i386 +_machdir?= $S/arch/i386 +_arch?= i386 +_archdir?= $S/arch/i386 INCLUDES= -nostdinc -I. -I$S -I$S/arch -CPPFLAGS= ${INCLUDES} ${IDENT} -D_KERNEL -Di386 +CPPFLAGS= ${INCLUDES} ${IDENT} -D_KERNEL -D${_mach} CDIAGFLAGS= -Werror -Wall -Wstrict-prototypes -Wmissing-prototypes \ -Wno-uninitialized -Wno-format -Wno-main \ -Wstack-larger-than-2047 @@ -112,9 +116,9 @@ LINKFLAGS+= -S -x %LOAD -assym.h: $S/kern/genassym.sh ${I386}/i386/genassym.cf Makefile +assym.h: $S/kern/genassym.sh ${_machdir}/i386/genassym.cf Makefile sh $S/kern/genassym.sh ${CC} ${CFLAGS} ${CPPFLAGS} \ - ${PARAM} < ${I386}/i386/genassym.cf > assym.h.tmp && \ + ${PARAM} < ${_machdir}/i386/genassym.cf > assym.h.tmp && \ mv -f assym.h.tmp assym.h param.c: $S/conf/param.c @@ -155,15 +159,15 @@ links: sed 's,.*/\(.*.o\),rm -f \1; ln -s ../GENERIC/\1 \1,' > makelinks sh makelinks && rm -f dontlink makelinks -SRCS= ${I386}/i386/locore.s \ +SRCS= ${_machdir}/i386/locore.s \ param.c ioconf.c ${CFILES} ${SFILES} depend:: .depend .depend: ${SRCS} assym.h param.c ${APMINC} ${DB_STRUCTINFO} - ${MKDEP} ${AFLAGS} ${CPPFLAGS} ${I386}/i386/locore.s + ${MKDEP} ${AFLAGS} ${CPPFLAGS} ${_machdir}/i386/locore.s ${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES} ${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES} sh $S/kern/genassym.sh ${MKDEP} -f assym.dep ${CFLAGS} \ - ${CPPFLAGS} < ${I386}/i386/genassym.cf + ${CPPFLAGS} < ${_machdir}/i386/genassym.cf @sed -e 's/.*\.o: /assym.h: /' -e 's/\/tmp\/genassym_c.[^ ]*//' \ < assym.dep >> .depend @rm -f assym.dep @@ -191,7 +195,7 @@ machdep.o: Makefile locore.o machdep.o: Makefile -locore.o: ${I386}/i386/locore.s assym.h +locore.o: ${_machdir}/i386/locore.s assym.h ${NORMAL_S} # The install target can be redefined by putting a |