[src/trunk]: src/share/mk Define LIBATF_C and LIBATF_CXX to point to their co...

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

details:   https://anonhg.NetBSD.org/src/rev/e673f81d9463
branches:  trunk
changeset: 762423:e673f81d9463
user:      jmmv <jmmv%NetBSD.org@localhost>
date:      Sun Feb 20 20:16:01 2011 +0000

description:
Define LIBATF_C and LIBATF_CXX to point to their corresponding .a files and
use these to properly set DPADD for test programs.

diffstat:

 share/mk/bsd.README      |  4 +++-
 share/mk/bsd.hostprog.mk |  4 +++-
 share/mk/bsd.prog.mk     |  7 ++++++-
 share/mk/bsd.test.mk     |  4 +++-
 4 files changed, 15 insertions(+), 4 deletions(-)

diffs (82 lines):

diff -r c06f63e203a8 -r e673f81d9463 share/mk/bsd.README
--- a/share/mk/bsd.README       Sun Feb 20 20:15:36 2011 +0000
+++ b/share/mk/bsd.README       Sun Feb 20 20:16:01 2011 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.README,v 1.278 2011/01/12 23:05:31 joerg Exp $
+#      $NetBSD: bsd.README,v 1.279 2011/02/20 20:16:01 jmmv Exp $
 #      @(#)bsd.README  8.2 (Berkeley) 4/2/94
 
 This is the README file for the make "include" files for the NetBSD
@@ -1316,6 +1316,8 @@
                LIBCRT0?=       ${DESTDIR}/usr/lib/crt0.o
                LIBARCHIVE?=    ${DESTDIR}/usr/lib/libarchive.a
                LIBASN1?=       ${DESTDIR}/usr/lib/libasn1.a
+               LIBATF_C?=      ${DESTDIR}/usr/lib/libatf-c.a
+               LIBATF_CXX?=    ${DESTDIR}/usr/lib/libatf-c++.a
                LIBBLUETOOTH?=  ${DESTDIR}/usr/lib/libbluetooth.a
                LIBBSDMALLOC?=  ${DESTDIR}/usr/lib/libbsdmalloc.a
                LIBBZ2?=        ${DESTDIR}/usr/lib/libbz2.a
diff -r c06f63e203a8 -r e673f81d9463 share/mk/bsd.hostprog.mk
--- a/share/mk/bsd.hostprog.mk  Sun Feb 20 20:15:36 2011 +0000
+++ b/share/mk/bsd.hostprog.mk  Sun Feb 20 20:16:01 2011 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.hostprog.mk,v 1.60 2010/12/25 18:56:45 joerg Exp $
+#      $NetBSD: bsd.hostprog.mk,v 1.61 2011/02/20 20:16:01 jmmv Exp $
 #      @(#)bsd.prog.mk 8.2 (Berkeley) 4/2/94
 
 .include <bsd.init.mk>
@@ -8,6 +8,8 @@
 clean:         cleanprog
 
 ##### Default values
+LIBATF_C?=     /usr/lib/libatf-c.a
+LIBATF_CXX?=   /usr/lib/libatf-c++.a
 LIBBLUETOOTH?= /usr/lib/libbluetooth.a
 LIBBZ2?=       /usr/lib/libbz2.a
 LIBC?=         /usr/lib/libc.a
diff -r c06f63e203a8 -r e673f81d9463 share/mk/bsd.prog.mk
--- a/share/mk/bsd.prog.mk      Sun Feb 20 20:15:36 2011 +0000
+++ b/share/mk/bsd.prog.mk      Sun Feb 20 20:16:01 2011 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.prog.mk,v 1.259 2011/02/13 00:42:45 christos Exp $
+#      $NetBSD: bsd.prog.mk,v 1.260 2011/02/20 20:16:01 jmmv Exp $
 #      @(#)bsd.prog.mk 8.2 (Berkeley) 4/2/94
 
 .ifndef HOSTPROG
@@ -113,6 +113,11 @@
 .MADE:         ${LIB${_lib:tu}}        # Note: ${DESTDIR} will be expanded
 .endif
 .endfor
+# atf-c and atf-c++ are special cases because we cannot use [-+] as part of
+# make(1) variable names.  Just define them here.
+LIBATF_C=      ${DESTDIR}/usr/lib/libatf-c.a
+LIBATF_CXX=    ${DESTDIR}/usr/lib/libatf-c++.a
+.MADE:         ${LIBATF_C} ${LIBATF_CXX}
 
 # PAM applications, if linked statically, need more libraries
 .if (${MKPIC} == "no")
diff -r c06f63e203a8 -r e673f81d9463 share/mk/bsd.test.mk
--- a/share/mk/bsd.test.mk      Sun Feb 20 20:15:36 2011 +0000
+++ b/share/mk/bsd.test.mk      Sun Feb 20 20:16:01 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.test.mk,v 1.15 2011/02/16 10:13:00 jmmv Exp $
+# $NetBSD: bsd.test.mk,v 1.16 2011/02/20 20:16:01 jmmv Exp $
 #
 
 .include <bsd.init.mk>
@@ -16,6 +16,7 @@
 _TESTS+=       ${TESTS_C}
 PROGS+=                ${TESTS_C}
 LDADD+=                -latf-c
+DPADD+=                ${LIBATF_C}
 .  for _T in ${TESTS_C}
 BINDIR.${_T}=  ${TESTSDIR}
 MAN.${_T}?=    # empty
@@ -26,6 +27,7 @@
 _TESTS+=       ${TESTS_CXX}
 PROGS_CXX+=    ${TESTS_CXX}
 LDADD+=                -latf-c++ -latf-c
+DPADD+=                ${LIBATF_CXX} ${LIBATF_C}
 .  for _T in ${TESTS_CXX}
 BINDIR.${_T}=  ${TESTSDIR}
 MAN.${_T}?=    # empty