Running "make distclean" in the build tree currently fails since this
tries to run the "distclean" target in the contrib/plugins/ folder, too,
but the Makefile there is missing this target. Thus add 'distclean' there
to fix this issue.

And to avoid regressions with "make distclean", add this command to one
of the build jobs, too.

Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 .gitlab-ci.d/buildtest.yml | 2 ++
 contrib/plugins/Makefile   | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml
index aa32782405..0c624813cf 100644
--- a/.gitlab-ci.d/buildtest.yml
+++ b/.gitlab-ci.d/buildtest.yml
@@ -345,6 +345,8 @@ build-tcg-disabled:
             124 132 139 142 144 145 151 152 155 157 165 194 196 200 202
             208 209 216 218 227 234 246 247 248 250 254 255 257 258
             260 261 262 263 264 270 272 273 277 279 image-fleecing
+    - cd ../..
+    - make distclean
 
 build-user:
   extends: .native_build_job_template
diff --git a/contrib/plugins/Makefile b/contrib/plugins/Makefile
index edf256cd9d..05a2a45c5c 100644
--- a/contrib/plugins/Makefile
+++ b/contrib/plugins/Makefile
@@ -77,7 +77,7 @@ lib%$(SO_SUFFIX): %.o
 endif
 
 
-clean:
+clean distclean:
 	rm -f *.o *$(SO_SUFFIX) *.d
 	rm -Rf .libs
 
-- 
2.46.0

Thomas Huth <thuth@redhat.com> writes:

> Running "make distclean" in the build tree currently fails since this
> tries to run the "distclean" target in the contrib/plugins/ folder, too,
> but the Makefile there is missing this target. Thus add 'distclean' there
> to fix this issue.
>
> And to avoid regressions with "make distclean", add this command to one
> of the build jobs, too.

Queued to plugins/next, thanks.

-- 
Alex Bennée
Virtualisation Tech Lead @ Linaro

On 9/2/24 08:47, Thomas Huth wrote:
> Running "make distclean" in the build tree currently fails since this
> tries to run the "distclean" target in the contrib/plugins/ folder, too,
> but the Makefile there is missing this target. Thus add 'distclean' there
> to fix this issue.
> 
> And to avoid regressions with "make distclean", add this command to one
> of the build jobs, too.
> 
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
>   .gitlab-ci.d/buildtest.yml | 2 ++
>   contrib/plugins/Makefile   | 2 +-
>   2 files changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml
> index aa32782405..0c624813cf 100644
> --- a/.gitlab-ci.d/buildtest.yml
> +++ b/.gitlab-ci.d/buildtest.yml
> @@ -345,6 +345,8 @@ build-tcg-disabled:
>               124 132 139 142 144 145 151 152 155 157 165 194 196 200 202
>               208 209 216 218 227 234 246 247 248 250 254 255 257 258
>               260 261 262 263 264 270 272 273 277 279 image-fleecing
> +    - cd ../..
> +    - make distclean
>   
>   build-user:
>     extends: .native_build_job_template
> diff --git a/contrib/plugins/Makefile b/contrib/plugins/Makefile
> index edf256cd9d..05a2a45c5c 100644
> --- a/contrib/plugins/Makefile
> +++ b/contrib/plugins/Makefile
> @@ -77,7 +77,7 @@ lib%$(SO_SUFFIX): %.o
>   endif
>   
>   
> -clean:
> +clean distclean:
>   	rm -f *.o *$(SO_SUFFIX) *.d
>   	rm -Rf .libs
>   

Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>