Kyua framework does not build up with /usr/obj

Reported to NetBSD as PR/51389, fix by dholland
http://gnats.netbsd.org/51389

Change-Id: Ib31662000255a62261fb461fcab2d931faa47f70
This commit is contained in:
Antoine Leca 2016-08-19 18:58:32 +02:00 committed by Lionel Sambuc
parent 6ddb33542a
commit 00e393ca04
3 changed files with 18 additions and 16 deletions

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.1 2013/02/19 06:04:43 jmmv Exp $ # $NetBSD: Makefile,v 1.3 2016/08/26 23:55:04 dholland Exp $
.include <bsd.own.mk> .include <bsd.own.mk>
@ -11,11 +11,12 @@ SRCS= atf_main.c
MAN= kyua-atf-tester.1 MAN= kyua-atf-tester.1
MAN+= kyua-atf-interface.7 MAN+= kyua-atf-interface.7
PRIVATELIBDIR!= cd ${.CURDIR}/../../lib; ${PRINTOBJDIR} ATFTESTER_LIBDIR!= cd ${.CURDIR}/../../lib/libatf_tester; ${PRINTOBJDIR}
LDADD+= ${PRIVATELIBDIR}/libatf_tester/libatf_tester.a TESTER_LIBDIR!= cd ${.CURDIR}/../../lib/libtester; ${PRINTOBJDIR}
DPADD+= ${PRIVATELIBDIR}/libatf_tester/libatf_tester.a LDADD+= ${ATFTESTER_LIBDIR}/libatf_tester.a
LDADD+= ${PRIVATELIBDIR}/libtester/libtester.a DPADD+= ${ATFTESTER_LIBDIR}/libatf_tester.a
DPADD+= ${PRIVATELIBDIR}/libtester/libtester.a LDADD+= ${TESTER_LIBDIR}/libtester.a
DPADD+= ${TESTER_LIBDIR}/libtester.a
CPPFLAGS+= -DHAVE_CONFIG_H CPPFLAGS+= -DHAVE_CONFIG_H
CPPFLAGS+= -I${.CURDIR}/../../lib/libtester CPPFLAGS+= -I${.CURDIR}/../../lib/libtester

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.1 2013/02/19 06:04:43 jmmv Exp $ # $NetBSD: Makefile,v 1.3 2016/08/26 23:55:04 dholland Exp $
.include <bsd.own.mk> .include <bsd.own.mk>
@ -11,9 +11,9 @@ SRCS= plain_main.c
MAN= kyua-plain-tester.1 MAN= kyua-plain-tester.1
MAN+= kyua-plain-interface.7 MAN+= kyua-plain-interface.7
PRIVATELIBDIR!= cd ${.CURDIR}/../../lib; ${PRINTOBJDIR} TESTER_LIBDIR!= cd ${.CURDIR}/../../lib/libtester; ${PRINTOBJDIR}
LDADD+= ${PRIVATELIBDIR}/libtester/libtester.a LDADD+= ${TESTER_LIBDIR}/libtester.a
DPADD+= ${PRIVATELIBDIR}/libtester/libtester.a DPADD+= ${TESTER_LIBDIR}/libtester.a
CPPFLAGS+= -DHAVE_CONFIG_H CPPFLAGS+= -DHAVE_CONFIG_H
CPPFLAGS+= -I${.CURDIR}/../../lib/libtester CPPFLAGS+= -I${.CURDIR}/../../lib/libtester

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.1 2013/02/19 06:04:44 jmmv Exp $ # $NetBSD: Makefile,v 1.3 2016/08/26 23:55:04 dholland Exp $
.include <bsd.own.mk> .include <bsd.own.mk>
@ -12,11 +12,12 @@ CPPFLAGS+= -DTESTERSDIR=\"/usr/libexec\"
CPPFLAGS+= -I${.CURDIR}/../../lib/libtester CPPFLAGS+= -I${.CURDIR}/../../lib/libtester
CPPFLAGS+= -I${SRCDIR} CPPFLAGS+= -I${SRCDIR}
PRIVATELIBDIR!= cd ${.CURDIR}/../../lib; ${PRINTOBJDIR} ATFTESTER_LIBDIR!= cd ${.CURDIR}/../../lib/libatf_tester; ${PRINTOBJDIR}
.for lib in atf_tester tester TESTER_LIBDIR!= cd ${.CURDIR}/../../lib/libtester; ${PRINTOBJDIR}
LDADD+= ${PRIVATELIBDIR}/lib${lib}/lib${lib}.a LDADD+= ${ATFTESTER_LIBDIR}/libatf_tester.a
DPADD+= ${PRIVATELIBDIR}/lib${lib}/lib${lib}.a DPADD+= ${ATFTESTER_LIBDIR}/libatf_tester.a
.endfor LDADD+= ${TESTER_LIBDIR}/libtester.a
DPADD+= ${TESTER_LIBDIR}/libtester.a
TESTS_C= atf_list_test TESTS_C= atf_list_test
TESTS_C+= atf_result_test TESTS_C+= atf_result_test