Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix wrong objdir-finding logic. PR 51389.

Browse Source
This commit is contained in:
dholland 2016-08-07 20:23:09 +00:00
parent ee8d4f58f5
commit 3fa0a981c9
3 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
external/bsd/kyua-testers/libexec/kyua-atf-tester/Makefile vendored
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.1 2013/02/19 06:04:43 jmmv Exp $
# $NetBSD: Makefile,v 1.2 2016/08/07 20:23:09 dholland 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/libtester.a
DPADD+= ${TESTER_LIBDIR}/libtester/libtester.a
CPPFLAGS+= -DHAVE_CONFIG_H
CPPFLAGS+= -I${.CURDIR}/../../lib/libtester

8
external/bsd/kyua-testers/libexec/kyua-plain-tester/Makefile vendored
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.1 2013/02/19 06:04:43 jmmv Exp $
# $NetBSD: Makefile,v 1.2 2016/08/07 20:23:09 dholland 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/libtester.a
DPADD+= ${TESTER_LIBDIR}/libtester/libtester.a
CPPFLAGS+= -DHAVE_CONFIG_H
CPPFLAGS+= -I${.CURDIR}/../../lib/libtester

13
external/bsd/kyua-testers/tests/kyua-testers/Makefile vendored
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.1 2013/02/19 06:04:44 jmmv Exp $
# $NetBSD: Makefile,v 1.2 2016/08/07 20:23:09 dholland 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/libtester.a
DPADD+= ${TESTER_LIBDIR}/libtester/libtester.a
TESTS_C= atf_list_test
TESTS_C+= atf_result_test