On 24.08.2021 12:50, Anthony PERARD wrote:
> --- a/.gitignore
> +++ b/.gitignore
> @@ -332,7 +332,6 @@ xen/include/compat/*
>  xen/include/config/
>  xen/include/generated/
>  xen/include/public/public
> -xen/include/xen/*.new

While this indeed looks to only have been here for compile.h, I'm
not convinced it is a good idea to delete the entry here. Does it
cause any harm if left in place?

> --- a/xen/Makefile
> +++ b/xen/Makefile
> @@ -351,7 +351,7 @@ _debug:
>       $(OBJDUMP) -D -S $(TARGET)-syms > $(TARGET).s
>  
>  .PHONY: _clean
> -_clean: delete-unfresh-files
> +_clean:
>       $(MAKE) -C tools clean
>       $(MAKE) $(clean) include
>       $(MAKE) $(clean) common
> @@ -368,7 +368,7 @@ _clean: delete-unfresh-files
>               -o -name "*.gcno" -o -name ".*.cmd" -o -name "lib.a" \) -exec 
> rm -f {} \;
>       rm -f include/asm $(TARGET) $(TARGET).gz $(TARGET).efi 
> $(TARGET).efi.map $(TARGET)-syms $(TARGET)-syms.map *~ core
>       rm -f asm-offsets.s arch/*/include/asm/asm-offsets.h
> -     rm -f .banner
> +     rm -f .banner include/xen/compile.h

Isn't this redundant with ...

> @@ -425,10 +419,16 @@ include/xen/compile.h: include/xen/compile.h.in .banner
>           -e 's/@@subversion@@/$(XEN_SUBVERSION)/g' \
>           -e 's/@@extraversion@@/$(XEN_EXTRAVERSION)/g' \
>           -e 's!@@changeset@@!$(shell tools/scmversion $(XEN_ROOT) || echo 
> "unavailable")!g' \
> -         < include/xen/compile.h.in > $@.new
> +         < $< > $(dot-target).tmp; \
> +     sed -rf tools/process-banner.sed < .banner >> $(dot-target).tmp; \
> +     mv -f $(dot-target).tmp $@; \
> +    fi
> +endef
> +
> +include/xen/compile.h: include/xen/compile.h.in .banner FORCE
>       @cat .banner
> -     @sed -rf tools/process-banner.sed < .banner >> $@.new
> -     @mv -f $@.new $@
> +     $(call if_changed,compile.h)
> +targets += include/xen/compile.h

... this? I would have hoped that $(targets) is included in the
generic cleaning logic ...

Jan


Reply via email to