doc,cmake: do not scan non-man pages when building man pages

Signed-off-by: Kefu Chai <kchai@redhat.com>

diff --git a/doc/conf.py b/doc/conf.py
index f1fefe0bc7cbfc5a98346d19e2a6322eb85301ae..7199b1669de8bf3a968f9b6595d478f4c672616c 100644 (file)
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -10,6 +10,18 @@ templates_path = ['_templates']
 source_suffix = '.rst'
 master_doc = 'index'
 exclude_patterns = ['**/.#*', '**/*~', 'start/quick-common.rst']
+if tags.has('man'):
+    exclude_patterns += ['architecture.rst', 'glossary.rst', 'release*.rst',
+                         'api/*',
+                         'cephfs/*',
+                         'dev/*',
+                         'install/*',
+                         'mon/*',
+                         'rados/*',
+                         'radosgw/*',
+                         'rbd/*',
+                         'start/*']
+
 pygments_style = 'sphinx'
 
 html_theme = 'ceph'

diff --git a/doc/man/CMakeLists.txt b/doc/man/CMakeLists.txt
index fbb6ce6f5ea759c4b819941cd9d01316dbfa631a..e81631babdcaeaa37ee8c8f3221fa290a126ac16 100644 (file)
--- a/doc/man/CMakeLists.txt
+++ b/doc/man/CMakeLists.txt
@@ -6,7 +6,7 @@ add_subdirectory(8)
 
 add_custom_command(
   OUTPUT ${sphinx_output}
-  COMMAND ${SPHINX_BUILD} -b man -d ${CMAKE_BINARY_DIR}/doc/doctrees -c ${CMAKE_SOURCE_DIR}/man ${CMAKE_CURRENT_SOURCE_DIR} ${sphinx_output_dir}
+  COMMAND ${SPHINX_BUILD} -b man -t man -d ${CMAKE_BINARY_DIR}/doc/doctrees -c ${CMAKE_SOURCE_DIR}/man ${CMAKE_CURRENT_SOURCE_DIR} ${sphinx_output_dir}
   DEPENDS ${sphinx_input})
 
 add_custom_target(

diff --git a/man/Makefile.am b/man/Makefile.am
index 710d6ea005bfeea77d3b189e233b4834d900240e..6a8ffea2e9307f5c6c267f0ebfdd5b3809fa1196 100644 (file)
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -21,7 +21,7 @@ $(dist_man_MANS): sphinx-build.stamp
 # in a tree populated from dist tarball, the $(top_srcdir)/doc is not included
 sphinx-build.stamp:
        if [ -d $(top_srcdir)/doc/man ] ; then \
-               ${SPHINX_BUILD} -b man -d doctrees -c $(top_srcdir)/man $(top_srcdir)/doc/man $(top_builddir)/man; \
+               ${SPHINX_BUILD} -b man -t man -d doctrees -c $(top_srcdir)/man $(top_srcdir)/doc/man $(top_builddir)/man; \
        fi
 
 clean-local::