about summary refs log tree commit diff
diff options
context:
space:
mode:
authorsternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>2021-02-23 23:19:19 +0100
committersternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>2021-02-23 23:19:19 +0100
commit26d41d6689bf4c50975eee3938d30865216c74d6 (patch)
treebe561a20009241f2fb7afa81bc09f8ee61754c78
parent700978231e214e504db9577ac9cc18ab0f8a333d (diff)
Revert "refactor(treewide): prefix public/internal API with sternenblog/"
This reverts commit f4b7cf4448effa168f2e1c247353c00e2741e831.

Actually, this made a lot of stuff more cumbersome I feel like and
didn't really solve the issue that was bothering me. I'll find
another way.
-rw-r--r--Doxyfile1
-rw-r--r--Makefile10
-rw-r--r--cgiutil.c (renamed from sternenblog/cgiutil.c)0
-rw-r--r--cgiutil.h (renamed from sternenblog/cgiutil.h)0
-rw-r--r--core.h (renamed from sternenblog/core.h)0
-rw-r--r--entry.c (renamed from sternenblog/entry.c)2
-rw-r--r--entry.h (renamed from sternenblog/entry.h)0
-rw-r--r--index.c (renamed from sternenblog/index.c)0
-rw-r--r--index.h (renamed from sternenblog/index.h)0
-rw-r--r--main.c17
-rw-r--r--stringutil.c (renamed from sternenblog/stringutil.c)0
-rw-r--r--stringutil.h (renamed from sternenblog/stringutil.h)0
-rw-r--r--template.h (renamed from sternenblog/template.h)0
-rw-r--r--templates/simple.c13
-rw-r--r--timeutil.c (renamed from sternenblog/timeutil.c)0
-rw-r--r--timeutil.h (renamed from sternenblog/timeutil.h)0
-rw-r--r--xml.c (renamed from sternenblog/xml.c)0
-rw-r--r--xml.h (renamed from sternenblog/xml.h)0
18 files changed, 19 insertions, 24 deletions
diff --git a/Doxyfile b/Doxyfile
index 8163fc2..73a2d68 100644
--- a/Doxyfile
+++ b/Doxyfile
@@ -26,4 +26,3 @@ EXAMPLE_PATH           = ./doc/examples/
 # hack to allow @include simple.c
 EXAMPLE_PATH          += ./templates/
 EXCLUDE_SYMBOLS        = _POSIX_C_SOURCE
-RECURSIVE              = YES
diff --git a/Makefile b/Makefile
index 0b4f5f8..97529d6 100644
--- a/Makefile
+++ b/Makefile
@@ -2,24 +2,22 @@ include config.mk
 
 ROOT_DIR:=$(shell dirname $(realpath $(firstword $(MAKEFILE_LIST))))
 
-TEMPLATE_API = sternenblog/core.h config.h sternenblog/xml.h sternenblog/cgiutil.h sternenblog/timeutil.h sternenblog/stringutil.h
-
 sternenblog.cgi: xml.o entry.o index.o stringutil.o cgiutil.o timeutil.o $(TEMPLATE).o main.o
 	$(CC) $(CFLAGS) -o $@ $^
 
-main.o: main.c sternenblog/core.h config.h
+main.o: main.c core.h timeutil.h config.h
 	$(CC) $(CFLAGS) -c -o main.o $<
 
-$(TEMPLATE).o: $(TEMPLATE).c $(TEMPLATE_API)
+$(TEMPLATE).o: $(TEMPLATE).c core.h config.h xml.h cgiutil.h timeutil.h stringutil.h
 	$(CC) $(CFLAGS) -I$(ROOT_DIR) -c -o $@ $<
 
-entry.o: config.h sternenblog/entry.c sternenblog/entry.h
+entry.o: config.h entry.c
 
 # only invoked if config.h does not exist
 config.h:
 	$(CP) config.example.h config.h
 
-%.o: sternenblog/%.c sternenblog/%.h
+%.o: %.c %.h
 	$(CC) $(CFLAGS) -c -o $@ $<
 
 clean:
