summaryrefslogtreecommitdiff
path: root/sys/arch/gumstix/conf
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2010-04-27 16:43:43 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2010-04-27 16:43:43 +0000
commit084eadb7ab47f77e4f6dea94d3626b2b339f62de (patch)
treea43b70c6df4bf61898f423d58ca8db983fe4c8b6 /sys/arch/gumstix/conf
parentdd42f700d9130d625243b36801652927d3e783ec (diff)
Use the form ${_archdir}/${_arch} to reach a few more places, unifying the
arm Makefiles a substantial step forward
Diffstat (limited to 'sys/arch/gumstix/conf')
-rw-r--r--sys/arch/gumstix/conf/Makefile.gumstix10
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/arch/gumstix/conf/Makefile.gumstix b/sys/arch/gumstix/conf/Makefile.gumstix
index 8e68990f2b7..dfcb6543577 100644
--- a/sys/arch/gumstix/conf/Makefile.gumstix
+++ b/sys/arch/gumstix/conf/Makefile.gumstix
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.gumstix,v 1.15 2010/04/27 15:33:08 deraadt Exp $
+# $OpenBSD: Makefile.gumstix,v 1.16 2010/04/27 16:43:42 deraadt Exp $
# For instructions on building kernels consult the config(8) and options(4)
# manual pages.
@@ -25,7 +25,7 @@ _machdir?= $S/arch/${_mach}
_archdir?= $S/arch/${_arch}
INCLUDES= -nostdinc -I. -I$S -I$S/arch
-CPPFLAGS= ${INCLUDES} ${IDENT} -D_KERNEL -D__gumstix__
+CPPFLAGS= ${INCLUDES} ${IDENT} -D_KERNEL -D__${_mach}__
CDIAGFLAGS= -Werror -Wall -Wstrict-prototypes -Wmissing-prototypes \
-Wno-uninitialized -Wno-format -Wno-main \
-Wstack-larger-than-2047 -Wvariable-decl
@@ -154,11 +154,11 @@ links:
sed 's,.*/\(.*.o\),rm -f \1; ln -s ../GENERIC/\1 \1,' > makelinks
sh makelinks && rm -f dontlink makelinks
-SRCS= ${_archdir}/arm/locore.S \
+SRCS= ${_archdir}/${_arch}/locore.S \
param.c ioconf.c ${CFILES} ${SFILES}
depend:: .depend
.depend: ${SRCS} assym.h param.c ${DB_STRUCTINFO}
- ${MKDEP} ${AFLAGS} ${CPPFLAGS} ${_archdir}/arm/locore.S
+ ${MKDEP} ${AFLAGS} ${CPPFLAGS} ${_archdir}/${_arch}/locore.S
${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES}
.if ${SFILES} != ""
${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES}
@@ -177,7 +177,7 @@ db_structinfo.h: $S/ddb/db_structinfo.c $S/ddb/parse_structinfo.awk
${_mach}_start.o: ${_machdir}/${_mach}/${_mach}_start.S assym.h
${NORMAL_S}
-locore.o: ${_archdir}/arm/locore.S assym.h
+locore.o: ${_archdir}/${_arch}/locore.S assym.h
${NORMAL_S}
# The install target can be redefined by putting a