Update some version-related constants

[ganeti-local] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index e427760..5aeeff9 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -53,6 +53,7 @@ CLEANFILES = \
        lib/rapi/*.py[co] \
        man/*.[78] \
        man/*.in \
+       man/*.html \
        qa/*.py[co] \
        test/*.py[co] \
        stamp-directories \
@@ -97,24 +98,24 @@ rapi_PYTHON = \
        lib/rapi/__init__.py \
        lib/rapi/baserlib.py \
        lib/rapi/connector.py \
-       lib/rapi/rlib1.py \
        lib/rapi/rlib2.py
 
 http_PYTHON = \
        lib/http/__init__.py \
+       lib/http/auth.py \
        lib/http/client.py \
        lib/http/server.py
 
 
 docsgml = \
-       doc/hooks.sgml \
        doc/install.sgml \
-       doc/admin.sgml \
-       doc/rapi.sgml \
-       doc/iallocator.sgml
+       doc/rapi.sgml
 
 docrst = \
+       doc/admin.rst \
        doc/design-2.0.rst \
+       doc/hooks.rst \
+       doc/iallocator.rst \
        doc/security.rst
 
 docdot = \
@@ -125,6 +126,8 @@ doc_DATA = \
        $(patsubst %.sgml,%.html,$(docsgml)) \
        $(patsubst %.sgml,%.pdf,$(docsgml))
 
+noinst_DATA = $(manhtml)
+
 dist_sbin_SCRIPTS = \
        daemons/ganeti-noded \
        daemons/ganeti-watcher \
@@ -179,17 +182,22 @@ EXTRA_DIST = \
 
 man_MANS = \
        man/ganeti.7 \
+       man/ganeti-masterd.8 \
        man/ganeti-noded.8 \
        man/ganeti-os-interface.7 \
+       man/ganeti-rapi.8 \
        man/ganeti-watcher.8 \
        man/gnt-backup.8 \
        man/gnt-cluster.8 \
+       man/gnt-debug.8 \
        man/gnt-instance.8 \
+       man/gnt-job.8 \
        man/gnt-node.8 \
        man/gnt-os.8
 
 maninput = $(patsubst %.7,%.in,$(patsubst %.8,%.in,$(man_MANS)))
 mansgml = $(patsubst %.in,%.sgml,$(maninput))
+manhtml = $(patsubst %.in,%.html,$(maninput))
 
 TEST_FILES = \
        test/data/bdev-both.txt \
@@ -261,6 +269,9 @@ man/%.7: man/%.in man/footer.sgml $(DOCBOOK_WRAPPER)
 man/%.8: man/%.in man/footer.sgml $(DOCBOOK_WRAPPER)
        $(DOCBOOK_WRAPPER) "$(DOCBOOK2MAN)" $< $@
 
+man/%.html: man/%.in $(DOCBOOK_WRAPPER)
+       $(DOCBOOK_WRAPPER) "$(DOCBOOK2HTML) --nochunks" $< $@
+
 man/footer.sgml $(TESTS): srclinks
 
 $(TESTS) $(BUILD_RAPI_RESOURCE_DOC): ganeti lib/_autoconf.py
@@ -269,6 +280,15 @@ lib/_autoconf.py: Makefile stamp-directories
        set -e; \
        { echo '# This file is automatically generated, do not edit!'; \
          echo '#'; \
+         echo ''; \
+         echo '"""Build-time configuration for Ganeti.'; \
+         echo '';\
+         echo 'This file is autogenerated by the build process.'; \
+         echo 'For any changes you need to re-run ./configure (and'; \
+         echo 'not edit by hand).'; \
+         echo ''; \
+         echo '"""'; \
+         echo ''; \
          echo "PACKAGE_VERSION = '$(PACKAGE_VERSION)'"; \
          echo "VERSION_MAJOR = '$(VERSION_MAJOR)'"; \
          echo "VERSION_MINOR = '$(VERSION_MINOR)'"; \
@@ -285,6 +305,8 @@ 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)'"; \
        } > $@
 
 $(REPLACE_VARS_SED): Makefile stamp-directories
@@ -294,9 +316,9 @@ $(REPLACE_VARS_SED): Makefile stamp-directories
          echo 's#@LOCALSTATEDIR@#$(localstatedir)#g'; \
          echo 's#@SBINDIR@#$(sbindir)#g'; \
          echo 's#@GANETI_VERSION@#$(PACKAGE_VERSION)#g'; \
-         echo 's#@LOCALSTATEDIR@#$(localstatedir)#g'; \
          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 '/@INCLUDE_RAPI_RESOURCES@/ {'; \
          echo '  r $(abs_top_builddir)/doc/rapi-resources.sgml'; \
          echo '  d'; \
@@ -344,7 +366,7 @@ apidoc:
                        CDIR=`pwd` && \
                        cd $$TMPDIR && \
                        mv lib ganeti && \
-                       epydoc --conf $$CDIR/epydoc.conf -o $$CDIR/doc/api \
+                       epydoc -v --conf $$CDIR/epydoc.conf -o $$CDIR/doc/api \
                ) ; \
                rm -rf $$TMPDIR ; \
        }