diff --git a/sternenblog/cgiutil.c b/cgiutil.c
index 7dc8114..7dc8114 100644
--- a/sternenblog/cgiutil.c
+++ b/cgiutil.c
diff --git a/sternenblog/cgiutil.h b/cgiutil.h
index fc359e7..fc359e7 100644
--- a/sternenblog/cgiutil.h
+++ b/cgiutil.h
diff --git a/sternenblog/core.h b/core.h
index 8f317ec..8f317ec 100644
--- a/sternenblog/core.h
+++ b/core.h
diff --git a/sternenblog/entry.c b/entry.c
index 0318311..8bb6476 100644
--- a/sternenblog/entry.c
+++ b/entry.c
@@ -11,7 +11,7 @@
 #include <unistd.h>
 
 #include "core.h"
-#include "../config.h" // TODO: make independent?
+#include "config.h" // TODO: make independent?
 #include "cgiutil.h"
 #include "entry.h"
 
diff --git a/sternenblog/entry.h b/entry.h
index 66e76bb..66e76bb 100644
--- a/sternenblog/entry.h
+++ b/entry.h
diff --git a/sternenblog/index.c b/index.c
index bb94bb9..bb94bb9 100644
--- a/sternenblog/index.c
+++ b/index.c
diff --git a/sternenblog/index.h b/index.h
index ae0a91b..ae0a91b 100644
--- a/sternenblog/index.h
+++ b/index.h
diff --git a/main.c b/main.c
index 25d306b..d58ddc9 100644
--- a/main.c
+++ b/main.c
@@ -86,16 +86,15 @@
 #include <time.h>
 #include <unistd.h>
 
+#include "core.h"
 #include "config.h"
-
-#include "sternenblog/core.h"
-#include "sternenblog/cgiutil.h"
-#include "sternenblog/entry.h"
-#include "sternenblog/index.h"
-#include "sternenblog/stringutil.h"
-#include "sternenblog/timeutil.h"
-#include "sternenblog/template.h"
-#include "sternenblog/xml.h"
+#include "cgiutil.h"
+#include "entry.h"
+#include "index.h"
+#include "stringutil.h"
+#include "timeutil.h"
+#include "template.h"
+#include "xml.h"
 
 /*!
  * @brief Routing enum to differentiate feeds
diff --git a/sternenblog/stringutil.c b/stringutil.c
index 44cec9e..44cec9e 100644
--- a/sternenblog/stringutil.c
+++ b/stringutil.c
diff --git a/sternenblog/stringutil.h b/stringutil.h
index 11c678f..11c678f 100644
--- a/sternenblog/stringutil.h
+++ b/stringutil.h
diff --git a/sternenblog/template.h b/template.h
index 21ff38b..21ff38b 100644
--- a/sternenblog/template.h
+++ b/template.h
diff --git a/templates/simple.c b/templates/simple.c
index 5ec9eeb..27fe683 100644
--- a/templates/simple.c
+++ b/templates/simple.c
@@ -3,14 +3,13 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include <core.h>
+#include <template.h>
 #include <config.h>
-
-#include <sternenblog/core.h>
-#include <sternenblog/template.h>
-#include <sternenblog/cgiutil.h>
-#include <sternenblog/stringutil.h>
-#include <sternenblog/timeutil.h>
-#include <sternenblog/xml.h>
+#include <cgiutil.h>
+#include <stringutil.h>
+#include <timeutil.h>
+#include <xml.h>
 
 static struct xml_context ctx;
 
diff --git a/sternenblog/timeutil.c b/timeutil.c
index 187ace0..187ace0 100644
--- a/sternenblog/timeutil.c
+++ b/timeutil.c
diff --git a/sternenblog/timeutil.h b/timeutil.h
index 4d36967..4d36967 100644
--- a/sternenblog/timeutil.h
+++ b/timeutil.h
diff --git a/sternenblog/xml.c b/xml.c
index 5965a09..5965a09 100644
--- a/sternenblog/xml.c
+++ b/xml.c
diff --git a/sternenblog/xml.h b/xml.h
index e790f76..e790f76 100644
--- a/sternenblog/xml.h
+++ b/xml.h