Module Name: src
Committed By: snj
Date: Sun Sep 18 06:14:01 UTC 2016
Modified Files:
src/external/bsd/kyua-testers/libexec/kyua-atf-tester [netbsd-7]:
Makefile
src/external/bsd/kyua-testers/libexec/kyua-plain-tester [netbsd-7]:
Makefile
src/external/bsd/kyua-testers/tests/kyua-testers [netbsd-7]: Makefile
Log Message:
Pull up following revision(s) (requested by dholland in ticket #1249):
external/bsd/kyua-testers/libexec/kyua-atf-tester/Makefile: revision
1.2, 1.3
external/bsd/kyua-testers/libexec/kyua-plain-tester/Makefile: revision
1.2, 1.3
external/bsd/kyua-testers/tests/kyua-testers/Makefile: revision 1.2, 1.3
Fix wrong objdir-finding logic. PR 51389.
--
Fix previous. (Sigh.) PR 51389 again.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.1.14.1 \
src/external/bsd/kyua-testers/libexec/kyua-atf-tester/Makefile
cvs rdiff -u -r1.1 -r1.1.14.1 \
src/external/bsd/kyua-testers/libexec/kyua-plain-tester/Makefile
cvs rdiff -u -r1.1 -r1.1.14.1 \
src/external/bsd/kyua-testers/tests/kyua-testers/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/kyua-testers/libexec/kyua-atf-tester/Makefile
diff -u src/external/bsd/kyua-testers/libexec/kyua-atf-tester/Makefile:1.1 src/external/bsd/kyua-testers/libexec/kyua-atf-tester/Makefile:1.1.14.1
--- src/external/bsd/kyua-testers/libexec/kyua-atf-tester/Makefile:1.1 Tue Feb 19 06:04:43 2013
+++ src/external/bsd/kyua-testers/libexec/kyua-atf-tester/Makefile Sun Sep 18 06:14:00 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2013/02/19 06:04:43 jmmv Exp $
+# $NetBSD: Makefile,v 1.1.14.1 2016/09/18 06:14:00 snj Exp $
.include <bsd.own.mk>
@@ -11,11 +11,12 @@ SRCS= atf_main.c
MAN= kyua-atf-tester.1
MAN+= kyua-atf-interface.7
-PRIVATELIBDIR!= cd ${.CURDIR}/../../lib; ${PRINTOBJDIR}
-LDADD+= ${PRIVATELIBDIR}/libatf_tester/libatf_tester.a
-DPADD+= ${PRIVATELIBDIR}/libatf_tester/libatf_tester.a
-LDADD+= ${PRIVATELIBDIR}/libtester/libtester.a
-DPADD+= ${PRIVATELIBDIR}/libtester/libtester.a
+ATFTESTER_LIBDIR!= cd ${.CURDIR}/../../lib/libatf_tester; ${PRINTOBJDIR}
+TESTER_LIBDIR!= cd ${.CURDIR}/../../lib/libtester; ${PRINTOBJDIR}
+LDADD+= ${ATFTESTER_LIBDIR}/libatf_tester.a
+DPADD+= ${ATFTESTER_LIBDIR}/libatf_tester.a
+LDADD+= ${TESTER_LIBDIR}/libtester.a
+DPADD+= ${TESTER_LIBDIR}/libtester.a
CPPFLAGS+= -DHAVE_CONFIG_H
CPPFLAGS+= -I${.CURDIR}/../../lib/libtester
Index: src/external/bsd/kyua-testers/libexec/kyua-plain-tester/Makefile
diff -u src/external/bsd/kyua-testers/libexec/kyua-plain-tester/Makefile:1.1 src/external/bsd/kyua-testers/libexec/kyua-plain-tester/Makefile:1.1.14.1
--- src/external/bsd/kyua-testers/libexec/kyua-plain-tester/Makefile:1.1 Tue Feb 19 06:04:43 2013
+++ src/external/bsd/kyua-testers/libexec/kyua-plain-tester/Makefile Sun Sep 18 06:14:01 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2013/02/19 06:04:43 jmmv Exp $
+# $NetBSD: Makefile,v 1.1.14.1 2016/09/18 06:14:01 snj Exp $
.include <bsd.own.mk>
@@ -11,9 +11,9 @@ SRCS= plain_main.c
MAN= kyua-plain-tester.1
MAN+= kyua-plain-interface.7
-PRIVATELIBDIR!= cd ${.CURDIR}/../../lib; ${PRINTOBJDIR}
-LDADD+= ${PRIVATELIBDIR}/libtester/libtester.a
-DPADD+= ${PRIVATELIBDIR}/libtester/libtester.a
+TESTER_LIBDIR!= cd ${.CURDIR}/../../lib/libtester; ${PRINTOBJDIR}
+LDADD+= ${TESTER_LIBDIR}/libtester.a
+DPADD+= ${TESTER_LIBDIR}/libtester.a
CPPFLAGS+= -DHAVE_CONFIG_H
CPPFLAGS+= -I${.CURDIR}/../../lib/libtester
Index: src/external/bsd/kyua-testers/tests/kyua-testers/Makefile
diff -u src/external/bsd/kyua-testers/tests/kyua-testers/Makefile:1.1 src/external/bsd/kyua-testers/tests/kyua-testers/Makefile:1.1.14.1
--- src/external/bsd/kyua-testers/tests/kyua-testers/Makefile:1.1 Tue Feb 19 06:04:44 2013
+++ src/external/bsd/kyua-testers/tests/kyua-testers/Makefile Sun Sep 18 06:14:01 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2013/02/19 06:04:44 jmmv Exp $
+# $NetBSD: Makefile,v 1.1.14.1 2016/09/18 06:14:01 snj Exp $
.include <bsd.own.mk>
@@ -12,11 +12,12 @@ CPPFLAGS+= -DTESTERSDIR=\"/usr/libexec\"
CPPFLAGS+= -I${.CURDIR}/../../lib/libtester
CPPFLAGS+= -I${SRCDIR}
-PRIVATELIBDIR!= cd ${.CURDIR}/../../lib; ${PRINTOBJDIR}
-.for lib in atf_tester tester
-LDADD+= ${PRIVATELIBDIR}/lib${lib}/lib${lib}.a
-DPADD+= ${PRIVATELIBDIR}/lib${lib}/lib${lib}.a
-.endfor
+ATFTESTER_LIBDIR!= cd ${.CURDIR}/../../lib/libatf_tester; ${PRINTOBJDIR}
+TESTER_LIBDIR!= cd ${.CURDIR}/../../lib/libtester; ${PRINTOBJDIR}
+LDADD+= ${ATFTESTER_LIBDIR}/libatf_tester.a
+DPADD+= ${ATFTESTER_LIBDIR}/libatf_tester.a
+LDADD+= ${TESTER_LIBDIR}/libtester.a
+DPADD+= ${TESTER_LIBDIR}/libtester.a
TESTS_C= atf_list_test
TESTS_C+= atf_result_test
