Module Name: src
Committed By: jmmv
Date: Sun Feb 20 20:18:57 UTC 2011
Modified Files:
src/external/bsd/atf/lib/libatf-c++: Makefile
src/external/bsd/atf/libexec/atf-check: Makefile
src/external/bsd/atf/usr.bin/atf-config: Makefile
src/external/bsd/atf/usr.bin/atf-report: Makefile
src/external/bsd/atf/usr.bin/atf-run: Makefile
src/external/bsd/atf/usr.bin/atf-sh: Makefile
src/external/bsd/atf/usr.bin/atf-version: Makefile
Log Message:
Set DPADD to point to the static versions of libatf-c and libatf-c++ as
appropriate.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/atf/lib/libatf-c++/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/atf/libexec/atf-check/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/atf/usr.bin/atf-config/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/atf/usr.bin/atf-report/Makefile
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/atf/usr.bin/atf-run/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/atf/usr.bin/atf-sh/Makefile
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/atf/usr.bin/atf-version/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/atf/lib/libatf-c++/Makefile
diff -u src/external/bsd/atf/lib/libatf-c++/Makefile:1.7 src/external/bsd/atf/lib/libatf-c++/Makefile:1.8
--- src/external/bsd/atf/lib/libatf-c++/Makefile:1.7 Sun Feb 6 19:34:20 2011
+++ src/external/bsd/atf/lib/libatf-c++/Makefile Sun Feb 20 20:18:56 2011
@@ -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
Index: src/external/bsd/atf/libexec/atf-check/Makefile
diff -u src/external/bsd/atf/libexec/atf-check/Makefile:1.1 src/external/bsd/atf/libexec/atf-check/Makefile:1.2
--- src/external/bsd/atf/libexec/atf-check/Makefile:1.1 Wed Oct 20 09:20:10 2010
+++ src/external/bsd/atf/libexec/atf-check/Makefile Sun Feb 20 20:18:56 2011
@@ -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}
Index: src/external/bsd/atf/usr.bin/atf-config/Makefile
diff -u src/external/bsd/atf/usr.bin/atf-config/Makefile:1.4 src/external/bsd/atf/usr.bin/atf-config/Makefile:1.5
--- src/external/bsd/atf/usr.bin/atf-config/Makefile:1.4 Wed Oct 20 09:20:13 2010
+++ src/external/bsd/atf/usr.bin/atf-config/Makefile Sun Feb 20 20:18:57 2011
@@ -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}
Index: src/external/bsd/atf/usr.bin/atf-report/Makefile
diff -u src/external/bsd/atf/usr.bin/atf-report/Makefile:1.4 src/external/bsd/atf/usr.bin/atf-report/Makefile:1.5
--- src/external/bsd/atf/usr.bin/atf-report/Makefile:1.4 Wed Oct 20 09:20:13 2010
+++ src/external/bsd/atf/usr.bin/atf-report/Makefile Sun Feb 20 20:18:57 2011
@@ -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}
Index: src/external/bsd/atf/usr.bin/atf-run/Makefile
diff -u src/external/bsd/atf/usr.bin/atf-run/Makefile:1.8 src/external/bsd/atf/usr.bin/atf-run/Makefile:1.9
--- src/external/bsd/atf/usr.bin/atf-run/Makefile:1.8 Wed Oct 20 09:20:13 2010
+++ src/external/bsd/atf/usr.bin/atf-run/Makefile Sun Feb 20 20:18:57 2011
@@ -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
Index: src/external/bsd/atf/usr.bin/atf-sh/Makefile
diff -u src/external/bsd/atf/usr.bin/atf-sh/Makefile:1.3 src/external/bsd/atf/usr.bin/atf-sh/Makefile:1.4
--- src/external/bsd/atf/usr.bin/atf-sh/Makefile:1.3 Wed Oct 20 09:20:13 2010
+++ src/external/bsd/atf/usr.bin/atf-sh/Makefile Sun Feb 20 20:18:57 2011
@@ -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}
Index: src/external/bsd/atf/usr.bin/atf-version/Makefile
diff -u src/external/bsd/atf/usr.bin/atf-version/Makefile:1.6 src/external/bsd/atf/usr.bin/atf-version/Makefile:1.7
--- src/external/bsd/atf/usr.bin/atf-version/Makefile:1.6 Wed Oct 20 09:20:13 2010
+++ src/external/bsd/atf/usr.bin/atf-version/Makefile Sun Feb 20 20:18:57 2011
@@ -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
