Author: ru
Date: Thu Feb 25 20:24:19 2010
New Revision: 204329
URL: http://svn.freebsd.org/changeset/base/204329
Log:
Fixed dependencies (make checkdpadd).
Modified:
head/lib/librt/Makefile
head/sbin/geom/class/part/Makefile
head/sbin/ifconfig/Makefile
head/sbin/ipfw/Makefile
head/usr.bin/cpio/Makefile
head/usr.bin/gcore/Makefile
head/usr.bin/systat/Makefile
head/usr.bin/tar/Makefile
head/usr.sbin/mfiutil/Makefile
head/usr.sbin/pmcstat/Makefile
Modified: head/lib/librt/Makefile
==============================================================================
--- head/lib/librt/Makefile Thu Feb 25 19:47:47 2010 (r204328)
+++ head/lib/librt/Makefile Thu Feb 25 20:24:19 2010 (r204329)
@@ -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
Modified: head/sbin/geom/class/part/Makefile
==============================================================================
--- head/sbin/geom/class/part/Makefile Thu Feb 25 19:47:47 2010
(r204328)
+++ head/sbin/geom/class/part/Makefile Thu Feb 25 20:24:19 2010
(r204329)
@@ -4,6 +4,7 @@
CLASS= part
+DPADD= ${LIBUTIL}
LDADD= -lutil
.include <bsd.lib.mk>
Modified: head/sbin/ifconfig/Makefile
==============================================================================
--- head/sbin/ifconfig/Makefile Thu Feb 25 19:47:47 2010 (r204328)
+++ head/sbin/ifconfig/Makefile Thu Feb 25 20:24:19 2010 (r204329)
@@ -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
Modified: head/sbin/ipfw/Makefile
==============================================================================
--- head/sbin/ipfw/Makefile Thu Feb 25 19:47:47 2010 (r204328)
+++ head/sbin/ipfw/Makefile Thu Feb 25 20:24:19 2010 (r204329)
@@ -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
Modified: head/usr.bin/cpio/Makefile
==============================================================================
--- head/usr.bin/cpio/Makefile Thu Feb 25 19:47:47 2010 (r204328)
+++ head/usr.bin/cpio/Makefile Thu Feb 25 20:24:19 2010 (r204329)
@@ -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_fr
# 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
Modified: head/usr.bin/gcore/Makefile
==============================================================================
--- head/usr.bin/gcore/Makefile Thu Feb 25 19:47:47 2010 (r204328)
+++ head/usr.bin/gcore/Makefile Thu Feb 25 20:24:19 2010 (r204329)
@@ -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
Modified: head/usr.bin/systat/Makefile
==============================================================================
--- head/usr.bin/systat/Makefile Thu Feb 25 19:47:47 2010
(r204328)
+++ head/usr.bin/systat/Makefile Thu Feb 25 20:24:19 2010
(r204329)
@@ -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>
Modified: head/usr.bin/tar/Makefile
==============================================================================
--- head/usr.bin/tar/Makefile Thu Feb 25 19:47:47 2010 (r204328)
+++ head/usr.bin/tar/Makefile Thu Feb 25 20:24:19 2010 (r204329)
@@ -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}\"
Modified: head/usr.sbin/mfiutil/Makefile
==============================================================================
--- head/usr.sbin/mfiutil/Makefile Thu Feb 25 19:47:47 2010
(r204328)
+++ head/usr.sbin/mfiutil/Makefile Thu Feb 25 20:24:19 2010
(r204329)
@@ -8,6 +8,7 @@ MAN8= mfiutil.8
CFLAGS+= -fno-builtin-strftime
WARNS?=3
+DPADD= ${LIBUTIL}
LDADD= -lutil
# Here be dragons
Modified: head/usr.sbin/pmcstat/Makefile
==============================================================================
--- head/usr.sbin/pmcstat/Makefile Thu Feb 25 19:47:47 2010
(r204328)
+++ head/usr.sbin/pmcstat/Makefile Thu Feb 25 20:24:19 2010
(r204329)
@@ -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 \
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
