From f38d3201d12d34f9a45b5dff205f0e0466958cc5 Mon Sep 17 00:00:00 2001
From: Werner Almesberger <werner@almesberger.net>
Date: Thu, 1 Nov 2012 18:13:03 -0300
Subject: [PATCH] rename libtxt to libant

---
 tools/ant-txt/Makefile                     | 2 +-
 tools/ant-txt/ant-txt.c                    | 2 +-
 tools/{libtxt => libant}/Makefile          | 4 ++--
 tools/{libtxt => libant}/edit.c            | 4 ++--
 tools/{libtxt => libant}/font.c            | 4 ++--
 tools/{libtxt/libtxt.h => libant/libant.h} | 8 ++++----
 tools/{libtxt => libant}/util.h            | 2 +-
 7 files changed, 13 insertions(+), 13 deletions(-)
 rename tools/{libtxt => libant}/Makefile (89%)
 rename tools/{libtxt => libant}/edit.c (98%)
 rename tools/{libtxt => libant}/font.c (98%)
 rename tools/{libtxt/libtxt.h => libant/libant.h} (93%)
 rename tools/{libtxt => libant}/util.h (95%)

diff --git a/tools/ant-txt/Makefile b/tools/ant-txt/Makefile
index 39d0e4c..9538514 100644
--- a/tools/ant-txt/Makefile
+++ b/tools/ant-txt/Makefile
@@ -16,7 +16,7 @@ MAIN = ant-txt
 CFLAGS = -g -Wall -I.. \
 	 $(if $(BEN), -static)
 
-LDLIBS = -L../libtxt -ltxt
+LDLIBS = -L../libant -lant
 
 OBJS = ant-txt.o
 
diff --git a/tools/ant-txt/ant-txt.c b/tools/ant-txt/ant-txt.c
index 24f5513..03e070f 100644
--- a/tools/ant-txt/ant-txt.c
+++ b/tools/ant-txt/ant-txt.c
@@ -18,7 +18,7 @@
 #include <assert.h>
 #include <sys/types.h>
 
-#include <libtxt/libtxt.h>
+#include <libant/libant.h>
 
 
 #define	W	80
diff --git a/tools/libtxt/Makefile b/tools/libant/Makefile
similarity index 89%
rename from tools/libtxt/Makefile
rename to tools/libant/Makefile
index db4176c..dbd8d68 100644
--- a/tools/libtxt/Makefile
+++ b/tools/libant/Makefile
@@ -1,5 +1,5 @@
 #
-# tools/libtxt/Makefile - Build the Antorcha tool
+# tools/libant/Makefile - Build the Antorcha library
 #
 # Written 2012 by Werner Almesberger
 # Copyright 2012 Werner Almesberger
@@ -11,7 +11,7 @@
 #
 
 
-LIB = libtxt.a
+LIB = libant.a
 
 # _GNU_SOURCE for vasprintf
 CFLAGS = -g -Wall -D_GNU_SOURCE
diff --git a/tools/libtxt/edit.c b/tools/libant/edit.c
similarity index 98%
rename from tools/libtxt/edit.c
rename to tools/libant/edit.c
index 9b93910..080584f 100644
--- a/tools/libtxt/edit.c
+++ b/tools/libant/edit.c
@@ -1,5 +1,5 @@
 /*
- * tools/libtxt/edit.c - Editing and rendering
+ * tools/libant/edit.c - Editing and rendering
  *
  * Written 2012 by Werner Almesberger
  * Copyright 2012 Werner Almesberger
@@ -17,7 +17,7 @@
 #include <sys/types.h>
 
 #include "util.h"
-#include "libtxt.h"
+#include "libant.h"
 
 
 #define	DEFAULT_FONT	"5x7"
diff --git a/tools/libtxt/font.c b/tools/libant/font.c
similarity index 98%
rename from tools/libtxt/font.c
rename to tools/libant/font.c
index 7f18c99..11b52ef 100644
--- a/tools/libtxt/font.c
+++ b/tools/libant/font.c
@@ -1,5 +1,5 @@
 /*
- * tools/libtxt/font.c - Font operations
+ * tools/libant/font.c - Font operations
  *
  * Written 2012 by Werner Almesberger
  * Copyright 2012 Werner Almesberger
@@ -17,7 +17,7 @@
 #include <errno.h>
 
 #include "util.h"
-#include "libtxt.h"
+#include "libant.h"
 
 
 static const char charset[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789!?$%+-*/=@.";
diff --git a/tools/libtxt/libtxt.h b/tools/libant/libant.h
similarity index 93%
rename from tools/libtxt/libtxt.h
rename to tools/libant/libant.h
index d405ca5..4094832 100644
--- a/tools/libtxt/libtxt.h
+++ b/tools/libant/libant.h
@@ -1,5 +1,5 @@
 /*
- * tools/libtxt/libtxt.h - Text processing functions
+ * tools/libant/libant.h - Text processing functions
  *
  * Written 2012 by Werner Almesberger
  * Copyright 2012 Werner Almesberger
@@ -10,8 +10,8 @@
  * (at your option) any later version.
  */
 
-#ifndef LIBTXT_H
-#define LIBTXT_H
+#ifndef LIBANT_H
+#define LIBANT_H
 
 #include <stdio.h>
 
@@ -77,4 +77,4 @@ void add_font_dir(const char *name);
 void *apply_edits(int width, int height, const struct edit *e,
     const char **error);
 
-#endif /* !LIBTXT_H */
+#endif /* !LIBANT_H */
diff --git a/tools/libtxt/util.h b/tools/libant/util.h
similarity index 95%
rename from tools/libtxt/util.h
rename to tools/libant/util.h
index 4548cfb..800ddb3 100644
--- a/tools/libtxt/util.h
+++ b/tools/libant/util.h
@@ -1,5 +1,5 @@
 /*
- * tools/libtxt/util.h - Utility functions
+ * tools/libant/util.h - Utility functions
  *
  * Written 2012 by Werner Almesberger
  * Copyright 2012 Werner Almesberger