[Openvpn-devel] build: Fix make distclean/distcheck

Message ID 20200916195616.30633-1-davids@openvpn.net
State Accepted
Headers show
Series
  • [Openvpn-devel] build: Fix make distclean/distcheck
Related show

Commit Message

David Sommerseth Sept. 16, 2020, 7:56 p.m.
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.

Signed-off-by: David Sommerseth <davids@openvpn.net>
---
 sample/Makefile.am | 3 +++
 1 file changed, 3 insertions(+)

Comments

Gert Doering Sept. 16, 2020, 8:31 p.m. | #1
Acked-by: Gert Doering <gert@greenie.muc.de>

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 <davids@openvpn.net>
     Acked-by: Gert Doering <gert@greenie.muc.de>
     Message-Id: <20200916195616.30633-1-davids@openvpn.net>
     URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg21026.html
     Signed-off-by: Gert Doering <gert@greenie.muc.de>


--
kind regards,

Gert Doering

Patch

diff --git a/sample/Makefile.am b/sample/Makefile.am
index 3be698e7..46d113ab 100644
--- a/sample/Makefile.am
+++ b/sample/Makefile.am
@@ -12,6 +12,9 @@ 
 MAINTAINERCLEANFILES = \
 	$(srcdir)/Makefile.in
 
+DISTCLEANFILES = \
+       $(builddir)/sample-plugins/Makefile
+
 EXTRA_DIST = \
 	sample-plugins \
 	sample-config-files \