[libvirt] [PATCH v4 02/42] build: collapse rules adding augeas tests to CLEANFILES
We already have a variable that lists all augeas test files, so we can
add everything to CLEANFILES at once.
Reviewed-by: Andrea Bolognani <abologna(a)redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com>
---
src/Makefile.am | 1 +
src/libxl/Makefile.inc.am | 1 -
src/locking/Makefile.inc.am | 4 +---
src/logging/Makefile.inc.am | 2 --
src/lxc/Makefile.inc.am | 1 -
src/qemu/Makefile.inc.am | 1 -
src/remote/Makefile.inc.am | 2 --
7 files changed, 2 insertions(+), 10 deletions(-)
diff --git a/src/Makefile.am b/src/Makefile.am
index f111b2a1b4..2b5ac3914e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -149,6 +149,7 @@ augeasdir = $(datadir)/augeas/lenses
augeastestdir = $(datadir)/augeas/lenses/tests
+CLEANFILES += $(augeastest_DATA)
# Internal generic driver infrastructure
DATATYPES_SOURCES = datatypes.h datatypes.c
diff --git a/src/libxl/Makefile.inc.am b/src/libxl/Makefile.inc.am
index abc65ede2c..cfe136f07e 100644
--- a/src/libxl/Makefile.inc.am
+++ b/src/libxl/Makefile.inc.am
@@ -68,7 +68,6 @@ libvirt_driver_libxl_impl_la_SOURCES = $(LIBXL_DRIVER_SOURCES)
conf_DATA += libxl/libxl.conf
augeas_DATA += libxl/libvirtd_libxl.aug
augeastest_DATA += test_libvirtd_libxl.aug
-CLEANFILES += test_libvirtd_libxl.aug
AUGEAS_DIRS += libxl
diff --git a/src/locking/Makefile.inc.am b/src/locking/Makefile.inc.am
index c44f74a529..2c53cff190 100644
--- a/src/locking/Makefile.inc.am
+++ b/src/locking/Makefile.inc.am
@@ -74,7 +74,7 @@ SYSCONF_FILES += locking/virtlockd.sysconf
PODFILES += locking/virtlockd.pod
MANINFILES += virtlockd.8.in
-CLEANFILES += test_virtlockd.aug $(man8_MANS)
+CLEANFILES += $(man8_MANS)
MAINTAINERCLEANFILES += $(MANINFILES)
SYSTEMD_UNIT_FILES_IN += \
@@ -115,7 +115,6 @@ endif WITH_SASL
if WITH_QEMU
augeastest_DATA += test_libvirt_lockd.aug
-CLEANFILES += test_libvirt_lockd.aug
nodist_conf_DATA += locking/qemu-lockd.conf
BUILT_SOURCES += locking/qemu-lockd.conf
DISTCLEANFILES += locking/qemu-lockd.conf
@@ -171,7 +170,6 @@ augeas_DATA += locking/libvirt_sanlock.aug
if WITH_QEMU
augeastest_DATA += test_libvirt_sanlock.aug
-CLEANFILES += test_libvirt_sanlock.aug
nodist_conf_DATA += locking/qemu-sanlock.conf
BUILT_SOURCES += locking/qemu-sanlock.conf
DISTCLEANFILES += locking/qemu-sanlock.conf
diff --git a/src/logging/Makefile.inc.am b/src/logging/Makefile.inc.am
index 8527890eb0..bf89c47b3b 100644
--- a/src/logging/Makefile.inc.am
+++ b/src/logging/Makefile.inc.am
@@ -46,8 +46,6 @@ MAINTAINERCLEANFILES += \
$(LOG_DAEMON_GENERATED) \
$(NULL)
-CLEANFILES += test_virtlogd.aug
-
PODFILES += logging/virtlogd.pod
MANINFILES += virtlogd.8.in
SYSCONF_FILES += logging/virtlogd.sysconf
diff --git a/src/lxc/Makefile.inc.am b/src/lxc/Makefile.inc.am
index 1c0b715a2f..df8d5db110 100644
--- a/src/lxc/Makefile.inc.am
+++ b/src/lxc/Makefile.inc.am
@@ -157,7 +157,6 @@ conf_DATA += lxc/lxc.conf
augeas_DATA += lxc/libvirtd_lxc.aug
augeastest_DATA += test_libvirtd_lxc.aug
-CLEANFILES += test_libvirtd_lxc.aug
AUGEAS_DIRS += lxc
diff --git a/src/qemu/Makefile.inc.am b/src/qemu/Makefile.inc.am
index e8c7d4b5b1..69aaeb46c2 100644
--- a/src/qemu/Makefile.inc.am
+++ b/src/qemu/Makefile.inc.am
@@ -116,7 +116,6 @@ conf_DATA += qemu/qemu.conf
augeas_DATA += qemu/libvirtd_qemu.aug
augeastest_DATA += test_libvirtd_qemu.aug
-CLEANFILES += test_libvirtd_qemu.aug
AUGEAS_DIRS += qemu
diff --git a/src/remote/Makefile.inc.am b/src/remote/Makefile.inc.am
index 4f706f9743..7d5c90cff1 100644
--- a/src/remote/Makefile.inc.am
+++ b/src/remote/Makefile.inc.am
@@ -130,8 +130,6 @@ augeastest_DATA += test_libvirtd.aug
conf_DATA += remote/libvirtd.conf
-CLEANFILES += test_libvirtd.aug
-
man8_MANS += libvirtd.8
libvirtd_SOURCES = $(LIBVIRTD_SOURCES)
--
2.21.0