--- a/Makefile	Mon Jan 01 16:43:18 2024 +0100
+++ b/Makefile	Tue Jan 02 23:31:00 2024 +0100
@@ -21,61 +21,40 @@
 # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-include config.mk
-
 all: compile test-compile FORCE
 
-install:
+install: config.mk FORCE
 	@cd src && $(MAKE) install
 
-dist: FORCE
-	$(MKDIR) $(dist_dir)/libucx
-	$(COPYALL) CHANGELOG configure COPYING Doxyfile Makefile README \
-		uaplogo.png docs make src tests $(dist_dir)/libucx/
-	@cd $(dist_dir) && tar -czf libucx-src-$(VERSION).tar.gz -Hustar libucx
-	@echo "[ Dist created: $(dist_dir)/libucx-src-$(VERSION).tar.gz ]"
+dist: config.mk FORCE
+	$(MAKE) -f make/makefile.mk dist
 
-clean:
-	$(RMDIR) $(build_dir)
+clean: config.mk FORCE
+	$(MAKE) -f make/makefile.mk clean
 
-dist-clean:
-	$(RMDIR) $(dist_dir)
-	$(RMDIR) $(build_dir)
-
-compile: $(build_dir) static shared
+dist-clean: config.mk FORCE
+	$(MAKE) -f make/makefile.mk dist-clean
 
-$(build_dir):
-	$(MKDIR) $@
+compile: config.mk FORCE
+	$(MAKE) -f make/makefile.mk compile
 
-shared: FORCE
-	@cd src && $(MAKE) OBJ_EXT=.shared.o \
-		CFLAGS="$(CFLAGS) $(SHLIB_CFLAGS)" \
-		LDFLAGS="$(LDFLAGS) $(SHLIB_LDFLAGS)" \
-		shared
+test-compile: config.mk FORCE
+	$(MAKE) -f make/makefile.mk test-compile
 
-static: FORCE
-	@cd src && $(MAKE) static
-
-check: all
-	$(RMFILE) $(build_dir)/*.gcda
-	$(RMFILE) $(build_dir)/tests/*.gcda
-	$(build_dir)/tests/ucxtest
+check: config.mk FORCE
+	$(MAKE) -f make/makefile.mk check
 
 check-coverage: FORCE
 	$(MAKE) -s check
 	@cd src && $(MAKE) check-coverage
 
-test-compile:
-	cd tests && $(MAKE)
+docs: config.mk FORCE
+	$(MAKE) -f make/makefile.mk docs
 
-docs: FORCE
-	@(test "$(WITH_DOCS_API)" = "yes" && cd docs && $(MAKE) all-api) \
-		|| echo "[ Generation of API Docs disabled - skipped ]"
-	@(test "$(WITH_DOCS_HTML)" = "yes" && cd docs && $(MAKE) all-html) \
-		|| echo "[ Generation of HTML Docs disabled - skipped ]"
+update-rules: config.mk FORCE
+	$(MAKE) -f make/makefile.mk update-rules
 
-update-rules:
-	make/update-rules.sh src
-	CFLAGS='$(CFLAGS) -I../src' make/update-rules.sh tests '$$(TEST_DIR)'
+config.mk:
+	./configure --release
 
 FORCE: