rename -lutil to -lminixutil

  . in preparation for netbsd -lutil

diff --git a/commands/cut/Makefile b/commands/cut/Makefile
index 1aed929efa542f368c56e83674eeee89a45b7d38..100dad1d45a73c0f6ef6478e5a2aa15ac70a4bae 100644 (file)
--- a/commands/cut/Makefile
+++ b/commands/cut/Makefile
@@ -3,7 +3,7 @@
 
 PROG=  cut
 
-LDADD+=        -lutil
-DPADD+=        ${LIBUTIL}
+LDADD+=        -lminixutil
+DPADD+=        ${LIBMINIXUTIL}
 
 .include <bsd.prog.mk>

diff --git a/commands/find/Makefile b/commands/find/Makefile
index 5cbcfd73abe9dc939952924c08b9fb955cf68e9a..05093bf0638a84ec8ae6fe2a9247c6f4e6083f42 100644 (file)
--- a/commands/find/Makefile
+++ b/commands/find/Makefile
@@ -6,7 +6,7 @@
 PROG=  find
 SRCS=  find.c function.c ls.c main.c misc.c operator.c option.c
 
-LDADD+=-lutil
-DPADD+=${LIBUTIL}
+LDADD+=-lminixutil
+DPADD+=${LIBMINIXUTIL}
 
 .include <bsd.prog.mk>

diff --git a/commands/hexdump/Makefile b/commands/hexdump/Makefile
index 2eec762455ee6ad24cfd66a83223c0ea820023e7..72ddcbeac3eb1fb54813acb1d42f31a52a2e1270 100644 (file)
--- a/commands/hexdump/Makefile
+++ b/commands/hexdump/Makefile
@@ -6,8 +6,8 @@ SRCS=   conv.c display.c hexdump.c hexsyntax.c odsyntax.c parse.c
 MAN=   hexdump.1 #od.1
 
 .ifndef HOSTPROG
-LDADD+=-lutil
-DPADD+=${LIBUTIL}
+LDADD+=-lminixutil
+DPADD+=${LIBMINIXUTIL}
 
 #LINKS=        ${BINDIR}/hexdump ${BINDIR}/od
 .endif

diff --git a/commands/man/Makefile b/commands/man/Makefile
index 4f6c305ed663699a98483c1e49bc9d33ae198bcd..797d24bd4982fd97184eadd431642f71e09596c7 100644 (file)
--- a/commands/man/Makefile
+++ b/commands/man/Makefile
@@ -5,8 +5,8 @@ PROG=   man
 SRCS=  man.c manconf.c
 MAN=   man.1 man.conf.5
 
-DPADD+=        ${LIBUTIL}
-LDADD+=        -lutil
+DPADD+=        ${LIBMINIXUTIL}
+LDADD+=        -lminixutil
 
 FILES=man.conf
 FILESDIR=/etc

diff --git a/drivers/random/Makefile b/drivers/random/Makefile
index 2e465979f6911e1fcaa75357923bba065911181c..9c8e14e25d5410553244f6259fb99383638a3d98 100644 (file)
--- a/drivers/random/Makefile
+++ b/drivers/random/Makefile
@@ -4,8 +4,8 @@ SRCS=   main.c random.c rijndael_api.c rijndael_alg.c
 
 .PATH: ${.CURDIR}/aes
 
-DPADD+=        ${LIBDRIVER} ${LIBSYS} ${LIBUTIL}
-LDADD+=        -ldriver -lsys -lutil
+DPADD+=        ${LIBDRIVER} ${LIBSYS} ${LIBMINIXUTIL}
+LDADD+=        -ldriver -lsys -lminixutil
 
 MAN=
 

diff --git a/lib/Makefile b/lib/Makefile
index 7b884d597ea98e32b11c641d7403170ea6a739f5..1009b1fa57a990c1b6e95b09975415bdf96f8c24 100644 (file)
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -15,7 +15,7 @@ LIBMINLIB_DIR?=
 LIBASYN_DIR?=
 
 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     \
        libexec libdevman libusb ${LIBMINLIB_DIR} ${LIBASYN_DIR}          \
        libddekit

diff --git a/lib/libutil/Makefile b/lib/libminixutil/Makefile
similarity index 82%
rename from lib/libutil/Makefile
rename to lib/libminixutil/Makefile
index 063f809407ddffc46ca5df38bce2181a462bde96..e1792806d017ac67216af20cffccb5fe7fa672aa 100644 (file)
--- a/lib/libutil/Makefile
+++ b/lib/libminixutil/Makefile
@@ -1,6 +1,6 @@
-# Makefile for libutil
+# Makefile for libminixutil
 
