[libvirt] [PATCH 03/41] build: collapse rules adding augeas tests to CLEANFILES

[Daniel P. Berrangé]

We already have a variable that lists all augeas test files, so we can
add everything to CLEANFILES at once.
---
 src/Makefile.am             | 1 +
 src/bhyve/Makefile.inc.am   | 1 -
 src/libxl/Makefile.inc.am   | 1 -
 src/locking/Makefile.inc.am | 5 +----
 src/logging/Makefile.inc.am | 3 ---
 src/lxc/Makefile.inc.am     | 1 -
 src/qemu/Makefile.inc.am    | 1 -
 src/remote/Makefile.inc.am  | 2 --
 8 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index 0b562dc250..58f0c792ed 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/bhyve/Makefile.inc.am b/src/bhyve/Makefile.inc.am
index d9cc64a827..0aef5e17c7 100644
--- a/src/bhyve/Makefile.inc.am
+++ b/src/bhyve/Makefile.inc.am
@@ -50,7 +50,6 @@ libvirt_driver_bhyve_impl_la_SOURCES = $(BHYVE_DRIVER_SOURCES)
 conf_DATA += bhyve/bhyve.conf
 augeas_DATA += bhyve/libvirtd_bhyve.aug
 augeastest_DATA += bhyve/test_libvirtd_bhyve.aug
-CLEANFILES += bhyve/test_libvirtd_bhyve.aug
 
 AUGEAS_DIRS += bhyve
 
diff --git a/src/libxl/Makefile.inc.am b/src/libxl/Makefile.inc.am
index 1abdeff390..e73f34db8e 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 += libxl/test_libvirtd_libxl.aug
-CLEANFILES += libxl/test_libvirtd_libxl.aug
 
 AUGEAS_DIRS += libxl
 
diff --git a/src/locking/Makefile.inc.am b/src/locking/Makefile.inc.am
index 8041ae89b8..0f284faf25 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 += locking/test_libvirt_lockd.aug
-CLEANFILES += locking/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 += locking/test_libvirt_sanlock.aug
-CLEANFILES += locking/test_libvirt_sanlock.aug
 nodist_conf_DATA += locking/qemu-sanlock.conf
 BUILT_SOURCES += locking/qemu-sanlock.conf
 DISTCLEANFILES += locking/qemu-sanlock.conf
@@ -204,7 +202,6 @@ conf_DATA += locking/virtlockd.conf
 
 augeas_DATA += locking/virtlockd.aug
 augeastest_DATA += locking/test_virtlockd.aug
-CLEANFILES += locking/test_virtlockd.aug
 
 INSTALL_DATA_DIRS += locking
 
diff --git a/src/logging/Makefile.inc.am b/src/logging/Makefile.inc.am
index 7e8391b3cc..58a139ec2f 100644
--- a/src/logging/Makefile.inc.am
+++ b/src/logging/Makefile.inc.am
@@ -46,8 +46,6 @@ MAINTAINERCLEANFILES += \
 	$(LOG_DAEMON_GENERATED) \
 	$(NULL)
 
-CLEANFILES += logging/test_virtlogd.aug
-
 PODFILES += logging/virtlogd.pod
 MANINFILES += virtlogd.8.in
 SYSCONF_FILES += logging/virtlogd.sysconf
@@ -98,7 +96,6 @@ conf_DATA += logging/virtlogd.conf
 
 augeas_DATA += logging/virtlogd.aug
 augeastest_DATA += logging/test_virtlogd.aug
-CLEANFILES += logging/test_virtlogd.aug
 
 logging/test_virtlogd.aug: logging/test_virtlogd.aug.in \
 		logging/virtlogd.conf $(AUG_GENTEST)
diff --git a/src/lxc/Makefile.inc.am b/src/lxc/Makefile.inc.am
index b7f539b878..f011d90e95 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 += lxc/test_libvirtd_lxc.aug
-CLEANFILES += lxc/test_libvirtd_lxc.aug
 
 AUGEAS_DIRS += lxc
 
diff --git a/src/qemu/Makefile.inc.am b/src/qemu/Makefile.inc.am
index 464bbfe735..750b8a5c85 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 += qemu/test_libvirtd_qemu.aug
-CLEANFILES += qemu/test_libvirtd_qemu.aug
 
 AUGEAS_DIRS += qemu
 
diff --git a/src/remote/Makefile.inc.am b/src/remote/Makefile.inc.am
index 4a1d89ee17..18519b129d 100644
--- a/src/remote/Makefile.inc.am
+++ b/src/remote/Makefile.inc.am
@@ -130,8 +130,6 @@ augeastest_DATA += remote/test_libvirtd.aug
 
 conf_DATA += remote/libvirtd.conf
 
-CLEANFILES += remote/test_libvirtd.aug
-
 man8_MANS += libvirtd.8
 
 libvirtd_SOURCES = $(LIBVIRTD_SOURCES)
-- 
2.21.0