From cdcea8045f677eae3332703ebcb470a8453a06f9 Mon Sep 17 00:00:00 2001 From: Tatsuhiro Tsujikawa Date: Sun, 9 Feb 2014 17:40:06 +0900 Subject: [PATCH] Include doc theme without recursive Makefiles --- configure.ac | 6 ------ doc/Makefile.am | 21 ++++++++++++++++--- doc/_themes/Makefile.am | 1 - doc/_themes/sphinx_rtd_theme/Makefile.am | 4 ---- .../sphinx_rtd_theme/static/Makefile.am | 1 - .../sphinx_rtd_theme/static/css/Makefile.am | 1 - .../sphinx_rtd_theme/static/fonts/Makefile.am | 3 --- .../sphinx_rtd_theme/static/js/Makefile.am | 1 - 8 files changed, 18 insertions(+), 20 deletions(-) delete mode 100644 doc/_themes/Makefile.am delete mode 100644 doc/_themes/sphinx_rtd_theme/Makefile.am delete mode 100644 doc/_themes/sphinx_rtd_theme/static/Makefile.am delete mode 100644 doc/_themes/sphinx_rtd_theme/static/css/Makefile.am delete mode 100644 doc/_themes/sphinx_rtd_theme/static/fonts/Makefile.am delete mode 100644 doc/_themes/sphinx_rtd_theme/static/js/Makefile.am diff --git a/configure.ac b/configure.ac index 446a1faf..bca01cc3 100644 --- a/configure.ac +++ b/configure.ac @@ -399,12 +399,6 @@ 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 diff --git a/doc/Makefile.am b/doc/Makefile.am index e591f697..8eb26f0f 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -21,11 +21,26 @@ # 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 \ - 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 # diff --git a/doc/_themes/Makefile.am b/doc/_themes/Makefile.am deleted file mode 100644 index 61b485fc..00000000 --- a/doc/_themes/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS = sphinx_rtd_theme diff --git a/doc/_themes/sphinx_rtd_theme/Makefile.am b/doc/_themes/sphinx_rtd_theme/Makefile.am deleted file mode 100644 index 4d9ec50e..00000000 --- a/doc/_themes/sphinx_rtd_theme/Makefile.am +++ /dev/null @@ -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 diff --git a/doc/_themes/sphinx_rtd_theme/static/Makefile.am b/doc/_themes/sphinx_rtd_theme/static/Makefile.am deleted file mode 100644 index 3dbe7542..00000000 --- a/doc/_themes/sphinx_rtd_theme/static/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS = css fonts js diff --git a/doc/_themes/sphinx_rtd_theme/static/css/Makefile.am b/doc/_themes/sphinx_rtd_theme/static/css/Makefile.am deleted file mode 100644 index 7c708b1e..00000000 --- a/doc/_themes/sphinx_rtd_theme/static/css/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -EXTRA_DIST = badge_only.css theme.css diff --git a/doc/_themes/sphinx_rtd_theme/static/fonts/Makefile.am b/doc/_themes/sphinx_rtd_theme/static/fonts/Makefile.am deleted file mode 100644 index a2dbbdef..00000000 --- a/doc/_themes/sphinx_rtd_theme/static/fonts/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -EXTRA_DIST = FontAwesome.otf fontawesome-webfont.eot \ -fontawesome-webfont.svg fontawesome-webfont.ttf \ -fontawesome-webfont.woff diff --git a/doc/_themes/sphinx_rtd_theme/static/js/Makefile.am b/doc/_themes/sphinx_rtd_theme/static/js/Makefile.am deleted file mode 100644 index d5d69c76..00000000 --- a/doc/_themes/sphinx_rtd_theme/static/js/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -EXTRA_DIST = theme.js