diff -ru a/Makefile b/Makefile
--- a/Makefile	2021-02-12 02:25:39.000000000 +0300
+++ b/Makefile	2023-06-30 02:16:45.402446633 +0300
@@ -13,60 +13,72 @@
 INSTALL_DIR = $(INSTALL) -d -m 755
 RM = rm
 RM_RF = $(RM) -rf
-CMAKE ?= cmake
-CMAKE_FLAGS = -DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_FLAGS=-fPIC
 
-### flags
+### directories
 #
-GLIB_CFLAGS ?= $(shell $(PKG_CONFIG) --cflags glib-2.0)
-GLIB_LDFLAGS ?= $(shell $(PKG_CONFIG) --libs glib-2.0)
-
-LIBPURPLE_CFLAGS=$(shell $(PKG_CONFIG) --cflags purple)
-PURPLE_DIR=$(shell $(PKG_CONFIG) --variable=plugindir purple)
-LIBPURPLE_LDFLAGS=$(shell $(PKG_CONFIG) --cflags purple) \
-		    -L$(PURPLE_DIR)
+LDIR=./lib
+BDIR=./build
+SDIR=./src
+HDIR=./headers
+TDIR=./test
 
-LIBOMEMO_CFLAGS = $(shell $(PKG_CONFIG) --cflags libomemo)
-LIBOMEMO_LDFLAGS = $(shell $(PKG_CONFIG) --libs libomemo)
+PURPLE_PLUGIN_DIR := $(shell $(PKG_CONFIG) --variable=plugindir purple)
 
-LIBAXC_CFLAGS = $(shell $(PKG_CONFIG) --cflags libaxc)
-LIBAXC_LDFLAGS = $(shell $(PKG_CONFIG) --libs libaxc)
+### flags
+#
+GLIB_CFLAGS      := $(shell $(PKG_CONFIG) --cflags glib-2.0)
+GLIB_LIBS        := $(shell $(PKG_CONFIG) --libs glib-2.0)
 
-LIBSIGNAL_PROTOCOL_CFLAGS = $(shell $(PKG_CONFIG) --cflags libsignal-protocol-c)
-LIBSIGNAL_PROTOCOL_LDFLAGS = $(shell $(PKG_CONFIG) --cflags libsignal-protocol-c)
+LIBOMEMO_CFLAGS  := $(shell $(PKG_CONFIG) --cflags libomemo)
+LIBOMEMO_LIBS    := $(shell $(PKG_CONFIG) --libs libomemo)
 
-XML2_CFLAGS ?= $(shell $(XML2_CONFIG) --cflags)
-XML2_LDFLAGS ?= $(shell $(XML2_CONFIG) --libs)
+LIBAXC_CFLAGS    := $(shell $(PKG_CONFIG) --cflags libaxc)
+LIBAXC_LIBS      := $(shell $(PKG_CONFIG) --libs libaxc)
 
-LIBGCRYPT_LDFLAGS ?= $(shell $(LIBGCRYPT_CONFIG) --libs)
+LIBSIGNAL_CFLAGS := $(shell $(PKG_CONFIG) --cflags libsignal-protocol-c)
+LIBSIGNAL_LIBS   := $(shell $(PKG_CONFIG) --cflags libsignal-protocol-c)
 
-USE_DYNAMIC_LIBS=libsignal-protocol-c libaxc libomemo
-USE_DYNAMIC_LIBS:=$(shell pkg-config --exists $(USE_DYNAMIC_LIBS) && \
-	echo '$(USE_DYNAMIC_LIBS)')
+SQLITE3_CFLAGS   := $(shell $(PKG_CONFIG) --cflags sqlite3)
+SQLITE3_LIBS     := $(shell $(PKG_CONFIG) --libs sqlite3)
 
-PKGCFG_C=$(GLIB_CFLAGS) \
-	 $(LIBPURPLE_CFLAGS) \
-	 $(XML2_CFLAGS)
+XML2_CFLAGS      := $(shell $(XML2_CONFIG) --cflags)
+XML2_LIBS        := $(shell $(XML2_CONFIG) --libs)
 
-ifneq ($(USE_DYNAMIC_LIBS),)
-	PKGCFG_C+=$(LIBOMEMO_CFLAGS) \
-	 $(LIBAXC_CFLAGS) \
-	 $(LIBSIGNAL_PROTOCOL_CFLAGS)
-endif
+LIBGCRYPT_CFLAGS := $(shell $(LIBGCRYPT_CONFIG) --cflags)
+LIBGCRYPT_LIBS   := $(shell $(LIBGCRYPT_CONFIG) --libs)
 
