Module Name:    src
Committed By:   nonaka
Date:           Mon Apr 13 12:54:45 UTC 2009

Modified Files:
        src/sys/arch/landisk/stand: Makefile.bootprogs
        src/sys/arch/landisk/stand/mbr: Makefile.mbr

Log Message:
Use <bsd.klinks.mk> to create ${MACHINE} and ${MACHINE_ARCH} symlinks.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/landisk/stand/Makefile.bootprogs
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/landisk/stand/mbr/Makefile.mbr

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/landisk/stand/Makefile.bootprogs
diff -u src/sys/arch/landisk/stand/Makefile.bootprogs:1.1 src/sys/arch/landisk/stand/Makefile.bootprogs:1.2
--- src/sys/arch/landisk/stand/Makefile.bootprogs:1.1	Fri Sep  1 21:26:18 2006
+++ src/sys/arch/landisk/stand/Makefile.bootprogs	Mon Apr 13 12:54:45 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.bootprogs,v 1.1 2006/09/01 21:26:18 uwe Exp $
+# $NetBSD: Makefile.bootprogs,v 1.2 2009/04/13 12:54:45 nonaka Exp $
 
 S=		${.CURDIR}/../../../../..
 
@@ -21,7 +21,7 @@
 
 .PATH:	${.CURDIR}/..
 
-COPTS=		-Os -ffreestanding
+COPTS=		-m4-nofpu -Os -ffreestanding
 
 LDFLAGS+=	-N
 CFLAGS+=	-Wall -Wmissing-prototypes -Wstrict-prototypes
@@ -29,22 +29,7 @@
 CPPFLAGS+=	-DSH4
 CPPFLAGS+=	-I${.OBJDIR} -I${.CURDIR}/.. -I${.CURDIR}/../../boot -I${S}
 
-LANDISK_STAND_DIR?= $S/arch/landisk/stand
-
-CLEANFILES+=	machine sh3
-
-.if !make(obj) && !make(clean) && !make(cleandir)
-.BEGIN: machine sh3
-.NOPATH: machine sh3
-
-machine::
-	-rm -f $@
-	ln -s ${S}/arch/${MACHINE}/include $@
-
-sh3::
-	-rm -f $@
-	ln -s ${S}/arch/sh3/include $@
-.endif
+.include <bsd.klinks.mk>
 
 lib:
 .ifdef LIBOBJ

Index: src/sys/arch/landisk/stand/mbr/Makefile.mbr
diff -u src/sys/arch/landisk/stand/mbr/Makefile.mbr:1.1 src/sys/arch/landisk/stand/mbr/Makefile.mbr:1.2
--- src/sys/arch/landisk/stand/mbr/Makefile.mbr:1.1	Fri Sep  1 21:26:19 2006
+++ src/sys/arch/landisk/stand/mbr/Makefile.mbr	Mon Apr 13 12:54:45 2009
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.mbr,v 1.1 2006/09/01 21:26:19 uwe Exp $
+#	$NetBSD: Makefile.mbr,v 1.2 2009/04/13 12:54:45 nonaka Exp $
 
 S=	${.CURDIR}/../../../../..
 
@@ -23,24 +23,12 @@
 LDFLAGS+=	-N -e start
 CPPFLAGS=	-nostdinc -I${.OBJDIR} -I${.CURDIR}/.. -I${S}
 
-CLEANFILES+=	${PROG}.tmp machine sh3
-
-.if !make(obj) && !make(clean) && !make(cleandir)
-.BEGIN: machine sh3
-.NOPATH: machine sh3
-
-machine::
-	-rm -f $@
-	ln -s ${S}/arch/${MACHINE}/include $@
-
-sh3::
-	-rm -f $@
-	ln -s ${S}/arch/sh3/include $@
-.endif
+CLEANFILES+=	${PROG}.tmp
 
 ${PROG}: ${OBJS}
 	${LD} -o ${PROG}.tmp ${LDFLAGS} -Ttext 0x8c200200 ${OBJS}
 	${OBJCOPY} -O binary ${PROG}.tmp ${PROG}
 	-rm -f ${PROG}.tmp
 
+.include <bsd.klinks.mk>
 .include <bsd.prog.mk>

Reply via email to