Module Name: src
Committed By: matt
Date: Wed Aug 21 08:04:50 UTC 2013
Modified Files:
src/sys/arch/amiga/stand/bootblock/boot: Makefile
src/sys/arch/amiga/stand/bootblock/bootxx_ffs: Makefile
Log Message:
Use <bsd.klinks.mk>
Use ${_MKTARGET_*}
Use correct arguments to ${AR}
Fix entry symbol.
To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 src/sys/arch/amiga/stand/bootblock/boot/Makefile
cvs rdiff -u -r1.19 -r1.20 \
src/sys/arch/amiga/stand/bootblock/bootxx_ffs/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.48 src/sys/arch/amiga/stand/bootblock/boot/Makefile:1.49
--- src/sys/arch/amiga/stand/bootblock/boot/Makefile:1.48 Thu Jul 18 12:15:15 2013
+++ src/sys/arch/amiga/stand/bootblock/boot/Makefile Wed Aug 21 08:04:50 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.48 2013/07/18 12:15:15 joerg Exp $
+# $NetBSD: Makefile,v 1.49 2013/08/21 08:04:50 matt Exp $
.include <bsd.own.mk>
.include <bsd.sys.mk> # for HOST_SH
@@ -66,11 +66,12 @@ DEFS+= -DNETBSD_VERS='"${NETBSD_VERS}"'
### main target: ###
-realall: machine m68k ${FILES}
+realall: ${FILES}
-CLEANFILES += boot.amiga x.out xxstart.o libboot.a vers.c machine m68k
+CLEANFILES += boot.amiga x.out xxstart.o libboot.a vers.c
.include <bsd.prog.mk>
+.include <bsd.klinks.mk>
### special rules for bootblocks ###
@@ -93,47 +94,44 @@ CFLAGS+= -Wall -Wmissing-prototypes -Wst
COPTS.cread.c = -O1
.c.o:
+ ${_MKTARGET_COMPILE}
${CC} ${CFLAGS} ${COPTS.${.IMPSRC:T}} -S $< -o $*.s
${TXLT} < $*.s | ${AS} ${AFLAGS} -o $@
rm $*.s
-.s.o: ; ${CC} ${CAFLAGS} ${COPTS} -x assembler-with-cpp -o $@ -c $<
-
-.S.o: ; ${CC} ${CAFLAGS} ${COPTS} -x assembler-with-cpp -o $@ -c $<
+.s.o:
+ ${_MKTARGET_COMPILE}
+ ${CC} ${CAFLAGS} ${COPTS} -x assembler-with-cpp -o $@ -c $<
+
+.S.o:
+ ${_MKTARGET_COMPILE}
+ ${CC} ${CAFLAGS} ${COPTS} -x assembler-with-cpp -o $@ -c $<
boot.amiga: x.out
+ ${_MKTARGET_CREATE}
${RELOC2BB} -S x.out $@ || (${NM} -u x.out && false)
x.out: xxstart.o libboot.a ${LIBZ}
+ ${_MKTARGET_LINK}
${LD} ${LDFLAGS} -r -dc -e start -o $@ $>
${SIZE} $@
${NM} -u $@
xxstart.o: ${.CURDIR}/bbstart.s
+ ${_MKTARGET_COMPILE}
${CC} ${CAFLAGS} ${COPTS} -x assembler-with-cpp \
-o $@ -c $>
libboot.a: ${OBJS}
- ${AR} r $@ $> && ${RANLIB} $@
+ ${_MKTARGET_BUILD}
+ ${AR} crs $@ $> && ${RANLIB} $@
vers.o: vers.c
vers.c: ${.CURDIR}/version
+ ${_MKTARGET_CREATE}
${HOST_SH} ${DIR_TOP}/conf/newvers_stand.sh \
${${MKREPRO} == "yes" :?:-D} -N ${.CURDIR}/version "amiga"
-.if !make(obj) && !make(clean) && !make(cleandir)
-.NOPATH: machine m68k
-.BEGIN: machine m68k
-
-machine:
- -rm -f $@
- ln -s ${DIR_TOP}/arch/amiga/include $@
-
-m68k:
- -rm -f $@
- ln -s ${DIR_TOP}/arch/m68k/include $@
-.endif
-
# make sure these are built:
${COBJS}: ${TXLT}
Index: src/sys/arch/amiga/stand/bootblock/bootxx_ffs/Makefile
diff -u src/sys/arch/amiga/stand/bootblock/bootxx_ffs/Makefile:1.19 src/sys/arch/amiga/stand/bootblock/bootxx_ffs/Makefile:1.20
--- src/sys/arch/amiga/stand/bootblock/bootxx_ffs/Makefile:1.19 Thu Jul 18 12:15:15 2013
+++ src/sys/arch/amiga/stand/bootblock/bootxx_ffs/Makefile Wed Aug 21 08:04:50 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2013/07/18 12:15:15 joerg Exp $
+# $NetBSD: Makefile,v 1.20 2013/08/21 08:04:50 matt Exp $
### what we need:
@@ -39,11 +39,12 @@ DEFS = -D_STANDALONE -DSA_EXEC_ANYOWNER
### main target: ###
-realall: machine m68k ${FILES}
+realall: ${FILES}
-CLEANFILES += bootxx_ffs bootxx_fd x.out f.out xxstart.o fdstart.o libboot.a vers.c machine m68k
+CLEANFILES += bootxx_ffs bootxx_fd x.out f.out xxstart.o fdstart.o libboot.a vers.c
.include <bsd.prog.mk>
+.include <bsd.klinks.mk>
### special rules for bootblocks ###
@@ -65,58 +66,58 @@ DEFS+= -DNETBSD_VERS='"${NETBSD_VERS}"'
DEFS+= -D__daddr_t=int32_t
.c.o:
+ ${_MKTARGET_COMPILE}
${CC} ${CFLAGS} -S $< -o $*.s
${TXLT} < $*.s | ${AS} ${AFLAGS} -o $*.o
rm $*.s
-.s.o: ; ${CC} ${CAFLAGS} ${COPTS} -x assembler-with-cpp -o $@ -c $<
-
-.S.o: ; ${CC} ${CAFLAGS} ${COPTS} -x assembler-with-cpp -o $@ -c $<
+.s.o:
+ ${_MKTARGET_COMPILE}
+ ${CC} ${CAFLAGS} ${COPTS} -x assembler-with-cpp -o $@ -c $<
+
+.S.o:
+ ${_MKTARGET_COMPILE}
+ ${CC} ${CAFLAGS} ${COPTS} -x assembler-with-cpp -o $@ -c $<
bootxx_ffs: x.out
+ ${_MKTARGET_CREATE}
${RELOC2BB} x.out $@ || (${NM} -u x.out && false)
bootxx_fd: f.out
+ ${_MKTARGET_CREATE}
${RELOC2BB} -F f.out $@ || (${NM} -u f.out && false)
x.out: xxstart.o libboot.a
- ${LD} ${LDFLAGS} -r -dc -e _start -o $@ $>
+ ${_MKTARGET_LINK}
+ ${LD} ${LDFLAGS} -r -dc -e start -o $@ $>
${SIZE} $@
${NM} -u $@
f.out: fdstart.o libboot.a
- ${LD} ${LDFLAGS} -r -dc -e _start -o $@ $>
+ ${_MKTARGET_LINK}
+ ${LD} ${LDFLAGS} -r -dc -e start -o $@ $>
${SIZE} $@
${NM} -u $@
xxstart.o: ${.CURDIR}/../boot/bbstart.s
+ ${_MKTARGET_COMPILE}
${CC} ${CAFLAGS} ${COPTS} -x assembler-with-cpp \
-o $@ -c $>
fdstart.o: ${.CURDIR}/../boot//bbstart.s
+ ${_MKTARGET_COMPILE}
${CC} -DAUTOLOAD=8192 ${CAFLAGS} ${COPTS} -x assembler-with-cpp \
-o $@ -c $>
libboot.a: ${OBJS}
- ${AR} r $@ $> && ${RANLIB} $@
+ ${_MKTARGET_BUILD}
+ ${AR} crs $@ $> && ${RANLIB} $@
vers.c: ${.CURDIR}/../boot/version
+ ${_MKTARGET_CREATE}
${HOST_SH} ${DIR_TOP}/conf/newvers_stand.sh -N \
${.CURDIR}/../boot/version "amiga"
-.if !make(obj) && !make(clean) && !make(cleandir)
-.NOPATH: machine m68k
-.BEGIN: machine m68k
-
-machine:
- -rm -f $@
- ln -s ${DIR_TOP}/arch/amiga/include $@
-
-m68k:
- -rm -f $@
- ln -s ${DIR_TOP}/arch/m68k/include $@
-.endif
-
# make sure these are built:
${COBJS}: ${TXLT}
