[src/trunk]: src/sys/arch Clean up ${LINKSCRIPT} and ${KERNLDSCRIPT}.

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

details:   https://anonhg.NetBSD.org/src/rev/fed85ebd346c
branches:  trunk
changeset: 339997:fed85ebd346c
user:      uebayasi <uebayasi%NetBSD.org@localhost>
date:      Thu Aug 20 06:21:02 2015 +0000

description:
Clean up ${LINKSCRIPT} and ${KERNLDSCRIPT}.

diffstat:

 sys/arch/epoc32/conf/Makefile.epoc32.inc |  14 ++++++++------
 sys/arch/evbarm/conf/Makefile.evbarm.inc |  14 ++++++++++----
 2 files changed, 18 insertions(+), 10 deletions(-)

diffs (65 lines):

diff -r eab4ae98c98e -r fed85ebd346c sys/arch/epoc32/conf/Makefile.epoc32.inc
--- a/sys/arch/epoc32/conf/Makefile.epoc32.inc  Thu Aug 20 06:20:19 2015 +0000
+++ b/sys/arch/epoc32/conf/Makefile.epoc32.inc  Thu Aug 20 06:21:02 2015 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.epoc32.inc,v 1.2 2014/11/15 14:25:22 uebayasi Exp $
+#      $NetBSD: Makefile.epoc32.inc,v 1.3 2015/08/20 06:21:02 uebayasi Exp $
 
 MACHINE_ARCH=          arm
 CPPFLAGS+=             -D${MACHINE}
@@ -8,14 +8,16 @@
 
 KERNEL_BASE_VIRT=      $(LOADADDRESS)
 
-LINKSCRIPT=            -T ldscript
+KERNLDSCRIPT=          ldscript
+LINKSCRIPT=            -T ${KERNLDSCRIPT}
 
-EXTRA_CLEAN+=          netbsd.map assym.d ldscript tmp
-
-netbsd:        ldscript        # XXX
+EXTRA_CLEAN+=          netbsd.map assym.d ${KERNLDSCRIPT} tmp
 
 # generate ldscript from common template
-ldscript: ${THISARM}/conf/ldscript.epoc32 ${THISARM}/conf/Makefile.epoc32.inc Makefile
+${KERNLDSCRIPT}: \
+    ${THISARM}/conf/ldscript.epoc32 \
+    ${THISARM}/conf/Makefile.epoc32.inc \
+    Makefile
        ${TOOL_SED} -e 's/@KERNEL_BASE_PHYS@/${KERNEL_BASE_PHYS}/' \
            -e 's/@KERNEL_BASE_VIRT@/${KERNEL_BASE_VIRT}/' \
            ${THISARM}/conf/ldscript.epoc32 > tmp && mv tmp $@
diff -r eab4ae98c98e -r fed85ebd346c sys/arch/evbarm/conf/Makefile.evbarm.inc
--- a/sys/arch/evbarm/conf/Makefile.evbarm.inc  Thu Aug 20 06:20:19 2015 +0000
+++ b/sys/arch/evbarm/conf/Makefile.evbarm.inc  Thu Aug 20 06:21:02 2015 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.evbarm.inc,v 1.31 2014/11/15 14:55:02 uebayasi Exp $
+#      $NetBSD: Makefile.evbarm.inc,v 1.32 2015/08/20 06:21:26 uebayasi Exp $
 
 #
 # If this is a install kernel and the ramdisk image exists in the object
@@ -28,15 +28,21 @@
 . endif
 .endif
 
-EXTRA_CLEAN+= ldscript tmp ${KERNELS:=.map}
+EXTRA_CLEAN+=  ${KERNELS:=.map}
 
 .if defined(KERNEL_BASE_PHYS)
 LINKTEXT=
 KERNLDSCRIPT=  ldscript
-LINKSCRIPT=    -T ldscript
+LINKSCRIPT=    -T ${KERNLDSCRIPT}
+
+EXTRA_CLEAN+=  ${KERNLDSCRIPT} tmp
 
 # generate ldscript from common template
-ldscript: ${THISARM}/conf/ldscript.evbarm ${THISARM}/conf/Makefile.evbarm.inc Makefile ${BOARDMKFRAG}
+${KERNLDSCRIPT}: \
+    ${THISARM}/conf/ldscript.evbarm \
+    ${THISARM}/conf/Makefile.evbarm.inc \
+    Makefile \
+    ${BOARDMKFRAG}
        echo ${KERNELS}
        ${TOOL_SED} -e 's/@KERNEL_BASE_PHYS@/${KERNEL_BASE_PHYS}/' \
            -e 's/@KERNEL_BASE_VIRT@/${KERNEL_BASE_VIRT}/' \