[src/trunk]: src/external/cddl/osnet DTrace: fix a problem with library refer...

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

details:   https://anonhg.NetBSD.org/src/rev/06ae967e5dd0
branches:  trunk
changeset: 752262:06ae967e5dd0
user:      darran <darran%NetBSD.org@localhost>
date:      Sun Feb 21 11:00:01 2010 +0000

description:
DTrace: fix a problem with library references for libctf and libdtrace.

diffstat:

 external/cddl/osnet/usr.bin/ctfconvert/Makefile |   7 +++++--
 external/cddl/osnet/usr.bin/ctfmerge/Makefile   |   9 ++++-----
 external/cddl/osnet/usr.sbin/dtrace/Makefile    |  20 ++++++++------------
 3 files changed, 17 insertions(+), 19 deletions(-)

diffs (86 lines):

diff -r a166d4ec2a0a -r 06ae967e5dd0 external/cddl/osnet/usr.bin/ctfconvert/Makefile
--- a/external/cddl/osnet/usr.bin/ctfconvert/Makefile   Sun Feb 21 10:21:06 2010 +0000
+++ b/external/cddl/osnet/usr.bin/ctfconvert/Makefile   Sun Feb 21 11:00:01 2010 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.2 2010/02/21 01:46:36 darran Exp $
+#      $NetBSD: Makefile,v 1.3 2010/02/21 11:00:01 darran Exp $
 
 # $FreeBSD: src/cddl/usr.bin/ctfconvert/Makefile,v 1.1.4.1 2009/08/03 08:13:06 kensmith Exp $
 
@@ -42,9 +42,12 @@
                -g
 
 .ifndef HOSTPROG
+LIBCTF_OBJDIR!=        cd ${.CURDIR}/../../lib/libctf  && ${PRINTOBJDIR}
+
 LDADD+=                -L${OSNETDIR}/lib/libctf \
                -L${NETBSDSRCDIR}/external/bsd/libdwarf/lib \
-               -L${NETBSDSRCDIR}/external/bsd/libelf/lib
+               -L${NETBSDSRCDIR}/external/bsd/libelf/lib \
+               -L${LIBCTF_OBJDIR}
 LDADD+=                -lctf -ldwarf -lelf -lz 
 .endif
 
diff -r a166d4ec2a0a -r 06ae967e5dd0 external/cddl/osnet/usr.bin/ctfmerge/Makefile
--- a/external/cddl/osnet/usr.bin/ctfmerge/Makefile     Sun Feb 21 10:21:06 2010 +0000
+++ b/external/cddl/osnet/usr.bin/ctfmerge/Makefile     Sun Feb 21 11:00:01 2010 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.2 2010/02/21 01:46:36 darran Exp $
+#      $NetBSD: Makefile,v 1.3 2010/02/21 11:00:01 darran Exp $
 
 # $FreeBSD: src/cddl/usr.bin/ctfmerge/Makefile,v 1.1.4.1 2009/08/03 08:13:06 kensmith Exp $
 
@@ -36,10 +36,9 @@
                -I${OPENSOLARIS_SYS_DISTDIR}/uts/common \
 
 .ifndef HOSTPROG
-LDADD+=                -L${OSNETDIR}/lib/libctf \
-               -L${NETBSDSRCDIR}/exernal/bsd/libdwarf/lib \
-               -L${NETBSDSRCDIR}/external/bsd/libelf/lib
-LDADD+=                -lctf -ldwarf -lelf -lz -lpthread
+LIBCTF_OBJDIR!=        cd ${.CURDIR}/../../lib/libctf && ${PRINTOBJDIR}
+LDADD+=                -L${LIBCTF_OBJDIR} -lctf
+LDADD+=                -ldwarf -lelf -lz -lpthread
 .endif
 
 .PATH:         ${OPENSOLARIS_USR_DISTDIR}/tools/ctf/common
diff -r a166d4ec2a0a -r 06ae967e5dd0 external/cddl/osnet/usr.sbin/dtrace/Makefile
--- a/external/cddl/osnet/usr.sbin/dtrace/Makefile      Sun Feb 21 10:21:06 2010 +0000
+++ b/external/cddl/osnet/usr.sbin/dtrace/Makefile      Sun Feb 21 11:00:01 2010 +0000
@@ -1,7 +1,8 @@
-#      $NetBSD: Makefile,v 1.2 2010/02/21 01:46:36 darran Exp $
+#      $NetBSD: Makefile,v 1.3 2010/02/21 11:00:02 darran Exp $
 
 # $FreeBSD: src/cddl/usr.sbin/dtrace/Makefile,v 1.1.4.1 2009/08/03 08:13:06 kensmith Exp $
 
+.include <bsd.own.mk>
 .include       "../../Makefile.inc"
 
 PROG=          dtrace
@@ -26,20 +27,15 @@
 #CFLAGS+=      -DNEED_ERRLOC
 #YFLAGS+=      -d
 
-LDFLAGS+=      -pthread \
-               -L${OSNETDIR}/lib/libdtrace \
-               -L${OSNETDIR}/lib/libctf 
 
-LDADD+=                -ldtrace -ly -ll -lctf -lelf -lz
+LDFLAGS+=      -pthread
 
-#LDFLAGS+=     -pthread \
-               -L${.OBJDIR}/../../lib/libdtrace \
-               -L${.OBJDIR}/../../lib/libproc \
-               -L${.OBJDIR}/../../lib/libctf \
-               -L${.OBJDIR}/../../../lib/libelf
+LIBCTF_OBJDIR!=        cd ${.CURDIR}/../../lib/libctf && ${PRINTOBJDIR}
+LDFLAGS+=      -L${LIBDTRACE_OBJDIR} -ldtrace
 
-#LDADD+=               -ldtrace -ly -ll -lproc -lctf -lelf -lz
+LIBDTRACE_OBJDIR!= cd ${.CURDIR}/../../lib/libdtrace && ${PRINTOBJDIR}
+LDFLAGS+=      -L${LIBCTF_OBJDIR} -lctf
 
-#DPADD+= ${LIBDTRACE} ${LIBCTF} ${LIBELF} ${LIBPTHREAD} ${LIBL} ${LIBY} ${LIBZ}
+LDADD+=                -ly -ll -lelf -lz
 
 .include <bsd.prog.mk>