sanchayanmaity/minix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Correct a few library dependency tracking mistakes

Browse source 
Change-Id: I3d509db3946ca6c284be64c92c4cec313cc4ca1b
This commit is contained in:
David van Moolenbroek 2014-07-10 12:18:11 +02:00 committed by Lionel Sambuc
parent a8492e9397
commit 87d31b0645
6 changed files with 22 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/i2c/Makefile
View file

@ -6,7 +6,7 @@ PROG= i2c
SRCS+= i2c.c SRCS+= i2c.c
DPADD+= ${LIBCHARDRIVER} ${LIBSYS} ${LIBTIMERS} ${CLKCONF} DPADD+= ${LIBCHARDRIVER} ${LIBSYS} ${LIBTIMERS} ${LIBCLKCONF}
LDADD+= -lchardriver -lsys -ltimers -lclkconf LDADD+= -lchardriver -lsys -ltimers -lclkconf
MAN= MAN=

2
drivers/random/Makefile
View file

@ -4,7 +4,7 @@ SRCS= main.c random.c rijndael_api.c rijndael_alg.c
.PATH: ${.CURDIR}/aes .PATH: ${.CURDIR}/aes
DPADD+= ${LIBCHARDRIVER} ${LIBSYS} ${LIBMINIXUTIL} DPADD+= ${LIBCHARDRIVER} ${LIBSYS}
LDADD+= -lchardriver -lsys LDADD+= -lchardriver -lsys
MAN= MAN=

2
drivers/readclock/arch/earm/Makefile.inc
View file

@ -6,5 +6,5 @@ HERE=${.CURDIR}/arch/${MACHINE_ARCH}
SRCS += arch_readclock.c omap_rtc.c omap_rtc.h SRCS += arch_readclock.c omap_rtc.c omap_rtc.h
DPADD+= ${CLKCONF} DPADD+= ${LIBCLKCONF}
LDADD+= -lclkconf LDADD+= -lclkconf

2
drivers/tps65217/Makefile
View file

@ -2,7 +2,7 @@
PROG= tps65217 PROG= tps65217
SRCS= tps65217.c SRCS= tps65217.c
DPADD+= ${LIBI2CDRIVER} ${CLKCONF} ${LIBSYS} ${LIBTIMERS} DPADD+= ${LIBI2CDRIVER} ${LIBCLKCONF} ${LIBSYS} ${LIBTIMERS}
LDADD+= -li2cdriver -lclkconf -lsys -ltimers LDADD+= -li2cdriver -lclkconf -lsys -ltimers
MAN= MAN=

2
servers/inet/Makefile
View file

@ -14,7 +14,7 @@ SRCS= buf.c clock.c inet.c inet_config.c \
WARNS= WARNS=
DPADD+= ${LIBCHARDRIVER} ${LIBSYS} ${LIBMINIXUTIL} DPADD+= ${LIBCHARDRIVER} ${LIBSYS}
LDADD+= -lchardriver -lsys LDADD+= -lchardriver -lsys
LDADD+= -lc LDADD+= -lc

20
share/mk/bsd.prog.mk
View file

@ -215,18 +215,32 @@ LIB${_lib:tu}= ${DESTDIR}/usr/lib/lib${_lib:S/xx/++/:S/atf_c/atf-c/}.a
bdev \ bdev \
blockdriver \ blockdriver \
chardriver \ chardriver \
clkconf \
compat_minix \
ddekit \
ddekit_usb_client \
ddekit_usb_server \
devman \
elf \ elf \
exec \ exec \
ddekit \ gpio \
devman \ hgfs \
i2cdriver \
inputdriver \
lwip \
minc \ minc \
minixfs \
minlib \ minlib \
mthread \ mthread \
netdriver \ netdriver \
netsock \
sffs \ sffs \
sys \ sys \
timers \ timers \
usb usb \
vboxfs \
virtio \
vtreefs
.ifndef LIB${_lib:tu} .ifndef LIB${_lib:tu}
LIB${_lib:tu}= ${DESTDIR}/usr/lib/lib${_lib:S/xx/++/:S/atf_c/atf-c/}.a 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 .MADE: ${LIB${_lib:tu}} # Note: ${DESTDIR} will be expanded