From 719d75e731437208d78add5f377dc5634e644a72 Mon Sep 17 00:00:00 2001
From: Runxi Yu <me@runxiyu.org>
Date: Thu, 13 Mar 2025 07:37:27 +0800
Subject: [PATCH] Reorganize directories

---
 .gitignore                      |  7 -------
 Makefile                        | 71 -----------------------------------------------------
 chtmpl.1 => htmplgen/htmplgen.1 |  0 
 chtmpl.7 => htmplgen/htmplgen.7 |  0 
 chtmpl.c => htmplgen/htmplgen.c |  0 
 chtmplr.c => htmpl/chtmplr.c    |  0 
 chtmplr.h => htmpl/chtmplr.h    |  0 
 htmplgen/.gitignore             |  4 ++++
 htmplgen/Makefile               | 35 +++++++++++++++++++++++++++++++++++
 parse.y => htmplgen/parse.y     |  0 

diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 4fc97512a42a5c42e9e8234117fcb33b1935c2af..0000000000000000000000000000000000000000
--- a/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-/chtmpl
-/parse.c
-/parse.h
-*.o
-*.a
-*.so
-*.so.*
diff --git a/Makefile b/Makefile
deleted file mode 100644
index ff19702c60658917173406103f3302b7ca1dd0b4..0000000000000000000000000000000000000000
--- a/Makefile
+++ /dev/null
@@ -1,71 +0,0 @@
-CC = cc
-YACC = yacc
-CFLAGS = -Wall -Werror -O2 -fPIC
-YFLAGS = -d
-LDFLAGS =
-
-VERSION = 1
-SONAME = libchtmplr.so.$(VERSION)
-
-TARGET = chtmpl
-STATIC_LIB = libchtmplr.a
-SHARED_LIB = libchtmplr.so.$(VERSION)
-SHARED_LINK = libchtmplr.so
-
-SRCS = chtmpl.c parse.y
-OBJS = chtmpl.o parse.o
-
-LIB_SRCS = chtmplr.c
-LIB_OBJS = chtmplr.o
-
-all: $(TARGET) $(STATIC_LIB) $(SHARED_LIB)
-
-parse.c parse.h: parse.y
-	$(YACC) $(YFLAGS) -o parse.c $<
-
-chtmpl.o: chtmpl.c parse.h
-	$(CC) $(CFLAGS) -c -o $@ $<
-
-parse.o: parse.c
-	$(CC) $(CFLAGS) -c -o $@ $<
-
-chtmplr.o: chtmplr.c chtmplr.h
-	$(CC) $(CFLAGS) -c -o $@ $<
-
-$(STATIC_LIB): $(LIB_OBJS)
-	ar rcs $@ $<
-
-$(SHARED_LIB): $(LIB_OBJS)
-	$(CC) -shared -Wl,-soname,$(SONAME) -o $@ $< $(LDFLAGS)
-	ln -sf $(SHARED_LIB) $(SHARED_LINK)
-
-$(TARGET): $(OBJS)
-	$(CC) $(LDFLAGS) -o $@ $(OBJS)
-
-clean:
-	rm -f $(TARGET) $(OBJS) parse.c parse.h $(LIB_OBJS) $(STATIC_LIB) $(SHARED_LIB) $(SHARED_LINK) *~
-
-PREFIX ?= /usr/local
-LIBDIR ?= $(PREFIX)/lib
-INCLUDEDIR ?= $(PREFIX)/include
-
-install: install-bin install-lib
-
-install-bin: $(TARGET)
-	install -d $(DESTDIR)$(PREFIX)/bin
-	install -m 755 $(TARGET) $(DESTDIR)$(PREFIX)/bin/
-
-install-lib: $(STATIC_LIB) $(SHARED_LIB)
-	install -d $(DESTDIR)$(INCLUDEDIR)
-	install -m 644 chtmplr.h $(DESTDIR)$(INCLUDEDIR)/
-
-	install -d $(DESTDIR)$(LIBDIR)
-	install -m 644 $(STATIC_LIB) $(DESTDIR)$(LIBDIR)/
-
-	install -m 755 $(SHARED_LIB) $(DESTDIR)$(LIBDIR)/
-	ln -sf $(SHARED_LIB) $(DESTDIR)$(LIBDIR)/$(SHARED_LINK)
-	ln -sf $(SHARED_LIB) $(DESTDIR)$(LIBDIR)/$(SONAME)
-	
-	-if [ $$(id -u) -eq 0 ]; then ldconfig; fi
-
-.PHONY: all clean install install-bin install-lib
diff --git a/chtmpl.1 b/htmplgen/htmplgen.1
rename from chtmpl.1
rename to htmplgen/htmplgen.1
diff --git a/chtmpl.7 b/htmplgen/htmplgen.7
rename from chtmpl.7
rename to htmplgen/htmplgen.7
diff --git a/chtmpl.c b/htmplgen/htmplgen.c
rename from chtmpl.c
rename to htmplgen/htmplgen.c
diff --git a/chtmplr.c b/htmpl/chtmplr.c
rename from chtmplr.c
rename to htmpl/chtmplr.c
diff --git a/chtmplr.h b/htmpl/chtmplr.h
rename from chtmplr.h
rename to htmpl/chtmplr.h
diff --git a/htmplgen/.gitignore b/htmplgen/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..d33eeff38ee16a5ceba0590ad8e71b40cb8ef5ea
--- /dev/null
+++ b/htmplgen/.gitignore
@@ -0,0 +1,4 @@
+*.o
+/parse.c
+/parse.h
+/htmplgen
diff --git a/htmplgen/Makefile b/htmplgen/Makefile
new file mode 100644
index 0000000000000000000000000000000000000000..752bacea089ec8dd0950778332c084b451016e03
--- /dev/null
+++ b/htmplgen/Makefile
@@ -0,0 +1,35 @@
+CC = cc
+YACC = yacc
+CFLAGS = -Wall -Werror -O2
+YFLAGS = -d
+LDFLAGS =
+
+TARGET = htmplgen
+
+PREFIX ?= /usr/local
+
+SRCS = htmplgen.c parse.y
+OBJS = htmplgen.o parse.o
+
+all: $(TARGET)
+
+parse.c parse.h: parse.y
+	$(YACC) $(YFLAGS) -o parse.c $<
+
+htmplgen.o: htmplgen.c parse.h
+	$(CC) $(CFLAGS) -c -o $@ $<
+
+parse.o: parse.c
+	$(CC) $(CFLAGS) -c -o $@ $<
+
+$(TARGET): $(OBJS)
+	$(CC) $(LDFLAGS) -o $@ $(OBJS)
+
+clean:
+	rm -f $(TARGET) $(OBJS) parse.c parse.h *~
+
+install: $(TARGET)
+	install -d $(DESTDIR)$(PREFIX)/bin
+	install -m 755 $(TARGET) $(DESTDIR)$(PREFIX)/bin/
+
+.PHONY: all clean install
diff --git a/parse.y b/htmplgen/parse.y
rename from parse.y
rename to htmplgen/parse.y

-- 
2.48.1