summary refs log tree commit diff
diff options
context:
space:
mode:
authorJune McEnroe <june@causal.agency>2021-01-12 22:06:56 -0500
committerJune McEnroe <june@causal.agency>2021-01-12 22:06:56 -0500
commitc277129386f1acfe133da11f23a7d730ae48964d (patch)
tree29923c815344b8ac967f2856338c5649365c43ce
parentConsolidate hilex formatters into hilex.c (diff)
downloadsrc-c277129386f1acfe133da11f23a7d730ae48964d.tar.gz
src-c277129386f1acfe133da11f23a7d730ae48964d.zip
Move hilex out of hilex directory
-rw-r--r--bin/.gitignore1
-rw-r--r--bin/Makefile12
-rw-r--r--bin/README.72
-rw-r--r--bin/c11.l (renamed from bin/hilex/c.l)0
-rw-r--r--bin/hilex.c (renamed from bin/hilex/hilex.c)0
-rw-r--r--bin/hilex.h (renamed from bin/hilex/hilex.h)0
-rw-r--r--bin/hilex/.gitignore2
-rw-r--r--bin/hilex/Makefile15
-rw-r--r--bin/make.l (renamed from bin/hilex/make.l)0
-rw-r--r--bin/man1/hilex.1 (renamed from bin/hilex/hilex.1)0
-rw-r--r--bin/mdoc.l (renamed from bin/hilex/mdoc.l)0
-rw-r--r--bin/text.l (renamed from bin/hilex/text.l)0
12 files changed, 15 insertions, 17 deletions
diff --git a/bin/.gitignore b/bin/.gitignore
index 02f47efe..4fe5b9b2 100644
--- a/bin/.gitignore
+++ b/bin/.gitignore
@@ -12,6 +12,7 @@ fbatt
 fbclock
 glitch
 hi
+hilex
 hnel
 htagml
 htmltags
diff --git a/bin/Makefile b/bin/Makefile
index 8e0cb324..9b2c06d4 100644
--- a/bin/Makefile
+++ b/bin/Makefile
@@ -26,6 +26,7 @@ BINS += c
 BINS += dtch
 BINS += glitch
 BINS += hi
+BINS += hilex
 BINS += hnel
 BINS += htagml
 BINS += modem
@@ -83,6 +84,17 @@ hi: hi.c
 	${CC} ${CFLAGS} ${LDFLAGS} hi.c ${LDLIBS.$@} -o $@
 	./hi -c
 
+OBJS.hilex += c11.o
+OBJS.hilex += hilex.o
+OBJS.hilex += make.o
+OBJS.hilex += mdoc.o
+OBJS.hilex += text.o
+
+hilex: ${OBJS.hilex}
+	${CC} ${LDFLAGS} ${OBJS.$@} ${LDLIBS.$@} -o $@
+
+${OBJS.hilex}: hilex.h
+
 open pbcopy pbpaste: pbd
 	ln -f pbd $@
 
diff --git a/bin/README.7 b/bin/README.7
index 31acdde5..d4cf26e8 100644
--- a/bin/README.7
+++ b/bin/README.7
@@ -38,6 +38,8 @@ framebuffer clock
 PNG glitcher
 .It Xr hi 1
 syntax highlighter
+.It Xr hilex 1
+syntax highlighter
 .It Xr hnel 1
 PTY input remapper
 .It Xr htagml 1
diff --git a/bin/hilex/c.l b/bin/c11.l
index d7a80ae2..d7a80ae2 100644
--- a/bin/hilex/c.l
+++ b/bin/c11.l
diff --git a/bin/hilex/hilex.c b/bin/hilex.c
index d9b747cc..d9b747cc 100644
--- a/bin/hilex/hilex.c
+++ b/bin/hilex.c
diff --git a/bin/hilex/hilex.h b/bin/hilex.h
index 2e463be7..2e463be7 100644
--- a/bin/hilex/hilex.h
+++ b/bin/hilex.h
diff --git a/bin/hilex/.gitignore b/bin/hilex/.gitignore
deleted file mode 100644
index f4c89460..00000000
--- a/bin/hilex/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.o
-hilex
diff --git a/bin/hilex/Makefile b/bin/hilex/Makefile
deleted file mode 100644
index e7972425..00000000
--- a/bin/hilex/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-CFLAGS += -std=c11 -Wall -Wextra -Wpedantic
-
-OBJS += c.o
-OBJS += hilex.o
-OBJS += make.o
-OBJS += mdoc.o
-OBJS += text.o
-
-hilex: ${OBJS}
-	${CC} ${LDFLAGS} ${OBJS} ${LDLIBS} -o $@
-
-${OBJS}: hilex.h
-
-clean:
-	rm -f hilex ${OBJS}
diff --git a/bin/hilex/make.l b/bin/make.l
index 952c589d..952c589d 100644
--- a/bin/hilex/make.l
+++ b/bin/make.l
diff --git a/bin/hilex/hilex.1 b/bin/man1/hilex.1
index 858c8565..858c8565 100644
--- a/bin/hilex/hilex.1
+++ b/bin/man1/hilex.1
diff --git a/bin/hilex/mdoc.l b/bin/mdoc.l
index 2680b722..2680b722 100644
--- a/bin/hilex/mdoc.l
+++ b/bin/mdoc.l
diff --git a/bin/hilex/text.l b/bin/text.l
index 78ebb7a2..78ebb7a2 100644
--- a/bin/hilex/text.l
+++ b/bin/text.l