PERFORCE change 96793 for review

[John Birrell]

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

Change 96793 by jb at 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}