add make generate

diff --git a/Makefile b/Makefile
index 1583cd0a98a85b630819c298a77cd97c71e8036e..ccc0a0bab8a2b6ac303be29e43ebbf9e9fa08bcb 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,9 @@
 PYTHON3 ?= "python3"
 
 .PHONY: help Makefile gitupdate svanalysis test htmlupload pypiupload \
-        pyfnwriter pywriter
+        pyfnwriter pywriter generate
+
+generate: svanalysis pyfnwriter pywriter
 
 gitupdate:
        git submodule init
@@ -12,18 +14,18 @@ svanalysis:
        sv_analysis
 
 # now installed as a command (/usr/local/bin/pywriter) by setup.py
-pywriter:
+pywriter: | svanalysis
        pywriter
 
 # likewise
-pyfnwriter:
+pyfnwriter: | pywriter
        pyfnwriter
 
 develop:
        python3 setup.py develop # yes, develop, not install
 
 # testing (usually done at install time)
-test: develop
+test: develop setup
        python3 setup.py test # could just run nosetest3...
 
 pypiupload:

diff --git a/README.md b/README.md
index 708b81e2d4fb1f91e9311dc9ef58fcb12ad09e6a..e664b8f02499c819320443e107e2581308179cf4 100644 (file)
--- a/README.md
+++ b/README.md
@@ -23,9 +23,7 @@ and the following scripts:
 Once those are sorted, installation and setup is as follows:
 
 * python3 setup.py develop
-* make svanalysis
-* make pywriter
-* make pyfnwriter
+* make generate
 
 # Usage