PERFORCE change 109197 for review

[John Birrell]

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

Change 109197 by jb at jb_freebsd8 on 2006/11/04 02:11:20

	Remove references to my experimental threads-in-libc.

Affected files ...

.. //depot/projects/dtrace/src/cddl/usr.bin/ctfconvert/Makefile#11 edit
.. //depot/projects/dtrace/src/cddl/usr.bin/ctfmerge/Makefile#8 edit

Differences ...

==== //depot/projects/dtrace/src/cddl/usr.bin/ctfconvert/Makefile#11 (text+ko) ====

@@ -41,16 +41,12 @@
 		-I${OPENSOLARIS_USR_DISTDIR}/tools/ctf/cvt \
 		-I${OPENSOLARIS_SYS_DISTDIR}/uts/common
 
-LDADD+=		-lctf -ldwarf -lelf -lz
-
-.if ${MK_LIBC_THREADS} == "no"
-LDADD+= -lpthread
-.endif
+LDADD+=		-lctf -ldwarf -lelf -lz -lpthread
 
 .PATH:		${.CURDIR}
 .PATH:		${OPENSOLARIS_USR_DISTDIR}/tools/ctf/common
 .PATH:		${OPENSOLARIS_USR_DISTDIR}/tools/ctf/cvt
 
-MK_MAN=no
+MK_MAN=		no
 
 .include <bsd.prog.mk>

==== //depot/projects/dtrace/src/cddl/usr.bin/ctfmerge/Makefile#8 (text+ko) ====

@@ -38,16 +38,12 @@
 		-I${OPENSOLARIS_USR_DISTDIR}/tools/ctf/cvt \
 		-I${OPENSOLARIS_SYS_DISTDIR}/uts/common
 
-LDADD+=		-lctf -ldwarf -lelf -lz
-
-.if ${MK_LIBC_THREADS} == "no"
-LDADD+= -lpthread
-.endif
+LDADD+=		-lctf -ldwarf -lelf -lz -lpthread
 
 .PATH:		${.CURDIR}/../ctfconvert
 .PATH:		${OPENSOLARIS_USR_DISTDIR}/tools/ctf/common
 .PATH:		${OPENSOLARIS_USR_DISTDIR}/tools/ctf/cvt
 
-MK_MAN=no
+MK_MAN=		no
 
 .include <bsd.prog.mk>