- Don't build .tar.bz2, we only distribute .tar.gz anyway.

- Clean generated files on “make maintainer-clean”.
- Build _autoconf.py and ganeti.initd on “make all”.

Reviewed-by: iustinp

configure.ac

@@ -3,7 +3,7 @@
 AC_PREREQ(2.59)
 AC_INIT(ganeti, 1.2b2, ganeti@googlegroups.com)
 AC_CONFIG_AUX_DIR(autotools)
-AM_INIT_AUTOMAKE([foreign tar-ustar dist-bzip2])
+AM_INIT_AUTOMAKE([foreign tar-ustar])
 
 # Check common programs
 AC_PROG_INSTALL

doc/Makefile.am

 docdir = $(datadir)/doc/$(PACKAGE)
 
 SUBDIRS = examples
-dist_doc_DATA = hooks.html hooks.pdf install.html install.pdf admin.html \
-  admin.pdf
+dist_doc_DATA = \
+  hooks.html hooks.pdf \
+  install.html install.pdf \
+  admin.html admin.pdf
 EXTRA_DIST = hooks.sgml install.sgml admin.sgml
+MAINTAINERCLEANFILES = *.html *.pdf
 
 %.html: %.sgml
 	docbook2html --nochunks $<

doc/examples/Makefile.am

-nodist_bin_SCRIPTS = ganeti.initd
-
 EXTRA_DIST = ganeti.initd.in ganeti.cron
 CLEANFILES = $(nodist_bin_SCRIPTS)
 
+nodist_bin_SCRIPTS = ganeti.initd
+
+all-local: ganeti.initd
 ganeti.initd: ganeti.initd.in
 	sed \
 	  -e "s#@PREFIX@#$(prefix)#g" \

lib/Makefile.am

-MAINTAINERCLEANFILES = _autoconf.py
+CLEANFILES = $(nodist_pkgpython_PYTHON) *.py[oc]
+
 nodist_pkgpython_PYTHON = _autoconf.py
 pkgpython_PYTHON = __init__.py backend.py cli.py cmdlib.py config.py \
 	objects.py errors.py logger.py ssh.py utils.py rpc.py \
 	bdev.py hypervisor.py opcodes.py mcpu.py constants.py \
 	ssconf.py
 
+all-local: _autoconf.py
+
 _autoconf.py: Makefile
 	{ echo '# This file is automatically generated, do not edit!'; \
 	  echo "PACKAGE_VERSION = '$(PACKAGE_VERSION)'"; \

man/Makefile.am

@@ -7,6 +7,7 @@ EXTRA_DIST = ganeti-os-interface.sgml gnt-cluster.sgml gnt-node.sgml \
 	     ganeti-watcher.sgml ganeti.sgml gnt-instance.sgml gnt-os.sgml \
 	     gnt-backup.sgml ganeti-noded.sgml \
 	     footer.sgml $(man_MANS)
+MAINTAINERCLEANFILES = *.[78]
 
 %.7 %.8: %.sgml footer.sgml
 	docbook2man $<

testing/Makefile.am

@@ -7,3 +7,4 @@ ganeti:
 	ln -s $(top_srcdir)/lib ganeti
 
 EXTRA_DIST = $(TESTS) mocks.py ganeti.qa.py qa-sample.yaml
+MAINTAINERCLEANFILES = ganeti