From 989934b37caf1f196dff6747dab4926603febf9d Mon Sep 17 00:00:00 2001 From: Ben Gras Date: Wed, 27 Jul 2011 12:34:50 +0200 Subject: [PATCH] rename -lutil to -lminixutil . in preparation for netbsd -lutil --- commands/cut/Makefile | 4 ++-- commands/find/Makefile | 4 ++-- commands/hexdump/Makefile | 4 ++-- commands/man/Makefile | 4 ++-- drivers/random/Makefile | 4 ++-- lib/Makefile | 2 +- lib/{libutil => libminixutil}/Makefile | 4 ++-- lib/{libutil => libminixutil}/efun.c | 0 lib/{libutil => libminixutil}/md5c.c | 0 lib/{libutil => libminixutil}/md5hl.c | 0 lib/{libutil => libminixutil}/openpty.c | 0 lib/{libutil => libminixutil}/sha1.c | 0 lib/{libutil => libminixutil}/sha1hl.c | 0 lib/{libutil => libminixutil}/sha2.c | 0 lib/{libutil => libminixutil}/sha2hl.c | 0 servers/inet/Makefile | 4 ++-- servers/lwip/Makefile | 4 ++-- usr.bin/m4/Makefile | 4 ++-- 18 files changed, 19 insertions(+), 19 deletions(-) rename lib/{libutil => libminixutil}/Makefile (82%) rename lib/{libutil => libminixutil}/efun.c (100%) rename lib/{libutil => libminixutil}/md5c.c (100%) rename lib/{libutil => libminixutil}/md5hl.c (100%) rename lib/{libutil => libminixutil}/openpty.c (100%) rename lib/{libutil => libminixutil}/sha1.c (100%) rename lib/{libutil => libminixutil}/sha1hl.c (100%) rename lib/{libutil => libminixutil}/sha2.c (100%) rename lib/{libutil => libminixutil}/sha2hl.c (100%) diff --git a/commands/cut/Makefile b/commands/cut/Makefile index 1aed929ef..100dad1d4 100644 --- a/commands/cut/Makefile +++ b/commands/cut/Makefile @@ -3,7 +3,7 @@ PROG= cut -LDADD+= -lutil -DPADD+= ${LIBUTIL} +LDADD+= -lminixutil +DPADD+= ${LIBMINIXUTIL} .include diff --git a/commands/find/Makefile b/commands/find/Makefile index 5cbcfd73a..05093bf06 100644 --- 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 diff --git a/commands/hexdump/Makefile b/commands/hexdump/Makefile index 2eec76245..72ddcbeac 100644 --- 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 4f6c305ed..797d24bd4 100644 --- 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 2e465979f..9c8e14e25 100644 --- 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 7b884d597..1009b1fa5 100644 --- 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 063f80940..e1792806d 100644 --- 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 85bf04956..67ee96a2a 100644 --- 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 4191d7fc7..0929d6530 100644 --- 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 3f266373a..1b3270788 100644 --- 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 -- 2.44.0