Sun Jan 24 22:49:08 2016 UTC ()
move cvslatest last


(christos)
diff -r1.185 -r1.186 src/tools/Makefile
cvs diff -r1.185 -r1.186 src/tools/Makefile (expand / switch to unified diff)

--- src/tools/Makefile 2016/01/24 20:14:17 1.185
+++ src/tools/Makefile 2016/01/24 22:49:08 1.186
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.185 2016/01/24 20:14:17 christos Exp $ 1# $NetBSD: Makefile,v 1.186 2016/01/24 22:49:08 christos Exp $
2 2
3.include <bsd.own.mk> 3.include <bsd.own.mk>
4.include <bsd.endian.mk> 4.include <bsd.endian.mk>
5 5
6# Make sure that the ordered build/install processing applies when using 6# Make sure that the ordered build/install processing applies when using
7# plain make. 7# plain make.
8.MAIN: build_install 8.MAIN: build_install
9 9
10# TOOLDIR must be valid, unless MKTOOLS=no 10# TOOLDIR must be valid, unless MKTOOLS=no
11.if ${MKTOOLS:Uyes} != "no" 11.if ${MKTOOLS:Uyes} != "no"
12.if "${TOOLDIR}" == "" 12.if "${TOOLDIR}" == ""
13.error "TOOLDIR is undefined or empty" 13.error "TOOLDIR is undefined or empty"
14.elif "${TOOLDIR:tW:M/*}" == "" 14.elif "${TOOLDIR:tW:M/*}" == ""
@@ -93,27 +93,26 @@ dependall-binstall: dependall-compat @@ -93,27 +93,26 @@ dependall-binstall: dependall-compat
93 93
94# Dependencies in SUBDIR below ordered to maximize parallel ability. 94# Dependencies in SUBDIR below ordered to maximize parallel ability.
95# See above for special treatment for host-mkdep, compat, and binstall. 95# See above for special treatment for host-mkdep, compat, and binstall.
96# 96#
97SUBDIR= host-mkdep compat binstall \ 97SUBDIR= host-mkdep compat binstall \
98 .WAIT mktemp .WAIT sed .WAIT genassym 98 .WAIT mktemp .WAIT sed .WAIT genassym
99.if ${TOOLS_BUILDRUMP} == "no" 99.if ${TOOLS_BUILDRUMP} == "no"
100SUBDIR+= cap_mkdb crunchgen ctags gencat hexdump \ 100SUBDIR+= cap_mkdb crunchgen ctags gencat hexdump \
101 ${LINT_BITS} \ 101 ${LINT_BITS} \
102 makewhatis mtree nbperf .WAIT uudecode 102 makewhatis mtree nbperf .WAIT uudecode
103.endif 103.endif
104 104
105SUBDIR+= cat rpcgen join lorder m4 mkdep tsort .WAIT yacc .WAIT awk .WAIT lex 105SUBDIR+= cat rpcgen join lorder m4 mkdep tsort .WAIT yacc .WAIT awk .WAIT lex
106SUBDIR+= cvslatest 
107 106
108.if ${TOOLS_BUILDRUMP} == "no" 107.if ${TOOLS_BUILDRUMP} == "no"
109SUBDIR += .WAIT texinfo \ 108SUBDIR += .WAIT texinfo \
110 .WAIT tic \ 109 .WAIT tic \
111 .WAIT pax \ 110 .WAIT pax \
112 .WAIT ${TOOLCHAIN_BITS} \ 111 .WAIT ${TOOLCHAIN_BITS} \
113 ${DTRACE_BITS} \ 112 ${DTRACE_BITS} \
114 asn1_compile cksum compile_et db \ 113 asn1_compile cksum compile_et db \
115 file lint1 slc \ 114 file lint1 slc \
116 makefs sortinfo \ 115 makefs sortinfo \
117 .WAIT menuc mkcsmapper mkesdb mklocale mknod msgc \ 116 .WAIT menuc mkcsmapper mkesdb mklocale mknod msgc \
118 .WAIT disklabel gpt \ 117 .WAIT disklabel gpt \
119 .WAIT paxctl \ 118 .WAIT paxctl \
@@ -208,26 +207,28 @@ SUBDIR+= hp300-mkboot @@ -208,26 +207,28 @@ SUBDIR+= hp300-mkboot
208SUBDIR+= elftosb 207SUBDIR+= elftosb
209.endif 208.endif
210 209
211.if ${MACHINE} == "evbarm" || ${MACHINE} == "evbmips" || \ 210.if ${MACHINE} == "evbarm" || ${MACHINE} == "evbmips" || \
212 ${MACHINE} == "evbppc" || ${MACHINE} == "sandpoint" 211 ${MACHINE} == "evbppc" || ${MACHINE} == "sandpoint"
213SUBDIR+= mkubootimage 212SUBDIR+= mkubootimage
214.endif 213.endif
215 214
216.if ${MKX11} != "no" 215.if ${MKX11} != "no"
217SUBDIR+= makestrs 216SUBDIR+= makestrs
218SUBDIR+= makekeys 217SUBDIR+= makekeys
219.endif 218.endif
220 219
 220SUBDIR+= cvslatest
 221
221.endif # TOOLCHAIN_BUILDRUMP 222.endif # TOOLCHAIN_BUILDRUMP
222 223
223check_MKTOOLS: .PHONY .NOTMAIN 224check_MKTOOLS: .PHONY .NOTMAIN
224.if ${MKTOOLS:Uyes} == "no" 225.if ${MKTOOLS:Uyes} == "no"
225 @echo '*** WARNING: "MKTOOLS" is set to "no"; this will prevent building and' 226 @echo '*** WARNING: "MKTOOLS" is set to "no"; this will prevent building and'
226 @echo '*** updating your host toolchain. This should be used only as a' 227 @echo '*** updating your host toolchain. This should be used only as a'
227 @echo '*** temporary workaround for toolchain problems, as it will result' 228 @echo '*** temporary workaround for toolchain problems, as it will result'
228 @echo '*** in version skew and build errors over time!' 229 @echo '*** in version skew and build errors over time!'
229.endif 230.endif
230 231
231.if ${MKTOOLS:Uyes} == "no" || ${USETOOLS} != "yes" # { 232.if ${MKTOOLS:Uyes} == "no" || ${USETOOLS} != "yes" # {
232SUBDIR= # empty 233SUBDIR= # empty
233realall realdepend install: check_MKTOOLS 234realall realdepend install: check_MKTOOLS