LUSetInstanceParams: nic parameters
[ganeti-local] / Makefile.am
index 17f6518..bfb5862 100644 (file)
@@ -11,7 +11,6 @@ abs_top_srcdir = @abs_top_srcdir@
 
 ACLOCAL_AMFLAGS = -I autotools
 DOCBOOK_WRAPPER = $(top_srcdir)/autotools/docbook-wrapper
-BUILD_RAPI_RESOURCE_DOC = $(top_srcdir)/doc/build-rapi-resources-doc
 REPLACE_VARS_SED = autotools/replace_vars.sed
 
 hypervisordir = $(pkgpythondir)/hypervisor
@@ -37,23 +36,25 @@ DIRS = \
        test/data \
        tools
 
+MAINTAINERCLEANFILES = \
+       $(docpng) \
+       $(maninput)
+
+maintainer-clean-local:
+       -rm -rf doc/api doc/build doc/html
+
 CLEANFILES = \
        autotools/replace_vars.sed \
        devel/upload \
-       doc/*.html \
-       doc/*.in \
-       doc/*.pdf \
-       $(patsubst %.dot,%.png,$(docdot)) \
-       doc/rapi-resources.sgml \
+       doc/examples/bash_completion \
        doc/examples/ganeti.initd \
        doc/examples/ganeti.cron \
        lib/*.py[co] \
        lib/http/*.py[co] \
        lib/hypervisor/*.py[co] \
        lib/rapi/*.py[co] \
-       man/*.[78] \
-       man/*.in \
-       man/*.html \
+       $(man_MANS) \
+       $(manhtml) \
        qa/*.py[co] \
        test/*.py[co] \
        stamp-directories \
@@ -107,26 +108,34 @@ http_PYTHON = \
        lib/http/server.py
 
 
-docsgml = \
-       doc/install.sgml \
-       doc/rapi.sgml
-
 docrst = \
        doc/admin.rst \
        doc/design-2.0.rst \
+       doc/glossary.rst \
        doc/hooks.rst \
        doc/iallocator.rst \
+       doc/index.rst \
+       doc/install.rst \
+       doc/rapi.rst \
        doc/security.rst
 
+doc/html: $(docrst) $(docpng) doc/conf.py configure.ac
+       @test -n "$(SPHINX)" || \
+           { echo 'sphinx-build' not found during configure; exit 1; }
+       mkdir -p doc/build/doctrees
+       PYTHONPATH=.:$(top_builddir) sphinx-build -q -b html \
+           -d doc/build/doctrees \
+           -D version="$(VERSION_MAJOR).$(VERSION_MINOR)" \
+           -D release="$(PACKAGE_VERSION)" \
+           $(top_srcdir)/doc doc/html
+       touch "$@"
+
 docdot = \
        doc/arch-2.0.dot
 
-doc_DATA = \
-       $(patsubst %.rst,%.html,$(docrst)) \
-       $(patsubst %.sgml,%.html,$(docsgml)) \
-       $(patsubst %.sgml,%.pdf,$(docsgml))
+docpng = $(patsubst %.dot,%.png,$(docdot))
 
-noinst_DATA = $(manhtml)
+noinst_DATA = $(manhtml) doc/html
 
 dist_sbin_SCRIPTS = \
        daemons/ganeti-noded \
@@ -148,14 +157,16 @@ dist_tools_SCRIPTS = \
        tools/lvmstrap
 
 EXTRA_DIST = \
+       $(MAINTAINERCLEANFILES) \
        NEWS \
        DEVNOTES \
        autotools/docbook-wrapper \
        devel/upload.in \
-       $(docrst) \
        $(docdot) \
-       $(docsgml) \
-       doc/build-rapi-resources-doc \
+       $(docrst) \
+       doc/conf.py \
+       doc/html \
+       doc/examples/bash_completion.in \
        doc/examples/ganeti.initd.in \
        doc/examples/ganeti.cron.in \
        doc/examples/dumb-allocator \
@@ -165,7 +176,7 @@ EXTRA_DIST = \
        $(dist_TESTS) \
        $(TEST_FILES) \
        man/footer.sgml \
-       $(mansgml) \
+       $(mansgml) $(maninput) \
        qa/ganeti-qa.py \
        qa/qa-sample.json \
        qa/qa_cluster.py \
@@ -195,15 +206,17 @@ man_MANS = \
        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))
+mansgml = $(patsubst %.7,%.sgml,$(patsubst %.8,%.sgml,$(man_MANS)))
+manhtml = $(patsubst %.sgml,%.html,$(mansgml))
+maninput = $(patsubst %.7,%.7.in,$(patsubst %.8,%.8.in,$(man_MANS))) $(patsubst %.html,%.html.in,$(manhtml))
 
 TEST_FILES = \
        test/data/bdev-both.txt \
+       test/data/bdev-8.3-both.txt \
        test/data/bdev-disk.txt \
        test/data/bdev-net.txt \
-       test/data/proc_drbd8.txt
+       test/data/proc_drbd8.txt \
+       test/data/proc_drbd83.txt
 
 dist_TESTS = \
        test/ganeti.bdev_unittest.py \
@@ -224,8 +237,7 @@ nodist_TESTS =
 
 TESTS = $(dist_TESTS) $(nodist_TESTS)
 
-TESTS_ENVIRONMENT = PYTHONPATH=.:$(top_builddir)
-
+TESTS_ENVIRONMENT = PYTHONPATH=.:$(top_builddir) $(PYTHON)
 
 all-local: stamp-directories lib/_autoconf.py devel/upload \
        doc/examples/bash_completion \
@@ -239,43 +251,38 @@ doc/examples/%: doc/examples/%.in stamp-directories \
                $(REPLACE_VARS_SED)
        sed -f $(REPLACE_VARS_SED) < $< > $@
 
-doc/%.in: doc/%.sgml stamp-directories $(REPLACE_VARS_SED)
-       sed -f $(REPLACE_VARS_SED) < $< > $@
-
-man/%.in: man/%.sgml stamp-directories $(REPLACE_VARS_SED)
-       sed -f $(REPLACE_VARS_SED) < $< > $@
-
-doc/%.pdf: doc/%.in $(DOCBOOK_WRAPPER)
-       $(DOCBOOK_WRAPPER) "$(DOCBOOK2PDF)" $< $@
-
-doc/%.html: doc/%.in $(DOCBOOK_WRAPPER)
-       $(DOCBOOK_WRAPPER) "$(DOCBOOK2HTML) --nochunks" $< $@
-
-doc/%.html: doc/%.rst
-       $(RST2HTML) $< $@
-
 doc/%.png: doc/%.dot
+       @test -n "$(DOT)" || { echo 'dot' not found during configure; exit 1; }
        $(DOT) -Tpng -o $@ $<
 
-doc/design-2.0.html: doc/design-2.0.rst doc/arch-2.0.png
-
-doc/rapi.pdf doc/rapi.html doc/rapi.in: doc/rapi-resources.sgml
+man/%.7.in man/%.8.in: man/%.sgml man/footer.sgml $(DOCBOOK_WRAPPER)
+       @test -n "$(DOCBOOK2MAN)" || { echo 'docbook2html' not found during configure; exit 1; }
+       TMPDIR=`mktemp -d` && { \
+       $(DOCBOOK_WRAPPER) "$(DOCBOOK2MAN)" $< $$TMPDIR/$(patsubst man/%.in,%,$@) ; \
+       mv $$TMPDIR/$(patsubst man/%.in,%,$@) $@ ; \
+       rm -rf "$$TMPDIR" ; \
+       }
 
-doc/rapi-resources.sgml: $(BUILD_RAPI_RESOURCE_DOC) lib/rapi/connector.py
-       PYTHONPATH=.:$(top_builddir) $(BUILD_RAPI_RESOURCE_DOC) > $@ || rm -f $@
+man/%.html.in: man/%.sgml man/footer.sgml $(DOCBOOK_WRAPPER)
+       @test -n "$(DOCBOOK2HTML)" || { echo 'docbook2html' not found during configure; exit 1; }
+       TMPDIR=`mktemp -d` && { \
+       $(DOCBOOK_WRAPPER) "$(DOCBOOK2HTML) --nochunks" $< $$TMPDIR/$(patsubst man/%.in,%,$@) ; \
+       mv $$TMPDIR/$(patsubst man/%.in,%,$@) $@ ; \
+       rm -rf "$$TMPDIR" ; \
+       }
 
-man/%.7: man/%.in man/footer.sgml $(DOCBOOK_WRAPPER)
-       $(DOCBOOK_WRAPPER) "$(DOCBOOK2MAN)" $< $@
+man/%.7: man/%.7.in stamp-directories $(REPLACE_VARS_SED)
+       sed -f $(REPLACE_VARS_SED) < $< > $@
 
-man/%.8: man/%.in man/footer.sgml $(DOCBOOK_WRAPPER)
-       $(DOCBOOK_WRAPPER) "$(DOCBOOK2MAN)" $< $@
+man/%.8: man/%.8.in stamp-directories $(REPLACE_VARS_SED)
+       sed -f $(REPLACE_VARS_SED) < $< > $@
 
-man/%.html: man/%.in $(DOCBOOK_WRAPPER)
-       $(DOCBOOK_WRAPPER) "$(DOCBOOK2HTML) --nochunks" $< $@
+man/%.html: man/%.html.in stamp-directories $(REPLACE_VARS_SED)
+       sed -f $(REPLACE_VARS_SED) < $< > $@
 
 man/footer.sgml $(TESTS): srclinks
 
-$(TESTS) $(BUILD_RAPI_RESOURCE_DOC): ganeti lib/_autoconf.py
+$(TESTS): ganeti lib/_autoconf.py
 
 lib/_autoconf.py: Makefile stamp-directories
        set -e; \
@@ -320,10 +327,6 @@ $(REPLACE_VARS_SED): Makefile stamp-directories
          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'; \
-         echo '}'; \
        } > $@
 
 # We need to create symlinks because "make distcheck" will not install Python
@@ -372,4 +375,11 @@ apidoc:
                rm -rf $$TMPDIR ; \
        }
 
+.PHONY: TAGS
+TAGS:
+       rm -f TAGS
+       find . -path './lib/*.py' -o -path 'scripts/gnt-*' -o \
+         -path 'daemons/ganeti-*' -o -path 'tools/*' | \
+         etags -
+
 # vim: set noet :