rename -lutil to -lminixutil
. in preparation for netbsd -lutil
This commit is contained in:
parent
ed651fafef
commit
989934b37c
18 changed files with 19 additions and 19 deletions
|
@ -3,7 +3,7 @@
|
||||||
|
|
||||||
PROG= cut
|
PROG= cut
|
||||||
|
|
||||||
LDADD+= -lutil
|
LDADD+= -lminixutil
|
||||||
DPADD+= ${LIBUTIL}
|
DPADD+= ${LIBMINIXUTIL}
|
||||||
|
|
||||||
.include <bsd.prog.mk>
|
.include <bsd.prog.mk>
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
PROG= find
|
PROG= find
|
||||||
SRCS= find.c function.c ls.c main.c misc.c operator.c option.c
|
SRCS= find.c function.c ls.c main.c misc.c operator.c option.c
|
||||||
|
|
||||||
LDADD+=-lutil
|
LDADD+=-lminixutil
|
||||||
DPADD+=${LIBUTIL}
|
DPADD+=${LIBMINIXUTIL}
|
||||||
|
|
||||||
.include <bsd.prog.mk>
|
.include <bsd.prog.mk>
|
||||||
|
|
|
@ -6,8 +6,8 @@ SRCS= conv.c display.c hexdump.c hexsyntax.c odsyntax.c parse.c
|
||||||
MAN= hexdump.1 #od.1
|
MAN= hexdump.1 #od.1
|
||||||
|
|
||||||
.ifndef HOSTPROG
|
.ifndef HOSTPROG
|
||||||
LDADD+=-lutil
|
LDADD+=-lminixutil
|
||||||
DPADD+=${LIBUTIL}
|
DPADD+=${LIBMINIXUTIL}
|
||||||
|
|
||||||
#LINKS= ${BINDIR}/hexdump ${BINDIR}/od
|
#LINKS= ${BINDIR}/hexdump ${BINDIR}/od
|
||||||
.endif
|
.endif
|
||||||
|
|
|
@ -5,8 +5,8 @@ PROG= man
|
||||||
SRCS= man.c manconf.c
|
SRCS= man.c manconf.c
|
||||||
MAN= man.1 man.conf.5
|
MAN= man.1 man.conf.5
|
||||||
|
|
||||||
DPADD+= ${LIBUTIL}
|
DPADD+= ${LIBMINIXUTIL}
|
||||||
LDADD+= -lutil
|
LDADD+= -lminixutil
|
||||||
|
|
||||||
FILES=man.conf
|
FILES=man.conf
|
||||||
FILESDIR=/etc
|
FILESDIR=/etc
|
||||||
|
|
|
@ -4,8 +4,8 @@ SRCS= main.c random.c rijndael_api.c rijndael_alg.c
|
||||||
|
|
||||||
.PATH: ${.CURDIR}/aes
|
.PATH: ${.CURDIR}/aes
|
||||||
|
|
||||||
DPADD+= ${LIBDRIVER} ${LIBSYS} ${LIBUTIL}
|
DPADD+= ${LIBDRIVER} ${LIBSYS} ${LIBMINIXUTIL}
|
||||||
LDADD+= -ldriver -lsys -lutil
|
LDADD+= -ldriver -lsys -lminixutil
|
||||||
|
|
||||||
MAN=
|
MAN=
|
||||||
|
|
||||||
|
|
|
@ -15,7 +15,7 @@ LIBMINLIB_DIR?=
|
||||||
LIBASYN_DIR?=
|
LIBASYN_DIR?=
|
||||||
|
|
||||||
SUBDIR= csu ${LIBCOMPAT_DIR} ${LIBC_DIR} libdriver libnetdriver \
|
SUBDIR= csu ${LIBCOMPAT_DIR} ${LIBC_DIR} libdriver libnetdriver \
|
||||||
libedit ${LIBM_DIR} libsys libtimers libutil libbz2 libl libhgfs \
|
libedit ${LIBM_DIR} libsys libtimers libminixutil libbz2 libl libhgfs \
|
||||||
libz libfetch libarchive libvtreefs libaudiodriver libmthread \
|
libz libfetch libarchive libvtreefs libaudiodriver libmthread \
|
||||||
libexec libdevman libusb ${LIBMINLIB_DIR} ${LIBASYN_DIR} \
|
libexec libdevman libusb ${LIBMINLIB_DIR} ${LIBASYN_DIR} \
|
||||||
libddekit
|
libddekit
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
# Makefile for libutil
|
# Makefile for libminixutil
|
||||||
|
|
||||||
LIB= util
|
LIB= minixutil
|
||||||
|
|
||||||
.if (${NBSD_LIBC} != "no")
|
.if (${NBSD_LIBC} != "no")
|
||||||
# SHA and MD5 functions already in libc
|
# SHA and MD5 functions already in libc
|
|
@ -12,8 +12,8 @@ SRCS= buf.c clock.c inet.c inet_config.c \
|
||||||
|
|
||||||
.PATH: ${.CURDIR}/generic
|
.PATH: ${.CURDIR}/generic
|
||||||
|
|
||||||
DPADD+= ${LIBDRIVER} ${LIBSYS} ${LIBUTIL}
|
DPADD+= ${LIBDRIVER} ${LIBSYS} ${LIBMINIXUTIL}
|
||||||
LDADD+= -ldriver -lsys -lutil
|
LDADD+= -ldriver -lsys -lminixutil
|
||||||
|
|
||||||
MAN=
|
MAN=
|
||||||
|
|
||||||
|
|
|
@ -11,8 +11,8 @@ SRCS= lwip.c \
|
||||||
|
|
||||||
.PATH: ${.CURDIR}/generic
|
.PATH: ${.CURDIR}/generic
|
||||||
|
|
||||||
DPADD+= ${LIBDRIVER} ${LIBSYS} ${LIBUTIL}
|
DPADD+= ${LIBDRIVER} ${LIBSYS} ${LIBMINIXUTIL}
|
||||||
LDADD+= -ldriver -lsys -lutil -ltimers -llwip
|
LDADD+= -ldriver -lsys -lminixutil -ltimers -llwip
|
||||||
|
|
||||||
MAN=
|
MAN=
|
||||||
|
|
||||||
|
|
|
@ -16,8 +16,8 @@ SRCS+= ohash_create_entry.c ohash_delete.c ohash_do.c ohash_entries.c \
|
||||||
ohash_qlookupi.c strtonum.c
|
ohash_qlookupi.c strtonum.c
|
||||||
YHEADER=1
|
YHEADER=1
|
||||||
.if (${HOSTPROG:U} == "")
|
.if (${HOSTPROG:U} == "")
|
||||||
DPADD+= ${LIBUTIL} ${LIBL}
|
DPADD+= ${LIBMINIXUTIL} ${LIBL}
|
||||||
LDADD+= -lutil -ll
|
LDADD+= -lminixutil -ll
|
||||||
.endif
|
.endif
|
||||||
|
|
||||||
tokenizer.o: parser.h
|
tokenizer.o: parser.h
|
||||||
|
|
Loading…
Reference in a new issue