+LIBPURPLE_CFLAGS := $(shell $(PKG_CONFIG) --cflags purple)
+LIBPURPLE_LIBS   := $(shell $(PKG_CONFIG) --libs purple)
 
-PKGCFG_L=$(shell $(PKG_CONFIG) --libs sqlite3 mxml) \
-	 $(GLIB_LDFLAGS) \
-	 $(LIBPURPLE_LDFLAGS) \
-	 $(XML2_LDFLAGS) \
-	 $(LIBGCRYPT_LDFLAGS)
-
-ifneq ($(USE_DYNAMIC_LIBS),)
-	PKGCFG_L+=$(LIBOMEMO_LDFLAGS) \
-	 $(LIBAXC_LDFLAGS) \
-	 $(LIBSIGNAL_PROTOCOL_LDFLAGS)
-endif
+LIBPURPLE_LDFLAGS := $(shell $(PKG_CONFIG) --cflags purple) \
+		    -L$(PURPLE_DIR)
 
+cppflags = \
+	-I$(HDIR)/jabber \
+	-D_XOPEN_SOURCE=700 -D_BSD_SOURCE -D_DEFAULT_SOURCE \
+	$(CPPFLAGS)
+cflags= \
+	-std=c11 -Wall -g -Wstrict-overflow \
+	$(GLIB_CFLAGS) \
+	$(LIBOMEMO_CFLAGS) \
+	$(LIBAXC_CFLAGS) \
+	$(LIBSIGNAL_PROTOCOL_CFLAGS) \
+	$(SQLITE3_CFLAGS) \
+	$(XML2_CFLAGS) \
+	$(LIBPURPLE_CFLAGS) \
+	$(LIBGCRYPT_CFLAGS) \
+	$(CFLAGS)
+
+libs= \
+	$(GLIB_LIBS) \
+	$(LIBOMEMO_LIBS) \
+	$(LIBAXC_LIBS) \
+	$(LIBSIGNAL_PROTOCOL_LIBS) \
+	$(SQLITE3_LIBS) \
+	$(XML2_LIBS) \
+	$(LIBPURPLE_LIBS) \
+	$(LIBGCRYPT_LIBS) \
+	$(LIBS)
 
 ifneq ("$(wildcard /etc/redhat-release)","")
 	LJABBER= -lxmpp
@@ -78,51 +90,21 @@
 endif
 endif
 
-ifeq ($(USE_DYNAMIC_LIBS),)
-	HEADERS=-I$(HDIR)/jabber -I$(LOMEMO_SRC) -I$(AXC_SRC) -I$(AX_DIR)/src
-else
-	HEADERS=-I$(HDIR)/jabber
-endif
-CFLAGS += -std=c11 -Wall -g -Wstrict-overflow $(PKGCFG_C) $(HEADERS)
 PLUGIN_CPPFLAGS=-DPURPLE_PLUGINS
 # -D_BSD_SOURCE can be removed once nobody uses glibc <= 2.18 any more
-CPPFLAGS += -D_XOPEN_SOURCE=700 -D_BSD_SOURCE -D_DEFAULT_SOURCE
-LDFLAGS += -ldl -lm $(PKGCFG_L) $(LJABBER) -Wl,-rpath,$(PURPLE_PLUGIN_DIR)
+LDFLAGS += -ldl $(PKGCFG_L) $(LJABBER)
 LDFLAGS_T=$(LDFLAGS) -lpurple -lcmocka
 
-### directories
-#
 PURPLE_HOME_PLUGIN_DIR=$(HOME)/.purple/plugins
 PURPLE_PLUGIN_DIR = $(shell $(PKG_CONFIG) --variable=plugindir purple)
 
