[GRASS-SVN] r60411 - grass/trunk/lib/python/pygrass/docs

[svn_grass at osgeo.org]

Author: lucadelu
Date: 2014-05-22 06:44:29 -0700 (Thu, 22 May 2014)
New Revision: 60411

Modified:
   grass/trunk/lib/python/pygrass/docs/Makefile
Log:
pygrass: set html documentation output to main html grass documentation; remove superfluous output formats

Modified: grass/trunk/lib/python/pygrass/docs/Makefile
===================================================================
--- grass/trunk/lib/python/pygrass/docs/Makefile	2014-05-22 13:43:43 UTC (rev 60410)
+++ grass/trunk/lib/python/pygrass/docs/Makefile	2014-05-22 13:44:29 UTC (rev 60411)
@@ -14,6 +14,7 @@
 endif
 PAPER         =
 BUILDDIR      = _build
+BUILDDIR_HTML = $(HTMLDIR)/pygrass
 
 MYGISBASE = $(GISBASE)
 
@@ -33,75 +34,30 @@
 	@echo "  html       to make standalone HTML files"
 	@echo "  dirhtml    to make HTML files named index.html in directories"
 	@echo "  singlehtml to make a single large HTML file"
-	@echo "  pickle     to make pickle files"
-	@echo "  json       to make JSON files"
-	@echo "  htmlhelp   to make HTML files and a HTML help project"
-	@echo "  qthelp     to make HTML files and a qthelp project"
-	@echo "  devhelp    to make HTML files and a Devhelp project"
 	@echo "  epub       to make an epub"
 	@echo "  latex      to make LaTeX files, you can set PAPER=a4 or PAPER=letter"
 	@echo "  latexpdf   to make LaTeX files and run them through pdflatex"
-	@echo "  text       to make text files"
 	@echo "  man        to make manual pages"
-	@echo "  texinfo    to make Texinfo files"
-	@echo "  info       to make Texinfo files and run them through makeinfo"
-	@echo "  gettext    to make PO message catalogs"
-	@echo "  changes    to make an overview of all changed/added/deprecated items"
-	@echo "  linkcheck  to check all external links for integrity"
 	@echo "  doctest    to run all doctests embedded in the documentation (if enabled)"
 
 clean:
 	-rm -rf $(BUILDDIR)/*
 
 html:
-	$(call run_grass,$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html)
+	$(call run_grass,$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR_HTML))
 	@echo
-	@echo "Build finished. The HTML pages are in $(BUILDDIR)/html/"
+	@echo "Build finished. The HTML pages are in $(BUILDDIR_HTML)"
 
 dirhtml:
-	$(call run_grass,$(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml)
+	$(call run_grass,$(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR_HTML))
 	@echo
-	@echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml/"
+	@echo "Build finished. The HTML pages are in $(BUILDDIR_HTML)"
 
 singlehtml:
-	$(call run_grass,$(SPHINXBUILD) -b singlehtml $(ALLSPHINXOPTS) $(BUILDDIR)/singlehtml)
+	$(call run_grass,$(SPHINXBUILD) -b singlehtml $(ALLSPHINXOPTS) $(BUILDDIR_HTML))
 	@echo
-	@echo "Build finished. The HTML page is in $(BUILDDIR)/singlehtml/"
+	@echo "Build finished. The HTML page is in $(BUILDDIR_HTML)"
 
-pickle:
-	$(call run_grass,$(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(BUILDDIR)/pickle)
-	@echo
-	@echo "Build finished; now you can process the pickle files in $(BUILDDIR)/pickle/."
-
-json:
-	$(call run_grass,$(SPHINXBUILD) -b json $(ALLSPHINXOPTS) $(BUILDDIR)/json)
-	@echo
-	@echo "Build finished; now you can process the JSON files in $(BUILDDIR)/json/"
-
-htmlhelp:
-	$(call run_grass,$(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp)
-	@echo
-	@echo "Build finished; now you can run HTML Help Workshop with the" \
-	      ".hhp project file in $(BUILDDIR)/htmlhelp/"
-
-qthelp:
-	$(call run_grass,$(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp)
-	@echo
-	@echo "Build finished; now you can run "qcollectiongenerator" with the" \
-	      ".qhcp project file in $(BUILDDIR)/qthelp, like this:"
-	@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/PyGrass.qhcp"
-	@echo "To view the help file:"
-	@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/PyGrass.qhc"
-
-devhelp:
-	$(call run_grass,$(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp)
-	@echo
-	@echo "Build finished."
-	@echo "To view the help file:"
-	@echo "# mkdir -p $$HOME/.local/share/devhelp/PyGrass"
-	@echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/PyGrass"
-	@echo "# devhelp"
-
 epub:
 	$(call run_grass,$(SPHINXBUILD) -b epub $(ALLSPHINXOPTS) $(BUILDDIR)/epub)
 	@echo
@@ -120,45 +76,11 @@
 	$(MAKE) -C $(BUILDDIR)/latex all-pdf
 	@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex/"
 
-text:
-	$(call run_grass,$(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(BUILDDIR)/text)
-	@echo
-	@echo "Build finished. The text files are in $(BUILDDIR)/text/"
-
 man:
 	$(call run_grass,$(SPHINXBUILD) -b man $(ALLSPHINXOPTS) $(BUILDDIR)/man)
 	@echo
 	@echo "Build finished. The manual pages are in $(BUILDDIR)/man/"
 
-texinfo:
-	$(call run_grass,$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo)
-	@echo
-	@echo "Build finished. The Texinfo files are in $(BUILDDIR)/texinfo."
-	@echo "Run \`make' in that directory to run these through makeinfo" \
-	      "(use \`make info' here to do that automatically)."
-
-info:
-	$(call run_grass,$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo)
-	@echo "Running Texinfo files through makeinfo..."
-	make -C $(BUILDDIR)/texinfo info
-	@echo "makeinfo finished; the Info files are in $(BUILDDIR)/texinfo/"
-
-gettext:
-	$(call run_grass,$(SPHINXBUILD) -b gettext $(I18NSPHINXOPTS) $(BUILDDIR)/locale)
-	@echo
-	@echo "Build finished. The message catalogs are in $(BUILDDIR)/locale/"
-
-changes:
-	$(call run_grass,$(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes)
-	@echo
-	@echo "The overview file is in $(BUILDDIR)/changes/"
-
-linkcheck:
-	$(call run_grass,$(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck)
-	@echo
-	@echo "Link check complete; look for any errors in the above output " \
-	      "or in $(BUILDDIR)/linkcheck/output.txt."
-
 doctest:
 	$(call run_grass,$(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest)
 	@echo "Testing of doctests in the sources finished, look at the " \