Skip to contentSkip to conversation

build: Fix make distclean/distcheck

PATCH In review David Sommerseth 2 participants 2 messages Sep 16, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 build: Fix make distclean/distcheck

In commit 0b5141d8f94 the sample-plugins got partially migrated to automake. But since it was not fully integrated within the full standard build, the sample/sample-plugins/Makefile was not removed by 'make distclean', which annoys 'make distcheck'.

The simplest way is just to explicitly enlist this Makefile in the list of files 'make distclean' should remove.

---
 sample/Makefile.am | 3 +++
 1 file changed, 3 insertions(+)
sample/Makefile.am +3 -0
index 3be698e7..46d113ab 100644
@@ -12,6 +12,9 @@
 MAINTAINERCLEANFILES = \
 	$(srcdir)/Makefile.in
 
+DISTCLEANFILES = \
+       $(builddir)/sample-plugins/Makefile
+
 EXTRA_DIST = \
 	sample-plugins \
 	sample-config-files \
Signature · 1 line
2.26.0
Acked-by on v1 1/1
#1 lore raw

I haven't tested this (my "distcheck capable" machine is still down), but it looks reasonable.

Your patch has been applied to the master and release/2.5 branch.

commit 6345cea86bde14b22a8024cad5026a7d302db25c (master) commit 55f4fe3a0d04b35f0e817c5a34246d9bda40e936 (release/2.5)

Author: David Sommerseth
Date:   Wed Sep 16 21:56:16 2020 +0200
     build: Fix make distclean/distcheck

     Signed-off-by: David Sommerseth <[email protected]...>
     Acked-by: Gert Doering <[email protected]...>
     Message-Id: <[email protected]...>
     URL: https://www.mail-archive.com/[email protected]/msg21026.html
     Signed-off-by: Gert Doering <[email protected]...>

--
kind regards,

Gert Doering