From 2b17df256812c29c6c446ee1bf2d2121a1feb422 Mon Sep 17 00:00:00 2001
From: Ned Batchelder <ned@nedbatchelder.com>
Date: Sun, 21 Jun 2009 19:03:53 -0400
Subject: Get rid of the doc Makefile, put it all in the root.

---
 Makefile     | 22 ++++++++++++++++++
 doc/Makefile | 74 ------------------------------------------------------------
 2 files changed, 22 insertions(+), 74 deletions(-)
 delete mode 100644 doc/Makefile

diff --git a/Makefile b/Makefile
index 31b79b08..59681065 100644
--- a/Makefile
+++ b/Makefile
@@ -20,6 +20,7 @@ clean:
 	-rm -f .coverage .coverage.*
 	-rm -f $(TEST_ZIP)
 	-rm -f setuptools-*.egg
+	-rm -rf doc/_build/*
 
 LINTABLE_TESTS = \
 	test/coverage_coverage.py \
@@ -63,3 +64,24 @@ $(DEVINST_FILE): coverage/tracer.c
 uninstall:
 	-rm -rf $(PYHOME)/lib/site-packages/coverage*
 	-rm -rf $(PYHOME)/scripts/coverage*
+
+SPHINXBUILD = sphinx-build
+SPHINXOPTS = -a -E doc
+WEBHOME = c:/ned/web/stellated/pages/code/coverage
+
+px:
+	$(SPHINXBUILD) -b px $(SPHINXOPTS) doc/_build/px
+	rm doc/_build/px/search.px
+	@echo
+	@echo "Build finished. The PX files are in doc/_build/px."
+
+dochtml:
+	$(SPHINXBUILD) -b html $(SPHINXOPTS) doc/_build/html
+	@echo
+	@echo "Build finished. The HTML pages are in doc/_build/html."
+
+publish:
+	rm -f $(WEBHOME)/*.px
+	cp doc/_build/px/*.px $(WEBHOME)
+	rm -f $(WEBHOME)/sample_html/*.*
+	cp doc/sample_html/*.* $(WEBHOME)/sample_html
diff --git a/doc/Makefile b/doc/Makefile
deleted file mode 100644
index 0d3e4255..00000000
--- a/doc/Makefile
+++ /dev/null
@@ -1,74 +0,0 @@
-# Makefile for Sphinx documentation
-#
-
-# You can set these variables from the command line.
-SPHINXOPTS    =
-SPHINXBUILD   = sphinx-build
-PAPER         =
-
-# Internal variables.
-PAPEROPT_a4     = -D latex_paper_size=a4
-PAPEROPT_letter = -D latex_paper_size=letter
-ALLSPHINXOPTS   = -a -E $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
-
-.PHONY: help clean html dirhtml pickle json htmlhelp qthelp latex changes linkcheck doctest
-
-help:
-	@echo "Please use \`make <target>' where <target> is one of"
-	@echo "  html      to make standalone HTML files"
-	@echo "  dirhtml   to make HTML files named index.html in directories"
-	@echo "  pickle    to make pickle files"
-	@echo "  json      to make JSON files"
-	@echo "  changes   to make an overview of all changed/added/deprecated items"
-	@echo "  linkcheck to check all external links for integrity"
-
-clean:
-	-rm -rf _build/*
-
-html:
-	$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) _build/html
-	@echo
-	@echo "Build finished. The HTML pages are in _build/html."
-
-px:
-	$(SPHINXBUILD) -b px $(ALLSPHINXOPTS) _build/px
-	rm _build/px/search.px
-	@echo
-	@echo "Build finished. The HTML pages are in _build/px."
-
-publish:
-	rm -f c:/ned/web/stellated/pages/code/coverage/*.px
-	cp _build/px/*.px c:/ned/web/stellated/pages/code/coverage
-	rm -f c:/ned/web/stellated/pages/code/coverage/sample_html/*.*
-	cp sample_html/*.* c:/ned/web/stellated/pages/code/coverage/sample_html
-
-text:
-	$(SPHINXBUILD) -b text $(ALLSPHINXOPTS) _build/text
-	@echo
-	@echo "Build finished. The text files are in _build/text."
-
-dirhtml:
-	$(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) _build/dirhtml
-	@echo
-	@echo "Build finished. The HTML pages are in _build/dirhtml."
-
-pickle:
-	$(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) _build/pickle
-	@echo
-	@echo "Build finished; now you can process the pickle files."
-
-json:
-	$(SPHINXBUILD) -b json $(ALLSPHINXOPTS) _build/json
-	@echo
-	@echo "Build finished; now you can process the JSON files."
-
-changes:
-	$(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) _build/changes
-	@echo
-	@echo "The overview file is in _build/changes."
-
-linkcheck:
-	$(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) _build/linkcheck
-	@echo
-	@echo "Link check complete; look for any errors in the above output " \
-	      "or in _build/linkcheck/output.txt."
-- 
cgit v1.2.1