-LDIR=./lib
-BDIR=./build
-SDIR=./src
-HDIR=./headers
-TDIR=./test
-
-LOMEMO_DIR=$(LDIR)/libomemo
-LOMEMO_SRC=$(LOMEMO_DIR)/src
-LOMEMO_BUILD=$(LOMEMO_DIR)/build
-LOMEMO_PATH=$(LOMEMO_BUILD)/libomemo-conversations.a
-
-AXC_DIR=$(LDIR)/axc
-AXC_SRC=$(AXC_DIR)/src
-AXC_BUILD=$(AXC_DIR)/build
-AXC_PATH=$(AXC_BUILD)/libaxc-nt.a
-
-AX_DIR=$(AXC_DIR)/lib/libsignal-protocol-c
-AX_PATH=$(AX_DIR)/build/src/libsignal-protocol-c.a
-
 SOURCES := $(sort $(wildcard $(SDIR)/*.c))
 OBJECTS := $(patsubst $(SDIR)/%.c, $(BDIR)/%.o, $(SOURCES))
 OBJECTS_W_COVERAGE := $(patsubst $(SDIR)/%.c, $(BDIR)/%_w_coverage.o, $(SOURCES))
-TEST_SOURCES := $(sort $(wildcard $(TDIR)/test_*.c))
-TEST_OBJECTS := $(patsubst $(TDIR)/test_%.c, $(BDIR)/test_%.o, $(TEST_SOURCES))
-TEST_TARGETS := $(patsubst $(TDIR)/test_%.c, $(BDIR)/test_%, $(TEST_SOURCES))
-ifeq ($(USE_DYNAMIC_LIBS),)
-	VENDOR_LIBS=$(LOMEMO_PATH) $(AXC_PATH) $(AX_PATH)
-endif
+
+TEST_SOURCES  := $(TDIR)/test_lurch_api.c $(TDIR)/test_lurch_util.c
+TEST_PROGRAMS := $(patsubst $(TDIR)/test_%.c, $(BDIR)/test_%, $(TEST_SOURCES))
+TEST_TARGETS  := $(patsubst $(TDIR)/test_%.c, test_%, $(TEST_SOURCES))
 
 ### make rules
 #
@@ -131,71 +113,46 @@
 $(BDIR):
 	$(MKDIR_P) build
 
-$(AX_PATH):
-	cd $(AX_DIR)/ && \
-	   $(MKDIR_P) build && \
-	   cd build && \
-	   $(CMAKE) $(CMAKE_FLAGS) .. \
-	   && $(MAKE)
-
-$(AXC_PATH):
-	$(MAKE) -C "$(AXC_DIR)" build/libaxc-nt.a
-
-$(LOMEMO_PATH):
-	$(MAKE) -C "$(LOMEMO_DIR)" build/libomemo-conversations.a
-
 $(BDIR)/%.o: $(SDIR)/%.c | $(BDIR)
-	$(CC) -fPIC $(CFLAGS) $(CPPFLAGS) $(PLUGIN_CPPFLAGS) -c $(SDIR)/$*.c -o $@
+	$(CC) -fPIC $(cppflags) $(cflags) -c -o $@ $<
 
-$(BDIR)/%_w_coverage.o: $(SDIR)/%.c | $(BDIR)
-	$(CC) -O0 --coverage $(CFLAGS) $(CPPFLAGS) $(PLUGIN_CPPFLAGS) -c $(SDIR)/$*.c -o $@
+$(BDIR)/%.o: $(TDIR)/%.c | $(BDIR)
+	$(CC) -fPIC $(cppflags) $(cflags) -c -o $@ $<
 
-$(BDIR)/test_%.o: $(TDIR)/test_%.c | $(BDIR)
-	$(CC) $(CFLAGS) -O0 -c $(TDIR)/test_$*.c -o $@
+$(BDIR)/test_%: $(TDIR)/test_%.c | $(BDIR)
+	$(CC) $(cppflags) $(cflags) -c -o $@ $<
 
-$(BDIR)/lurch.so: $(OBJECTS) $(VENDOR_LIBS)
-	$(CC) -fPIC -shared $(CFLAGS) $(CPPFLAGS) $(PLUGIN_CPPFLAGS) \
-		$^ \
-		-o $@ $(LDFLAGS)
-$(BDIR)/lurch.a: $(BDIR)/lurch.o $(VENDOR_LIBS)
-	$(AR) rcs $@ $^
+$(BDIR)/lurch.so: $(OBJECTS)
+	$(CC) -shared $(cflags) \
+		-o $@ $(libs) \
+		$^
 
 install: $(BDIR)/lurch.so
-	[ -e "$(DESTDIR)/$(PURPLE_PLUGIN_DIR)" ] || \
-		$(INSTALL_DIR) "$(DESTDIR)/$(PURPLE_PLUGIN_DIR)"
-	$(INSTALL_LIB) "$(BDIR)/lurch.so" "$(DESTDIR)/$(PURPLE_PLUGIN_DIR)/lurch.so"
-
-install-home: $(BDIR)/lurch.so
-	[ -e "$(PURPLE_HOME_PLUGIN_DIR)" ] || \
-		$(INSTALL_DIR) "$(PURPLE_HOME_PLUGIN_DIR)"
-	$(INSTALL_LIB) "$(BDIR)/lurch.so" "$(PURPLE_HOME_PLUGIN_DIR)/lurch.so"
-
-
-LURCH_VERSION ?= 0.0.0
-TARBALL_DIR_NAME=lurch-$(LURCH_VERSION)
-TARBALL_FILE_NAME=$(TARBALL_DIR_NAME)-src.tar.gz
-
-tarball: | clean-all $(BDIR)
-	$(MKDIR) $(TARBALL_DIR_NAME)
-	rsync -av --progress . $(TARBALL_DIR_NAME)/ --exclude $(TARBALL_DIR_NAME)/ --exclude-from=.gitignore
-	-find $(TARBALL_DIR_NAME)/ -name "*.git*" -exec rm -rf "{}" \;
-	tar czf $(TARBALL_FILE_NAME) $(TARBALL_DIR_NAME)/
-	mv $(TARBALL_FILE_NAME) $(TARBALL_DIR_NAME)/
-	mv $(TARBALL_DIR_NAME) $(BDIR)/
+	$(INSTALL_DIR) "$(DESTDIR)/$(PURPLE_PLUGIN_DIR)"
+	$(INSTALL_LIB) -s "$(BDIR)/lurch.so" "$(DESTDIR)/$(PURPLE_PLUGIN_DIR)/lurch.so"
 
-$(BDIR)/test_lurch_util: $(OBJECTS_W_COVERAGE) $(VENDOR_LIBS) $(BDIR)/test_lurch_util.o
-	$(CC) $(CFLAGS) $(CPPFLAGS) -O0 --coverage $^ $(PURPLE_DIR)/libjabber.so.0 -o $@ $(LDFLAGS_T) \
+test: $(TEST_TARGETS)
+
+$(TEST_TARGETS): %: $(BDIR)/%
+	$<
+
+$(BDIR)/test_lurch_util: $(OBJECTS) $(BDIR)/test_lurch_util.o
+	$(CC) $(cflags) -o $@  \
 	-Wl,--wrap=purple_user_dir \
 	-Wl,--wrap=purple_prefs_get_bool \
 	-Wl,--wrap=purple_prefs_get_int \
 	-Wl,--wrap=purple_debug_error \
 	-Wl,--wrap=purple_debug_info \
 	-Wl,--wrap=purple_debug_misc \
-	-Wl,--wrap=purple_base16_encode_chunked
-	bash -c "set -o pipefail; $@ 2>&1 | grep -Ev ".*CRITICAL.*" | tr -s '\n'" # filter annoying and irrelevant glib output
+	-Wl,--wrap=purple_base16_encode_chunked \
+	-lcmocka \
+	-Wl,-rpath,$(PURPLE_PLUGIN_DIR) $(PURPLE_PLUGIN_DIR)/libjabber.so.0 \
+	$(LIBPURPLE_LIBS) \
+	$(libs) \
+	$^
 
-$(BDIR)/test_lurch_api: $(OBJECTS_W_COVERAGE) $(VENDOR_LIBS) $(BDIR)/test_lurch_api.o
-	$(CC) $(CFLAGS) $(CPPFLAGS) -O0 --coverage $^ $(PURPLE_DIR)/libjabber.so.0 -o $@ $(LDFLAGS_T) \
+$(BDIR)/test_lurch_api: $(OBJECTS) $(BDIR)/test_lurch_api.o
+	$(CC) $(cflags) -o $@ \
 	-Wl,--wrap=purple_account_get_username \
 	-Wl,--wrap=purple_account_get_connection \
 	-Wl,--wrap=purple_connection_get_protocol_data \
@@ -216,10 +173,12 @@
 	-Wl,--wrap=omemo_storage_chatlist_save \
 	-Wl,--wrap=omemo_storage_chatlist_exists \
 	-Wl,--wrap=omemo_storage_user_devicelist_retrieve \
-	-Wl,--wrap=lurch_util_fp_get_printable
-	bash -c "set -o pipefail; $@ 2>&1 | grep -Ev ".*CRITICAL.*" | tr -s '\n'" # filter annoying and irrelevant glib output
-
-test: $(OBJECTS_W_COVERAGE) $(VENDOR_LIBS) $(TEST_TARGETS)
+	-Wl,--wrap=lurch_util_fp_get_printable \
+	-lcmocka \
+	-Wl,-rpath,$(PURPLE_PLUGIN_DIR) $(PURPLE_PLUGIN_DIR)/libjabber.so.0 \
+	$(LIBPURPLE_LIBS) \
+	$(libs) \
+	$^
 
 coverage: test
 	gcovr -r . --html --html-details -o build/coverage.html
@@ -228,9 +187,5 @@
 clean:
 	$(RM_RF) "$(BDIR)"
 
-clean-all: clean
-	$(MAKE) -C "$(LOMEMO_DIR)" clean
-	$(MAKE) -C "$(AXC_DIR)" clean-all
-
-.PHONY: clean clean-all install install-home tarball test coverage
+.PHONY: clean install test $(TEST_TARGETS)