diff options
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/cpio/Makefile | 5 | ||||
| -rw-r--r-- | usr.bin/gcore/Makefile | 3 | ||||
| -rw-r--r-- | usr.bin/systat/Makefile | 4 | ||||
| -rw-r--r-- | usr.bin/tar/Makefile | 3 |
4 files changed, 9 insertions, 6 deletions
diff --git a/usr.bin/cpio/Makefile b/usr.bin/cpio/Makefile index d609780ac9c7..bfcbe9734297 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 358c7472f786..e83a48f375a4 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 bdd41c61006e..6a7e53d5d39c 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 29abcc5f7fe0..18289520209c 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}\" |