Use `foo/bar.a' instead of `-Lfoo -lbar' for linking to static internal

libraries, so that `ld -f' in can create correct dependencies for
yet-to-be-built libraries.

6 files changed, 28 insertions, 47 deletions

diff --git a/usr.sbin/pcvt/kcon/Makefile b/usr.sbin/pcvt/kcon/Makefile
index 5b58298..77a9f26 100644
--- a/usr.sbin/pcvt/kcon/Makefile
+++ b/usr.sbin/pcvt/kcon/Makefile
@@ -3,15 +3,12 @@ DEVICE=		/dev/ttyv0
 CFLAGS+= 	-I${.CURDIR}/../keycap -DKEYB_DEVICE=\"${DEVICE}\"
 
 .if exists(${.OBJDIR}/../keycap)
-LIBDESTDIR=	${.OBJDIR}/../keycap
+LIBKEYCAP=	${.OBJDIR}/../keycap/libkeycap.a
 .else
-LIBDESTDIR=	${.CURDIR}/../keycap
+LIBKEYCAP=	${.CURDIR}/../keycap/libkeycap.a
 .endif
 
-# the -Lfoo could be omitted if libkeycap.a were installed before
-# making those programs here
-
-DPADD =       ${LIBDESTDIR}/libkeycap.a
-LDADD =       -L${LIBDESTDIR} -lkeycap
+DPADD=		${LIBKEYCAP}
+LDADD=		${LIBKEYCAP}
 
 .include <bsd.prog.mk>
diff --git a/usr.sbin/pkg_install/Makefile.inc b/usr.sbin/pkg_install/Makefile.inc
index 50332c0..73ab2a3 100644
--- a/usr.sbin/pkg_install/Makefile.inc
+++ b/usr.sbin/pkg_install/Makefile.inc
@@ -1,2 +1,10 @@
+#	$Id$
+
+.if exists(${.OBJDIR}/../lib)
+LIBINSTALL=	${.OBJDIR}/../lib/libinstall.a
+.else
+LIBINSTALL=	${.CURDIR}/../lib/libinstall.a
+.endif
+
 # Inherit BINDIR from one level up.
 .include "../Makefile.inc"
diff --git a/usr.sbin/pkg_install/add/Makefile b/usr.sbin/pkg_install/add/Makefile
index 83a022e..749285d 100644
--- a/usr.sbin/pkg_install/add/Makefile
+++ b/usr.sbin/pkg_install/add/Makefile
@@ -1,17 +1,11 @@
+#	$Id$
+
 PROG= pkg_add
 
 CFLAGS+=	${DEBUG} -I${.CURDIR}/../lib
 
-.if exists(${.OBJDIR}/../lib)
-LDADD+=		-L${.OBJDIR}/../lib -linstall
-DPADD+=		${.OBJDIR}/../lib/libinstall.a
-.else
-LDADD+=		-L${.CURDIR}/../lib -linstall
-DPADD+=		${.CURDIR}/../lib/libinstall.a
-.endif
-
-LDADD+=		-lftpio -lmd
-DPADD+=		${LIBFTPIO} ${LIBMD}
+DPADD=	${LIBINSTALL} ${LIBFTPIO} ${LIBMD}
+LDADD=	${LIBINSTALL} -lftpio -lmd
 
 SRCS= main.c perform.c futil.c extract.c
 
diff --git a/usr.sbin/pkg_install/create/Makefile b/usr.sbin/pkg_install/create/Makefile
index 01048ac..d347d8e 100644
--- a/usr.sbin/pkg_install/create/Makefile
+++ b/usr.sbin/pkg_install/create/Makefile
@@ -1,17 +1,11 @@
+#	$Id$
+
 PROG= pkg_create
 
 CFLAGS+=	${DEBUG} -I${.CURDIR}/../lib
 
-.if exists(${.OBJDIR}/../lib)
-LDADD+=		-L${.OBJDIR}/../lib -linstall
-DPADD+=		${.OBJDIR}/../lib/libinstall.a
-.else
-LDADD+=		-L${.CURDIR}/../lib -linstall
-DPADD+=		${.CURDIR}/../lib/libinstall.a
-.endif
-
-LDADD+=         -lftpio -lmd
-DPADD+=         ${LIBFTPIO} ${LIBMD}
+DPADD=	${LIBINSTALL} ${LIBFTPIO} ${LIBMD}
+LDADD=	${LIBINSTALL} -lftpio -lmd
 
 SRCS= main.c perform.c pl.c
 
diff --git a/usr.sbin/pkg_install/delete/Makefile b/usr.sbin/pkg_install/delete/Makefile
index 20a5717..15b8f56 100644
--- a/usr.sbin/pkg_install/delete/Makefile
+++ b/usr.sbin/pkg_install/delete/Makefile
@@ -1,16 +1,10 @@
+#	$Id$
+
 PROG= pkg_delete
 CFLAGS+=	${DEBUG} -I${.CURDIR}/../lib
 
-.if exists(${.OBJDIR}/../lib)
-LDADD+=		-L${.OBJDIR}/../lib -linstall
-DPADD+=		${.OBJDIR}/../lib/libinstall.a
-.else
-LDADD+=		-L${.CURDIR}/../lib -linstall
-DPADD+=		${.CURDIR}/../lib/libinstall.a
-.endif
-
-LDADD+=         -lftpio -lmd
-DPADD+=         ${LIBFTPIO} ${LIBMD}
+DPADD=	${LIBINSTALL} ${LIBFTPIO} ${LIBMD}
+LDADD=	${LIBINSTALL} -lftpio -lmd
 
 SRCS= main.c perform.c
 
diff --git a/usr.sbin/pkg_install/info/Makefile b/usr.sbin/pkg_install/info/Makefile
index 29f98d2..e071687 100644
--- a/usr.sbin/pkg_install/info/Makefile
+++ b/usr.sbin/pkg_install/info/Makefile
@@ -1,16 +1,10 @@
+#	$Id$
+
 PROG= pkg_info
 CFLAGS+=	${DEBUG} -I${.CURDIR}/../lib
 
-.if exists(${.OBJDIR}/../lib)
-LDADD+=		-L${.OBJDIR}/../lib -linstall
-DPADD+=		${.OBJDIR}/../lib/libinstall.a
-.else
-LDADD+=		-L${.CURDIR}/../lib -linstall
-DPADD+=		${.CURDIR}/../lib/libinstall.a
-.endif
-
-LDADD+=         -lftpio -lmd
-DPADD+=         ${LIBFTPIO} ${LIBMD}
+DPADD=	${LIBINSTALL} ${LIBFTPIO} ${LIBMD}
+LDADD=	${LIBINSTALL} -lftpio -lmd
 
 SRCS= main.c perform.c show.c