--- a/Makefile	Thu Aug 04 14:59:33 2022 +0200
+++ b/Makefile	Thu Aug 04 16:47:10 2022 +0200
@@ -20,13 +20,14 @@
 
 include config.mk
 
-LIBSCI=                 lib/libsci.a
-LIBSCI_SRCS=            extern/libsqlite/sqlite3.c \
-                        lib/apic.c \
-                        lib/log.c \
-                        lib/strlcpy.c \
-                        lib/strtonum.c \
-                        lib/util.c
+VERSION=                0.1.0
+
+LIBSCI=                 libsci/libsci.a
+LIBSCI_SRCS=            libsci/apic.c \
+                        libsci/log.c \
+                        libsci/strlcpy.c \
+                        libsci/strtonum.c \
+                        libsci/util.c
 LIBSCI_OBJS=            ${LIBSCI_SRCS:.c=.o}
 LIBSCI_DEPS=            ${LIBSCI_SRCS:.c=.d}
 
@@ -54,6 +55,7 @@
 SCID=                   scid/scid
 SCID_SRCS=              extern/libduktape/duktape.c \
                         extern/libmustache4c/mustache.c \
+                        extern/libsqlite/sqlite3.c \
                         scid/crud.c \
                         scid/db.c \
                         scid/http.c \
@@ -100,14 +102,15 @@
                         -Iextern/libgreatest \
                         -Iextern/libmustache4c \
                         -Iextern/libduktape \
-                        -Ilib \
+                        -Ilibsci \
                         -I.
 DEFS=                   -DVARDIR=\"${VARDIR}\" \
-                        -DTMPDIR=\"${TMPDIR}\" \
+                        -DVERSION=\"${VERSION}\" \
                         -DSQLITE_THREADSAFE=0 \
                         -DSQLITE_OMIT_LOAD_EXTENSION=0 \
                         -DSQLITE_OMIT_DEPRECATED=0 \
                         -DSQLITE_DEFAULT_FOREIGN_KEY=1
+SUBST=                  -e "s,@VERSION@,${VERSION},g"
 
 .SUFFIXES:
 .SUFFIXES: .c .o .sql .h
@@ -147,8 +150,7 @@
 ${SCICTL_OBJS}: ${LIBSCI}
 
 ${SCICTL}: ${SCICTL_OBJS}
-	${CC} ${CFLAGS} -o $@ ${SCICTL_OBJS} ${LIBSCI} \
-		${LIBCURL_LIBS} ${JANSSON_LIBS} ${LDFLAGS}
+	${CC} ${CFLAGS} -o $@ ${SCICTL_OBJS} ${LIBSCI} ${LIBCURL_LIBS} ${JANSSON_LIBS} ${LDFLAGS}
 
 # }}}
 
@@ -157,8 +159,7 @@
 ${SCID_OBJS}: ${LIBSCI}
 
 ${SCID}: ${SCID_OBJS}
-	${CC} ${CFLAGS} -o $@ ${SCID_OBJS} lib/libsci.a \
-		${JANSSON_LIBS} ${KCGI_LIBS} -lm ${LDFLAGS}
+	${CC} ${CFLAGS} -o $@ ${SCID_OBJS} ${LIBSCI} ${JANSSON_LIBS} ${KCGI_LIBS} -lm ${LDFLAGS}
 
 # }}}
 
@@ -167,8 +168,7 @@
 ${SCIWORKERD_OBJS}: ${LIBSCI}
 
 ${SCIWORKERD}: ${SCIWORKERD_OBJS}
-	${CC} ${CFLAGS} -o $@ ${SCIWORKERD_OBJS} lib/libsci.a \
-		${LIBCURL_LIBS} ${JANSSON_LIBS} ${LDFLAGS}
+	${CC} ${CFLAGS} -o $@ ${SCIWORKERD_OBJS} ${LIBSCI} ${LIBCURL_LIBS} ${JANSSON_LIBS} ${LDFLAGS}
 
 # }}}
 
@@ -188,9 +188,12 @@
 	rm -f ${SCIWORKERD}${SCIWORKERD_OBJS} ${SCIWORKERD_DEPS}
 	rm -f ${TESTS_OBJS} ${TESTS_DEPS}
 
+doxygen:
+	sed ${SUBST} < doc/Doxyfile | doxygen -
+
 ${TESTS_OBJS}: lib/libsci.a
 
 tests: lib/libsci.a ${TESTS_OBJS}
 	for t in ${TESTS_OBJS}; do $$t -v; done
 
-.PHONY: all clean install tests
+.PHONY: all clean doxygen install tests