Fix API docs

doc/Makefile

@@ -4,6 +4,7 @@
 # You can set these variables from the command line.
 SPHINXOPTS    =
 SPHINXBUILD   = sphinx-build
+SPHINXAPIDOC  = sphinx-apidoc
 PAPER         =
 BUILDDIR      = build
 
@@ -51,6 +52,7 @@ clean:
 
 .PHONY: html
 html:
+	$(SPHINXAPIDOC) -o source ../tones
 	$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
 	@echo
 	@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."

doc/source/conf.py

@@ -21,25 +21,6 @@
 import sys
 import sphinx_rtd_theme
 
-def run_apidoc(_):
-    argv = [
-        "-o", "source",
-        "../tones"
-    ]
-
-    try:
-        # Sphinx 1.7+
-        from sphinx.ext import apidoc
-        apidoc.main(argv)
-    except ImportError:
-        # Sphinx 1.6 (and earlier)
-        from sphinx import apidoc
-        argv.insert(0, apidoc.__file__)
-        apidoc.main(argv)
-
-def setup(app):
-    app.connect('builder-inited', run_apidoc)
-
 sys.path.insert(0, os.path.abspath('../..'))
 
 # -- General configuration ------------------------------------------------