[src/trunk]: src/sys/conf Simplify. Wrap long lines.

[uebayasi <uebayasi%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/2e5a8133c0b6
branches:  trunk
changeset: 340390:2e5a8133c0b6
user:      uebayasi <uebayasi%NetBSD.org@localhost>
date:      Thu Sep 03 01:40:06 2015 +0000

description:
Simplify.  Wrap long lines.

diffstat:

 sys/conf/Makefile.kern.inc |  11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diffs (32 lines):

diff -r 34df80f7a697 -r 2e5a8133c0b6 sys/conf/Makefile.kern.inc
--- a/sys/conf/Makefile.kern.inc        Thu Sep 03 01:30:18 2015 +0000
+++ b/sys/conf/Makefile.kern.inc        Thu Sep 03 01:40:06 2015 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.kern.inc,v 1.227 2015/09/03 01:30:18 uebayasi Exp $
+#      $NetBSD: Makefile.kern.inc,v 1.228 2015/09/03 01:40:06 uebayasi Exp $
 #
 # This file contains common `MI' targets and definitions and it is included
 # at the bottom of each `MD' ${MACHINE}/conf/Makefile.${MACHINE}.
@@ -213,7 +213,6 @@
 # xxx: ${SYSTEM_DEP} swapxxxx.o vers.o build_kernel
 
 SYSTEM_OBJ?=   ${MD_OBJS} ${MI_OBJS} ${OBJS} ${SYSLIBCOMPAT} ${LIBKERN}
-SYSTEM_OBJ_NOSWAP=     ${SYSTEM_OBJ:N*swap*netbsd*}
 SYSTEM_DEP+=   Makefile ${SYSTEM_OBJ} .gdbinit
 .if defined(CTFMERGE)
 SYSTEM_CTFMERGE= ${CTFMERGE} ${CTFMFLAGS} -o ${.TARGET} ${SYSTEM_OBJ} ${EXTRA_OBJ} vers.o
@@ -223,8 +222,12 @@
 SYSTEM_LD_HEAD?=@rm -f $@
 SYSTEM_LD?=    ${_MKSHMSG} "   link  ${.CURDIR:T}/${.TARGET}"; \
                ${_MKSHECHO}\
-               ${LD} -Map ${.TARGET}.map --cref ${LINKFLAGS} -o ${.TARGET} '$${SYSTEM_OBJ_NOSWAP}' '$${EXTRA_OBJ}' vers.o '$${OBJS:M*swap${.TARGET}.o}'; \
-               ${LD} -Map ${.TARGET}.map --cref ${LINKFLAGS} -o ${.TARGET} ${SYSTEM_OBJ_NOSWAP} ${EXTRA_OBJ} vers.o ${OBJS:M*swap${.TARGET}.o}
+               ${LD} -Map ${.TARGET}.map --cref ${LINKFLAGS} -o ${.TARGET} \
+               '$${SYSTEM_OBJ:N*swap*netbsd*}' '$${EXTRA_OBJ}' vers.o \
+               ${OBJS:M*swap${.TARGET}.o}; \
+               ${LD} -Map ${.TARGET}.map --cref ${LINKFLAGS} -o ${.TARGET} \
+               ${SYSTEM_OBJ:N*swap*netbsd*} ${EXTRA_OBJ} vers.o \
+               ${OBJS:M*swap${.TARGET}.o}
 
 # Give MD generated ldscript dependency on ${SYSTEM_OBJ}
 .if defined(KERNLDSCRIPT)