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/sparc64/conf | |
| parent | 708629cd0c05ab438fc3b9af3268459de7d4a8e6 (diff) | |
next unification step: move all MD naming _mach, _machdir, _arch, and _archdir
ok miod drahn
Diffstat (limited to 'sys/arch/sparc64/conf')
| -rw-r--r-- | sys/arch/sparc64/conf/Makefile.sparc64 | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/sys/arch/sparc64/conf/Makefile.sparc64 b/sys/arch/sparc64/conf/Makefile.sparc64 index 0335924bc0f..b4d7b7371cf 100644 --- a/sys/arch/sparc64/conf/Makefile.sparc64 +++ b/sys/arch/sparc64/conf/Makefile.sparc64 @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.sparc64,v 1.35 2010/04/26 18:58:31 deraadt Exp $ +# $OpenBSD: Makefile.sparc64,v 1.36 2010/04/26 20:50:17 deraadt Exp $ # This makefile is constructed from a machine description: # config machineid @@ -29,7 +29,11 @@ STRIP?= strip .ifndef S S!= cd ../../../..; pwd .endif -SPARC64= $S/arch/sparc64 + +_mach?= sparc64 +_machdir?= $S/arch/sparc64 +_arch?= sparc64 +_archdir?= $S/arch/sparc64 INCLUDES= -nostdinc -I. -I$S -I$S/arch CPPFLAGS= ${INCLUDES} ${IDENT} -D_KERNEL @@ -106,9 +110,9 @@ LINKFLAGS+= -S -x %LOAD -assym.h: $S/kern/genassym.sh ${SPARC64}/sparc64/genassym.cf Makefile +assym.h: $S/kern/genassym.sh ${_machdir}/sparc64/genassym.cf Makefile sh $S/kern/genassym.sh ${CC} ${CFLAGS} ${CPPFLAGS} \ - ${PARAM} < ${SPARC64}/sparc64/genassym.cf > assym.h.tmp && \ + ${PARAM} < ${_machdir}/sparc64/genassym.cf > assym.h.tmp && \ mv -f assym.h.tmp assym.h param.c: $S/conf/param.c @@ -149,17 +153,17 @@ links: sed 's,../.*/\(.*.o\),rm -f \1; ln -s ../GENERIC/\1 \1,' > makelinks sh makelinks && rm -f dontlink -SRCS= ${SPARC64}/sparc64/locore.s \ +SRCS= ${_machdir}/sparc64/locore.s \ param.c ioconf.c ${CFILES} ${SFILES} depend:: .depend .depend: ${SRCS} assym.h param.c ${DB_STRUCTINFO} - ${MKDEP} ${AFLAGS} ${CPPFLAGS} ${SPARC64}/sparc64/locore.s + ${MKDEP} ${AFLAGS} ${CPPFLAGS} ${_machdir}/sparc64/locore.s ${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES} .if !empty(SFILES) ${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES} .endif sh $S/kern/genassym.sh ${MKDEP} -f assym.dep ${CFLAGS} \ - ${CPPFLAGS} < ${SPARC64}/sparc64/genassym.cf + ${CPPFLAGS} < ${_machdir}/sparc64/genassym.cf @sed -e 's/.*\.o: /assym.h: /' -e 's/\/tmp\/genassym_c.[^ ]*//' \ < assym.dep >> .depend @rm -f assym.dep @@ -169,7 +173,7 @@ db_structinfo.h: $S/ddb/db_structinfo.c $S/ddb/parse_structinfo.awk objdump -g db_structinfo.o | awk -f $S/ddb/parse_structinfo.awk > $@ rm -f db_structinfo.o -locore.o: ${SPARC64}/sparc64/locore.s assym.h +locore.o: ${_machdir}/sparc64/locore.s assym.h ${NORMAL_S} # The install target can be redefined by putting a |