summaryrefslogtreecommitdiffstats
path: root/usr.bin
diff options
context:
space:
mode:
authorru <ru@FreeBSD.org>2010-02-25 20:24:19 +0000
committerru <ru@FreeBSD.org>2010-02-25 20:24:19 +0000
commit4d27ff91d01ec406d08089baae33529e85e9868f (patch)
tree4f5956e5e1eefb11957b3c4e601da267e4d60995 /usr.bin
parentab65ee82de3cee0452b0d696f87e19f28add5f08 (diff)
downloadFreeBSD-src-4d27ff91d01ec406d08089baae33529e85e9868f.zip
FreeBSD-src-4d27ff91d01ec406d08089baae33529e85e9868f.tar.gz
Fixed dependencies (make checkdpadd).
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/cpio/Makefile5
-rw-r--r--usr.bin/gcore/Makefile3
-rw-r--r--usr.bin/systat/Makefile4
-rw-r--r--usr.bin/tar/Makefile3
4 files changed, 9 insertions, 6 deletions
diff --git a/usr.bin/cpio/Makefile b/usr.bin/cpio/Makefile
index d609780..bfcbe97 100644
--- a/usr.bin/cpio/Makefile
+++ b/usr.bin/cpio/Makefile
@@ -5,7 +5,6 @@
PROG= bsdcpio
BSDCPIO_VERSION_STRING=2.7.0
SRCS= cpio.c cmdline.c err.c matching.c pathmatch.c
-DPADD= ${LIBARCHIVE} ${LIBZ} ${LIBBZ2}
CFLAGS+= -DBSDCPIO_VERSION_STRING=\"${BSDCPIO_VERSION_STRING}\"
CFLAGS+= -DPLATFORM_CONFIG_H=\"config_freebsd.h\"
.ifdef RELEASE_CRUNCH
@@ -13,8 +12,10 @@ CFLAGS+= -DPLATFORM_CONFIG_H=\"config_freebsd.h\"
# statically linked, cannot use -lcrypto, and are size sensitive.
CFLAGS+= -DSMALLER
.endif
-LDADD+= -larchive -lz -lbz2 -lmd
+DPADD= ${LIBARCHIVE} ${LIBZ} ${LIBBZ2} ${LIBMD}
+LDADD= -larchive -lz -lbz2 -lmd
.if ${MK_OPENSSL} != "no"
+DPADD+= ${LIBCRYPTO}
LDADD+= -lcrypto
.endif
diff --git a/usr.bin/gcore/Makefile b/usr.bin/gcore/Makefile
index 358c747..e83a48f 100644
--- a/usr.bin/gcore/Makefile
+++ b/usr.bin/gcore/Makefile
@@ -1,9 +1,10 @@
# @(#)Makefile 8.1 (Berkeley) 6/6/93
# $FreeBSD$
-LDADD+= -lutil
PROG= gcore
SRCS= elfcore.c gcore.c
+DPADD= ${LIBUTIL}
+LDADD= -lutil
WARNS?= 1
diff --git a/usr.bin/systat/Makefile b/usr.bin/systat/Makefile
index bdd41c6..6a7e53d 100644
--- a/usr.bin/systat/Makefile
+++ b/usr.bin/systat/Makefile
@@ -16,7 +16,7 @@ CFLAGS+= -DINET6
WARNS?= 0
-DPADD= ${LIBCURSES} ${LIBM} ${LIBDEVSTAT} ${LIBKVM}
-LDADD= -lcursesw -lm -ldevstat -lkvm
+DPADD= ${LIBNCURSESW} ${LIBM} ${LIBDEVSTAT} ${LIBKVM}
+LDADD= -lncursesw -lm -ldevstat -lkvm
.include <bsd.prog.mk>
diff --git a/usr.bin/tar/Makefile b/usr.bin/tar/Makefile
index 29abcc5..1828952 100644
--- a/usr.bin/tar/Makefile
+++ b/usr.bin/tar/Makefile
@@ -15,9 +15,10 @@ SRCS= bsdtar.c \
tree.c \
util.c \
write.c
-DPADD= ${LIBARCHIVE} ${LIBBZ2} ${LIBZ}
+DPADD= ${LIBARCHIVE} ${LIBBZ2} ${LIBZ} ${LIBMD}
LDADD= -larchive -lbz2 -lz -lmd
.if ${MK_OPENSSL} != "no"
+DPADD+= ${LIBCRYPTO}
LDADD+= -lcrypto
.endif
CFLAGS+= -DBSDTAR_VERSION_STRING=\"${BSDTAR_VERSION_STRING}\"
OpenPOWER on IntegriCloud