make DB helper functions free functions

[nominatim.git] / Makefile

diff --git a/Makefile b/Makefile
index 1575b72a5d5d273ee3f31cc969d11f2d52fe8bd2..dae45322a0410980af4f2419065429c5ca065786 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,20 +2,20 @@ all:
 
 # Building of wheels
 
-build: build-core build-db build-api
+build: clean-build build-db build-api
 
-build-core:
-       cd packaging/nominatim-core; python3 -m build . --outdir ../dist/
+clean-build:
+       rm -f dist/*
 
 build-db:
-       cd packaging/nominatim-db; python3 -m build . --outdir ../dist/
+       python3 -m build packaging/nominatim-db --outdir dist/
 
 build-api:
-       cd packaging/nominatim-api; python3 -m build . --outdir ../dist/
+       python3 -m build packaging/nominatim-api --outdir dist/
 
 # Tests
 
-tests: mypy lint pytest
+tests: mypy lint pytest bdd
 
 mypy:
        mypy --strict src
@@ -29,4 +29,4 @@ lint:
 bdd:
        cd test/bdd; behave -DREMOVE_TEMPLATE=1
 
-.PHONY: tests mypy pytest lint bdd build build-core build-db build-api
+.PHONY: tests mypy pytest lint bdd build clean-build build-db build-api