[CRIU] [PATCH 2/2] images/Makefile: sanitize cleaning

[Dmitry Safonov]

2017-02-08 8:06 GMT+03:00 Kir Kolyshkin <kir at openvz.org>:
> Instead of removing everything by means of a few wildcards,
> let's properly generate the file names to be removed.
>
> Signed-off-by: Kir Kolyshkin <kir at openvz.org>
> ---
>  images/Makefile | 11 +++++------
>  1 file changed, 5 insertions(+), 6 deletions(-)
>
> diff --git a/images/Makefile b/images/Makefile
> index 86a7a01..e37d988 100644
> --- a/images/Makefile
> +++ b/images/Makefile
> @@ -105,6 +105,7 @@ $(obj)/%.o: $(obj)/%.pb-c.c $(obj)/%.pb-c.h
>  $(obj)/built-in.o: $(addprefix $(obj)/,$(proto-obj-y))
>         $(E) "  LINK    " $@
>         $(Q) $(LD) $(ldflags-y) -r -o $@ $^
> +clean-y += $(obj)/built-in.o

A typo:
cleanup-y += ..
And Travis tests fail cause of this.

>
>  ifneq ($(MAKECMDGOALS),clean)
>  ifneq ($(MAKECMDGOALS),mrproper)
> @@ -112,9 +113,7 @@ ifneq ($(MAKECMDGOALS),mrproper)
>  endif
>  endif
>
> -mrproper-y += $(obj)/*.pb-c.c $(obj)/*.pb-c.h
> -cleanup-y += $(obj)/*.o $(obj)/*.d $(obj)/*.s $(obj)/*.i
> -cleanup-y += $(obj)/google/protobuf/*.d
> -cleanup-y += $(obj)/google/protobuf/*.h
> -cleanup-y += $(obj)/google/protobuf/*.c
> -cleanup-y += $(obj)/google/protobuf/*.o
> +cleanup-y += $(call cleanify,$(addprefix $(obj)/,$(proto-obj-y)))
> +cleanup-y += $(call cleanify,$(addprefix $(obj)/,$(proto-obj-y:.o=.pb-c.o)))
> +mrproper-y += $(addprefix $(obj)/,$(proto-obj-y:.o=.pb-c.c))
> +mrproper-y += $(addprefix $(obj)/,$(proto-obj-y:.o=.pb-c.h))
> --
> 2.9.3

-- 
             Dmitry