Index: head/cddl/usr.bin/ctfconvert/Makefile =================================================================== --- head/cddl/usr.bin/ctfconvert/Makefile (revision 204338) +++ head/cddl/usr.bin/ctfconvert/Makefile (revision 204339) @@ -1,51 +1,52 @@ # $FreeBSD$ .include .include "../../Makefile.inc" DEBUG_FLAGS= -g PROG= ctfconvert SRCS= alist.c \ ctf.c \ ctfconvert.c \ dwarf.c \ fixup_tdescs.c \ hash.c \ iidesc.c \ input.c \ list.c \ memory.c \ merge.c \ output.c \ st_parse.c \ stabs.c \ stack.c \ strtab.c \ symbol.c \ tdata.c \ traverse.c \ util.c WARNS?= 6 CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris \ -I${.CURDIR}/../../../cddl/compat/opensolaris/include \ -I${OPENSOLARIS_USR_DISTDIR} \ -I${OPENSOLARIS_SYS_DISTDIR} \ -I${OPENSOLARIS_USR_DISTDIR}/head \ -I${OPENSOLARIS_USR_DISTDIR}/tools/ctf/common \ -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 .PATH: ${OPENSOLARIS_USR_DISTDIR}/tools/ctf/cvt MK_MAN= no .include Index: head/cddl/usr.bin/ctfdump/Makefile =================================================================== --- head/cddl/usr.bin/ctfdump/Makefile (revision 204338) +++ head/cddl/usr.bin/ctfdump/Makefile (revision 204339) @@ -1,31 +1,30 @@ # $FreeBSD$ .include "../../Makefile.inc" PROG= ctfdump SRCS= dump.c \ symbol.c \ utils.c WARNS?= 6 CFLAGS+= -I${OPENSOLARIS_USR_DISTDIR} \ -I${OPENSOLARIS_SYS_DISTDIR} \ -I${OPENSOLARIS_USR_DISTDIR}/head \ -I${OPENSOLARIS_USR_DISTDIR}/cmd/mdb/tools/common \ -I${.CURDIR}/../../../sys/cddl/compat/opensolaris \ -I${.CURDIR}/../../../cddl/compat/opensolaris/include \ -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 NO_MAN= .include Index: head/cddl/usr.bin/ctfmerge/Makefile =================================================================== --- head/cddl/usr.bin/ctfmerge/Makefile (revision 204338) +++ head/cddl/usr.bin/ctfmerge/Makefile (revision 204339) @@ -1,47 +1,48 @@ # $FreeBSD$ .include .include "../../Makefile.inc" WARNS= 1 PROG= ctfmerge SRCS= alist.c \ barrier.c \ ctf.c \ ctfmerge.c \ fifo.c \ hash.c \ iidesc.c \ input.c \ list.c \ memory.c \ merge.c \ output.c \ strtab.c \ symbol.c \ tdata.c \ traverse.c \ util.c WARNS?= 6 CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris \ -I${.CURDIR}/../../../cddl/compat/opensolaris/include \ -I${OPENSOLARIS_USR_DISTDIR} \ -I${OPENSOLARIS_SYS_DISTDIR} \ -I${OPENSOLARIS_USR_DISTDIR}/head \ -I${OPENSOLARIS_USR_DISTDIR}/tools/ctf/common \ -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 MK_MAN= no .include Index: head/cddl/usr.bin/zinject/Makefile =================================================================== --- head/cddl/usr.bin/zinject/Makefile (revision 204338) +++ head/cddl/usr.bin/zinject/Makefile (revision 204339) @@ -1,25 +1,25 @@ # $FreeBSD$ .PATH: ${.CURDIR}/../../contrib/opensolaris/cmd/zinject PROG= zinject SRCS= zinject.c translate.c NO_MAN= CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris CFLAGS+= -I${.CURDIR}/../../compat/opensolaris/include CFLAGS+= -I${.CURDIR}/../../compat/opensolaris/lib/libumem CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/lib/libzfs/common CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/lib/libzpool/common CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/lib/libnvpair CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common 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 Index: head/cddl/usr.sbin/dtrace/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/Makefile (revision 204338) +++ head/cddl/usr.sbin/dtrace/Makefile (revision 204339) @@ -1,37 +1,30 @@ # $FreeBSD$ .include "../../Makefile.inc" PROG= dtrace BINDIR?= /usr/sbin SRCS= dtrace.c WARNS= 1 CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris \ -I${.CURDIR}/../../../cddl/compat/opensolaris/include \ -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}/compat .PATH: ${OPENSOLARIS_USR_DISTDIR}/cmd/dtrace # Optional debugging stuff... #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 Index: head/cddl/usr.sbin/lockstat/Makefile =================================================================== --- head/cddl/usr.sbin/lockstat/Makefile (revision 204338) +++ head/cddl/usr.sbin/lockstat/Makefile (revision 204339) @@ -1,40 +1,33 @@ # $FreeBSD$ .include "../../Makefile.inc" PROG= lockstat BINDIR?= /usr/sbin SRCS= lockstat.c sym.c WARNS= 1 CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris \ -I${.CURDIR}/../../../cddl/compat/opensolaris/include \ -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}/compat \ -I${.CURDIR}/../../../sys .PATH: ${OPENSOLARIS_USR_DISTDIR}/cmd/lockstat 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= .include