Merge branch 'devel-2.6'

[ganeti-local] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index b9473f0..8359d6c 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -23,6 +23,7 @@ RUN_IN_TEMPDIR = $(top_srcdir)/autotools/run-in-tempdir
 CHECK_PYTHON_CODE = $(top_srcdir)/autotools/check-python-code
 CHECK_HEADER = $(top_srcdir)/autotools/check-header
 CHECK_MAN_DASHES = $(top_srcdir)/autotools/check-man-dashes
+CHECK_MAN_REFERENCES = $(top_srcdir)/autotools/check-man-references
 CHECK_MAN_WARNINGS = $(top_srcdir)/autotools/check-man-warnings
 CHECK_VERSION = $(top_srcdir)/autotools/check-version
 CHECK_NEWS = $(top_srcdir)/autotools/check-news
@@ -356,7 +357,9 @@ utils_PYTHON = \
        lib/utils/wrapper.py \
        lib/utils/x509.py
 
-docrst = \
+docinput = \
+       doc/conf.py \
+       doc/css/style.css \
        doc/admin.rst \
        doc/cluster-merge.rst \
        doc/design-2.0.rst \
@@ -582,7 +585,7 @@ $(RUN_IN_TEMPDIR): | stamp-directories
 # has to exist in order for the sphinx module to be loaded
 # successfully, but we certainly don't want the docs to be rebuilt if
 # it changes
-doc/html/index.html: $(docrst) doc/conf.py configure.ac \
+doc/html/index.html: $(docinput) doc/conf.py configure.ac \
        $(RUN_IN_TEMPDIR) lib/build/sphinx_ext.py \
        lib/build/shell_example_lexer.py lib/opcodes.py lib/ht.py \
        doc/css/style.css \
@@ -595,7 +598,7 @@ doc/html/index.html: $(docrst) doc/conf.py configure.ac \
            -D version="$(VERSION_MAJOR).$(VERSION_MINOR)" \
            -D release="$(PACKAGE_VERSION)" \
            -D graphviz_dot="$(DOT)" \
-           $(abs_top_srcdir)/doc $(CURDIR)/doc/html
+           $(abs_top_builddir)/doc $(CURDIR)/doc/html
        rm -f doc/html/.buildinfo doc/html/objects.inv
        touch $@
 
@@ -794,6 +797,7 @@ EXTRA_DIST = \
        autotools/check-header \
        autotools/check-imports \
        autotools/check-man-dashes \
+       autotools/check-man-references \
        autotools/check-man-warnings \
        autotools/check-news \
        autotools/check-python-code \
@@ -812,9 +816,7 @@ EXTRA_DIST = \
        devel/webserver \
        tools/kvm-ifup.in \
        tools/vcluster-setup.in \
-       $(docrst) \
-       doc/conf.py \
-       doc/css/style.css \
+       $(docinput) \
        doc/html \
        $(BUILT_EXAMPLES:%=%.in) \
        doc/examples/ganeti.default \
@@ -1119,7 +1121,8 @@ srclink_files = \
        test/hs/offline-test.sh \
        test/hs/cli-tests-defs.sh \
        $(all_python_code) \
-       $(HS_LIBTEST_SRCS) $(HS_PROG_SRCS)
+       $(HS_LIBTEST_SRCS) $(HS_PROG_SRCS) \
+       $(docinput)
 
 check_python_code = \
        $(BUILD_BASH_COMPLETION) \
@@ -1193,12 +1196,13 @@ man/%.gen: man/%.rst lib/query.py lib/build/sphinx_ext.py \
        | $(RUN_IN_TEMPDIR) $(BUILT_PYTHON_SOURCES)
        @echo "Checking $< for hardcoded paths..."
        @if grep -nEf autotools/wrong-hardcoded-paths $<; then \
-         echo "Man page $< has harcoded paths (see above)!" 1>&2 ; \
+         echo "Man page $< has hardcoded paths (see above)!" 1>&2 ; \
          exit 1; \
        fi
        set -e ; \
        trap 'echo auto-removing $@; rm $@' EXIT; \
        PYTHONPATH=. $(RUN_IN_TEMPDIR) $(CURDIR)/$(DOCPP) < $< > $@ ;\
+       $(CHECK_MAN_REFERENCES) $@; \
        trap - EXIT
 
 man/%.7.in man/%.8.in man/%.1.in: man/%.gen man/footer.rst