Merge branch 'master' into draft-10

configure.ac

@@ -399,6 +399,12 @@ AC_CONFIG_FILES([
   python/Makefile
   doc/Makefile
   doc/conf.py
+  doc/_themes/Makefile
+  doc/_themes/sphinx_rtd_theme/Makefile
+  doc/_themes/sphinx_rtd_theme/static/Makefile
+  doc/_themes/sphinx_rtd_theme/static/css/Makefile
+  doc/_themes/sphinx_rtd_theme/static/fonts/Makefile
+  doc/_themes/sphinx_rtd_theme/static/js/Makefile
 ])
 AC_OUTPUT
 

doc/Makefile.am

@@ -21,8 +21,11 @@
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+SUBDIRS = _themes
+
 EXTRA_DIST = README.rst apiref-header.rst index.rst mkapiref.py \
-	package_README.rst tutorial-client.rst tutorial-server.rst
+	package_README.rst tutorial-client.rst tutorial-server.rst \
+	nghttp2.h.rst nghttp2ver.h.rst
 
 # Makefile for Sphinx documentation
 #

doc/_themes/Makefile.am

+SUBDIRS = sphinx_rtd_theme

doc/_themes/sphinx_rtd_theme/Makefile.am

+SUBDIRS = static
+
+EXTRA_DIST = breadcrumbs.html footer.html __init__.py layout.html \
+layout_old.html searchbox.html search.html theme.conf versions.html

doc/_themes/sphinx_rtd_theme/static/Makefile.am

+SUBDIRS = css fonts js

doc/_themes/sphinx_rtd_theme/static/css/Makefile.am

+EXTRA_DIST = badge_only.css theme.css

doc/_themes/sphinx_rtd_theme/static/fonts/Makefile.am

+EXTRA_DIST = FontAwesome.otf fontawesome-webfont.eot \
+fontawesome-webfont.svg fontawesome-webfont.ttf \
+fontawesome-webfont.woff

doc/_themes/sphinx_rtd_theme/static/js/Makefile.am

+EXTRA_DIST = theme.js