Module Name: src
Committed By: mrg
Date: Tue Jul 6 06:09:57 UTC 2010
Modified Files:
src/sys/arch/amiga/stand/bootblock/boot: Makefile
src/sys/arch/amiga/stand/bootblock/bootxx_ffs: Makefile
src/sys/arch/amiga/stand/bootblock/installboot: Makefile installboot.c
src/sys/arch/amiga/stand/bootblock/ppcboot: Makefile
Log Message:
use elf2bb / elf2bb.h instead of the old, now gone aout2bb version.
To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 src/sys/arch/amiga/stand/bootblock/boot/Makefile
cvs rdiff -u -r1.13 -r1.14 \
src/sys/arch/amiga/stand/bootblock/bootxx_ffs/Makefile
cvs rdiff -u -r1.6 -r1.7 \
src/sys/arch/amiga/stand/bootblock/installboot/Makefile
cvs rdiff -u -r1.4 -r1.5 \
src/sys/arch/amiga/stand/bootblock/installboot/installboot.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/amiga/stand/bootblock/ppcboot/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amiga/stand/bootblock/boot/Makefile
diff -u src/sys/arch/amiga/stand/bootblock/boot/Makefile:1.42 src/sys/arch/amiga/stand/bootblock/boot/Makefile:1.43
--- src/sys/arch/amiga/stand/bootblock/boot/Makefile:1.42 Sun Mar 14 00:26:10 2010
+++ src/sys/arch/amiga/stand/bootblock/boot/Makefile Tue Jul 6 06:09:56 2010
@@ -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"
Index: src/sys/arch/amiga/stand/bootblock/bootxx_ffs/Makefile
diff -u src/sys/arch/amiga/stand/bootblock/bootxx_ffs/Makefile:1.13 src/sys/arch/amiga/stand/bootblock/bootxx_ffs/Makefile:1.14
--- src/sys/arch/amiga/stand/bootblock/bootxx_ffs/Makefile:1.13 Sun Mar 14 00:26:10 2010
+++ src/sys/arch/amiga/stand/bootblock/bootxx_ffs/Makefile Tue Jul 6 06:09:57 2010
@@ -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
Index: src/sys/arch/amiga/stand/bootblock/installboot/Makefile
diff -u src/sys/arch/amiga/stand/bootblock/installboot/Makefile:1.6 src/sys/arch/amiga/stand/bootblock/installboot/Makefile:1.7
--- src/sys/arch/amiga/stand/bootblock/installboot/Makefile:1.6 Tue Jan 29 18:46:11 2002
+++ src/sys/arch/amiga/stand/bootblock/installboot/Makefile Tue Jul 6 06:09:57 2010
@@ -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>
Index: src/sys/arch/amiga/stand/bootblock/installboot/installboot.c
diff -u src/sys/arch/amiga/stand/bootblock/installboot/installboot.c:1.4 src/sys/arch/amiga/stand/bootblock/installboot/installboot.c:1.5
--- src/sys/arch/amiga/stand/bootblock/installboot/installboot.c:1.4 Mon Mar 26 23:08:29 2007
+++ src/sys/arch/amiga/stand/bootblock/installboot/installboot.c Tue Jul 6 06:09:57 2010
@@ -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
Index: src/sys/arch/amiga/stand/bootblock/ppcboot/Makefile
diff -u src/sys/arch/amiga/stand/bootblock/ppcboot/Makefile:1.8 src/sys/arch/amiga/stand/bootblock/ppcboot/Makefile:1.9
--- src/sys/arch/amiga/stand/bootblock/ppcboot/Makefile:1.8 Sun Mar 14 00:26:10 2010
+++ src/sys/arch/amiga/stand/bootblock/ppcboot/Makefile Tue Jul 6 06:09:57 2010
@@ -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}
