From 8e587e525e562acef1423a1b80870890d190c278 Mon Sep 17 00:00:00 2001
From: Michael Hanselmann <hansmi@google.com>
Date: Tue, 11 Sep 2007 08:45:54 +0000
Subject: [PATCH] =?UTF-8?q?-=20Don't=20build=20.tar.bz2,=20we=20only=20dis?=
=?UTF-8?q?tribute=20.tar.gz=20anyway.=20-=20Clean=20generated=20files=20o?=
=?UTF-8?q?n=20=E2=80=9Cmake=20maintainer-clean=E2=80=9D.=20-=20Build=20?=
=?UTF-8?q?=5Fautoconf.py=20and=20ganeti.initd=20on=20=E2=80=9Cmake=20all?=
=?UTF-8?q?=E2=80=9D.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Reviewed-by: iustinp
---
configure.ac | 2 +-
doc/Makefile.am | 7 +++++--
doc/examples/Makefile.am | 5 +++--
lib/Makefile.am | 5 ++++-
man/Makefile.am | 1 +
testing/Makefile.am | 1 +
6 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/configure.ac b/configure.ac
index c7c45324f..0ae0010b3 100644
--- a/configure.ac
+++ b/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
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 3270b7877..4aedb1501 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,9 +1,12 @@
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 $<
diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am
index 667567de9..f26adeef6 100644
--- a/doc/examples/Makefile.am
+++ b/doc/examples/Makefile.am
@@ -1,8 +1,9 @@
-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" \
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 48e90e8c4..c32cf6eeb 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,10 +1,13 @@
-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)'"; \
diff --git a/man/Makefile.am b/man/Makefile.am
index 552ae2de0..4b6a410b9 100644
--- a/man/Makefile.am
+++ b/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 $<
diff --git a/testing/Makefile.am b/testing/Makefile.am
index 732c182f5..9fb5f7e44 100644
--- a/testing/Makefile.am
+++ b/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
--
GitLab