Merge pull request #1336 from gizmoguy/sphinx-docs-port

Run sphinx-apidoc as part of conf.py so it works on readthedocs.

docs/Makefile

@@ -3,10 +3,6 @@
 
 # You can set these variables from the command line.
 SPHINXOPTS    =
-APIDOC        = sphinx-apidoc
-APIDOCOUTPUT  = source/apidoc
-APIDOCMODPATH = ../faucet
-APIDOCEXCLUDE =
 SPHINXBUILD   = sphinx-build
 SPHINXPROJ    = faucet
 SOURCEDIR     = .
@@ -21,5 +17,4 @@ help:
 # Catch-all target: route all unknown targets to Sphinx using the new
 # "make mode" option.  $(O) is meant as a shortcut for $(SPHINXOPTS).
 %: Makefile
-	@$(APIDOC) -o $(APIDOCOUTPUT) $(APIDOCMODPATH) $(APIDOCEXCLUDE)
 	@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)

docs/conf.py

@@ -158,3 +158,18 @@
      author, 'faucet', '',
      'Miscellaneous'),
 ]
+
+# -- Magic to run sphinx-apidoc automatically -----------------------------
+
+# See https://github.com/rtfd/readthedocs.org/issues/1139
+# on which this is based.
+
+def run_apidoc(_):
+    """Call sphinx-apidoc on faucet module"""
+    from sphinx.apidoc import main as apidoc_main
+    cur_dir = os.path.abspath(os.path.dirname(__file__))
+    apidoc_main([None, '-e', '-o', 'source/apidoc', '../faucet'])
+
+def setup(app):
+    """Over-ride Sphinx setup to trigger sphinx-apidoc."""
+    app.connect('builder-inited', run_apidoc)