Fixed DPADD.

9 files changed, 29 insertions, 18 deletions

diff --git a/usr.sbin/pcvt/kcon/Makefile b/usr.sbin/pcvt/kcon/Makefile
index dee4f45..5b58298 100644
--- a/usr.sbin/pcvt/kcon/Makefile
+++ b/usr.sbin/pcvt/kcon/Makefile
@@ -2,9 +2,16 @@ PROG=		kcon
 DEVICE=		/dev/ttyv0
 CFLAGS+= 	-I${.CURDIR}/../keycap -DKEYB_DEVICE=\"${DEVICE}\"
 
+.if exists(${.OBJDIR}/../keycap)
+LIBDESTDIR=	${.OBJDIR}/../keycap
+.else
+LIBDESTDIR=	${.CURDIR}/../keycap
+.endif
+
 # the -Lfoo could be omitted if libkeycap.a were installed before
 # making those programs here
 
-LDADD =       -L${.CURDIR}/../keycap -L${.OBJDIR}/../keycap -lkeycap
+DPADD =       ${LIBDESTDIR}/libkeycap.a
+LDADD =       -L${LIBDESTDIR} -lkeycap
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/rpc.yppasswdd/Makefile b/usr.sbin/rpc.yppasswdd/Makefile
index 8a106cf..5da11ca 100644
--- a/usr.sbin/rpc.yppasswdd/Makefile
+++ b/usr.sbin/rpc.yppasswdd/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.3 1996/06/05 06:13:02 wpaul Exp $
+# $Id: Makefile,v 1.4 1996/06/06 20:47:53 wpaul Exp $
 
 PROG=	rpc.yppasswdd
 SRCS=	pw_copy.c pw_util.c util.c yppasswd_svc.c yp_error.c ypxfr_misc.c \
@@ -16,7 +16,8 @@ CFLAGS+= -I${.CURDIR}/../../usr.sbin/vipw -I${.CURDIR}/../../usr.sbin/ypserv \
 	 -I${.CURDIR}/../../libexec/ypxfr -I${.CURDIR}/../../usr.bin/chpass \
 	 -I${.CURDIR} -I.
 
-LDADD+=-lrpcsvc -lcrypt
+DPADD=	${LIBRPCSVC} ${LIBCRYPT}
+LDADD=	-lrpcsvc -lcrypt
 
 CLEANFILES= yppasswd_svc.c yppasswd.h \
 	    yppasswd_private_xdr.c yppasswd_private.h \
diff --git a/usr.sbin/rpc.ypxfrd/Makefile b/usr.sbin/rpc.ypxfrd/Makefile
index 627f23f..7a56a82 100644
--- a/usr.sbin/rpc.ypxfrd/Makefile
+++ b/usr.sbin/rpc.ypxfrd/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.1.1.1 1996/06/05 04:36:54 wpaul Exp $
+# $Id: Makefile,v 1.2 1996/06/06 03:59:22 wpaul Exp $
 
 PROG=	rpc.ypxfrd
 SRCS=	ypxfrd_svc.c ypxfrd_server.c yp_error.c \
@@ -12,7 +12,8 @@ MAN8=	rpc.ypxfrd.8
 
 CFLAGS+= -I. -DXFRBLOCKSIZE=65535
 
-LDADD+=-lrpcsvc
+DPADD=	${LIBRPCSVC}
+LDADD=	-lrpcsvc
 
 CLEANFILES= ypxfrd_svc.c ypxfrd.h
 
diff --git a/usr.sbin/slstat/Makefile b/usr.sbin/slstat/Makefile
index 406d370..6cabf1e 100644
--- a/usr.sbin/slstat/Makefile
+++ b/usr.sbin/slstat/Makefile
@@ -1,9 +1,9 @@
 #	from: @(#)Makefile	5.6 (Berkeley) 4/23/91
-#	$Id: Makefile,v 1.1.1.1 1994/06/17 06:42:36 rich Exp $
+#	$Id: Makefile,v 1.2 1994/10/17 06:05:31 davidg Exp $
 
 PROG=	slstat
 MAN8=	slstat.8
-DPADD=	${LIBUTIL}
+DPADD=	${LIBKVM}
 LDADD=	-lkvm
 BINGRP=	kmem
 BINMODE=2555
