From c431227e33503421d3412bd33415750b6010730d Mon Sep 17 00:00:00 2001 From: Stephen Finucane Date: Thu, 8 Dec 2016 12:55:30 +0000 Subject: [PATCH] doc: Remove documentation from distdoc target Basic Sphinx integration is now complete. Remove the documentation aspects of the 'dist-docs' target in favor of the htmldocs target. Signed-off-by: Stephen Finucane Signed-off-by: Ben Pfaff --- Documentation/automake.mk | 6 ++--- Makefile.am | 8 ++----- build-aux/dist-docs | 50 +-------------------------------------- debian/rules.modules | 2 +- third-party/automake.mk | 5 ++-- 5 files changed, 9 insertions(+), 62 deletions(-) diff --git a/Documentation/automake.mk b/Documentation/automake.mk index d76280751..b02d63e5f 100644 --- a/Documentation/automake.mk +++ b/Documentation/automake.mk @@ -1,7 +1,5 @@ -docs += \ - Documentation/group-selection-method-property.txt - EXTRA_DIST += \ + Documentation/group-selection-method-property.txt \ Documentation/_static/logo.png \ Documentation/conf.py \ Documentation/index.rst \ @@ -76,7 +74,7 @@ EXTRA_DIST += \ SPHINXOPTS = SPHINXBUILD = sphinx-build SPHINXSRCDIR = $(srcdir)/Documentation -SPHINXBUILDDIR = $(srcdir)/Documentation/_build +SPHINXBUILDDIR = $(builddir)/Documentation/_build # Internal variables. PAPEROPT_a4 = -D latex_paper_size=a4 diff --git a/Makefile.am b/Makefile.am index 1385eff3e..44de86ab2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -63,15 +63,11 @@ CLEAN_LOCAL = DISTCLEANFILES = PYCOV_CLEAN_FILES = build-aux/check-structs,cover -# A list of Markdown- or reStructuredText-formatted documentation that will -# automatically be included in the "make dist-docs" output. -docs = \ +EXTRA_DIST = \ AUTHORS.rst \ CONTRIBUTING.rst \ MAINTAINERS.rst \ - README.rst -EXTRA_DIST = \ - $(docs) \ + README.rst \ NOTICE \ .travis.yml \ .travis/linux-build.sh \ diff --git a/build-aux/dist-docs b/build-aux/dist-docs index 1d7eeb534..d2d11d7b5 100755 --- a/build-aux/dist-docs +++ b/build-aux/dist-docs @@ -34,7 +34,6 @@ search_path () { exit 1 } search_path man -search_path rst2html search_path ps2pdf # Create dist-docs directory. @@ -56,54 +55,7 @@ cat >&3 < Open vSwitch $VERSION Documentation -

Open vSwitch $VERSION Documentation

-

Documents

- -EOF - -# Add top-level documentation to index.html, giving it .txt extensions so that -# the webserver doesn't serve it as rST and make your web browser try to invoke -# some kind of external helper you don't have installed. -# -# Also translate documentation to HTML. -for file -do - title=`head -1 "$srcdir/$file"` - dir=$distdir/`dirname $file`; test -d "$dir" || mkdir "$dir" - case $file in - *.rst) - title=`grep -A 1 -e "^=" $srcdir/$file | sed -n 2p` - cp "$srcdir/$file" "$distdir/$file.txt" - ln -s $(basename "$file.txt") "$distdir/$file" - rst2html "$distdir/$file.txt" --stylesheet-path="style.css" \ - --link-stylesheet --title="$file (Open vSwitch $VERSION)" \ - > "$distdir/$file.html" - cat < - - - - -EOF - ;; - - *) - cp "$srcdir/$file" "$distdir/$file" - cat < - - - - -EOF - ;; - esac -done >&3 - -# Add header for manpages to index.html. -cat >&3 < -

Manpages

+

Open vSwitch $VERSION Manpages

$file$titleHTML, plain text
$file$titleplain text
EOF diff --git a/debian/rules.modules b/debian/rules.modules index 7ea8b1b85..b0c6cdcee 100755 --- a/debian/rules.modules +++ b/debian/rules.modules @@ -8,7 +8,7 @@ MA_DIR ?= /usr/share/modass DATAPATH_CONFIGURE_OPTS = kdist_clean: - dh_testdir + dh_testdir dh_testroot dh_clean rm -rf openvswitch diff --git a/third-party/automake.mk b/third-party/automake.mk index 9eaf02f81..dd7bf4184 100644 --- a/third-party/automake.mk +++ b/third-party/automake.mk @@ -1,2 +1,3 @@ -docs += third-party/README.rst -EXTRA_DIST += third-party/ofp-tcpdump.patch +EXTRA_DIST += \ + third-party/ofp-tcpdump.patch \ + third-party/README.rst