From bb97a3d43c2b7f2a5b4f05069e3bb12383a9e20d Mon Sep 17 00:00:00 2001 From: bdrewery Date: Fri, 4 Dec 2015 03:17:47 +0000 Subject: Fix LDADD/DPADD that should be LIBADD. Sponsored by: EMC / Isilon Storage Division --- cddl/lib/libctf/Makefile | 4 +--- cddl/lib/libzfs/Makefile | 8 +------- cddl/lib/libzfs_core/Makefile | 3 +-- cddl/lib/libzpool/Makefile | 4 +--- cddl/sbin/zfs/Makefile | 4 +--- cddl/sbin/zpool/Makefile | 4 +--- cddl/usr.bin/zinject/Makefile | 4 +--- cddl/usr.bin/zstreamdump/Makefile | 4 +--- cddl/usr.bin/ztest/Makefile | 5 +---- cddl/usr.sbin/dtrace/tests/common/proc/Makefile | 3 +-- cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh | 3 +-- cddl/usr.sbin/zdb/Makefile | 4 +--- cddl/usr.sbin/zhack/Makefile | 4 +--- 13 files changed, 13 insertions(+), 41 deletions(-) (limited to 'cddl') diff --git a/cddl/lib/libctf/Makefile b/cddl/lib/libctf/Makefile index d8a645e..a79aef5 100644 --- a/cddl/lib/libctf/Makefile +++ b/cddl/lib/libctf/Makefile @@ -28,8 +28,6 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris \ -I${OPENSOLARIS_USR_DISTDIR}/lib/libctf/common \ -I${OPENSOLARIS_SYS_DISTDIR}/uts/common -DPADD= ${LIBZ} -LDADD= -lz +LIBADD+= z .include - diff --git a/cddl/lib/libzfs/Makefile b/cddl/lib/libzfs/Makefile index b960c9e..9af9674 100644 --- a/cddl/lib/libzfs/Makefile +++ b/cddl/lib/libzfs/Makefile @@ -6,13 +6,7 @@ .PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs/common LIB= zfs -DPADD= ${LIBMD} ${LIBPTHREAD} ${LIBUMEM} ${LIBUTIL} ${LIBM} ${LIBNVPAIR} \ - ${LIBAVL} ${LIBZFS_CORE} ${LIBUUTIL} ${LIBBSDXML} ${LIBGEOM} \ - ${LIBNVPAIR} ${LIBZ} - -LDADD= -lmd -lpthread -lumem -lutil -luutil -lm -lnvpair -lavl \ - -lbsdxml -lgeom -lnvpair -lz -lzfs_core - +LIBADD= md pthread umem util uutil m avl bsdxml geom nvpair z zfs_core SRCS= deviceid.c \ fsshare.c \ mkdirp.c \ diff --git a/cddl/lib/libzfs_core/Makefile b/cddl/lib/libzfs_core/Makefile index 99ab34d..12d06d9 100644 --- a/cddl/lib/libzfs_core/Makefile +++ b/cddl/lib/libzfs_core/Makefile @@ -7,8 +7,7 @@ .PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs/common LIB= zfs_core -DPADD= ${LIBNVPAIR} -LDADD= -lnvpair +LIBADD= nvpair SRCS= libzfs_core.c \ libzfs_core_compat.c \ diff --git a/cddl/lib/libzpool/Makefile b/cddl/lib/libzpool/Makefile index b80af04..b305315 100644 --- a/cddl/lib/libzpool/Makefile +++ b/cddl/lib/libzpool/Makefile @@ -56,9 +56,7 @@ CFLAGS+= -I${.CURDIR}/../../../lib/libpthread/thread CFLAGS+= -I${.CURDIR}/../../../lib/libpthread/sys CFLAGS+= -I${.CURDIR}/../../../lib/libthr/arch/${MACHINE_CPUARCH}/include -DPADD= ${LIBMD} ${LIBPTHREAD} ${LIBZ} ${LIBNVPAIR} \ - ${LIBAVL} ${LIBUMEM} -LDADD= -lmd -lpthread -lz -lnvpair -lavl -lumem +LIBADD= md pthread z nvpair avl umem # atomic.S doesn't like profiling. MK_PROFILE= no diff --git a/cddl/sbin/zfs/Makefile b/cddl/sbin/zfs/Makefile index a49d278..b1a104c 100644 --- a/cddl/sbin/zfs/Makefile +++ b/cddl/sbin/zfs/Makefile @@ -22,8 +22,6 @@ 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/common/zfs -DPADD= ${LIBGEOM} ${LIBJAIL} ${LIBNVPAIR} ${LIBUMEM} \ - ${LIBUTIL} ${LIBUUTIL} ${LIBZFS_CORE} ${LIBZFS} -LDADD= -lgeom -ljail -lnvpair -lumem -lutil -luutil -lzfs_core -lzfs +LIBADD= geom jail nvpair umem util uutil zfs_core zfs .include diff --git a/cddl/sbin/zpool/Makefile b/cddl/sbin/zpool/Makefile index bfcb017..11adad2 100644 --- a/cddl/sbin/zpool/Makefile +++ b/cddl/sbin/zpool/Makefile @@ -27,8 +27,6 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/stat/common -DPADD= ${LIBAVL} ${LIBGEOM} ${LIBNVPAIR} \ - ${LIBUMEM} ${LIBUTIL} ${LIBUUTIL} ${LIBZFS_CORE} ${LIBZFS} -LDADD= -lavl -lgeom -lnvpair -lumem -lutil -luutil -lzfs_core -lzfs +LIBADD= avl geom nvpair umem util uutil zfs_core zfs .include diff --git a/cddl/usr.bin/zinject/Makefile b/cddl/usr.bin/zinject/Makefile index 008788b..68ca78d 100644 --- a/cddl/usr.bin/zinject/Makefile +++ b/cddl/usr.bin/zinject/Makefile @@ -21,8 +21,6 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs/ CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/head CFLAGS+= -I${.CURDIR}/../../lib/libumem -DPADD= ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBUUTIL} \ - ${LIBZFS_CORE} ${LIBZFS} ${LIBZPOOL} -LDADD= -lgeom -lm -lnvpair -lumem -luutil -lzfs_core -lzfs -lzpool +LIBADD= geom m nvpair umem uutil zfs_core zfs zpool .include diff --git a/cddl/usr.bin/zstreamdump/Makefile b/cddl/usr.bin/zstreamdump/Makefile index 304ff7c..e6b7b90 100644 --- a/cddl/usr.bin/zstreamdump/Makefile +++ b/cddl/usr.bin/zstreamdump/Makefile @@ -18,9 +18,7 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/head CFLAGS+= -I${.CURDIR}/../../lib/libumem -DPADD= ${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBZPOOL} \ - ${LIBPTHREAD} ${LIBZ} ${LIBAVL} -LDADD= -lm -lnvpair -lumem -lzpool -lpthread -lz -lavl +LIBADD= m nvpair umem zpool pthread z avl CSTD= c99 diff --git a/cddl/usr.bin/ztest/Makefile b/cddl/usr.bin/ztest/Makefile index 0865226..1b3430b 100644 --- a/cddl/usr.bin/ztest/Makefile +++ b/cddl/usr.bin/ztest/Makefile @@ -18,10 +18,7 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/head CFLAGS+= -I${.CURDIR}/../../lib/libumem -DPADD= ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBZPOOL} \ - ${LIBPTHREAD} ${LIBAVL} ${LIBZFS_CORE} ${LIBZFS} ${LIBUUTIL} -LDADD= -lgeom -lm -lnvpair -lumem -lzpool -lpthread -lavl -lzfs_core -lzfs \ - -luutil +LIBADD= geom m nvpair umem zpool pthread avl zfs_core zfs uutil CSTD= c99 diff --git a/cddl/usr.sbin/dtrace/tests/common/proc/Makefile b/cddl/usr.sbin/dtrace/tests/common/proc/Makefile index 596474c..6ca6b58 100644 --- a/cddl/usr.sbin/dtrace/tests/common/proc/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/proc/Makefile @@ -24,7 +24,6 @@ CFILES= \ tst.sigwait.c \ -LDADD.tst.sigwait.exe+= -lrt -DPADD.tst.sigwait.exe+= ${LIBRT} +LIBADD.tst.sigwait.exe=rt .include "../../dtrace.test.mk" diff --git a/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh b/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh index ec3ad24..fda81fb 100755 --- a/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh +++ b/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh @@ -36,8 +36,7 @@ genmakefile() local special if [ "$basedir" = proc ]; then special=" -LDADD.tst.sigwait.exe+= -lrt -DPADD.tst.sigwait.exe+= \${LIBRT} +LIBADD.tst.sigwait.exe+= rt " elif [ "$basedir" = uctf ]; then special=" diff --git a/cddl/usr.sbin/zdb/Makefile b/cddl/usr.sbin/zdb/Makefile index 0e2ec8f..4fbcaea 100644 --- a/cddl/usr.sbin/zdb/Makefile +++ b/cddl/usr.sbin/zdb/Makefile @@ -24,9 +24,7 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head CFLAGS+= -I${.CURDIR}/../../lib/libumem -DPADD= ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBPTHREAD} ${LIBUMEM} \ - ${LIBUUTIL} ${LIBZFS_CORE} ${LIBZFS} ${LIBZPOOL} -LDADD= -lgeom -lm -lnvpair -lpthread -lumem -luutil -lzfs_core -lzfs -lzpool +LIBADD= geom m nvpair pthread umem uutil zfs_core zfs zpool # Since there are many asserts in this program, it makes no sense to compile # it without debugging. diff --git a/cddl/usr.sbin/zhack/Makefile b/cddl/usr.sbin/zhack/Makefile index 8064cf1..c42a49e 100644 --- a/cddl/usr.sbin/zhack/Makefile +++ b/cddl/usr.sbin/zhack/Makefile @@ -23,9 +23,7 @@ CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head CFLAGS+= -I${.CURDIR}/../../lib/libumem -DPADD= ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBPTHREAD} ${LIBUMEM} \ - ${LIBUUTIL} ${LIBZFS_CORE} ${LIBZFS} ${LIBZPOOL} -LDADD= -lgeom -lm -lnvpair -lpthread -lumem -luutil -lzfs_core -lzfs -lzpool +LIBADD= geom m nvpair pthread umem uutil zfs_core zfs zpool CFLAGS+= -DDEBUG=1 #DEBUG_FLAGS+= -g -- cgit v1.1