[Midnightbsd-cvs] src [8118] U trunk/cddl: cleanup linking
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Fri Sep 16 17:38:13 EDT 2016
Revision: 8118
http://svnweb.midnightbsd.org/src/?rev=8118
Author: laffer1
Date: 2016-09-16 17:38:13 -0400 (Fri, 16 Sep 2016)
Log Message:
-----------
cleanup linking
Modified Paths:
--------------
trunk/cddl/lib/libzfs/Makefile
trunk/cddl/sbin/zfs/Makefile
trunk/cddl/sbin/zpool/Makefile
trunk/cddl/usr.bin/zinject/Makefile
trunk/cddl/usr.bin/ztest/Makefile
trunk/cddl/usr.sbin/zdb/Makefile
Property Changed:
----------------
trunk/cddl/lib/libzfs/Makefile
trunk/cddl/sbin/zfs/Makefile
trunk/cddl/sbin/zpool/Makefile
trunk/cddl/usr.bin/zinject/Makefile
trunk/cddl/usr.bin/ztest/Makefile
trunk/cddl/usr.sbin/zdb/Makefile
Modified: trunk/cddl/lib/libzfs/Makefile
===================================================================
--- trunk/cddl/lib/libzfs/Makefile 2016-09-16 21:36:18 UTC (rev 8117)
+++ trunk/cddl/lib/libzfs/Makefile 2016-09-16 21:38:13 UTC (rev 8118)
@@ -6,8 +6,8 @@
.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs/common
LIB= zfs
-DPADD= ${LIBMD} ${LIBPTHREAD} ${LIBUMEM} ${LIBUTIL}
-LDADD= -lmd -lpthread -lumem -lutil
+DPADD= ${LIBMD} ${LIBPTHREAD} ${LIBUMEM} ${LIBUTIL} ${LIBM}
+LDADD= -lmd -lpthread -lumem -lutil -lm
SRCS= deviceid.c \
fsshare.c \
Property changes on: trunk/cddl/lib/libzfs/Makefile
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.4
\ No newline at end of property
Modified: trunk/cddl/sbin/zfs/Makefile
===================================================================
--- trunk/cddl/sbin/zfs/Makefile 2016-09-16 21:36:18 UTC (rev 8117)
+++ trunk/cddl/sbin/zfs/Makefile 2016-09-16 21:38:13 UTC (rev 8118)
@@ -1,4 +1,4 @@
-# $MidnightBSD: src/cddl/sbin/zfs/Makefile,v 1.2 2008/11/11 19:33:42 laffer1 Exp $
+# $MidnightBSD$
# $FreeBSD: src/cddl/sbin/zfs/Makefile,v 1.3 2007/10/01 18:17:23 ru Exp $
.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/zfs
@@ -22,8 +22,8 @@
CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys
CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs
-DPADD= ${LIBBSDXML} ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBSBUF} ${LIBUMEM} \
+DPADD= ${LIBGEOM} ${LIBNVPAIR} ${LIBUMEM} \
${LIBUTIL} ${LIBUUTIL} ${LIBZFS}
-LDADD= -lbsdxml -lgeom -lm -lnvpair -lsbuf -lumem -lutil -luutil -lzfs
+LDADD= -lgeom -lnvpair -lumem -lutil -luutil -lzfs
.include <bsd.prog.mk>
Property changes on: trunk/cddl/sbin/zfs/Makefile
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.3
\ No newline at end of property
Modified: trunk/cddl/sbin/zpool/Makefile
===================================================================
--- trunk/cddl/sbin/zpool/Makefile 2016-09-16 21:36:18 UTC (rev 8117)
+++ trunk/cddl/sbin/zpool/Makefile 2016-09-16 21:38:13 UTC (rev 8118)
@@ -1,4 +1,4 @@
-# $MidnightBSD: src/cddl/sbin/zpool/Makefile,v 1.2 2008/11/11 19:33:42 laffer1 Exp $
+# $MidnightBSD$
# $FreeBSD: src/cddl/sbin/zpool/Makefile,v 1.3 2007/10/01 18:17:23 ru Exp $
.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/zpool
@@ -27,8 +27,8 @@
CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common
CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/stat/common
-DPADD= ${LIBAVL} ${LIBBSDXML} ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBSBUF} \
+DPADD= ${LIBAVL} ${LIBGEOM} ${LIBNVPAIR} \
${LIBUMEM} ${LIBUTIL} ${LIBUUTIL} ${LIBZFS}
-LDADD= -lavl -lbsdxml -lgeom -lm -lnvpair -lsbuf -lumem -lutil -luutil -lzfs
+LDADD= -lavl -lgeom -lnvpair -lumem -lutil -luutil -lzfs
.include <bsd.prog.mk>
Property changes on: trunk/cddl/sbin/zpool/Makefile
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.3
\ No newline at end of property
Modified: trunk/cddl/usr.bin/zinject/Makefile
===================================================================
--- trunk/cddl/usr.bin/zinject/Makefile 2016-09-16 21:36:18 UTC (rev 8117)
+++ trunk/cddl/usr.bin/zinject/Makefile 2016-09-16 21:38:13 UTC (rev 8118)
@@ -19,8 +19,8 @@
CFLAGS+= -I${.CURDIR}/../../contrib/opensolaris/head
CFLAGS+= -I${.CURDIR}/../../lib/libumem
-DPADD= ${LIBAVL} ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBUUTIL} \
+DPADD= ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBUUTIL} \
${LIBZFS} ${LIBZPOOL}
-LDADD= -lavl -lgeom -lm -lnvpair -lumem -luutil -lzfs -lzpool
+LDADD= -lgeom -lm -lnvpair -lumem -luutil -lzfs -lzpool
.include <bsd.prog.mk>
Property changes on: trunk/cddl/usr.bin/zinject/Makefile
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Modified: trunk/cddl/usr.bin/ztest/Makefile
===================================================================
--- trunk/cddl/usr.bin/ztest/Makefile 2016-09-16 21:36:18 UTC (rev 8117)
+++ trunk/cddl/usr.bin/ztest/Makefile 2016-09-16 21:38:13 UTC (rev 8118)
@@ -18,8 +18,8 @@
CFLAGS+= -I${.CURDIR}/../../lib/libumem
DPADD= ${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBZPOOL} \
- ${LIBPTHREAD} ${LIBZ} ${LIBAVL}
-LDADD= -lm -lnvpair -lumem -lzpool -lpthread -lz -lavl
+ ${LIBPTHREAD} ${LIBAVL}
+LDADD= -lm -lnvpair -lumem -lzpool -lpthread -lavl
CSTD= c99
Property changes on: trunk/cddl/usr.bin/ztest/Makefile
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.4
\ No newline at end of property
Modified: trunk/cddl/usr.sbin/zdb/Makefile
===================================================================
--- trunk/cddl/usr.sbin/zdb/Makefile 2016-09-16 21:36:18 UTC (rev 8117)
+++ trunk/cddl/usr.sbin/zdb/Makefile 2016-09-16 21:38:13 UTC (rev 8118)
@@ -23,9 +23,9 @@
CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head
CFLAGS+= -I${.CURDIR}/../../lib/libumem
-DPADD= ${LIBAVL} ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBPTHREAD} ${LIBUMEM} \
- ${LIBUUTIL} ${LIBZ} ${LIBZFS} ${LIBZPOOL}
-LDADD= -lavl -lgeom -lm -lnvpair -lpthread -lumem -luutil -lz -lzfs -lzpool
+DPADD= ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBPTHREAD} ${LIBUMEM} \
+ ${LIBUUTIL} ${LIBZFS} ${LIBZPOOL}
+LDADD= -lgeom -lm -lnvpair -lpthread -lumem -luutil -lzfs -lzpool
.include <bsd.prog.mk>
Property changes on: trunk/cddl/usr.sbin/zdb/Makefile
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.3
\ No newline at end of property
More information about the Midnightbsd-cvs
mailing list