[src/trunk]: src/sys/arch/epoc32/stand Cleanup.

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

details:   https://anonhg.NetBSD.org/src/rev/c73600f7a7ad
branches:  trunk
changeset: 786570:c73600f7a7ad
user:      matt <matt%NetBSD.org@localhost>
date:      Wed May 01 22:57:37 2013 +0000

description:
Cleanup.
bsd.init.mk include ../Machine.inc so don't do it again.
For now, restrict this to epoc32 because of the external tools needed

diffstat:

 sys/arch/epoc32/stand/Makefile             |  8 ++++++--
 sys/arch/epoc32/stand/Makefile.inc         |  3 ++-
 sys/arch/epoc32/stand/e32boot/Makefile.inc |  6 +++---
 sys/arch/epoc32/stand/e32boot/exe/Makefile |  5 ++---
 sys/arch/epoc32/stand/e32boot/ldd/Makefile |  4 +---
 5 files changed, 14 insertions(+), 12 deletions(-)

diffs (79 lines):

diff -r bcacf059d703 -r c73600f7a7ad sys/arch/epoc32/stand/Makefile
--- a/sys/arch/epoc32/stand/Makefile    Wed May 01 22:36:52 2013 +0000
+++ b/sys/arch/epoc32/stand/Makefile    Wed May 01 22:57:37 2013 +0000
@@ -1,7 +1,11 @@
-#      $NetBSD: Makefile,v 1.1 2013/04/28 12:11:27 kiyohara Exp $
+#      $NetBSD: Makefile,v 1.2 2013/05/01 22:57:37 matt Exp $
 
-.include <bsd.own.mk>
+.include <bsd.endian.mk>
+
+.if ${MACHINE} == "epoc32" && ${TARGET_ENDIANNESS} == "1234"
 
 SUBDIR+=       e32boot
 
+.endif
+
 .include <bsd.subdir.mk>
diff -r bcacf059d703 -r c73600f7a7ad sys/arch/epoc32/stand/Makefile.inc
--- a/sys/arch/epoc32/stand/Makefile.inc        Wed May 01 22:36:52 2013 +0000
+++ b/sys/arch/epoc32/stand/Makefile.inc        Wed May 01 22:57:37 2013 +0000
@@ -1,3 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.1 2013/04/28 12:11:27 kiyohara Exp $
+#      $NetBSD: Makefile.inc,v 1.2 2013/05/01 22:57:37 matt Exp $
 
 BINDIR=                /usr/mdec
+MACHINE=       epoc32
diff -r bcacf059d703 -r c73600f7a7ad sys/arch/epoc32/stand/e32boot/Makefile.inc
--- a/sys/arch/epoc32/stand/e32boot/Makefile.inc        Wed May 01 22:36:52 2013 +0000
+++ b/sys/arch/epoc32/stand/e32boot/Makefile.inc        Wed May 01 22:57:37 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.1 2013/04/28 12:11:27 kiyohara Exp $
+#      $NetBSD: Makefile.inc,v 1.2 2013/05/01 22:57:37 matt Exp $
 
 # Require pkgsrc/cross/psion-gcc.
 ARM_EPOC_PE_GCC?=      /usr/pkg/bin/arm-epoc-pe-gcc
@@ -24,11 +24,11 @@
        @false
 .endif
 
-check_psion_utils:
+check_psion_sdk:
 .if !exists(${EPOC32_SDKDIR}/include/e32base.h)
        @echo "Error: File does not exist: ${EPOC32_SDKDIR}/include/e32base.h"
        @echo "Please build and install pkgsrc/cross/psion-sdk-e32."
        @false
 .endif
 
-check_epoc32_cross: check_psion_gcc check_psion_utils check_psion_utils
+check_epoc32_cross: check_psion_gcc check_psion_utils check_psion_sdk
diff -r bcacf059d703 -r c73600f7a7ad sys/arch/epoc32/stand/e32boot/exe/Makefile
--- a/sys/arch/epoc32/stand/e32boot/exe/Makefile        Wed May 01 22:36:52 2013 +0000
+++ b/sys/arch/epoc32/stand/e32boot/exe/Makefile        Wed May 01 22:57:37 2013 +0000
@@ -1,6 +1,4 @@
-#      $NetBSD: Makefile,v 1.2 2013/05/01 13:15:26 kiyohara Exp $
-
-.include <../Makefile.inc>
+#      $NetBSD: Makefile,v 1.3 2013/05/01 22:57:37 matt Exp $
 
 .include <bsd.own.mk>
 .include <bsd.sys.mk>
@@ -44,6 +42,7 @@
 all: check_epoc32_cross $(PROG)
 
 $(PROG): $(OBJS) $(IN)
+       ${_MKTARGET_LINK}
        $(LD) -s --base-file $(PROG:.exe=.bas) \
            -o $@ --whole-archive $(IN) --no-whole-archive $(LIBS)
        TMP=. $(EXTERNAL_TOOLCHAIN)/bin/$(MACHINE_GNU_PLATFORM)-dlltool \
diff -r bcacf059d703 -r c73600f7a7ad sys/arch/epoc32/stand/e32boot/ldd/Makefile
--- a/sys/arch/epoc32/stand/e32boot/ldd/Makefile        Wed May 01 22:36:52 2013 +0000
+++ b/sys/arch/epoc32/stand/e32boot/ldd/Makefile        Wed May 01 22:57:37 2013 +0000
@@ -1,6 +1,4 @@
-#      $NetBSD: Makefile,v 1.2 2013/05/01 13:15:26 kiyohara Exp $
-
-.include <../Makefile.inc>
+#      $NetBSD: Makefile,v 1.3 2013/05/01 22:57:37 matt Exp $
 
 .include <bsd.own.mk>
 .include <bsd.sys.mk>