X-Git-Url: https://code.grnet.gr/git/ganeti-local/blobdiff_plain/876860a3cf6f39450b0bf749a5979cd48f49bdba..3736cb6b9c48c054a86a7cb768847a44e5fea8e9:/Makefile.am diff --git a/Makefile.am b/Makefile.am index 3d9b34b..da7c689 100644 --- a/Makefile.am +++ b/Makefile.am @@ -37,23 +37,24 @@ DIRS = \ test/data \ tools +MAINTAINERCLEANFILES = \ + $(dochtml) \ + $(patsubst %.dot,%.png,$(docdot)) \ + $(maninput) + CLEANFILES = \ autotools/replace_vars.sed \ devel/upload \ - doc/*.html \ - doc/*.in \ - doc/*.pdf \ - $(patsubst %.dot,%.png,$(docdot)) \ - doc/rapi-resources.sgml \ + doc/rapi-resources.gen \ + 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,24 +108,20 @@ http_PYTHON = \ lib/http/server.py -docsgml = \ - doc/hooks.sgml \ - doc/install.sgml \ - doc/rapi.sgml - docrst = \ doc/admin.rst \ doc/design-2.0.rst \ + doc/hooks.rst \ doc/iallocator.rst \ + doc/install.rst \ doc/security.rst +dochtml = $(patsubst %.rst,%.html,$(docrst)) + docdot = \ doc/arch-2.0.dot -doc_DATA = \ - $(patsubst %.rst,%.html,$(docrst)) \ - $(patsubst %.sgml,%.html,$(docsgml)) \ - $(patsubst %.sgml,%.pdf,$(docsgml)) +doc_DATA = $(dochtml) noinst_DATA = $(manhtml) @@ -148,14 +145,15 @@ dist_tools_SCRIPTS = \ tools/lvmstrap EXTRA_DIST = \ + $(MAINTAINERCLEANFILES) \ NEWS \ DEVNOTES \ autotools/docbook-wrapper \ devel/upload.in \ $(docrst) \ $(docdot) \ - $(docsgml) \ doc/build-rapi-resources-doc \ + doc/examples/bash_completion.in \ doc/examples/ganeti.initd.in \ doc/examples/ganeti.cron.in \ doc/examples/dumb-allocator \ @@ -165,7 +163,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 +193,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,53 +224,62 @@ nodist_TESTS = TESTS = $(dist_TESTS) $(nodist_TESTS) -TESTS_ENVIRONMENT = PYTHONPATH=.:$(top_builddir) +TESTS_ENVIRONMENT = PYTHONPATH=.:$(top_builddir) $(PYTHON) +RAPI_RESOURCES = $(wildcard lib/rapi/*.py) all-local: stamp-directories lib/_autoconf.py devel/upload \ + doc/examples/bash_completion \ doc/examples/ganeti.initd doc/examples/ganeti.cron devel/upload: devel/upload.in stamp-directories $(REPLACE_VARS_SED) sed -f $(REPLACE_VARS_SED) < $< > $@ chmod u+x $@ -doc/examples/ganeti.%: doc/examples/ganeti.%.in stamp-directories \ +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 + @test -n "$(RST2HTML)" || { echo 'rst2html' not found during configure; exit 1; } $(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 +doc/rapi.html: doc/rapi-resources.gen -doc/rapi-resources.sgml: $(BUILD_RAPI_RESOURCE_DOC) lib/rapi/connector.py - PYTHONPATH=.:$(top_builddir) $(BUILD_RAPI_RESOURCE_DOC) > $@ || rm -f $@ +doc/rapi-resources.gen: $(BUILD_RAPI_RESOURCE_DOC) $(RAPI_RESOURCES) + PYTHONPATH=.:$(top_builddir) $(BUILD_RAPI_RESOURCE_DOC) > $@ || \ + rm -f $@ -man/%.7: man/%.in man/footer.sgml $(DOCBOOK_WRAPPER) - $(DOCBOOK_WRAPPER) "$(DOCBOOK2MAN)" $< $@ +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" ; \ + } -man/%.8: man/%.in man/footer.sgml $(DOCBOOK_WRAPPER) - $(DOCBOOK_WRAPPER) "$(DOCBOOK2MAN)" $< $@ +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/%.html: man/%.in $(DOCBOOK_WRAPPER) - $(DOCBOOK_WRAPPER) "$(DOCBOOK2HTML) --nochunks" $< $@ +man/%.7: man/%.7.in stamp-directories $(REPLACE_VARS_SED) + sed -f $(REPLACE_VARS_SED) < $< > $@ + +man/%.8: man/%.8.in stamp-directories $(REPLACE_VARS_SED) + sed -f $(REPLACE_VARS_SED) < $< > $@ + +man/%.html: man/%.html.in stamp-directories $(REPLACE_VARS_SED) + sed -f $(REPLACE_VARS_SED) < $< > $@ man/footer.sgml $(TESTS): srclinks @@ -307,6 +316,7 @@ lib/_autoconf.py: Makefile stamp-directories echo "KVM_PATH = '$(KVM_PATH)'"; \ echo "KVM_MIGRATION_PORT = '$(KVM_MIGRATION_PORT)'"; \ echo "SOCAT_PATH = '$(SOCAT_PATH)'"; \ + echo "LVM_STRIPECOUNT = $(LVM_STRIPECOUNT)" ; \ } > $@ $(REPLACE_VARS_SED): Makefile stamp-directories @@ -319,10 +329,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