From 87d31b06452ca22164fcf4aafdc96fe49f450754 Mon Sep 17 00:00:00 2001
From: David van Moolenbroek <david@minix3.org>
Date: Thu, 10 Jul 2014 12:18:11 +0200
Subject: [PATCH] Correct a few library dependency tracking mistakes

Change-Id: I3d509db3946ca6c284be64c92c4cec313cc4ca1b
---
 drivers/i2c/Makefile                     |  2 +-
 drivers/random/Makefile                  |  2 +-
 drivers/readclock/arch/earm/Makefile.inc |  2 +-
 drivers/tps65217/Makefile                |  2 +-
 servers/inet/Makefile                    |  2 +-
 share/mk/bsd.prog.mk                     | 20 +++++++++++++++++---
 6 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/drivers/i2c/Makefile b/drivers/i2c/Makefile
index e2892804d..801f98155 100644
--- a/drivers/i2c/Makefile
+++ b/drivers/i2c/Makefile
@@ -6,7 +6,7 @@ PROG=   i2c
 
 SRCS+=   i2c.c
 
-DPADD+= ${LIBCHARDRIVER} ${LIBSYS} ${LIBTIMERS} ${CLKCONF}
+DPADD+= ${LIBCHARDRIVER} ${LIBSYS} ${LIBTIMERS} ${LIBCLKCONF}
 LDADD+= -lchardriver -lsys -ltimers -lclkconf
 
 MAN=
diff --git a/drivers/random/Makefile b/drivers/random/Makefile
index 050cf87bb..e993c121a 100644
--- a/drivers/random/Makefile
+++ b/drivers/random/Makefile
@@ -4,7 +4,7 @@ SRCS=	main.c random.c rijndael_api.c rijndael_alg.c
 
 .PATH:	${.CURDIR}/aes
 
-DPADD+=	${LIBCHARDRIVER} ${LIBSYS} ${LIBMINIXUTIL}
+DPADD+=	${LIBCHARDRIVER} ${LIBSYS}
 LDADD+=	-lchardriver -lsys 
 
 MAN=
diff --git a/drivers/readclock/arch/earm/Makefile.inc b/drivers/readclock/arch/earm/Makefile.inc
index 24df8bed8..909a63b6e 100644
--- a/drivers/readclock/arch/earm/Makefile.inc
+++ b/drivers/readclock/arch/earm/Makefile.inc
@@ -6,5 +6,5 @@ HERE=${.CURDIR}/arch/${MACHINE_ARCH}
 
 SRCS += arch_readclock.c omap_rtc.c omap_rtc.h
 
-DPADD+= ${CLKCONF}
+DPADD+= ${LIBCLKCONF}
 LDADD+= -lclkconf 
diff --git a/drivers/tps65217/Makefile b/drivers/tps65217/Makefile
index a884550be..fea029de5 100644
--- a/drivers/tps65217/Makefile
+++ b/drivers/tps65217/Makefile
@@ -2,7 +2,7 @@
 PROG=	tps65217
 SRCS=	tps65217.c
 
-DPADD+= ${LIBI2CDRIVER} ${CLKCONF} ${LIBSYS} ${LIBTIMERS}
+DPADD+= ${LIBI2CDRIVER} ${LIBCLKCONF} ${LIBSYS} ${LIBTIMERS}
 LDADD+= -li2cdriver -lclkconf -lsys -ltimers
 
 MAN=
diff --git a/servers/inet/Makefile b/servers/inet/Makefile
index c80bab993..cc04b0eee 100644
--- a/servers/inet/Makefile
+++ b/servers/inet/Makefile
@@ -14,7 +14,7 @@ SRCS=	buf.c clock.c inet.c inet_config.c \
 
 WARNS=
 
-DPADD+=	${LIBCHARDRIVER} ${LIBSYS} ${LIBMINIXUTIL}
+DPADD+=	${LIBCHARDRIVER} ${LIBSYS}
 LDADD+=	-lchardriver -lsys
 
 LDADD+= -lc
diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk
index dc41895db..557d5a203 100644
--- a/share/mk/bsd.prog.mk
+++ b/share/mk/bsd.prog.mk
@@ -215,18 +215,32 @@ LIB${_lib:tu}=	${DESTDIR}/usr/lib/lib${_lib:S/xx/++/:S/atf_c/atf-c/}.a
 	bdev \
 	blockdriver \
 	chardriver \
+	clkconf \
+	compat_minix \
+	ddekit \
+	ddekit_usb_client \
+	ddekit_usb_server \
+	devman \
 	elf \
 	exec \
-	ddekit \
-	devman \
+	gpio \
+	hgfs \
+	i2cdriver \
+	inputdriver \
+	lwip \
 	minc \
+	minixfs \
 	minlib \
 	mthread \
 	netdriver \
+	netsock \
 	sffs \
 	sys \
 	timers \
-	usb
+	usb \
+	vboxfs \
+	virtio \
+	vtreefs
 .ifndef LIB${_lib:tu}
 LIB${_lib:tu}=	${DESTDIR}/usr/lib/lib${_lib:S/xx/++/:S/atf_c/atf-c/}.a
 .MADE:		${LIB${_lib:tu}}	# Note: ${DESTDIR} will be expanded