sphinx: Treat warnings as errors

[ganeti-local] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 20c7504..718775e 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -46,6 +46,7 @@ DIRS = \
 MAINTAINERCLEANFILES = \
        $(docpng) \
        $(maninput) \
+       doc/install-quick.rst \
        doc/news.rst
 
 maintainer-clean-local:
@@ -53,6 +54,7 @@ maintainer-clean-local:
 
 CLEANFILES = \
        autotools/replace_vars.sed \
+       daemons/daemon-util \
        daemons/ganeti-cleaner \
        devel/upload \
        doc/examples/bash_completion \
@@ -147,6 +149,7 @@ docrst = \
        doc/hooks.rst \
        doc/iallocator.rst \
        doc/index.rst \
+       doc/install-quick.rst \
        doc/install.rst \
        doc/locking.rst \
        doc/news.rst \
@@ -157,7 +160,7 @@ docrst = \
 doc/html/.stamp: $(docrst) $(docpng) doc/conf.py configure.ac
        @test -n "$(SPHINX)" || \
            { echo 'sphinx-build' not found during configure; exit 1; }
-       PYTHONPATH=. $(RUN_IN_TEMPDIR) $(SPHINX) -q -b html \
+       PYTHONPATH=. $(RUN_IN_TEMPDIR) $(SPHINX) -q -W -b html \
            -d . \
            -D version="$(VERSION_MAJOR).$(VERSION_MINOR)" \
            -D release="$(PACKAGE_VERSION)" \
@@ -175,6 +178,14 @@ doc/news.rst: NEWS
          cat $<; \
        } > $@
 
+doc/install-quick.rst: INSTALL
+       set -e; \
+       { echo '.. This file is automatically updated at build time from $<.'; \
+         echo '.. Do not edit.'; \
+         echo; \
+         cat $<; \
+       } > $@
+
 docdot = \
        doc/arch-2.0.dot \
        doc/design-2.1-lock-acquire.dot \
@@ -220,6 +231,9 @@ dist_tools_SCRIPTS = \
        tools/cfgupgrade \
        tools/lvmstrap
 
+pkglib_SCRIPTS = \
+       daemons/daemon-util
+
 EXTRA_DIST = \
        NEWS \
        pylintrc \
@@ -227,6 +241,7 @@ EXTRA_DIST = \
        autotools/check-python-code \
        autotools/docbook-wrapper \
        $(RUN_IN_TEMPDIR) \
+       daemons/daemon-util.in \
        daemons/ganeti-cleaner.in \
        devel/upload.in \
        $(docdot) \
@@ -342,7 +357,7 @@ devel/upload: devel/upload.in $(REPLACE_VARS_SED)
        sed -f $(REPLACE_VARS_SED) < $< > $@
        chmod u+x $@
 
-daemons/ganeti-cleaner: daemons/ganeti-cleaner.in \
+daemons/%: daemons/%.in \
                $(REPLACE_VARS_SED)
        sed -f $(REPLACE_VARS_SED) < $< > $@
        chmod +x $@
@@ -403,7 +418,6 @@ lib/_autoconf.py: Makefile stamp-directories
          echo "VERSION_FULL = '$(VERSION_FULL)'"; \
          echo "LOCALSTATEDIR = '$(localstatedir)'"; \
          echo "SYSCONFDIR = '$(sysconfdir)'"; \
-         echo "SSH_INITD_SCRIPT = '$(SSH_INITD_SCRIPT)'"; \
          echo "EXPORT_DIR = '$(EXPORT_DIR)'"; \
          echo "OS_SEARCH_PATH = [$(OS_SEARCH_PATH)]"; \
          echo "XEN_BOOTLOADER = '$(XEN_BOOTLOADER)'"; \
@@ -412,12 +426,12 @@ lib/_autoconf.py: Makefile stamp-directories
          echo "FILE_STORAGE_DIR = '$(FILE_STORAGE_DIR)'"; \
          echo "IALLOCATOR_SEARCH_PATH = [$(IALLOCATOR_SEARCH_PATH)]"; \
          echo "KVM_PATH = '$(KVM_PATH)'"; \
-         echo "KVM_MIGRATION_PORT = '$(KVM_MIGRATION_PORT)'"; \
-         echo "SOCAT_PATH = '$(SOCAT_PATH)'"; \
-         echo "SOCAT_ESCAPE = '$(SOCAT_ESCAPE)'"; \
+         echo "SOCAT_PATH = '$(SOCAT)'"; \
+         echo "SOCAT_USE_ESCAPE = $(SOCAT_USE_ESCAPE)"; \
          echo "LVM_STRIPECOUNT = $(LVM_STRIPECOUNT)"; \
          echo "TOOLSDIR = '$(toolsdir)'"; \
          echo "GNT_SCRIPTS = [$(foreach i,$(notdir $(gnt_scripts)),'$(i)',)]"; \
+         echo "PKGLIBDIR = '$(pkglibdir)'"; \
        } > $@
 
 $(REPLACE_VARS_SED): Makefile
@@ -432,6 +446,7 @@ $(REPLACE_VARS_SED): Makefile
          echo 's#@CUSTOM_XEN_KERNEL@#$(XEN_KERNEL)#g'; \
          echo 's#@CUSTOM_XEN_INITRD@#$(XEN_INITRD)#g'; \
          echo 's#@RPL_FILE_STORAGE_DIR@#$(FILE_STORAGE_DIR)#g'; \
+         echo 's#@RPL_SSH_INITD_SCRIPT@#$(SSH_INITD_SCRIPT)#g'; \
          echo 's#@PKGLIBDIR@#$(pkglibdir)#g'; \
        } > $@