[src/trunk]: src/sys/arch/amiga/stand/bootblock use elf2bb / elf2bb.h instead...

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

details:   https://anonhg.NetBSD.org/src/rev/e11ecb7b4dde
branches:  trunk
changeset: 756075:e11ecb7b4dde
user:      mrg <mrg%NetBSD.org@localhost>
date:      Tue Jul 06 06:09:56 2010 +0000

description:
use elf2bb / elf2bb.h instead of the old, now gone aout2bb version.

diffstat:

 sys/arch/amiga/stand/bootblock/boot/Makefile             |  8 ++++----
 sys/arch/amiga/stand/bootblock/bootxx_ffs/Makefile       |  4 ++--
 sys/arch/amiga/stand/bootblock/installboot/Makefile      |  4 ++--
 sys/arch/amiga/stand/bootblock/installboot/installboot.c |  4 ++--
 sys/arch/amiga/stand/bootblock/ppcboot/Makefile          |  4 ++--
 5 files changed, 12 insertions(+), 12 deletions(-)

diffs (106 lines):

diff -r 2e6f72d6a5bb -r e11ecb7b4dde sys/arch/amiga/stand/bootblock/boot/Makefile
--- a/sys/arch/amiga/stand/bootblock/boot/Makefile      Tue Jul 06 06:04:58 2010 +0000
+++ b/sys/arch/amiga/stand/bootblock/boot/Makefile      Tue Jul 06 06:09:56 2010 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.42 2010/03/14 00:26:10 mrg Exp $
+#      $NetBSD: Makefile,v 1.43 2010/07/06 06:09:56 mrg Exp $
 
 .include <bsd.sys.mk>          # for HOST_SH
 
@@ -77,7 +77,7 @@
 INCPATH += -I${DIR_TOP}/../common/dist/zlib
 INCPATH += -I${.CURDIR}
 INCPATH += -I${.CURDIR}/../../.. -I${.OBJDIR}
-INCPATH += -I${.CURDIR}/../aout2bb
+INCPATH += -I${.CURDIR}/../elf2bb
 
 AFLAGS += -m68030 -l
 CAFLAGS += -Wa,-l -Wa,-m68030 ${INCPATH}
@@ -89,7 +89,7 @@
 
 .c.o:
        ${CC} ${CFLAGS} -S $< -o $*.s
-       ${TXLT} < $*.s | ${AS} ${AFLAGS} -o $*.o
+       ${TXLT} < $*.s | ${AS} ${AFLAGS} -o $@
        rm $*.s
 
 .s.o: ; ${CC} ${CAFLAGS} ${COPTS} -x assembler-with-cpp -o $@ -c $<
@@ -111,7 +111,7 @@
 libboot.a: ${OBJS}
        ${AR} r $@ $> && ${RANLIB} $@
 
-.PHONY:        vers.c
+vers.o: vers.c
 vers.c:        ${.CURDIR}/version
        ${HOST_SH} ${DIR_TOP}/conf/newvers_stand.sh -N ${.CURDIR}/version "amiga"
 
diff -r 2e6f72d6a5bb -r e11ecb7b4dde sys/arch/amiga/stand/bootblock/bootxx_ffs/Makefile
--- a/sys/arch/amiga/stand/bootblock/bootxx_ffs/Makefile        Tue Jul 06 06:04:58 2010 +0000
+++ b/sys/arch/amiga/stand/bootblock/bootxx_ffs/Makefile        Tue Jul 06 06:09:56 2010 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.13 2010/03/14 00:26:10 mrg Exp $
+#      $NetBSD: Makefile,v 1.14 2010/07/06 06:09:57 mrg Exp $
 
 ### what we need:
 
@@ -49,7 +49,7 @@
 
 INCPATH = -nostdinc -I${DIR_TOP} -I${DIR_TOP}/lib/libsa -I${.CURDIR}
 INCPATH += -I${.CURDIR}/../boot -I${.CURDIR}/../../..
-INCPATH += -I${.CURDIR}/../aout2bb -I${.OBJDIR}
+INCPATH += -I${.CURDIR}/../elf2bb -I${.OBJDIR}
 
 AFLAGS += -m68030 -l
 CAFLAGS += -Wa,-l -Wa,-m68030 ${INCPATH} -D_PRIMARY_BOOT
diff -r 2e6f72d6a5bb -r e11ecb7b4dde sys/arch/amiga/stand/bootblock/installboot/Makefile
--- a/sys/arch/amiga/stand/bootblock/installboot/Makefile       Tue Jul 06 06:04:58 2010 +0000
+++ b/sys/arch/amiga/stand/bootblock/installboot/Makefile       Tue Jul 06 06:09:56 2010 +0000
@@ -1,10 +1,10 @@
-#      $NetBSD: Makefile,v 1.6 2002/01/29 18:46:11 aymeric Exp $
+#      $NetBSD: Makefile,v 1.7 2010/07/06 06:09:57 mrg Exp $
 PROG=installboot
 SRCS=installboot.c chksum.c
 BINDIR=/usr/mdec
 
 NOMAN= # defined
 
-.PATH: ${.CURDIR}/../aout2bb   # chksum.c
+.PATH: ${.CURDIR}/../elf2bb    # chksum.c
 
 .include <bsd.prog.mk>
diff -r 2e6f72d6a5bb -r e11ecb7b4dde sys/arch/amiga/stand/bootblock/installboot/installboot.c
--- a/sys/arch/amiga/stand/bootblock/installboot/installboot.c  Tue Jul 06 06:04:58 2010 +0000
+++ b/sys/arch/amiga/stand/bootblock/installboot/installboot.c  Tue Jul 06 06:09:56 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: installboot.c,v 1.4 2007/03/26 23:08:29 hubertf Exp $  */
+/*     $NetBSD: installboot.c,v 1.5 2010/07/06 06:09:57 mrg Exp $      */
 
 #include <err.h>
 #include <fcntl.h>
@@ -7,7 +7,7 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "../aout2bb/chksum.h"
+#include "../elf2bb/chksum.h"
 
 /* XXX Must be kept in sync with bbstart.s! */
 #define CMDLN_LOC 0x10
diff -r 2e6f72d6a5bb -r e11ecb7b4dde sys/arch/amiga/stand/bootblock/ppcboot/Makefile
--- a/sys/arch/amiga/stand/bootblock/ppcboot/Makefile   Tue Jul 06 06:04:58 2010 +0000
+++ b/sys/arch/amiga/stand/bootblock/ppcboot/Makefile   Tue Jul 06 06:09:56 2010 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.8 2010/03/14 00:26:10 mrg Exp $
+#      $NetBSD: Makefile,v 1.9 2010/07/06 06:09:57 mrg Exp $
 
 ### what we need:
 
@@ -38,7 +38,7 @@
 
 ### special  rules for bootblocks ###
 
-INCPATH = -I${DIR_TOP} -I${DIR_TOP}/lib/libsa -I${DIR_BOOT} -I${.CURDIR} -I${.CURDIR}/../../.. -I${.CURDIR}/../aout2bb -I${.OBJDIR}
+INCPATH = -I${DIR_TOP} -I${DIR_TOP}/lib/libsa -I${DIR_BOOT} -I${.CURDIR} -I${.CURDIR}/../../.. -I${.CURDIR}/../elf2bb -I${.OBJDIR}
 
 AFLAGS += -m68030 -l
 CAFLAGS += -Wa,-l -Wa,-m68030 ${INCPATH}