Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/external/bsd/atf Do not install atf-config, atf-report, atf-...



details:   https://anonhg.NetBSD.org/src/rev/bd6fd6cbe1b0
branches:  trunk
changeset: 785124:bd6fd6cbe1b0
user:      jmmv <jmmv%NetBSD.org@localhost>
date:      Mon Feb 25 00:22:10 2013 +0000

description:
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).

diffstat:

 external/bsd/atf/etc/Makefile       |   6 +++++-
 external/bsd/atf/share/Makefile     |   9 +++++++--
 external/bsd/atf/tests/atf/Makefile |  14 ++++++++------
 external/bsd/atf/usr.bin/Makefile   |   9 +++++++--
 4 files changed, 27 insertions(+), 11 deletions(-)

diffs (76 lines):

diff -r f18209567a80 -r bd6fd6cbe1b0 external/bsd/atf/etc/Makefile
--- a/external/bsd/atf/etc/Makefile     Mon Feb 25 00:21:04 2013 +0000
+++ b/external/bsd/atf/etc/Makefile     Mon Feb 25 00:22:10 2013 +0000
@@ -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>
diff -r f18209567a80 -r bd6fd6cbe1b0 external/bsd/atf/share/Makefile
--- a/external/bsd/atf/share/Makefile   Mon Feb 25 00:21:04 2013 +0000
+++ b/external/bsd/atf/share/Makefile   Mon Feb 25 00:22:10 2013 +0000
@@ -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 $
+
+.include <bsd.init.mk>
 
-SUBDIR= doc examples xml xsl
+SUBDIR=                doc
+.if !(${MKKYUA} != "no")
+SUBDIR+=       examples xml xsl
+.endif
 
 .include <bsd.subdir.mk>
diff -r f18209567a80 -r bd6fd6cbe1b0 external/bsd/atf/tests/atf/Makefile
--- a/external/bsd/atf/tests/atf/Makefile       Mon Feb 25 00:21:04 2013 +0000
+++ b/external/bsd/atf/tests/atf/Makefile       Mon Feb 25 00:22:10 2013 +0000
@@ -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}
 
diff -r f18209567a80 -r bd6fd6cbe1b0 external/bsd/atf/usr.bin/Makefile
--- a/external/bsd/atf/usr.bin/Makefile Mon Feb 25 00:21:04 2013 +0000
+++ b/external/bsd/atf/usr.bin/Makefile Mon Feb 25 00:22:10 2013 +0000
@@ -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 $
+
+.include <bsd.init.mk>
 
-SUBDIR= atf-config atf-report atf-run atf-sh atf-version
+SUBDIR=                atf-sh
+.if !(${MKKYUA} != "no")
+SUBDIR+=       atf-config atf-report atf-run atf-version
+.endif
 
 .include <bsd.subdir.mk>



Home | Main Index | Thread Index | Old Index