Author: ru
Date: Thu Feb 25 22:18:35 2010
New Revision: 204339
URL: http://svn.freebsd.org/changeset/base/204339
Log:
Fixed dependencies (make checkdpadd).
Modified:
head/cddl/usr.bin/ctfconvert/Makefile
head/cddl/usr.bin/ctfdump/Makefile
head/cddl/usr.bin/ctfmerge/Makefile
head/cddl/usr.bin/zinject/Makefile
head/cddl/usr.sbin/dtrace/Makefile
head/cddl/usr.sbin/lockstat/Makefile
Modified: head/cddl/usr.bin/ctfconvert/Makefile
==============================================================================
--- head/cddl/usr.bin/ctfconvert/Makefile Thu Feb 25 22:16:30 2010
(r204338)
+++ head/cddl/usr.bin/ctfconvert/Makefile Thu Feb 25 22:18:35 2010
(r204339)
@@ -40,7 +40,8 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/
-I${OPENSOLARIS_USR_DISTDIR}/tools/ctf/cvt \
-I${OPENSOLARIS_SYS_DISTDIR}/uts/common
-LDADD+= -lctf -ldwarf -lelf -lz -lthr
+DPADD= ${LIBCTF} ${LIBDWARF} ${LIBELF} ${LIBZ} ${LIBPTHREAD}
+LDADD= -lctf -ldwarf -lelf -lz -lpthread
.PATH: ${.CURDIR}
.PATH: ${OPENSOLARIS_USR_DISTDIR}/tools/ctf/common
Modified: head/cddl/usr.bin/ctfdump/Makefile
==============================================================================
--- head/cddl/usr.bin/ctfdump/Makefile Thu Feb 25 22:16:30 2010
(r204338)
+++ head/cddl/usr.bin/ctfdump/Makefile Thu Feb 25 22:18:35 2010
(r204339)
@@ -19,9 +19,8 @@ CFLAGS+= -I${OPENSOLARIS_USR_DISTDIR} \
-I${OPENSOLARIS_USR_DISTDIR}/tools/ctf/common \
-I${OPENSOLARIS_SYS_DISTDIR}/uts/common
-LDFLAGS+= -pthread
-
-LDADD+= -lelf -lz
+DPADD= ${LIBPTHREAD} ${LIBELF} ${LIBZ}
+LDADD= -lpthread -lelf -lz
.PATH: ${OPENSOLARIS_USR_DISTDIR}/tools/ctf/common
.PATH: ${OPENSOLARIS_USR_DISTDIR}/tools/ctf/dump
Modified: head/cddl/usr.bin/ctfmerge/Makefile
==============================================================================
--- head/cddl/usr.bin/ctfmerge/Makefile Thu Feb 25 22:16:30 2010
(r204338)
+++ head/cddl/usr.bin/ctfmerge/Makefile Thu Feb 25 22:18:35 2010
(r204339)
@@ -37,7 +37,8 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/
-I${OPENSOLARIS_USR_DISTDIR}/tools/ctf/cvt \
-I${OPENSOLARIS_SYS_DISTDIR}/uts/common
-LDADD+= -lctf -ldwarf -lelf -lz -lthr
+DPADD= ${LIBCTF} ${LIBDWARF} ${LIBELF} ${LIBZ} ${LIBPTHREAD}
+LDADD= -lctf -ldwarf -lelf -lz -lpthread
.PATH: ${OPENSOLARIS_USR_DISTDIR}/tools/ctf/common
.PATH: ${OPENSOLARIS_USR_DISTDIR}/tools/ctf/cvt
Modified: head/cddl/usr.bin/zinject/Makefile
==============================================================================
--- head/cddl/usr.bin/zinject/Makefile Thu Feb 25 22:16:30 2010
(r204338)
+++ head/cddl/usr.bin/zinject/Makefile Thu Feb 25 22:18:35 2010
(r204339)
@@ -19,7 +19,7 @@ CFLAGS+= -I${.CURDIR}/../../contrib/open
CFLAGS+= -I${.CURDIR}/../../lib/libumem
DPADD= ${LIBAVL} ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBUUTIL} \
- ${LIBZFS} ${LIBZPOOL} ${LIBUUTIL}
+ ${LIBZFS} ${LIBZPOOL}
LDADD= -lavl -lgeom -lm -lnvpair -lumem -luutil -lzfs -lzpool
.include <bsd.prog.mk>
Modified: head/cddl/usr.sbin/dtrace/Makefile
==============================================================================
--- head/cddl/usr.sbin/dtrace/Makefile Thu Feb 25 22:16:30 2010
(r204338)
+++ head/cddl/usr.sbin/dtrace/Makefile Thu Feb 25 22:18:35 2010
(r204339)
@@ -24,14 +24,7 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/
#CFLAGS+= -DNEED_ERRLOC
#YFLAGS+= -d
-LDFLAGS+= -pthread \
- -L${.OBJDIR}/../../lib/libdtrace \
- -L${.OBJDIR}/../../lib/libproc \
- -L${.OBJDIR}/../../lib/libctf \
- -L${.OBJDIR}/../../../lib/libelf
-
-LDADD+= -ldtrace -ly -ll -lproc -lctf -lelf -lz
-
-DPADD+= ${LIBDTRACE} ${LIBCTF} ${LIBELF} ${LIBPTHREAD} ${LIBL} ${LIBY} ${LIBZ}
+DPADD= ${LIBPTHREAD} ${LIBDTRACE} ${LIBY} ${LIBL} ${LIBPROC} ${LIBCTF}
${LIBELF} ${LIBZ}
+LDADD= -lpthread -ldtrace -ly -ll -lproc -lctf -lelf -lz
.include <bsd.prog.mk>
Modified: head/cddl/usr.sbin/lockstat/Makefile
==============================================================================
--- head/cddl/usr.sbin/lockstat/Makefile Thu Feb 25 22:16:30 2010
(r204338)
+++ head/cddl/usr.sbin/lockstat/Makefile Thu Feb 25 22:18:35 2010
(r204339)
@@ -25,15 +25,8 @@ CFLAGS+= -DNEED_ERRLOC -g
#YFLAGS+= -d
-LDFLAGS+= -pthread \
- -L${.OBJDIR}/../../lib/libdtrace \
- -L${.OBJDIR}/../../lib/libproc \
- -L${.OBJDIR}/../../lib/libctf \
- -L${.OBJDIR}/../../../lib/libelf
-
-LDADD+= -ldtrace -ly -ll -lproc -lctf -lelf -lz -lrt
-
-#DPADD+= ${LIBDTRACE} ${LIBPTHREAD} ${LIBL} ${LIBY} ${LIBZ}
+DPADD= ${LIBPTHREAD} ${LIBDTRACE} ${LIBY} ${LIBL} ${LIBPROC} ${LIBCTF}
${LIBELF} ${LIBZ} ${LIBRT}
+LDADD= -lpthread -ldtrace -ly -ll -lproc -lctf -lelf -lz -lrt
NO_MAN=
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
