Module Name: src
Committed By: joerg
Date: Tue Nov 1 21:16:30 UTC 2011
Modified Files:
src/share/mk: bsd.own.mk
src/tools: Makefile
Added Files:
src/tools/nbperf: Makefile
Log Message:
Hook up nbperf into the normal tool build.
To generate a diff of this commit:
cvs rdiff -u -r1.689 -r1.690 src/share/mk/bsd.own.mk
cvs rdiff -u -r1.149 -r1.150 src/tools/Makefile
cvs rdiff -u -r0 -r1.3 src/tools/nbperf/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.689 src/share/mk/bsd.own.mk:1.690
--- src/share/mk/bsd.own.mk:1.689 Mon Oct 31 14:20:11 2011
+++ src/share/mk/bsd.own.mk Tue Nov 1 21:16:29 2011
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.689 2011/10/31 14:20:11 chs Exp $
+# $NetBSD: bsd.own.mk,v 1.690 2011/11/01 21:16:29 joerg Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -309,7 +309,7 @@ TOOL_MKTEMP= ${TOOLDIR}/bin/${_TOOL_PRE
TOOL_MKUBOOTIMAGE= ${TOOLDIR}/bin/${_TOOL_PREFIX}mkubootimage
TOOL_MSGC= MSGDEF=${TOOLDIR}/share/misc ${TOOLDIR}/bin/${_TOOL_PREFIX}msgc
TOOL_MTREE= ${TOOLDIR}/bin/${_TOOL_PREFIX}mtree
-TOOL_NBPERF= ${TOOLDIR}/bin/${_TOOL_PREFIX}nbperf
+TOOL_NBPERF= ${TOOLDIR}/bin/${_TOOL_PREFIX}perf
TOOL_PAX= ${TOOLDIR}/bin/${_TOOL_PREFIX}pax
TOOL_PIC= ${TOOLDIR}/bin/${_TOOL_PREFIX}pic
TOOL_PIGZ= ${TOOLDIR}/bin/${_TOOL_PREFIX}pigz
Index: src/tools/Makefile
diff -u src/tools/Makefile:1.149 src/tools/Makefile:1.150
--- src/tools/Makefile:1.149 Tue Oct 11 13:54:01 2011
+++ src/tools/Makefile Tue Nov 1 21:16:28 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.149 2011/10/11 13:54:01 joerg Exp $
+# $NetBSD: Makefile,v 1.150 2011/11/01 21:16:28 joerg Exp $
.include <bsd.own.mk>
@@ -48,7 +48,7 @@ SUBDIR= host-mkdep .WAIT compat .WAIT \
binstall .WAIT mktemp .WAIT sed .WAIT \
cap_mkdb crunchgen ctags genassym gencat hexdump join \
${LINT_BITS} \
- lorder makewhatis mkdep mtree rpcgen tic tsort \
+ lorder makewhatis mkdep mtree nbperf rpcgen tic tsort \
uudecode m4 \
.WAIT texinfo \
.WAIT yacc \
Added files:
Index: src/tools/nbperf/Makefile
diff -u /dev/null src/tools/nbperf/Makefile:1.3
--- /dev/null Tue Nov 1 21:16:30 2011
+++ src/tools/nbperf/Makefile Tue Nov 1 21:16:29 2011
@@ -0,0 +1,6 @@
+# $NetBSD: Makefile,v 1.3 2011/11/01 21:16:29 joerg Exp $
+
+HOSTPROGNAME= ${_TOOL_PREFIX}perf
+HOST_SRCDIR= usr.bin/nbperf
+
+.include "${.CURDIR}/../Makefile.host"