From 4984de5fd4ba476e526183a6c585963b6a4530e1 Mon Sep 17 00:00:00 2001
From: William Coe <willcoe@aiven.io>
Date: Mon, 27 Apr 2020 10:28:17 +1000
Subject: [PATCH] Clean up Makefile

---
 Makefile | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/Makefile b/Makefile
index ed2c33e..feb09da 100644
--- a/Makefile
+++ b/Makefile
@@ -1,16 +1,15 @@
 short_ver = 0.0.1
 long_ver = $(shell git describe --long 2>/dev/null || echo $(short_ver)-0-unknown-g`git describe --always`)
-generated = rpm_s3_mirror/version.py
 
-all: $(generated)
+all:
 
 PYTHON ?= python3
-PYTHON_SOURCE_DIRS = rpm_s3_mirror/ test/
+PYTHON_SOURCE_DIRS = rpm_s3_mirror/ tests/
 PYTEST_ARG ?= -v
 
 clean:
 	$(RM) -r *.egg-info/ build/ dist/ rpm/
-	$(RM) ../rpm_s3_mirror_* test-*.xml $(generated)
+	$(RM) ../rpm_s3_mirror_* test-*.xml
 
 rpm:
 	git archive --output=rpm_s3_mirror-rpm-src.tar --prefix=rpm_s3_mirror/ HEAD
@@ -29,25 +28,24 @@ build-dep-fed:
 		python3-boto3 \
 		python3-lxml
 
-test: copyright
+test: copyright unittest
 
 .PHONY: copyright
 copyright:
 	$(eval MISSING_COPYRIGHT := $(shell git ls-files "*.py" | xargs grep -EL "Copyright \(c\) 20.* Aiven|Aiven license OK"))
 	@if [ "$(MISSING_COPYRIGHT)" != "" ]; then echo Missing Copyright statement in files: $(MISSING_COPYRIGHT) ; false; fi
 
+unittest:
+	$(PYTHON) -m pytest $(PYTEST_ARG) tests/
 
-unittest: $(generated)
-	$(PYTHON) -m pytest $(PYTEST_ARG) test/
-
-coverage: $(generated)
-	$(PYTHON) -m coverage run --source rpm_s3_mirror -m pytest $(PYTEST_ARG) test/
+coverage:
+	$(PYTHON) -m coverage run --source rpm_s3_mirror -m pytest $(PYTEST_ARG) tests/
 	$(PYTHON) -m coverage report --show-missing
 
-pylint: $(generated)
+pylint:
 	$(PYTHON) -m pylint.lint --rcfile .pylintrc $(PYTHON_SOURCE_DIRS)
 
-flake8: $(generated)
+flake8:
 	$(PYTHON) -m flake8 --exclude=__init__.py --ignore=E722 --max-line-len=125 $(PYTHON_SOURCE_DIRS)
 
 .PHONY: rpm