diff options
| author | ru <ru@FreeBSD.org> | 2010-02-25 20:24:19 +0000 |
|---|---|---|
| committer | ru <ru@FreeBSD.org> | 2010-02-25 20:24:19 +0000 |
| commit | 4d27ff91d01ec406d08089baae33529e85e9868f (patch) | |
| tree | 4f5956e5e1eefb11957b3c4e601da267e4d60995 | |
| parent | ab65ee82de3cee0452b0d696f87e19f28add5f08 (diff) | |
| download | FreeBSD-src-4d27ff91d01ec406d08089baae33529e85e9868f.zip FreeBSD-src-4d27ff91d01ec406d08089baae33529e85e9868f.tar.gz | |
Fixed dependencies (make checkdpadd).
| -rw-r--r-- | lib/librt/Makefile | 3 | ||||
| -rw-r--r-- | sbin/geom/class/part/Makefile | 1 | ||||
| -rw-r--r-- | sbin/ifconfig/Makefile | 2 | ||||
| -rw-r--r-- | sbin/ipfw/Makefile | 1 | ||||
| -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 | ||||
| -rw-r--r-- | usr.sbin/mfiutil/Makefile | 1 | ||||
| -rw-r--r-- | usr.sbin/pmcstat/Makefile | 2 |
10 files changed, 16 insertions, 9 deletions
diff --git a/lib/librt/Makefile b/lib/librt/Makefile index e2ac374..f98d94e 100644 --- a/lib/librt/Makefile +++ b/lib/librt/Makefile @@ -4,7 +4,8 @@ LIB=rt SHLIB_MAJOR= 1 CFLAGS+=-I${.CURDIR}/../libc/include -I${.CURDIR} CFLAGS+=-Winline -Wall -g -LDADD+=-lpthread +DPADD= ${LIBPTHREAD} +LDADD= -lpthread WARNS?= 2 diff --git a/sbin/geom/class/part/Makefile b/sbin/geom/class/part/Makefile index 8e7d0ff..7fe221a 100644 --- a/sbin/geom/class/part/Makefile +++ b/sbin/geom/class/part/Makefile @@ -4,6 +4,7 @@ CLASS= part +DPADD= ${LIBUTIL} LDADD= -lutil .include <bsd.lib.mk> diff --git a/sbin/ifconfig/Makefile b/sbin/ifconfig/Makefile index 8fd21ae..77491f2 100644 --- a/sbin/ifconfig/Makefile +++ b/sbin/ifconfig/Makefile @@ -28,7 +28,7 @@ SRCS+= ifgre.c # GRE keys etc SRCS+= ifgif.c # GIF reversed header workaround SRCS+= ifieee80211.c regdomain.c # SIOC[GS]IEEE80211 support -DPADD+= ${LIBBSDXML} ${LIBSBUF} ${LIBJAIL} +DPADD+= ${LIBBSDXML} ${LIBJAIL} ${LIBSBUF} LDADD+= -lbsdxml -ljail -lsbuf SRCS+= ifcarp.c # SIOC[GS]VH support diff --git a/sbin/ipfw/Makefile b/sbin/ipfw/Makefile index c09ebca..b25f38c 100644 --- a/sbin/ipfw/Makefile +++ b/sbin/ipfw/Makefile @@ -3,6 +3,7 @@ PROG= ipfw SRCS= ipfw2.c dummynet.c ipv6.c main.c nat.c altq.c WARNS?= 2 +DPADD= ${LIBUTIL} LDADD= -lutil MAN= ipfw.8 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}\" diff --git a/usr.sbin/mfiutil/Makefile b/usr.sbin/mfiutil/Makefile index 03ded03..dbf158d 100644 --- a/usr.sbin/mfiutil/Makefile +++ b/usr.sbin/mfiutil/Makefile @@ -8,6 +8,7 @@ MAN8= mfiutil.8 CFLAGS+= -fno-builtin-strftime WARNS?=3 +DPADD= ${LIBUTIL} LDADD= -lutil # Here be dragons diff --git a/usr.sbin/pmcstat/Makefile b/usr.sbin/pmcstat/Makefile index a29b016..c27e56d 100644 --- a/usr.sbin/pmcstat/Makefile +++ b/usr.sbin/pmcstat/Makefile @@ -5,7 +5,7 @@ PROG= pmcstat MAN= pmcstat.8 -DPADD= ${LIBELF} ${LIBKVM} ${LIBPMC} ${LIBM} +DPADD= ${LIBELF} ${LIBKVM} ${LIBPMC} ${LIBM} ${LIBNCURSES} LDADD= -lelf -lkvm -lpmc -lm -lncurses SRCS= pmcstat.c pmcstat.h pmcstat_log.c \ |
