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 #include -#include +#include #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 #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 #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 @@ -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