[Libguestfs] [PATCH 1/3] p2v: Consolidate EXTRA_DIST and CLEANFILES into single lists.

[Richard W.M. Jones]

No functional change.
---
 p2v/Makefile.am | 26 +++++++++++---------------
 1 file changed, 11 insertions(+), 15 deletions(-)

diff --git a/p2v/Makefile.am b/p2v/Makefile.am
index 53c96a1..f00cae9 100644
--- a/p2v/Makefile.am
+++ b/p2v/Makefile.am
@@ -18,21 +18,32 @@
 include $(top_srcdir)/subdir-rules.mk
 
 EXTRA_DIST = \
+	$(TESTS) $(SLOW_TESTS) \
 	dependencies.m4 \
 	issue \
 	launch-virt-p2v.in \
 	p2v.ks.in \
 	p2v.service \
+	test-virt-p2v-pxe.sshd_config.in \
+	test-virt-p2v-ssh.sh \
 	virt-p2v.pod \
 	virt-p2v-make-disk.in \
 	virt-p2v-make-disk.pod \
 	virt-p2v-make-kickstart.in \
 	virt-p2v-make-kickstart.pod
 
+# Don't clean ssh_host_rsa_key{,.pub} or id_rsa{,.pub} since those
+# consume system entropy to regenerate.
 CLEANFILES = \
+	$(dependencies_files) \
+	stamp-test-virt-p2v-pxe-kernel \
 	stamp-virt-p2v.pod \
 	stamp-virt-p2v-make-disk.pod \
 	stamp-virt-p2v-make-kickstart.pod \
+	test-virt-p2v-pxe.img \
+	test-virt-p2v-pxe.vmlinuz \
+	test-virt-p2v-pxe.initramfs \
+	test-virt-p2v-pxe.sshd_config \
 	virt-p2v.1 \
 	virt-p2v-make-disk.1 \
 	virt-p2v-make-kickstart.1
@@ -89,7 +100,6 @@ dependencies_files = \
 	dependencies.debian \
 	dependencies.redhat \
 	dependencies.suse
-CLEANFILES += $(dependencies_files)
 
 $(dependencies_files): dependencies.m4
 	define=`echo $@ | $(SED) 's/dependencies.//;y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`; \
@@ -225,17 +235,3 @@ stamp-test-virt-p2v-pxe-userkey:
 	rm -f test-virt-p2v-pxe.id_rsa.pub
 	ssh-keygen -t rsa -f test-virt-p2v-pxe.id_rsa -N ''
 	touch $@
-
-# Don't clean ssh_host_rsa_key{,.pub} or id_rsa{,.pub} since those
-# consume system entropy to regenerate.
-CLEANFILES += \
-	stamp-test-virt-p2v-pxe-kernel \
-	test-virt-p2v-pxe.img \
-	test-virt-p2v-pxe.vmlinuz \
-	test-virt-p2v-pxe.initramfs \
-	test-virt-p2v-pxe.sshd_config
-
-EXTRA_DIST += \
-	$(TESTS) $(SLOW_TESTS) \
-	test-virt-p2v-pxe.sshd_config.in \
-	test-virt-p2v-ssh.sh
-- 
2.7.4