Sphinx adapted Makefile

Makefile

@@ -2,17 +2,23 @@
 
 .venv:
 	python3 -m venv .venv
-	. .venv/bin/activate
-	pip3 install --upgrade pdoc3
-	pip3 install --upgrade GitPython
-	pip3 install --upgrade build
-	pip3 install --upgrade twine
-	pip3 install --upgrade pytest flake8
+	. .venv/bin/activate ; \
+	pip install -r docs/requirements.txt
+	#  Regen requirements;
+	#    pip freeze > docs/requirements.txt
+
 
 doc: .venv
-	. .venv/bin/activate
-	rm -rf docs/html
-	pdoc --html TermTk -o docs/html
+	# old doc gen, using pdoc3 ; \
+	# . .venv/bin/activate ; \
+	# rm -rf docs/html ; \
+	# pdoc --html TermTk -o docs/html ; \
+	. .venv/bin/activate ; \
+	rm -rf docs/html ; \
+	rm -rf docs/source/autogen.* ; \
+	# sphinx-apidoc -o docs/source/TermTk/ -e TermTk/ ; \
+	make -C docs/ clean ; \
+	make -C docs/ html ;
 
 runGittk: .venv
 	. .venv/bin/activate
@@ -37,8 +43,9 @@ buildTest: .venv
 deployDoc:
 	git checkout gh-pages
 	find index.html TTk* libbpytop -name "*.html" | rm -rf
-	cp -a docs/html/TermTk/* .
-	find index.html TTk* libbpytop -name "*.html" | xargs git add
+	# cp -a docs/html/TermTk/* .
+	cp -a docs/build/html/* .
+	find *.html *.inv *.js autogen.TermTk _* | xargs git add
 	git commit -m "Doc Updated"
 	git push origin gh-pages
 	git checkout main