summaryrefslogtreecommitdiff
path: root/sys/arch/armish/conf
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2010-04-26 18:58:32 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2010-04-26 18:58:32 +0000
commit3a9fd31666735fef020ad537ee5d25ff9651c9e4 (patch)
treefd98d9e24c2082085be34cb1b223a6f1631f0ed0 /sys/arch/armish/conf
parent67022400e72d2b80461fa3e8bd6d236e38bbd6cf (diff)
first step of unification: spaces at end of lines; comments, etc.
ok miod
Diffstat (limited to 'sys/arch/armish/conf')
-rw-r--r--sys/arch/armish/conf/Makefile.armish21
1 files changed, 9 insertions, 12 deletions
diff --git a/sys/arch/armish/conf/Makefile.armish b/sys/arch/armish/conf/Makefile.armish
index 52e7922d47f..13aa9bbd183 100644
--- a/sys/arch/armish/conf/Makefile.armish
+++ b/sys/arch/armish/conf/Makefile.armish
@@ -1,8 +1,5 @@
-# $OpenBSD: Makefile.armish,v 1.12 2009/10/19 19:46:56 guenther Exp $
-# $NetBSD: Makefile.i386,v 1.67 1996/05/11 16:12:11 mycroft Exp $
+# $OpenBSD: Makefile.armish,v 1.13 2010/04/26 18:58:30 deraadt Exp $
-# Makefile for OpenBSD
-#
# This makefile is constructed from a machine description:
# config machineid
# Most changes should be made in the machine description
@@ -19,8 +16,8 @@
# -DTRACE compile in kernel tracing hooks
# -DQUOTA compile in file system quotas
-# DEBUG is set to -g if debugging.
-# PROF is set to -pg if profiling.
+# DEBUG is set to -g by config if debugging is requested (config -g).
+# PROF is set to -pg by config if profiling is requested (config -p).
.include <bsd.own.mk>
@@ -50,7 +47,7 @@ CMACHFLAGS+= -msoft-float -fno-builtin-printf -fno-builtin-log
COPTS?= -O2
CFLAGS= ${DEBUG} ${CDIAGFLAGS} ${CMACHFLAGS} ${COPTS} ${PIPE}
-AFLAGS= -x assembler-with-cpp -D_LOCORE ${CMACHFLAGS}
+AFLAGS= -x assembler-with-cpp -D_LOCORE ${CMACHFLAGS}
#LINKFLAGS= -Ttext 0xF0000020 -e start --warn-common
#LINKFLAGS= -T ${THISARM}/conf/kern.ldscript
LINKFLAGS= -T ldscript
@@ -178,7 +175,7 @@ depend:: .depend
.endif
cat ${ARM}/arm/genassym.cf | \
sh $S/kern/genassym.sh ${MKDEP} -f assym.dep ${CFLAGS} \
- ${CPPFLAGS}
+ ${CPPFLAGS}
@sed -e 's/.*\.o: /assym.h: /' -e 's/\/tmp\/genassym_c.[^ ]*//' \
< assym.dep >> .depend
@rm -f assym.dep
@@ -191,9 +188,9 @@ db_structinfo.h: $S/ddb/db_structinfo.c $S/ddb/parse_structinfo.awk
# depend on root or device configuration
autoconf.o conf.o: Makefile
-
-# depend on network or filesystem configuration
-uipc_domain.o uipc_proto.o vfs_conf.o: Makefile
+
+# depend on network or filesystem configuration
+uipc_domain.o uipc_proto.o vfs_conf.o: Makefile
if.o if_tun.o if_loop.o if_ethersubr.o: Makefile
if_arp.o if_ether.o: Makefile
ip_input.o ip_output.o in_pcb.o in_proto.o: Makefile
@@ -202,7 +199,7 @@ tcp_subr.o tcp_timer.o tcp_output.o: Makefile
# depend on maxusers
machdep.o: Makefile
-# depend on CPU configuration
+# depend on CPU configuration
locore.o machdep.o: Makefile
${BOARDTYPE}_start.o: ${THISARM}/armish/${BOARDTYPE}_start.S assym.h