From ae7aafc127d8439fad3250afe7b6f28d44690d39 Mon Sep 17 00:00:00 2001
From: sin <sin@2f30.org>
Date: Sat, 29 Nov 2014 21:44:07 +0000
Subject: [PATCH] Rename util/ to libutil/

---
 Makefile                           | 46 +++++++++++++++---------------
 {util => libutil}/agetcwd.c        |  0
 {util => libutil}/agetline.c       |  0
 {util => libutil}/apathmax.c       |  0
 {util => libutil}/concat.c         |  0
 {util => libutil}/ealloc.c         |  0
 {util => libutil}/eprintf.c        |  0
 {util => libutil}/estrtol.c        |  0
 {util => libutil}/estrtoul.c       |  0
 {util => libutil}/explicit_bzero.c |  0
 {util => libutil}/passwd.c         |  0
 {util => libutil}/proc.c           |  0
 {util => libutil}/putword.c        |  0
 {util => libutil}/recurse.c        |  0
 {util => libutil}/strlcat.c        |  0
 {util => libutil}/strlcpy.c        |  0
 {util => libutil}/tty.c            |  0
 17 files changed, 23 insertions(+), 23 deletions(-)
 rename {util => libutil}/agetcwd.c (100%)
 rename {util => libutil}/agetline.c (100%)
 rename {util => libutil}/apathmax.c (100%)
 rename {util => libutil}/concat.c (100%)
 rename {util => libutil}/ealloc.c (100%)
 rename {util => libutil}/eprintf.c (100%)
 rename {util => libutil}/estrtol.c (100%)
 rename {util => libutil}/estrtoul.c (100%)
 rename {util => libutil}/explicit_bzero.c (100%)
 rename {util => libutil}/passwd.c (100%)
 rename {util => libutil}/proc.c (100%)
 rename {util => libutil}/putword.c (100%)
 rename {util => libutil}/recurse.c (100%)
 rename {util => libutil}/strlcat.c (100%)
 rename {util => libutil}/strlcpy.c (100%)
 rename {util => libutil}/tty.c (100%)

diff --git a/Makefile b/Makefile
index 150ca13..f86fd8f 100644
--- a/Makefile
+++ b/Makefile
@@ -15,22 +15,22 @@ HDR = \
 	util.h
 
 LIB = \
-	util/agetcwd.o        \
-	util/agetline.o       \
-	util/apathmax.o       \
-	util/concat.o         \
-	util/ealloc.o         \
-	util/eprintf.o        \
-	util/estrtol.o        \
-	util/estrtoul.o       \
-	util/explicit_bzero.o \
-	util/passwd.o         \
-	util/proc.o           \
-	util/putword.o        \
-	util/recurse.o        \
-	util/strlcat.o        \
-	util/strlcpy.o        \
-	util/tty.o
+	libutil/agetcwd.o        \
+	libutil/agetline.o       \
+	libutil/apathmax.o       \
+	libutil/concat.o         \
+	libutil/ealloc.o         \
+	libutil/eprintf.o        \
+	libutil/estrtol.o        \
+	libutil/estrtoul.o       \
+	libutil/explicit_bzero.o \
+	libutil/passwd.o         \
+	libutil/proc.o           \
+	libutil/putword.o        \
+	libutil/recurse.o        \
+	libutil/strlcat.o        \
+	libutil/strlcpy.o        \
+	libutil/tty.o
 
 SRC = \
 	last.c              \
@@ -144,7 +144,7 @@ options:
 	@echo "LDFLAGS  = $(LDFLAGS)"
 	@echo "CC       = $(CC)"
 
-binlib: util.a
+binlib: libutil.a
 	$(MAKE) bin
 
 bin: $(BIN)
@@ -157,13 +157,13 @@ config.h:
 
 .o:
 	@echo LD $@
-	@$(LD) -o $@ $< util.a $(LDFLAGS)
+	@$(LD) -o $@ $< libutil.a $(LDFLAGS)
 
 .c.o:
 	@echo CC $<
 	@$(CC) -c -o $@ $< $(CFLAGS)
 
