Replace nodegroups' PartialNic by PartialNicParams

[ganeti-local] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 1a7ab8f..1ee6f5e 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
@@ -81,6 +82,7 @@ DIRS = \
        daemons \
        devel \
        doc \
+       doc/css \
        doc/examples \
        doc/examples/gnt-debug \
        doc/examples/hooks \
@@ -355,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 \
@@ -581,9 +585,10 @@ $(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 \
        | $(BUILT_PYTHON_SOURCES)
        @test -n "$(SPHINX)" || \
            { echo 'sphinx-build' not found during configure; exit 1; }
@@ -593,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 $@
 
@@ -792,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 \
@@ -810,8 +816,7 @@ EXTRA_DIST = \
        devel/webserver \
        tools/kvm-ifup.in \
        tools/vcluster-setup.in \
-       $(docrst) \
-       doc/conf.py \
+       $(docinput) \
        doc/html \
        $(BUILT_EXAMPLES:%=%.in) \
        doc/examples/ganeti.default \
@@ -925,7 +930,9 @@ TEST_FILES = \
        test/data/kvm_0.12.5_help.txt \
        test/data/kvm_0.15.90_help.txt \
        test/data/kvm_0.9.1_help.txt \
+       test/data/kvm_0.9.1_help_boot_test.txt \
        test/data/kvm_1.0_help.txt \
+       test/data/kvm_1.1.2_help.txt \
        test/data/ovfdata/compr_disk.vmdk.gz \
        test/data/ovfdata/config.ini \
        test/data/ovfdata/corrupted_resources.ovf \
@@ -1116,7 +1123,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) \
@@ -1190,12 +1198,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