Sun Jan 23 11:29:46 2011 UTC ()
Redo previous.
bsd.own.mk must be included after NOMAN=.


(nakayama)
diff -r1.27 -r1.28 src/sys/arch/sparc/stand/ofwboot/Makefile
cvs diff -r1.27 -r1.28 src/sys/arch/sparc/stand/ofwboot/Makefile (expand / switch to unified diff)

--- src/sys/arch/sparc/stand/ofwboot/Makefile 2011/01/22 19:19:24 1.27
+++ src/sys/arch/sparc/stand/ofwboot/Makefile 2011/01/23 11:29:46 1.28
@@ -1,20 +1,18 @@ @@ -1,20 +1,18 @@
1# $NetBSD: Makefile,v 1.27 2011/01/22 19:19:24 joerg Exp $ 1# $NetBSD: Makefile,v 1.28 2011/01/23 11:29:46 nakayama Exp $
2 2
3CURDIR= ${.CURDIR} 3CURDIR= ${.CURDIR}
4S= ${CURDIR}/../../../.. 4S= ${CURDIR}/../../../..
5 5
6.include <bsd.own.mk> 
7 
8# 6#
9# Override normal settings 7# Override normal settings
10# 8#
11 9
12WARNS= 0 10WARNS= 0
13 11
14PROG?= ofwboot 12PROG?= ofwboot
15SRCS= srt0.s Locore.c boot.c ofdev.c alloc.c net.c netif_of.c vers.c 13SRCS= srt0.s Locore.c boot.c ofdev.c alloc.c net.c netif_of.c vers.c
16SRCS+= bootinfo.c loadfile_machdep.c promlib.c prf.c isfloppy.c 14SRCS+= bootinfo.c loadfile_machdep.c promlib.c prf.c isfloppy.c
17.PATH: ${S}/arch/sparc64/sparc64 ${S}/arch/sparc/stand/common 15.PATH: ${S}/arch/sparc64/sparc64 ${S}/arch/sparc/stand/common
18 16
19# XXX SHOULD NOT NEED TO DEFINE THESE! 17# XXX SHOULD NOT NEED TO DEFINE THESE!
20LIBCRT0= 18LIBCRT0=
@@ -84,26 +82,28 @@ LIBSA= ${SALIB} @@ -84,26 +82,28 @@ LIBSA= ${SALIB}
84.BEGIN: 82.BEGIN:
85 @([ -h machine ] || ln -s ${S}/arch/sparc64/include machine) 83 @([ -h machine ] || ln -s ${S}/arch/sparc64/include machine)
86 @([ -h sparc64 ] || ln -s ${S}/arch/sparc64/include sparc64) 84 @([ -h sparc64 ] || ln -s ${S}/arch/sparc64/include sparc64)
87 @([ -h sparc ] || ln -s ${S}/arch/sparc/include sparc) 85 @([ -h sparc ] || ln -s ${S}/arch/sparc/include sparc)
88.NOPATH: machine sparc64 sparc 86.NOPATH: machine sparc64 sparc
89.endif 87.endif
90CLEANFILES+= machine sparc64 sparc 88CLEANFILES+= machine sparc64 sparc
91 89
92cleandir distclean: .WAIT cleanlibdir 90cleandir distclean: .WAIT cleanlibdir
93 91
94cleanlibdir: 92cleanlibdir:
95 -rm -rf lib 93 -rm -rf lib
96 94
 95.include <bsd.own.mk>
 96
97vers.c: version 97vers.c: version
98 ${HOST_SH} ${S}/conf/newvers_stand.sh ${${MKREPRO} == "yes" :?:-D} \ 98 ${HOST_SH} ${S}/conf/newvers_stand.sh ${${MKREPRO} == "yes" :?:-D} \
99 ${CURDIR}/version "sparc64" ${NEWVERSWHAT} 99 ${CURDIR}/version "sparc64" ${NEWVERSWHAT}
100 100
101CLEANFILES+= vers.c 101CLEANFILES+= vers.c
102 102
103.if CROSS 103.if CROSS
104${PROG}: ${OBJS} ${LIBSA} ${LIBZ} ${LIBKERN} 104${PROG}: ${OBJS} ${LIBSA} ${LIBZ} ${LIBKERN}
105 ${LD} -N -p -Ttext ${RELOC} -e ${ENTRY} >lderr -o ${PROG} \ 105 ${LD} -N -p -Ttext ${RELOC} -e ${ENTRY} >lderr -o ${PROG} \
106 ${OBJS} -L${SADST} -lsa -L${ZDST} -lz -L${KERNDST} -lkern # solaris linker 106 ${OBJS} -L${SADST} -lsa -L${ZDST} -lz -L${KERNDST} -lkern # solaris linker
107.else 107.else
108${PROG}: ${OBJS} ${LIBSA} ${LIBZ} ${LIBKERN} 108${PROG}: ${OBJS} ${LIBSA} ${LIBZ} ${LIBKERN}
109 ${LD} -X -N -Ttext ${RELOC} -e ${ENTRY} -o ${PROG} \ 109 ${LD} -X -N -Ttext ${RELOC} -e ${ENTRY} -o ${PROG} \