-LIB=   util
+LIB=   minixutil
 
 .if (${NBSD_LIBC} != "no")
 # SHA and MD5 functions already in libc

diff --git a/lib/libutil/efun.c b/lib/libminixutil/efun.c
similarity index 100%
rename from lib/libutil/efun.c
rename to lib/libminixutil/efun.c

diff --git a/lib/libutil/md5c.c b/lib/libminixutil/md5c.c
similarity index 100%
rename from lib/libutil/md5c.c
rename to lib/libminixutil/md5c.c

diff --git a/lib/libutil/md5hl.c b/lib/libminixutil/md5hl.c
similarity index 100%
rename from lib/libutil/md5hl.c
rename to lib/libminixutil/md5hl.c

diff --git a/lib/libutil/openpty.c b/lib/libminixutil/openpty.c
similarity index 100%
rename from lib/libutil/openpty.c
rename to lib/libminixutil/openpty.c

diff --git a/lib/libutil/sha1.c b/lib/libminixutil/sha1.c
similarity index 100%
rename from lib/libutil/sha1.c
rename to lib/libminixutil/sha1.c

diff --git a/lib/libutil/sha1hl.c b/lib/libminixutil/sha1hl.c
similarity index 100%
rename from lib/libutil/sha1hl.c
rename to lib/libminixutil/sha1hl.c

diff --git a/lib/libutil/sha2.c b/lib/libminixutil/sha2.c
similarity index 100%
rename from lib/libutil/sha2.c
rename to lib/libminixutil/sha2.c

diff --git a/lib/libutil/sha2hl.c b/lib/libminixutil/sha2hl.c
similarity index 100%
rename from lib/libutil/sha2hl.c
rename to lib/libminixutil/sha2hl.c

diff --git a/servers/inet/Makefile b/servers/inet/Makefile
index 85bf0495607797aade65a1cd121c17d5955054fb..67ee96a2a2a4a1ddf6f1890b9cb298e1cea3e148 100644 (file)
--- a/servers/inet/Makefile
+++ b/servers/inet/Makefile
@@ -12,8 +12,8 @@ SRCS= buf.c clock.c inet.c inet_config.c \
 
 .PATH: ${.CURDIR}/generic
 
-DPADD+=        ${LIBDRIVER} ${LIBSYS} ${LIBUTIL}
-LDADD+=        -ldriver -lsys -lutil
+DPADD+=        ${LIBDRIVER} ${LIBSYS} ${LIBMINIXUTIL}
+LDADD+=        -ldriver -lsys -lminixutil
 
 MAN=
 

diff --git a/servers/lwip/Makefile b/servers/lwip/Makefile
index 4191d7fc7e9bcd8d830eded5e5f8abd83c46826d..0929d6530423d92247cd25f9a9d1a6f34b84efd1 100644 (file)
--- a/servers/lwip/Makefile
+++ b/servers/lwip/Makefile
@@ -11,8 +11,8 @@ SRCS= lwip.c          \
 
 .PATH: ${.CURDIR}/generic
 
-DPADD+=        ${LIBDRIVER} ${LIBSYS} ${LIBUTIL}
-LDADD+=        -ldriver -lsys -lutil -ltimers -llwip
+DPADD+=        ${LIBDRIVER} ${LIBSYS} ${LIBMINIXUTIL}
+LDADD+=        -ldriver -lsys -lminixutil -ltimers -llwip
 
 MAN=
 

diff --git a/usr.bin/m4/Makefile b/usr.bin/m4/Makefile
index 3f266373a8f547bb66f852a1bc9bc6a8ed3b77bd..1b32707883b1cc407c35cd59e648ca062823b363 100644 (file)
--- a/usr.bin/m4/Makefile
+++ b/usr.bin/m4/Makefile
@@ -16,8 +16,8 @@ SRCS+=        ohash_create_entry.c ohash_delete.c ohash_do.c ohash_entries.c \
        ohash_qlookupi.c strtonum.c
 YHEADER=1
 .if (${HOSTPROG:U} == "")
-DPADD+=                ${LIBUTIL} ${LIBL}
-LDADD+=                -lutil -ll
+DPADD+=                ${LIBMINIXUTIL} ${LIBL}
+LDADD+=                -lminixutil -ll
 .endif
 
 tokenizer.o: parser.h