diff --git a/usr.sbin/spray/Makefile b/usr.sbin/spray/Makefile
index 5ecd1c5..a46a58af 100644
--- a/usr.sbin/spray/Makefile
+++ b/usr.sbin/spray/Makefile
@@ -1,7 +1,8 @@
-#	$Id: Makefile,v 1.2 1995/07/11 01:18:05 jtc Exp $
+#	$Id: Makefile,v 1.1.1.1 1996/01/05 09:09:30 graichen Exp $
 
 PROG=	spray
 MAN8=	spray.8
+DPADD=	${LIBRPCSVC}
 LDADD=	-lrpcsvc
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/sup/sup/Makefile b/usr.sbin/sup/sup/Makefile
index 7deb8d2..4a372ce 100644
--- a/usr.sbin/sup/sup/Makefile
+++ b/usr.sbin/sup/sup/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.3 1995/12/26 22:39:27 peter Exp $
+# $Id: Makefile,v 1.4 1996/06/24 04:25:57 jkh Exp $
 
 PROG=	sup
 SRCS=	supcmain.c supcvers.c supcparse.c supcname.c supcmisc.c supcmeat.c
@@ -13,7 +13,7 @@ LIBOBJ=	${.OBJDIR}/../lib
 LIBOBJ=	${LIBSRC}
 .endif
 
-DPADD+=	$(LIBCRYPT) $(LIBOBJ)/libsup.a
-LDADD+= -L${LIBOBJ} -lsup -lcrypt
+DPADD=	$(LIBCRYPT) $(LIBOBJ)/libsup.a ${LIBCRYPT}
+LDADD=	-L${LIBOBJ} -lsup -lcrypt
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/sup/supfilesrv/Makefile b/usr.sbin/sup/supfilesrv/Makefile
index c2a1c88..52ac4bd 100644
--- a/usr.sbin/sup/supfilesrv/Makefile
+++ b/usr.sbin/sup/supfilesrv/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.3 1996/02/06 19:04:41 pst Exp $
+# $Id: Makefile,v 1.4 1996/06/24 04:25:59 jkh Exp $
 
 PROG=	supfilesrv
 SRCS=	supfilesrv.c
@@ -15,7 +15,7 @@ LIBOBJ=	${.OBJDIR}/../lib
 LIBOBJ=	${LIBSRC}
 .endif
 
-DPADD+=	$(LIBCRYPT) $(LIBOBJ)/libsup.a $(LIBUTIL)
-LDADD+= -L${LIBOBJ} -lsup -lcrypt -lutil
+DPADD=	$(LIBOBJ)/libsup.a $(LIBCRYPT) $(LIBUTIL)
+LDADD=	-L${LIBOBJ} -lsup -lcrypt -lutil
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/sup/supscan/Makefile b/usr.sbin/sup/supscan/Makefile
index f96d732..7c2a6aa 100644
--- a/usr.sbin/sup/supscan/Makefile
+++ b/usr.sbin/sup/supscan/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.1 1995/12/26 05:15:20 peter Exp $
+# $Id: Makefile,v 1.2 1996/06/24 04:26:03 jkh Exp $
 
 PROG=	supscan
 SRCS=	supscan.c
@@ -14,7 +14,7 @@ LIBOBJ=	${.OBJDIR}/../lib
 LIBOBJ=	${LIBSRC}
 .endif
 
-DPADD+=	$(LIBCRYPT) $(LIBOBJ)/libsup.a
-LDADD+= -L${LIBOBJ} -lsup -lcrypt
+DPADD=	$(LIBCRYPT) $(LIBOBJ)/libsup.a ${LIBCRYPT}
+LDADD=	-L${LIBOBJ} -lsup -lcrypt
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/xntpd/xntpd/Makefile b/usr.sbin/xntpd/xntpd/Makefile
index a1de730..cb62927 100644
--- a/usr.sbin/xntpd/xntpd/Makefile
+++ b/usr.sbin/xntpd/xntpd/Makefile
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile,v 1.7 1994/10/03 23:51:32 phk Exp $
+# $Id: Makefile,v 1.8 1996/06/24 04:26:19 jkh Exp $
 #
 
 CFLAGS+= -I${.CURDIR}/../include
@@ -21,6 +21,7 @@ DPADD+= ${.CURDIR}/../parse/libparse.a
 .endif
 
 LDADD+= -lntp -lparse -lkvm
+DPADD+= ${LIBKVM}
 
 PROG= xntpd
 MAN8= ${.CURDIR}/../doc/xntpd.8