[src/trunk]: src/external/cddl/osnet/usr.bin use merged ctf rules

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

details:   https://anonhg.NetBSD.org/src/rev/108e62157e6b
branches:  trunk
changeset: 794234:108e62157e6b
user:      christos <christos%NetBSD.org@localhost>
date:      Sun Mar 09 17:05:23 2014 +0000

description:
use merged ctf rules

diffstat:

 external/cddl/osnet/usr.bin/ctfconvert/Makefile |  26 +-----------------------
 external/cddl/osnet/usr.bin/ctfdump/Makefile    |  22 +++-----------------
 external/cddl/osnet/usr.bin/ctfmerge/Makefile   |  22 +++-----------------
 3 files changed, 10 insertions(+), 60 deletions(-)

diffs (125 lines):

diff -r b09c3dbbe378 -r 108e62157e6b external/cddl/osnet/usr.bin/ctfconvert/Makefile
--- a/external/cddl/osnet/usr.bin/ctfconvert/Makefile   Sun Mar 09 17:05:01 2014 +0000
+++ b/external/cddl/osnet/usr.bin/ctfconvert/Makefile   Sun Mar 09 17:05:23 2014 +0000
@@ -1,10 +1,11 @@
-#      $NetBSD: Makefile,v 1.4 2013/01/18 19:58:43 christos Exp $
+#      $NetBSD: Makefile,v 1.5 2014/03/09 17:05:23 christos Exp $
 
 # $FreeBSD: src/cddl/usr.bin/ctfconvert/Makefile,v 1.1.4.1 2009/08/03 08:13:06 kensmith Exp $
 
 .include <bsd.own.mk>
 
 .include       "../../Makefile.inc"
+.include       "../../Makefile.ctf"
 
 DEBUG_FLAGS=   -g
 
@@ -31,28 +32,5 @@
                traverse.c \
                util.c
 
-CFLAGS+=       -I${OSNETDIR}/sys \
-               -I${OSNETDIR}/include \
-               -I${OPENSOLARIS_USR_DISTDIR} \
-               -I${OPENSOLARIS_SYS_DISTDIR} \
-               -I${OPENSOLARIS_USR_DISTDIR}/head \
-               -I${OPENSOLARIS_USR_DISTDIR}/tools/ctf/common \
-               -I${OPENSOLARIS_USR_DISTDIR}/tools/ctf/cvt \
-               -I${OPENSOLARIS_SYS_DISTDIR}/uts/common \
-               -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${LIBCTF_OBJDIR}
-LDADD+=                -lctf -ldwarf -lelf -lz 
-.endif
-
-.PATH:         ${.CURDIR}
-.PATH:         ${OPENSOLARIS_USR_DISTDIR}/tools/ctf/common
-.PATH:         ${OPENSOLARIS_USR_DISTDIR}/tools/ctf/cvt
 
 .include <bsd.prog.mk>
diff -r b09c3dbbe378 -r 108e62157e6b external/cddl/osnet/usr.bin/ctfdump/Makefile
--- a/external/cddl/osnet/usr.bin/ctfdump/Makefile      Sun Mar 09 17:05:01 2014 +0000
+++ b/external/cddl/osnet/usr.bin/ctfdump/Makefile      Sun Mar 09 17:05:23 2014 +0000
@@ -1,8 +1,9 @@
-#      $NetBSD: Makefile,v 1.4 2013/01/18 19:58:44 christos Exp $
+#      $NetBSD: Makefile,v 1.5 2014/03/09 17:05:23 christos Exp $
 
 # $FreeBSD: src/cddl/usr.bin/ctfdump/Makefile,v 1.1.4.1 2009/08/03 08:13:06 kensmith Exp $
 
 .include       "../../Makefile.inc"
+.include       "../../Makefile.ctf"
 
 PROG=          ctfdump
 
@@ -10,22 +11,7 @@
                symbol.c \
                utils.c
 
-CFLAGS+=       -I${OSNETDIR}/sys \
-               -I${OSNETDIR}/include \
-               -I${OPENSOLARIS_USR_DISTDIR} \
-               -I${OPENSOLARIS_SYS_DISTDIR} \
-               -I${OPENSOLARIS_USR_DISTDIR}/head \
-               -I${OPENSOLARIS_USR_DISTDIR}/cmd/mdb/tools/common \
-               -I${OPENSOLARIS_USR_DISTDIR}/tools/ctf/common \
-               -I${OPENSOLARIS_SYS_DISTDIR}/uts/common \
-               -I${NETBSDSRCDIR}/external/bsd/libelf/dist
-
-LDFLAGS+=      -pthread
-
-LDADD+=                -L${NETBSDSRCDIR}/external/bsd/libelf/lib
-LDADD+=                -lelf -lz
-
-.PATH:         ${.CURDIR}/../../dist/tools/ctf/common
-.PATH:         ${.CURDIR}/../../dist/tools/ctf/dump
+LDADD+=-lpthread
+DPADD+=${LIBPTHREAD}
 
 .include <bsd.prog.mk>
diff -r b09c3dbbe378 -r 108e62157e6b external/cddl/osnet/usr.bin/ctfmerge/Makefile
--- a/external/cddl/osnet/usr.bin/ctfmerge/Makefile     Sun Mar 09 17:05:01 2014 +0000
+++ b/external/cddl/osnet/usr.bin/ctfmerge/Makefile     Sun Mar 09 17:05:23 2014 +0000
@@ -1,10 +1,11 @@
-#      $NetBSD: Makefile,v 1.4 2013/01/18 19:58:44 christos Exp $
+#      $NetBSD: Makefile,v 1.5 2014/03/09 17:05:23 christos Exp $
 
 # $FreeBSD: src/cddl/usr.bin/ctfmerge/Makefile,v 1.1.4.1 2009/08/03 08:13:06 kensmith Exp $
 
 .include <bsd.own.mk>
 
 .include       "../../Makefile.inc"
+.include       "../../Makefile.ctf"
 
 PROG=          ctfmerge
 
@@ -26,22 +27,7 @@
                traverse.c \
                util.c
 
-CFLAGS+=       -I${OSNETDIR}/sys \
-               -I${OSNETDIR}/include \
-               -I${OPENSOLARIS_USR_DISTDIR} \
-               -I${OPENSOLARIS_SYS_DISTDIR} \
-               -I${OPENSOLARIS_USR_DISTDIR}/head \
-               -I${OPENSOLARIS_USR_DISTDIR}/tools/ctf/common \
-               -I${OPENSOLARIS_USR_DISTDIR}/tools/ctf/cvt \
-               -I${OPENSOLARIS_SYS_DISTDIR}/uts/common \
-
-.ifndef HOSTPROG
-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
-.PATH:         ${OPENSOLARIS_USR_DISTDIR}/tools/ctf/cvt
+LDADD+=-lrt -lpthread
+DPADD+=${LIBRT} ${LIBPTHREAD}
 
 .include <bsd.prog.mk>