From owner-p4-projects@FreeBSD.ORG  Sun May  7 22:10:38 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 5DD0C16A402; Sun,  7 May 2006 22:10:38 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 3D0C016A400
	for <perforce@freebsd.org>; Sun,  7 May 2006 22:10:38 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 09A5243D48
	for <perforce@freebsd.org>; Sun,  7 May 2006 22:10:38 +0000 (GMT)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k47MAbgr047296
	for <perforce@freebsd.org>; Sun, 7 May 2006 22:10:37 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k47MAbPQ047288
	for perforce@freebsd.org; Sun, 7 May 2006 22:10:37 GMT
	(envelope-from jb@freebsd.org)
Date: Sun, 7 May 2006 22:10:37 GMT
Message-Id: <200605072210.k47MAbPQ047288@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jb@freebsd.org using -f
From: John Birrell <jb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 96793 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 07 May 2006 22:10:38 -0000

http://perforce.freebsd.org/chv.cgi?CH=96793

Change 96793 by jb@jb_freebsd2 on 2006/05/07 22:10:07

	Use libproc.

Affected files ...

.. //depot/projects/dtrace/src/cddl/lib/libdtrace/Makefile#6 edit
.. //depot/projects/dtrace/src/cddl/usr.sbin/dtrace/Makefile#3 edit

Differences ...

==== //depot/projects/dtrace/src/cddl/lib/libdtrace/Makefile#6 (text+ko) ====

@@ -51,6 +51,7 @@
 .PATH:		${OPENSOLARIS_USR_DISTDIR}/lib/libgen/common
 
 CFLAGS+=	-I${.OBJDIR} \
+		-I${.CURDIR}/../libproc \
 		-I${.CURDIR}/../../../contrib \
 		-I${.CURDIR}/../../../sys/contrib \
 		-I${.CURDIR}/../../../sys \
@@ -58,7 +59,8 @@
 		-I${OPENSOLARIS_USR_DISTDIR}/lib/libctf/common \
 		-I${OPENSOLARIS_USR_DISTDIR}/lib/libdtrace/common \
 		-I${OPENSOLARIS_USR_DISTDIR}/lib/libproc/common \
-		-I${OPENSOLARIS_SYS_DISTDIR}/uts/common
+		-I${OPENSOLARIS_SYS_DISTDIR}/uts/common \
+		-I${OPENSOLARIS_SYS_DISTDIR}/compat
 
 #CFLAGS+=	-DYYDEBUG
 

==== //depot/projects/dtrace/src/cddl/usr.sbin/dtrace/Makefile#3 (text+ko) ====

@@ -16,7 +16,8 @@
 		-I${OPENSOLARIS_USR_DISTDIR}/head \
 		-I${OPENSOLARIS_USR_DISTDIR}/lib/libdtrace/common \
 		-I${OPENSOLARIS_USR_DISTDIR}/lib/libproc/common \
-		-I${OPENSOLARIS_SYS_DISTDIR}/uts/common
+		-I${OPENSOLARIS_SYS_DISTDIR}/uts/common \
+		-I${OPENSOLARIS_SYS_DISTDIR}/compat
 
 .PATH:		${OPENSOLARIS_USR_DISTDIR}/cmd/dtrace
 
@@ -24,10 +25,11 @@
 
 LDFLAGS+=	-pthread \
 		-L${.OBJDIR}/../../lib/libdtrace \
+		-L${.OBJDIR}/../../lib/libproc \
 		-L${.OBJDIR}/../../lib/libctf \
 		-L${.OBJDIR}/../../lib/libelf
 
-LDADD+=		-ldtrace -ly -ll -lctf -lelf -lz
+LDADD+=		-ldtrace -ly -ll -lproc -lctf -lelf -lz
 
 #DPADD+= ${LIBDTRACE} ${LIBPTHREAD} ${LIBL} ${LIBY} ${LIBZ}