build-aux: ensure all scripts are included in EXTRA_DIST

Few of the scripts in build-aux are included in EXTRA_DIST. This is not
a serious problem since they are primarily tools intended for developers
upstream, and downstream builds won't need them. Having them missing,
however, complicates downstream patching because it means patches that
are auto-exported from git will fail to apply if they include a change
to a file in build-aux/.  By bundling all these scripts in the dist we
make patching more straightforward.

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>

diff --git a/Makefile.am b/Makefile.am
index 365b0b3b945971cb6e080e04f2a29bacbfa4b86d..8eaec0b364c3310408624ab0fcc279ebe5f88591 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -40,7 +40,17 @@ EXTRA_DIST = \
   cfg.mk \
   run.in \
   README.md \
-  AUTHORS.in
+  AUTHORS.in \
+  build-aux/augeas-gentest.pl \
+  build-aux/check-spacing.pl \
+  build-aux/gitlog-to-changelog \
+  build-aux/header-ifdef.pl \
+  build-aux/minimize-po.pl \
+  build-aux/mock-noinline.pl \
+  build-aux/prohibit-duplicate-header.pl \
+  build-aux/useless-if-before-free \
+  build-aux/vc-list-files \
+  $(NULL)
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libvirt.pc libvirt-qemu.pc libvirt-lxc.pc libvirt-admin.pc

diff --git a/src/Makefile.am b/src/Makefile.am
index ce199d1e93a233cf83ed339d94cff6509daef51f..7d452a9490ef03068107eb06dc5d1c513bb9c2fd 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -404,7 +404,6 @@ check-local: check-augeas
 check-augeas: $(AUGEAS_DIRS:%=check-augeas-%)
 
 AUG_GENTEST = $(PERL) $(top_srcdir)/build-aux/augeas-gentest.pl
-EXTRA_DIST += $(top_srcdir)/build-aux/augeas-gentest.pl
 
 
 #