[PATCH xtables-addons] build: clean some extra build artefacts.

[PATCH xtables-addons] build: clean some extra build artefacts.

[Jeremy Sowden]

Because extensions/Makefile.am does not contain a `SUBDIRS` variable
listing extensions/ACCOUNT and extensions/pknock, when `make distclean`
is run, make does not recurse into them.  Add a `distclean-local` target
to extensions/Makefile.am to fix this.

Makefile.mans creates .manpages.lst, but does not remove it.  Add
it to the `clean` target.

Signed-off-by: Jeremy Sowden <jeremy@azazel.net>
---
 Makefile.mans.in       | 2 +-
 extensions/Makefile.am | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/Makefile.mans.in b/Makefile.mans.in
index 18e82b39882d..63424f7d558a 100644
--- a/Makefile.mans.in
+++ b/Makefile.mans.in
@@ -40,4 +40,4 @@ targets.man: .manpages.lst ${wcman_targets}
 	$(call man_run,${wlist_targets})
 
 clean:
-	rm -f xtables-addons.8 matches.man targets.man
+	rm -f xtables-addons.8 matches.man targets.man .manpages.lst
diff --git a/extensions/Makefile.am b/extensions/Makefile.am
index a487fd8c141a..e7e942127e59 100644
--- a/extensions/Makefile.am
+++ b/extensions/Makefile.am
@@ -26,4 +26,8 @@ install-exec-local: modules_install
 
 clean-local: clean_modules
 
+distclean-local:
+	$(MAKE) -C ACCOUNT distclean
+	$(MAKE) -C pknock distclean
+
 include ../Makefile.extra
-- 
2.28.0

Re: [PATCH xtables-addons] build: clean some extra build artefacts.

[Jan Engelhardt]

On Saturday 2020-08-29 22:41, Jeremy Sowden wrote:

>Because extensions/Makefile.am does not contain a `SUBDIRS` variable
>listing extensions/ACCOUNT and extensions/pknock, when `make distclean`
>is run, make does not recurse into them.  Add a `distclean-local` target
>to extensions/Makefile.am to fix this.

I find it suspicious that the userspace tools are not even built.
Therefore, I just added those directories to SUBDIRS. This should 
conveniently also cure the need for an extra call to distcleaning.

Re: [PATCH xtables-addons] build: clean some extra build artefacts.

[Jeremy Sowden]

[-- Attachment #1: Type: text/plain, Size: 598 bytes --]

On 2020-08-30, at 13:39:28 +0200, Jan Engelhardt wrote:
> On Saturday 2020-08-29 22:41, Jeremy Sowden wrote:
> > Because extensions/Makefile.am does not contain a `SUBDIRS` variable
> > listing extensions/ACCOUNT and extensions/pknock, when `make distclean`
> > is run, make does not recurse into them.  Add a `distclean-local` target
> > to extensions/Makefile.am to fix this.
>
> I find it suspicious that the userspace tools are not even built.
> Therefore, I just added those directories to SUBDIRS. This should
> conveniently also cure the need for an extra call to distcleaning.

Thanks,

J.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]