[src/trunk]: src/external/bsd/atf Set DPADD to point to the static versions o...

[jmmv <jmmv%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/a1a069114633
branches:  trunk
changeset: 762425:a1a069114633
user:      jmmv <jmmv%NetBSD.org@localhost>
date:      Sun Feb 20 20:18:56 2011 +0000

description:
Set DPADD to point to the static versions of libatf-c and libatf-c++ as
appropriate.

diffstat:

 external/bsd/atf/lib/libatf-c++/Makefile      |  4 ++--
 external/bsd/atf/libexec/atf-check/Makefile   |  3 ++-
 external/bsd/atf/usr.bin/atf-config/Makefile  |  3 ++-
 external/bsd/atf/usr.bin/atf-report/Makefile  |  3 ++-
 external/bsd/atf/usr.bin/atf-run/Makefile     |  3 ++-
 external/bsd/atf/usr.bin/atf-sh/Makefile      |  3 ++-
 external/bsd/atf/usr.bin/atf-version/Makefile |  3 ++-
 7 files changed, 14 insertions(+), 8 deletions(-)

diffs (120 lines):

diff -r 31c839f7ed9c -r a1a069114633 external/bsd/atf/lib/libatf-c++/Makefile
--- a/external/bsd/atf/lib/libatf-c++/Makefile  Sun Feb 20 20:17:35 2011 +0000
+++ b/external/bsd/atf/lib/libatf-c++/Makefile  Sun Feb 20 20:18:56 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2011/02/06 19:34:20 jmmv Exp $
+# $NetBSD: Makefile,v 1.8 2011/02/20 20:18:56 jmmv Exp $
 
 NOLINT=                # defined
 
@@ -6,7 +6,7 @@
 
 LIB=           atf-c++
 LDADD=         -L${.OBJDIR}/../libatf-c -latf-c
-DPADD=         libatf-c.a
+DPADD=         ${LIBATF_C}
 NOPIC=         # defined; interface is still too unstable
 
 SRCDIR=                ${NETBSDSRCDIR}/external/bsd/atf/dist
diff -r 31c839f7ed9c -r a1a069114633 external/bsd/atf/libexec/atf-check/Makefile
--- a/external/bsd/atf/libexec/atf-check/Makefile       Sun Feb 20 20:17:35 2011 +0000
+++ b/external/bsd/atf/libexec/atf-check/Makefile       Sun Feb 20 20:18:56 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2010/10/20 09:20:10 jmmv Exp $
+# $NetBSD: Makefile,v 1.2 2011/02/20 20:18:56 jmmv Exp $
 
 .include <bsd.own.mk>
 
@@ -11,6 +11,7 @@
 MAN=           atf-check.1
 
 LDADD+=                -latf-c++ -latf-c
+DPADD+=                ${LIBATF_CXX} ${LIBATF_C}
 
 CPPFLAGS+=     -DHAVE_CONFIG_H
 CPPFLAGS+=     -I${SRCDIR}
diff -r 31c839f7ed9c -r a1a069114633 external/bsd/atf/usr.bin/atf-config/Makefile
--- a/external/bsd/atf/usr.bin/atf-config/Makefile      Sun Feb 20 20:17:35 2011 +0000
+++ b/external/bsd/atf/usr.bin/atf-config/Makefile      Sun Feb 20 20:18:56 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2010/10/20 09:20:13 jmmv Exp $
+# $NetBSD: Makefile,v 1.5 2011/02/20 20:18:57 jmmv Exp $
 
 .include <bsd.own.mk>
 
@@ -11,6 +11,7 @@
 MAN=           atf-config.1
 
 LDADD+=                -latf-c++ -latf-c
+DPADD+=                ${LIBATF_CXX} ${LIBATF_C}
 
 CPPFLAGS+=     -DHAVE_CONFIG_H
 CPPFLAGS+=     -I${SRCDIR}
diff -r 31c839f7ed9c -r a1a069114633 external/bsd/atf/usr.bin/atf-report/Makefile
--- a/external/bsd/atf/usr.bin/atf-report/Makefile      Sun Feb 20 20:17:35 2011 +0000
+++ b/external/bsd/atf/usr.bin/atf-report/Makefile      Sun Feb 20 20:18:56 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2010/10/20 09:20:13 jmmv Exp $
+# $NetBSD: Makefile,v 1.5 2011/02/20 20:18:57 jmmv Exp $
 
 .include <bsd.own.mk>
 
@@ -11,6 +11,7 @@
 MAN=           atf-report.1
 
 LDADD+=                -latf-c++ -latf-c
+DPADD+=                ${LIBATF_CXX} ${LIBATF_C}
 
 CPPFLAGS+=     -DHAVE_CONFIG_H
 CPPFLAGS+=     -I${SRCDIR}
diff -r 31c839f7ed9c -r a1a069114633 external/bsd/atf/usr.bin/atf-run/Makefile
--- a/external/bsd/atf/usr.bin/atf-run/Makefile Sun Feb 20 20:17:35 2011 +0000
+++ b/external/bsd/atf/usr.bin/atf-run/Makefile Sun Feb 20 20:18:56 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2010/10/20 09:20:13 jmmv Exp $
+# $NetBSD: Makefile,v 1.9 2011/02/20 20:18:57 jmmv Exp $
 
 .include <bsd.own.mk>
 
@@ -17,6 +17,7 @@
 CPPFLAGS+=     -I${SRCDIR}
 CPPFLAGS+=     -I${.CURDIR}/../../lib/libatf-c
 LDADD+=                -latf-c++ -latf-c
+DPADD+=                ${LIBATF_CXX} ${LIBATF_C}
 
 COPTS.atf-run.cpp+=    -Wno-stack-protector
 
diff -r 31c839f7ed9c -r a1a069114633 external/bsd/atf/usr.bin/atf-sh/Makefile
--- a/external/bsd/atf/usr.bin/atf-sh/Makefile  Sun Feb 20 20:17:35 2011 +0000
+++ b/external/bsd/atf/usr.bin/atf-sh/Makefile  Sun Feb 20 20:18:56 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2010/10/20 09:20:13 jmmv Exp $
+# $NetBSD: Makefile,v 1.4 2011/02/20 20:18:57 jmmv Exp $
 
 .include <bsd.own.mk>
 
@@ -11,6 +11,7 @@
 MAN=           atf-sh.1 atf-sh-api.3
 
 LDADD+=                -latf-c++ -latf-c
+DPADD+=                ${LIBATF_CXX} ${LIBATF_C}
 
 CPPFLAGS+=     -DHAVE_CONFIG_H
 CPPFLAGS+=     -I${SRCDIR}
diff -r 31c839f7ed9c -r a1a069114633 external/bsd/atf/usr.bin/atf-version/Makefile
--- a/external/bsd/atf/usr.bin/atf-version/Makefile     Sun Feb 20 20:17:35 2011 +0000
+++ b/external/bsd/atf/usr.bin/atf-version/Makefile     Sun Feb 20 20:18:56 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2010/10/20 09:20:13 jmmv Exp $
+# $NetBSD: Makefile,v 1.7 2011/02/20 20:18:57 jmmv Exp $
 
 .include <bsd.own.mk>
 
@@ -15,6 +15,7 @@
 CPPFLAGS+=     -I${.CURDIR}/../../lib/libatf-c
 CPPFLAGS+=     -I${.CURDIR}
 LDADD+=                -latf-c++ -latf-c
+DPADD+=                ${LIBATF_CXX} ${LIBATF_C}
 
 WARNS?=                2