From d5cbf85f1a972b05f624ba2caef09fb3139fb5f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Date: Wed, 3 Apr 2019 11:53:00 +0100 Subject: [PATCH] build-aux: ensure all scripts are included in EXTRA_DIST MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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é --- Makefile.am | 12 +++++++++++- src/Makefile.am | 1 - 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index 365b0b3b94..8eaec0b364 100644 --- 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 ce199d1e93..7d452a9490 100644 --- 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 #