Merge pull request #2929 from merriam/merriam-clean-sources

Merriam Makefile Updates

Makefile

@@ -31,6 +31,25 @@ endif
 
 .PHONY: build force mesabuild pdf style stylereport hook test batchtest cover clean distclean theming
 
+help:
+	@echo "Please use \`make <target>' where <target> is one of"
+	@echo "  build          for a standard build"
+	@echo "  clean          remove generated and compiled files"
+	@echo "  cover          create an html coverage report of unittests"
+	@echo "  debug          for a debug build (with -g)"
+	@echo "  dist-clean     clean then use 'git clean'"
+	@echo "  force          for a forced build (with -f)"
+	@echo "  hook           add Pep-8 checking as a git precommit hook"
+	@echo "  html           to make standalone HTML files"
+	@echo "  install        run a setup.py install"
+	@echo "  mesabuild      for a build with MesaGL"
+	@echo "  style          to check Python code for style hints."
+	@echo "  style-report   make html version of style hints"
+	@echo "  test           run unittests (nosetests)"
+	@echo "  theming        create a default theme atlas"
+	@echo "  "
+	@echo "You can also 'cd doc && make help' to build more documentation types"
+
 build:
 	$(PYTHON) setup.py $(BUILD_OPTS)
 

doc/Makefile

@@ -44,16 +44,22 @@ AUTOBUILD_STAMP      = $(AUTOBUILD_STAMP_BASE)$(PYTHON)
 
 help:
 	@echo "Please use \`make <target>' where <target> is one of"
+	@echo "  build-all to build the common documentation types."
+	@echo "  changes   to make an overview over all changed/added/deprecated items"
+	@echo "  clean     to remove generated files"
+	@echo "  gettext   to make gettext pages"
 	@echo "  html      to make standalone HTML files"
-	@echo "  pickle    to make pickle files (usable by e.g. sphinx-web)"
 	@echo "  htmlhelp  to make HTML files and a HTML help project"
 	@echo "  latex     to make LaTeX files, you can set PAPER=a4 or PAPER=letter"
+	@echo "  linkcheck to check through the reference linking"
+	@echo "  man       to build Man doctrees."
 	@echo "  pdf       to make standalone PDF files"
+	@echo "  pickle    to make pickle files (usable by e.g. sphinx-web)"
 	@echo "  ps        to make standalone PS files"
-	@echo "  changes   to make an overview over all changed/added/deprecated items"
-	@echo "  linkcheck to check all external links for integrity"
+	@echo "  web       same as pickle"
 
 clean:
+	-rm -rf sources/api-*.rst
 # windows just doesn't support e.g. build\*
 ifdef ComSpec
 	-rmdir /s /q build