FIX travis now builds docs with new makefile

NelleV · NelleV · commit ab956b1d3254 · 2016-09-08T09:21:51.000-07:00
diff --git a/.travis.yml b/.travis.yml
@@ -168,7 +168,7 @@ script:
       fi
     else
       cd doc
-      python make.py html -n 2
+      make html-small-plots -j 2
       # We don't build the LaTeX docs here, so linkchecker will complain
       touch build/html/Matplotlib.pdf
       # Linkchecker only works with python 2.7 for the time being
diff --git a/doc/Makefile b/doc/Makefile
@@ -54,12 +54,12 @@ clean:
 	rm -rf users/installing.rst
 	rm -rf _templates/gallery.html
 
-html:
+html: prepare
 	$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html -W
 	@echo
 	@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
 
-html-small-plots:
+html-small-plots: prepare
 	$(SPHINXBUILD) -D plot_formats=png:80 -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html -W
 	@echo
 	@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
