Correct a few library dependency tracking mistakes

Change-Id: I3d509db3946ca6c284be64c92c4cec313cc4ca1b

diff --git a/drivers/i2c/Makefile b/drivers/i2c/Makefile
index e2892804d5611a7a9bb307ee174a394d3b2e38ca..801f981552622c2bafec297d668efa125dce619c 100644 (file)
--- 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 050cf87bb98007492ff4acff094afcc95670f2df..e993c121adc951146a9e420856da77e9d5f1bce2 100644 (file)
--- 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 24df8bed84eb16b35e65a003c91c28d5dd81d0e7..909a63b6e77f03894906025cfbc410bc301fa6d7 100644 (file)
--- 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 a884550bef4120fc0d4a419df69378b8ef58ed7a..fea029de5f69fc2f0f8cfb84e70eb447bbbfad9a 100644 (file)
--- 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 c80bab993d8818c8e10d75a1b2c08884083bd256..cc04b0eee5143c9115a7040eeb8e8fc6c3eb3a29 100644 (file)
--- 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 dc41895dbdc4bf94ac61aa64d5aa6f0754251b08..557d5a203db495d2d996f55d1eefc22d5a215abf 100644 (file)
--- 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 \
-       elf \
-       exec \
+       clkconf \
+       compat_minix \
        ddekit \
+       ddekit_usb_client \
+       ddekit_usb_server \
        devman \
+       elf \
+       exec \
+       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