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@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrangé 2019-07-19 16:52:28 +01:00
parent 06334b97f1
commit ae6fd27533
7 changed files with 2 additions and 10 deletions

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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)