X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=Makefile;h=ccc0a0bab8a2b6ac303be29e43ebbf9e9fa08bcb;hb=0c9ba1a68c862791e849ea607b588888bcae6ea4;hp=476773317b240b0756a42a983bd758fa602fd0ab;hpb=4a73ed8633945ab25107532fbd622a8db94d0043;p=openpower-isa.git

diff --git a/Makefile b/Makefile
index 47677331..ccc0a0ba 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,9 @@
 PYTHON3 ?= "python3"
 
-.PHONY: help Makefile gitupdate svanalysis test htmlupload pypiupload pywriter
+.PHONY: help Makefile gitupdate svanalysis test htmlupload pypiupload \
+        pyfnwriter pywriter generate
+
+generate: svanalysis pyfnwriter pywriter
 
 gitupdate:
 	git submodule init
@@ -8,17 +11,21 @@ gitupdate:
 
 # now installed as a command (/usr/local/bin/svanalysis) by setup.py
 svanalysis:
-	svanalysis
+	sv_analysis
 
 # now installed as a command (/usr/local/bin/pywriter) by setup.py
-pywriter:
+pywriter: | svanalysis
 	pywriter
 
+# likewise
+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:
@@ -41,13 +48,13 @@ help:
 # copies all documentation to libre-soc (libre-soc admins only)
 htmlupload: clean html
 	rsync -HPavz --delete build/html/* \
-        libre-soc.org:/var/www/libre-soc.org/docs/soc/
+        libre-soc.org:/var/www/libre-soc.org/docs/openpower-isa/
 
 # Catch-all target: route all unknown targets to Sphinx using the new
 # "make mode" option.  $(O) is meant as a shortcut for $(SPHINXOPTS).
 %: Makefile
 	echo "catch-all falling through to sphinx for document building"
 	mkdir -p "$(SOURCEDIR)"/src/gen
-	sphinx-apidoc --ext-autodoc -o "$(SOURCEDIR)"/src/gen ./src/soc
+	sphinx-apidoc --ext-autodoc -o "$(SOURCEDIR)"/src/gen ./src/openpower
 	@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)