summaryrefslogtreecommitdiff
path: root/sys/arch/macppc/conf
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2010-04-26 20:50:18 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2010-04-26 20:50:18 +0000
commit7d8335af25d63232cdab8f6874bc2b72488d3ca8 (patch)
treee3849c30a7aed831288698c9a98e45d4f9a8ddc8 /sys/arch/macppc/conf
parent708629cd0c05ab438fc3b9af3268459de7d4a8e6 (diff)
next unification step: move all MD naming _mach, _machdir, _arch, and _archdir
ok miod drahn
Diffstat (limited to 'sys/arch/macppc/conf')
-rw-r--r--sys/arch/macppc/conf/Makefile.macppc20
1 files changed, 12 insertions, 8 deletions
diff --git a/sys/arch/macppc/conf/Makefile.macppc b/sys/arch/macppc/conf/Makefile.macppc
index def562f4c75..bf0530dc187 100644
--- a/sys/arch/macppc/conf/Makefile.macppc
+++ b/sys/arch/macppc/conf/Makefile.macppc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.macppc,v 1.34 2010/04/26 18:58:30 deraadt Exp $
+# $OpenBSD: Makefile.macppc,v 1.35 2010/04/26 20:50:16 deraadt Exp $
# This makefile is constructed from a machine description:
# config machineid
@@ -31,7 +31,11 @@ SIZE?= size
.ifndef S
S!= cd ../../../..; pwd
.endif
-MACPPC= $S/arch/macppc
+
+_mach?= macppc
+_machdir?= $S/arch/macppc
+_arch?= powerpc
+_archdir?= $S/arch/powerpc
INCLUDES= -I. -I$S -I$S/arch -nostdinc
CPPFLAGS= ${INCLUDES} ${IDENT} -D_KERNEL \
@@ -106,9 +110,9 @@ LINKFLAGS+= -S -x
%LOAD
-assym.h: $S/kern/genassym.sh ${MACPPC}/macppc/genassym.cf Makefile
+assym.h: $S/kern/genassym.sh ${_machdir}/macppc/genassym.cf Makefile
sh $S/kern/genassym.sh ${CC} ${CFLAGS} ${CPPFLAGS} \
- < ${MACPPC}/macppc/genassym.cf > assym.h.tmp && \
+ < ${_machdir}/macppc/genassym.cf > assym.h.tmp && \
mv -f assym.h.tmp assym.h
param.c: $S/conf/param.c
@@ -148,17 +152,17 @@ links:
sed 's,../.*/\(.*.o\),rm -f \1; ln -s ../GENERIC/\1 \1,' > makelinks
sh makelinks && rm -f dontlink
-SRCS= ${MACPPC}/macppc/locore.S \
+SRCS= ${_machdir}/macppc/locore.S \
param.c ioconf.c ${CFILES} ${SFILES}
depend:: .depend
.depend: ${SRCS} assym.h param.c ${DB_STRUCTINFO}
- ${MKDEP} ${AFLAGS} ${CPPFLAGS} ${MACPPC}/macppc/locore.S
+ ${MKDEP} ${AFLAGS} ${CPPFLAGS} ${_machdir}/macppc/locore.S
${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES}
.if ${SFILES} != ""
${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES}
.endif
sh $S/kern/genassym.sh ${MKDEP} -f assym.dep ${CFLAGS} \
- ${CPPFLAGS} < ${MACPPC}/macppc/genassym.cf
+ ${CPPFLAGS} < ${_machdir}/macppc/genassym.cf
@sed -e 's/.*\.o: /assym.h: /' -e 's/\/tmp\/genassym_c.[^ ]*//' \
< assym.dep >> .depend
@rm -f assym.dep
@@ -181,7 +185,7 @@ genassym.o machdep.o: Makefile
locore.o machdep.o: Makefile
-locore.o: ${MACPPC}/macppc/locore.S assym.h
+locore.o: ${_machdir}/macppc/locore.S assym.h
${NORMAL_S}
# The install target can be redefined by putting a