Module Name: src
Committed By: jmmv
Date: Mon Feb 25 00:22:11 UTC 2013
Modified Files:
src/external/bsd/atf/etc: Makefile
src/external/bsd/atf/share: Makefile
src/external/bsd/atf/tests/atf: Makefile
src/external/bsd/atf/usr.bin: Makefile
Log Message:
Do not install atf-config, atf-report, atf-run nor atf-version when
MKKYUA!=no. The newly imported kyua-atf-compat module provides a
backwards-compatibility implementation of atf-report and atf-run
based on kyua(1).
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/atf/etc/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/atf/share/Makefile
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/atf/tests/atf/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/atf/usr.bin/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/atf/etc/Makefile
diff -u src/external/bsd/atf/etc/Makefile:1.1 src/external/bsd/atf/etc/Makefile:1.2
--- src/external/bsd/atf/etc/Makefile:1.1 Mon Jan 19 07:13:03 2009
+++ src/external/bsd/atf/etc/Makefile Mon Feb 25 00:22:10 2013
@@ -1,5 +1,9 @@
-# $NetBSD: Makefile,v 1.1 2009/01/19 07:13:03 jmmv Exp $
+# $NetBSD: Makefile,v 1.2 2013/02/25 00:22:10 jmmv Exp $
+.include <bsd.init.mk>
+
+.if !(${MKKYUA} != "no")
SUBDIR= atf
+.endif
.include <bsd.subdir.mk>
Index: src/external/bsd/atf/share/Makefile
diff -u src/external/bsd/atf/share/Makefile:1.2 src/external/bsd/atf/share/Makefile:1.3
--- src/external/bsd/atf/share/Makefile:1.2 Fri Jun 4 08:33:41 2010
+++ src/external/bsd/atf/share/Makefile Mon Feb 25 00:22:11 2013
@@ -1,5 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2010/06/04 08:33:41 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2013/02/25 00:22:11 jmmv Exp $
-SUBDIR= doc examples xml xsl
+.include <bsd.init.mk>
+
+SUBDIR= doc
+.if !(${MKKYUA} != "no")
+SUBDIR+= examples xml xsl
+.endif
.include <bsd.subdir.mk>
Index: src/external/bsd/atf/tests/atf/Makefile
diff -u src/external/bsd/atf/tests/atf/Makefile:1.6 src/external/bsd/atf/tests/atf/Makefile:1.7
--- src/external/bsd/atf/tests/atf/Makefile:1.6 Wed Oct 20 09:20:10 2010
+++ src/external/bsd/atf/tests/atf/Makefile Mon Feb 25 00:22:11 2013
@@ -1,18 +1,20 @@
-# $NetBSD: Makefile,v 1.6 2010/10/20 09:20:10 jmmv Exp $
+# $NetBSD: Makefile,v 1.7 2013/02/25 00:22:11 jmmv Exp $
.include <bsd.own.mk>
TESTSDIR= ${TESTSBASE}/atf
-ATFFILE= yes
-SUBDIR= atf-c \
+TESTS_SUBDIRS= atf-c \
atf-c++ \
- atf-config \
- atf-report \
- atf-run \
atf-sh \
test-programs
+.if !(${MKKYUA} != "no")
+TESTS_SUBDIRS+= atf-config \
+ atf-report \
+ atf-run
+.endif
+
SRCDIR= ${NETBSDSRCDIR}/external/bsd/atf/dist
.PATH: ${SRCDIR}
Index: src/external/bsd/atf/usr.bin/Makefile
diff -u src/external/bsd/atf/usr.bin/Makefile:1.3 src/external/bsd/atf/usr.bin/Makefile:1.4
--- src/external/bsd/atf/usr.bin/Makefile:1.3 Wed Oct 20 09:20:12 2010
+++ src/external/bsd/atf/usr.bin/Makefile Mon Feb 25 00:22:11 2013
@@ -1,5 +1,10 @@
-# $NetBSD: Makefile,v 1.3 2010/10/20 09:20:12 jmmv Exp $
+# $NetBSD: Makefile,v 1.4 2013/02/25 00:22:11 jmmv Exp $
-SUBDIR= atf-config atf-report atf-run atf-sh atf-version
+.include <bsd.init.mk>
+
+SUBDIR= atf-sh
+.if !(${MKKYUA} != "no")
+SUBDIR+= atf-config atf-report atf-run atf-version
+.endif
.include <bsd.subdir.mk>
