From d6681ce0d1108ffcabdf9aa05ae771857f799da2 Mon Sep 17 00:00:00 2001 From: Philippe Proulx Date: Mon, 18 Sep 2017 16:22:47 -0400 Subject: [PATCH] Fix: doc/bindings/python: make the doc buildable MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Philippe Proulx Signed-off-by: Jérémie Galarneau --- doc/bindings/python/Makefile.am | 28 +++++++--------------------- doc/bindings/python/source/conf.py | 4 +--- 2 files changed, 8 insertions(+), 24 deletions(-) diff --git a/doc/bindings/python/Makefile.am b/doc/bindings/python/Makefile.am index 955e2c35..865e286c 100644 --- a/doc/bindings/python/Makefile.am +++ b/doc/bindings/python/Makefile.am @@ -2,7 +2,6 @@ SPHINX_SOURCE_DIR = $(srcdir)/source SPHINX_BUILD_DIR = build SPHINX_BUILD_HTML_DIR = $(SPHINX_BUILD_DIR)/html SPHINX_BUILD_DIRHTML_DIR = $(SPHINX_BUILD_DIR)/dirhtml - SPHINX_HTML_TARGET = $(SPHINX_BUILD_HTML_DIR)/index.html SPHINX_DIRHTML_TARGET = $(SPHINX_BUILD_DIRHTML_DIR)/index.html @@ -10,31 +9,18 @@ EXTRA_DIST = $(srcdir)/source all-local: $(SPHINX_HTML_TARGET) $(SPHINX_DIRHTML_TARGET) -PP = .:swig-libs -LLP = $(top_builddir)/formats/ctf/.libs:$(top_builddir)/lib/.libs - +PYTHON_BABELTRACE_BUILD_LIB_DIR = $(abs_top_builddir)/bindings/python/babeltrace/build/build_lib +PYTHON_BT2_BUILD_LIB_DIR = $(abs_top_builddir)/bindings/python/bt2/build/build_lib +PP = $(PYTHON_BABELTRACE_BUILD_LIB_DIR):$(PYTHON_BT2_BUILD_LIB_DIR) +LLP = $(abs_top_builddir)/lib/.libs LOCAL_SPHINXBUILD = PYTHONPATH="$(PP)" LD_LIBRARY_PATH="$(LLP)" $(PYTHON) $(srcdir)/sphinx-build.py - SPHINX_SRC = $(wildcard $(SPHINX_SOURCE_DIR)/*.rst) -BABELTRACE_PYTHON_DEPS = babeltrace swig-libs - -$(SPHINX_HTML_TARGET): $(SPHINX_SRC) $(BABELTRACE_PYTHON_DEPS) +$(SPHINX_HTML_TARGET): $(SPHINX_SRC) $(LOCAL_SPHINXBUILD) -b html -E $(SPHINX_SOURCE_DIR) $(SPHINX_BUILD_HTML_DIR) -$(SPHINX_DIRHTML_TARGET): $(SPHINX_SRC) $(BABELTRACE_PYTHON_DEPS) +$(SPHINX_DIRHTML_TARGET): $(SPHINX_SRC) $(LOCAL_SPHINXBUILD) -b dirhtml -E $(SPHINX_SOURCE_DIR) $(SPHINX_BUILD_DIRHTML_DIR) -swig-libs: - $(LN_S) $(abs_top_builddir)/bindings/python/babeltrace/.libs $@ - -babeltrace: - $(mkdir_p) $@ - $(LN_S) $(abs_top_builddir)/bindings/python/babeltrace/__init__.py $@/__init__.py - $(LN_S) $(abs_top_srcdir)/bindings/python/babeltrace/common.py $@/common.py - $(LN_S) $(abs_top_srcdir)/bindings/python/babeltrace/reader.py $@/reader.py - $(LN_S) $(abs_top_srcdir)/bindings/python/babeltrace/writer.py $@/writer.py - $(LN_S) $(abs_top_builddir)/bindings/python/babeltrace/nativebt.py $@/nativebt.py - clean-local: - rm -rf $(SPHINX_BUILD_DIR) swig-libs babeltrace + rm -rf $(SPHINX_BUILD_DIR) diff --git a/doc/bindings/python/source/conf.py b/doc/bindings/python/source/conf.py index bdf5fe61..32e1cdf7 100644 --- a/doc/bindings/python/source/conf.py +++ b/doc/bindings/python/source/conf.py @@ -15,7 +15,7 @@ source_suffix = '.rst' source_encoding = 'utf-8-sig' master_doc = 'index' project = 'Babeltrace Python bindings' -copyright = '2014, EfficiOS Inc.' +copyright = '2017, EfficiOS Inc.' version = babeltrace.__version__ release = version language = None @@ -38,8 +38,6 @@ if os.path.isdir(os.path.join('_themes', 'sphinx_rtd_theme')): html_theme_options = {} html_theme_path = ['_themes'] -html_title = None -html_short_title = None html_logo = None html_favicon = None html_static_path = ['_static'] -- 2.34.1