walkero
/
nghttp2
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Merge branch 'master' into draft-10

This commit is contained in:
Tatsuhiro Tsujikawa 2014-02-09 17:40:53 +09:00
parent 5884794a7f cdcea8045f
commit 2c4dc08aee
8 changed files with 18 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
configure.ac
View File

@ -399,12 +399,6 @@ AC_CONFIG_FILES([
python/Makefile python/Makefile
doc/Makefile doc/Makefile
doc/conf.py 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 AC_OUTPUT

21
doc/Makefile.am
View File

@ -21,11 +21,26 @@
# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # 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 \ 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 nghttp2.h.rst nghttp2ver.h.rst \
_themes/sphinx_rtd_theme/footer.html \
_themes/sphinx_rtd_theme/theme.conf \
_themes/sphinx_rtd_theme/layout_old.html \
_themes/sphinx_rtd_theme/__init__.py \
_themes/sphinx_rtd_theme/layout.html \
_themes/sphinx_rtd_theme/search.html \
_themes/sphinx_rtd_theme/breadcrumbs.html \
_themes/sphinx_rtd_theme/versions.html \
_themes/sphinx_rtd_theme/searchbox.html \
_themes/sphinx_rtd_theme/static/fonts/FontAwesome.otf \
_themes/sphinx_rtd_theme/static/fonts/fontawesome-webfont.svg \
_themes/sphinx_rtd_theme/static/fonts/fontawesome-webfont.woff \
_themes/sphinx_rtd_theme/static/fonts/fontawesome-webfont.eot \
_themes/sphinx_rtd_theme/static/fonts/fontawesome-webfont.ttf \
_themes/sphinx_rtd_theme/static/js/theme.js \
_themes/sphinx_rtd_theme/static/css/theme.css \
_themes/sphinx_rtd_theme/static/css/badge_only.css
# Makefile for Sphinx documentation # Makefile for Sphinx documentation
# #

1
doc/_themes/Makefile.am vendored
View File

@ -1 +0,0 @@
SUBDIRS = sphinx_rtd_theme

4
doc/_themes/sphinx_rtd_theme/Makefile.am vendored
View File

@ -1,4 +0,0 @@
SUBDIRS = static
EXTRA_DIST = breadcrumbs.html footer.html __init__.py layout.html \
layout_old.html searchbox.html search.html theme.conf versions.html

1
doc/_themes/sphinx_rtd_theme/static/Makefile.am vendored
View File

@ -1 +0,0 @@
SUBDIRS = css fonts js

1
doc/_themes/sphinx_rtd_theme/static/css/Makefile.am vendored
View File

@ -1 +0,0 @@
EXTRA_DIST = badge_only.css theme.css

3
doc/_themes/sphinx_rtd_theme/static/fonts/Makefile.am vendored
View File

@ -1,3 +0,0 @@
EXTRA_DIST = FontAwesome.otf fontawesome-webfont.eot \
fontawesome-webfont.svg fontawesome-webfont.ttf \
fontawesome-webfont.woff

1
doc/_themes/sphinx_rtd_theme/static/js/Makefile.am vendored
View File

@ -1 +0,0 @@
EXTRA_DIST = theme.js