MAINTAINERCLEANFILES = \
$(docpng) \
- $(maninput)
+ $(maninput) \
+ doc/news.rst
maintainer-clean-local:
- -rm -rf doc/api doc/build doc/html
+ rm -rf doc/api doc/html
CLEANFILES = \
autotools/replace_vars.sed \
doc/examples/bash_completion \
doc/examples/ganeti.initd \
doc/examples/ganeti.cron \
+ doc/examples/gnt-config-backup \
doc/examples/hooks/ipsec \
lib/*.py[co] \
lib/build/*.py[co] \
qa/*.py[co] \
test/*.py[co] \
stamp-directories \
+ stamp-srclinks \
$(nodist_pkgpython_PYTHON)
BUILT_SOURCES = \
ganeti \
- srclinks \
+ stamp-srclinks \
+ stamp-directories \
lib/_autoconf.py
nodist_pkgpython_PYTHON = \
doc/index.rst \
doc/install.rst \
doc/locking.rst \
+ doc/news.rst \
doc/rapi.rst \
- doc/security.rst
+ doc/security.rst \
+ doc/walkthrough.rst
-doc/html: $(docrst) $(docpng) doc/conf.py configure.ac
+doc/html/.stamp: $(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 \
+ PYTHONPATH=. $(RUN_IN_TEMPDIR) $(SPHINX) -q -b html \
+ -d . \
-D version="$(VERSION_MAJOR).$(VERSION_MINOR)" \
-D release="$(PACKAGE_VERSION)" \
- $(top_srcdir)/doc doc/html
- touch "$@"
+ $(abs_top_srcdir)/doc $(CURDIR)/doc/html
+ rm -f doc/html/.buildinfo doc/html/objects.inv
+ touch $@
+
+doc/html: doc/html/.stamp
+
+doc/news.rst: NEWS
+ set -e; \
+ { echo '.. This file is automatically updated at build time from $<.'; \
+ echo '.. Do not edit.'; \
+ echo; \
+ cat $<; \
+ } > $@
docdot = \
doc/arch-2.0.dot \
docpng = $(patsubst %.dot,%.png,$(docdot))
-noinst_DATA = $(manhtml) doc/html
+# Things to build but not to install (add it to EXTRA_DIST if it should be
+# distributed)
+noinst_DATA = \
+ devel/upload \
+ doc/html \
+ doc/examples/bash_completion \
+ doc/examples/ganeti.cron \
+ doc/examples/ganeti.initd \
+ doc/examples/gnt-config-backup \
+ doc/examples/hooks/ipsec \
+ $(manhtml)
gnt_scripts = \
scripts/gnt-backup \
tools/lvmstrap
EXTRA_DIST = \
- $(MAINTAINERCLEANFILES) \
NEWS \
pylintrc \
autotools/build-bash-completion \
autotools/check-python-code \
autotools/docbook-wrapper \
- autotools/run-in-tempdir \
+ $(RUN_IN_TEMPDIR) \
daemons/ganeti-cleaner.in \
devel/upload.in \
$(docdot) \
+ $(docpng) \
$(docrst) \
doc/conf.py \
doc/html \
doc/examples/ganeti.initd.in \
doc/examples/ganeti.cron.in \
+ doc/examples/gnt-config-backup.in \
doc/examples/dumb-allocator \
doc/examples/hooks/ethers \
doc/examples/hooks/ipsec.in \
$(dist_TESTS) \
$(TEST_FILES) \
man/footer.sgml \
- $(mansgml) $(maninput) \
+ $(mansgml) \
+ $(maninput) \
qa/ganeti-qa.py \
qa/qa-sample.json \
qa/qa_cluster.py \
man_MANS = \
man/ganeti.7 \
man/ganeti-cleaner.8 \
+ man/ganeti-confd.8 \
man/ganeti-masterd.8 \
man/ganeti-noded.8 \
man/ganeti-os-interface.7 \
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))
+maninput = \
+ $(patsubst %.7,%.7.in,$(patsubst %.8,%.8.in,$(man_MANS))) \
+ $(patsubst %.html,%.html.in,$(manhtml))
TEST_FILES = \
test/data/bdev-both.txt \
test/ganeti.hooks_unittest.py \
test/ganeti.http_unittest.py \
test/ganeti.locking_unittest.py \
+ test/ganeti.mcpu_unittest.py \
test/ganeti.objects_unittest.py \
test/ganeti.rapi.resources_unittest.py \
test/ganeti.serializer_unittest.py \
check_python_code = \
$(all_python_code)
-all-local: stamp-directories devel/upload \
- doc/examples/bash_completion \
- doc/examples/ganeti.initd doc/examples/ganeti.cron \
- doc/examples/hooks/ipsec
-
-devel/upload: devel/upload.in stamp-directories $(REPLACE_VARS_SED)
+devel/upload: devel/upload.in $(REPLACE_VARS_SED)
sed -f $(REPLACE_VARS_SED) < $< > $@
chmod u+x $@
-daemons/ganeti-cleaner: daemons/ganeti-cleaner.in stamp-directories \
+daemons/ganeti-cleaner: daemons/ganeti-cleaner.in \
$(REPLACE_VARS_SED)
sed -f $(REPLACE_VARS_SED) < $< > $@
chmod +x $@
-doc/examples/%: doc/examples/%.in stamp-directories \
+doc/examples/%: doc/examples/%.in \
$(REPLACE_VARS_SED)
sed -f $(REPLACE_VARS_SED) < $< > $@
-doc/examples/hooks/%: doc/examples/hooks/%.in stamp-directories \
+doc/examples/hooks/%: doc/examples/hooks/%.in \
$(REPLACE_VARS_SED)
sed -f $(REPLACE_VARS_SED) < $< > $@
$(DOT) -Tpng -o $@ $<
man/%.7.in man/%.8.in: man/%.sgml man/footer.sgml $(DOCBOOK_WRAPPER)
- @test -n "$(DOCBOOK2MAN)" || { echo 'docbook2man' not found during configure; exit 1; }
+ @test -n "$(DOCBOOK2MAN)" || \
+ { echo 'docbook2man' not found during configure; exit 1; }
$(DOCBOOK_WRAPPER) "$(DOCBOOK2MAN)" $< $(notdir $(@:.in=)) $@
man/%.html.in: man/%.sgml man/footer.sgml $(DOCBOOK_WRAPPER)
- @test -n "$(DOCBOOK2HTML)" || { echo 'docbook2html' not found during configure; exit 1; }
+ @test -n "$(DOCBOOK2HTML)" || \
+ { echo 'docbook2html' not found during configure; exit 1; }
$(DOCBOOK_WRAPPER) "$(DOCBOOK2HTML) --nochunks" $< $(notdir $(@:.in=)) $@
-man/%.7: man/%.7.in stamp-directories $(REPLACE_VARS_SED)
+man/%.7: man/%.7.in $(REPLACE_VARS_SED)
sed -f $(REPLACE_VARS_SED) < $< > $@
-man/%.8: man/%.8.in stamp-directories $(REPLACE_VARS_SED)
+man/%.8: man/%.8.in $(REPLACE_VARS_SED)
sed -f $(REPLACE_VARS_SED) < $< > $@
-man/%.html: man/%.html.in stamp-directories $(REPLACE_VARS_SED)
+man/%.html: man/%.html.in $(REPLACE_VARS_SED)
sed -f $(REPLACE_VARS_SED) < $< > $@
lib/_autoconf.py: Makefile stamp-directories
echo "SSH_INITD_SCRIPT = '$(SSH_INITD_SCRIPT)'"; \
echo "EXPORT_DIR = '$(EXPORT_DIR)'"; \
echo "OS_SEARCH_PATH = [$(OS_SEARCH_PATH)]"; \
+ echo "XEN_BOOTLOADER = '$(XEN_BOOTLOADER)'"; \
echo "XEN_KERNEL = '$(XEN_KERNEL)'"; \
echo "XEN_INITRD = '$(XEN_INITRD)'"; \
echo "FILE_STORAGE_DIR = '$(FILE_STORAGE_DIR)'"; \
echo "GNT_SCRIPTS = [$(foreach i,$(notdir $(gnt_scripts)),'$(i)',)]"; \
} > $@
-$(REPLACE_VARS_SED): Makefile stamp-directories
+$(REPLACE_VARS_SED): Makefile
set -e; \
{ echo 's#@PREFIX@#$(prefix)#g'; \
echo 's#@SYSCONFDIR@#$(sysconfdir)#g'; \
echo 's#@BINDIR@#$(bindir)#g'; \
echo 's#@SBINDIR@#$(sbindir)#g'; \
echo 's#@GANETI_VERSION@#$(PACKAGE_VERSION)#g'; \
+ echo 's#@CUSTOM_XEN_BOOTLOADER@#$(XEN_BOOTLOADER)#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'; \
# We need to create symlinks because "make distcheck" will not install Python
# files when building.
-srclinks: stamp-directories
+stamp-srclinks: Makefile stamp-directories
set -e; \
for i in $(srclink_files); do \
if test ! -f $$i -a -f $(abs_top_srcdir)/$$i; then \
$(LN_S) $(abs_top_srcdir)/$$i $$i; \
fi; \
done
+ touch $@
.PHONY: ganeti
ganeti:
# a dist hook rule for catching revision control directories
distcheck-hook:
- if find $(top_distdir) | grep -F -e '.svn' -e '.git'; then \
- echo "Found revision control files in final archive" 1>&2 ; \
+ if find $(top_distdir) -name .svn -or -name .git | grep .; then \
+ echo "Found revision control files in final archive." 1>&2; \
+ exit 1; \
+ fi
+ if find $(top_distdir) -name '*.py[co]' | grep .; then \
+ echo "Found Python byte code in final archive." 1>&2; \
+ exit 1; \
+ fi
+ if find $(top_distdir) -name '*~' | grep .; then \
+ echo "Found backup files in final archive." 1>&2; \
exit 1; \
fi
projects / ganeti-local / blobdiff