Index: head/lib/librt/Makefile =================================================================== --- head/lib/librt/Makefile (revision 204328) +++ head/lib/librt/Makefile (revision 204329) @@ -1,19 +1,20 @@ # $FreeBSD$ LIB=rt SHLIB_MAJOR= 1 CFLAGS+=-I${.CURDIR}/../libc/include -I${.CURDIR} CFLAGS+=-Winline -Wall -g -LDADD+=-lpthread +DPADD= ${LIBPTHREAD} +LDADD= -lpthread WARNS?= 2 #MAN= libthr.3 SRCS+= aio.c mq.c sigev_thread.c timer.c PRECIOUSLIB= VERSION_MAP= ${.CURDIR}/Version.map .include Index: head/sbin/geom/class/part/Makefile =================================================================== --- head/sbin/geom/class/part/Makefile (revision 204328) +++ head/sbin/geom/class/part/Makefile (revision 204329) @@ -1,9 +1,10 @@ # $FreeBSD$ .PATH: ${.CURDIR}/../../misc CLASS= part +DPADD= ${LIBUTIL} LDADD= -lutil .include Index: head/sbin/ifconfig/Makefile =================================================================== --- head/sbin/ifconfig/Makefile (revision 204328) +++ head/sbin/ifconfig/Makefile (revision 204329) @@ -1,52 +1,52 @@ # From: @(#)Makefile 8.1 (Berkeley) 6/5/93 # $FreeBSD$ .include PROG= ifconfig SRCS= ifconfig.c # base support # # NB: The order here defines the order in which the constructors # are called. This in turn defines the default order in which # status is displayed. Probably should add a priority mechanism # to the registration process so we don't depend on this aspect # of the toolchain. # SRCS+= af_link.c # LLC support SRCS+= af_inet.c # IPv4 support SRCS+= af_inet6.c # IPv6 support SRCS+= af_atalk.c # AppleTalk support SRCS+= af_nd6.c # ND6 support SRCS+= ifclone.c # clone device support SRCS+= ifmac.c # MAC support SRCS+= ifmedia.c # SIOC[GS]IFMEDIA support SRCS+= ifvlan.c # SIOC[GS]ETVLAN support 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 SRCS+= ifgroup.c # ... SRCS+= ifpfsync.c # pfsync(4) support SRCS+= ifbridge.c # bridge support SRCS+= iflagg.c # lagg support .if ${MK_IPX_SUPPORT} != "no" && !defined(RELEASE_CRUNCH) SRCS+= af_ipx.c # IPX support DPADD+= ${LIBIPX} LDADD+= -lipx .endif MAN= ifconfig.8 CFLAGS+= -Wall -Wmissing-prototypes -Wcast-qual -Wwrite-strings -Wnested-externs WARNS?= 2 .include Index: head/sbin/ipfw/Makefile =================================================================== --- head/sbin/ipfw/Makefile (revision 204328) +++ head/sbin/ipfw/Makefile (revision 204329) @@ -1,9 +1,10 @@ # $FreeBSD$ PROG= ipfw SRCS= ipfw2.c dummynet.c ipv6.c main.c nat.c altq.c WARNS?= 2 +DPADD= ${LIBUTIL} LDADD= -lutil MAN= ipfw.8 .include Index: head/usr.bin/cpio/Makefile =================================================================== --- head/usr.bin/cpio/Makefile (revision 204328) +++ head/usr.bin/cpio/Makefile (revision 204329) @@ -1,31 +1,32 @@ # $FreeBSD$ .include 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 # FreeBSD's installer uses cpio in crunched binaries that are # 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 .if ${MK_GNU_CPIO} != "yes" SYMLINKS=bsdcpio ${BINDIR}/cpio MLINKS= bsdcpio.1 cpio.1 .endif .PHONY: check test check test: $(PROG) bsdcpio.1.gz cd ${.CURDIR}/test && make clean test .include Index: head/usr.bin/gcore/Makefile =================================================================== --- head/usr.bin/gcore/Makefile (revision 204328) +++ head/usr.bin/gcore/Makefile (revision 204329) @@ -1,10 +1,11 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 # $FreeBSD$ -LDADD+= -lutil PROG= gcore SRCS= elfcore.c gcore.c +DPADD= ${LIBUTIL} +LDADD= -lutil WARNS?= 1 .include Index: head/usr.bin/systat/Makefile =================================================================== --- head/usr.bin/systat/Makefile (revision 204328) +++ head/usr.bin/systat/Makefile (revision 204329) @@ -1,22 +1,22 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 # $FreeBSD$ .include PROG= systat SRCS= cmds.c cmdtab.c devs.c fetch.c iostat.c keyboard.c main.c \ mbufs.c netcmds.c netstat.c pigs.c swap.c icmp.c \ mode.c ip.c tcp.c \ vmstat.c convtbl.c ifcmds.c ifstat.c .if ${MK_INET6_SUPPORT} != "no" SRCS+= icmp6.c ip6.c CFLAGS+= -DINET6 .endif WARNS?= 0 -DPADD= ${LIBCURSES} ${LIBM} ${LIBDEVSTAT} ${LIBKVM} -LDADD= -lcursesw -lm -ldevstat -lkvm +DPADD= ${LIBNCURSESW} ${LIBM} ${LIBDEVSTAT} ${LIBKVM} +LDADD= -lncursesw -lm -ldevstat -lkvm .include Index: head/usr.bin/tar/Makefile =================================================================== --- head/usr.bin/tar/Makefile (revision 204328) +++ head/usr.bin/tar/Makefile (revision 204329) @@ -1,34 +1,35 @@ # $FreeBSD$ .include PROG= bsdtar BSDTAR_VERSION_STRING=2.7.0 SRCS= bsdtar.c \ cmdline.c \ err.c \ getdate.c \ line_reader.c \ matching.c \ pathmatch.c \ read.c \ subst.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}\" CFLAGS+= -DPLATFORM_CONFIG_H=\"config_freebsd.h\" CFLAGS+= -I${.CURDIR} -I${.CURDIR}/../../lib/libarchive SYMLINKS= bsdtar ${BINDIR}/tar MLINKS= bsdtar.1 tar.1 DEBUG_FLAGS=-g .PHONY: check test check test: $(PROG) bsdtar.1.gz cd ${.CURDIR}/test && make test .include Index: head/usr.sbin/mfiutil/Makefile =================================================================== --- head/usr.sbin/mfiutil/Makefile (revision 204328) +++ head/usr.sbin/mfiutil/Makefile (revision 204329) @@ -1,18 +1,19 @@ # $FreeBSD$ PROG= mfiutil SRCS= mfiutil.c mfi_cmd.c mfi_config.c mfi_drive.c mfi_evt.c mfi_flash.c \ mfi_patrol.c mfi_show.c mfi_volume.c MAN8= mfiutil.8 CFLAGS+= -fno-builtin-strftime WARNS?=3 +DPADD= ${LIBUTIL} LDADD= -lutil # Here be dragons .ifdef DEBUG CFLAGS+= -DDEBUG .endif .include Index: head/usr.sbin/pmcstat/Makefile =================================================================== --- head/usr.sbin/pmcstat/Makefile (revision 204328) +++ head/usr.sbin/pmcstat/Makefile (revision 204329) @@ -1,14 +1,14 @@ # # $FreeBSD$ # 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 \ pmcpl_callgraph.c pmcpl_gprof.c pmcpl_annotate.c pmcpl_calltree.c .include