aboutsummaryrefslogtreecommitdiff
path: root/cddl
diff options
context:
space:
mode:
Diffstat (limited to 'cddl')
-rw-r--r--cddl/usr.bin/ctfconvert/Makefile3
-rw-r--r--cddl/usr.bin/ctfdump/Makefile5
-rw-r--r--cddl/usr.bin/ctfmerge/Makefile3
-rw-r--r--cddl/usr.bin/zinject/Makefile2
-rw-r--r--cddl/usr.sbin/dtrace/Makefile11
-rw-r--r--cddl/usr.sbin/lockstat/Makefile11
6 files changed, 11 insertions, 24 deletions
diff --git a/cddl/usr.bin/ctfconvert/Makefile b/cddl/usr.bin/ctfconvert/Makefile
index 57a08dd04c6d..aea32c73e04d 100644
--- a/cddl/usr.bin/ctfconvert/Makefile
+++ b/cddl/usr.bin/ctfconvert/Makefile
@@ -40,7 +40,8 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris \
-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
diff --git a/cddl/usr.bin/ctfdump/Makefile b/cddl/usr.bin/ctfdump/Makefile
index 9a65c15efd31..700b070d0c40 100644
--- a/cddl/usr.bin/ctfdump/Makefile
+++ b/cddl/usr.bin/ctfdump/Makefile
@@ -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
diff --git a/cddl/usr.bin/ctfmerge/Makefile b/cddl/usr.bin/ctfmerge/Makefile
index 051fa0b434d3..7c96d366e8bf 100644
--- a/cddl/usr.bin/ctfmerge/Makefile
+++ b/cddl/usr.bin/ctfmerge/Makefile
@@ -37,7 +37,8 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris \
-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
diff --git a/cddl/usr.bin/zinject/Makefile b/cddl/usr.bin/zinject/Makefile
index c8693fe9c73c..82505a875f65 100644
--- a/cddl/usr.bin/zinject/Makefile
+++ b/cddl/usr.bin/zinject/Makefile
@@ -19,7 +19,7 @@ CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/head
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>
diff --git a/cddl/usr.sbin/dtrace/Makefile b/cddl/usr.sbin/dtrace/Makefile
index 44116fcbc4ef..56e88153bdbc 100644
--- a/cddl/usr.sbin/dtrace/Makefile
+++ b/cddl/usr.sbin/dtrace/Makefile
@@ -24,14 +24,7 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris \
#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>
diff --git a/cddl/usr.sbin/lockstat/Makefile b/cddl/usr.sbin/lockstat/Makefile
index 9c135f91263f..4fbddef3fbf1 100644
--- a/cddl/usr.sbin/lockstat/Makefile
+++ b/cddl/usr.sbin/lockstat/Makefile
@@ -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=