Reorganize the test source code and doc building.

[dunshire.git] / makefile

diff --git a/makefile b/makefile
index 511f2cc0fa17b948aeaca578c3331ad18c5b5502..e48e9a07212c0d09448c2a40cf4967da1586ded7 100644 (file)
--- a/makefile
+++ b/makefile
@@ -1,9 +1,9 @@
 PN := dunshire
 SRCDIR := src/$(PN)
+TESTDIR := src/test
 SRCS := $(SRCDIR)/*.py
 
 doc: $(SRCS) doc/source/conf.py doc/makefile
-       sphinx-apidoc -f -o doc/source $(SRCDIR)
        cd doc && $(MAKE) html
 
 .PHONY: doctest
@@ -12,7 +12,7 @@ doctest:
 
 .PHONY: check
 check:
-       python test/suite.py
+       PYTHONPATH=src python $(TESTDIR)/suite.py
 
 .PHONY: lint
 lint:
@@ -20,4 +20,4 @@ lint:
 
 .PHONY: clean
 clean:
-       rm -rf $(SRCDIR)/__pycache__ doc/build
+       rm -rf $(SRCDIR)/__pycache__ $(TESTDIR)/__pycache__ doc/build