-util.a: $(LIB)
+libutil.a: $(LIB)
 	@echo AR $@
 	@$(AR) -r -c $@ $?
 	@ranlib $@
@@ -194,12 +194,12 @@ uninstall:
 dist: clean
 	@echo creating dist tarball
 	@mkdir -p ubase-$(VERSION)
-	@cp -r LICENSE Makefile config.mk TODO $(SRC) $(MAN) util $(HDR) ubase-$(VERSION)
+	@cp -r LICENSE Makefile config.mk TODO $(SRC) $(MAN) libutil $(HDR) ubase-$(VERSION)
 	@tar -cf ubase-$(VERSION).tar ubase-$(VERSION)
 	@gzip ubase-$(VERSION).tar
 	@rm -rf ubase-$(VERSION)
 
-ubase-box: config.h $(SRC) util.a
+ubase-box: config.h $(SRC) libutil.a
 	@echo creating box binary
 	@mkdir -p build
 	@cp $(HDR) build
@@ -217,9 +217,9 @@ ubase-box: config.h $(SRC) util.a
 	@for f in $(SRC); do echo "printf(\"`basename $$f .c`\"); putchar(' ');" >> build/$@.c; done
 	@echo "putchar(0xa); }; return 0; }" >> build/$@.c
 	@echo LD $@
-	@$(LD) -o $@ build/*.c util.a $(CFLAGS) $(LDFLAGS)
+	@$(LD) -o $@ build/*.c libutil.a $(CFLAGS) $(LDFLAGS)
 	@rm -r build
 
 clean:
 	@echo cleaning
-	@rm -f $(BIN) $(OBJ) $(LIB) util.a ubase-box
+	@rm -f $(BIN) $(OBJ) $(LIB) libutil.a ubase-box
diff --git a/util/agetcwd.c b/libutil/agetcwd.c
similarity index 100%
rename from util/agetcwd.c
rename to libutil/agetcwd.c
diff --git a/util/agetline.c b/libutil/agetline.c
similarity index 100%
rename from util/agetline.c
rename to libutil/agetline.c
diff --git a/util/apathmax.c b/libutil/apathmax.c
similarity index 100%
rename from util/apathmax.c
rename to libutil/apathmax.c
diff --git a/util/concat.c b/libutil/concat.c
similarity index 100%
rename from util/concat.c
rename to libutil/concat.c
diff --git a/util/ealloc.c b/libutil/ealloc.c
similarity index 100%
rename from util/ealloc.c
rename to libutil/ealloc.c
diff --git a/util/eprintf.c b/libutil/eprintf.c
similarity index 100%
rename from util/eprintf.c
rename to libutil/eprintf.c
diff --git a/util/estrtol.c b/libutil/estrtol.c
similarity index 100%
rename from util/estrtol.c
rename to libutil/estrtol.c
diff --git a/util/estrtoul.c b/libutil/estrtoul.c
similarity index 100%
rename from util/estrtoul.c
rename to libutil/estrtoul.c
diff --git a/util/explicit_bzero.c b/libutil/explicit_bzero.c
similarity index 100%
rename from util/explicit_bzero.c
rename to libutil/explicit_bzero.c
diff --git a/util/passwd.c b/libutil/passwd.c
similarity index 100%
rename from util/passwd.c
rename to libutil/passwd.c
diff --git a/util/proc.c b/libutil/proc.c
similarity index 100%
rename from util/proc.c
rename to libutil/proc.c
diff --git a/util/putword.c b/libutil/putword.c
similarity index 100%
rename from util/putword.c
rename to libutil/putword.c
diff --git a/util/recurse.c b/libutil/recurse.c
similarity index 100%
rename from util/recurse.c
rename to libutil/recurse.c
diff --git a/util/strlcat.c b/libutil/strlcat.c
similarity index 100%
rename from util/strlcat.c
rename to libutil/strlcat.c
diff --git a/util/strlcpy.c b/libutil/strlcpy.c
similarity index 100%
rename from util/strlcpy.c
rename to libutil/strlcpy.c
diff --git a/util/tty.c b/libutil/tty.c
similarity index 100%
rename from util/tty.c
rename to libutil/tty.c