[PATCH weston 2/2] build: let 'make clean' remove logs/ again

Kristian Høgsberg hoegsberg at gmail.com
Mon May 12 10:07:16 PDT 2014


On Mon, May 12, 2014 at 10:08:57AM +0300, Pekka Paalanen wrote:
> From: Pekka Paalanen <pekka.paalanen at collabora.co.uk>
> 
> Before in the recursive automake setting, we had tests/logs/ for
> explicitly created test log files. There is a Makefile rule to
> remove the logs directory on 'make clean'. The rule broke on moving to
> non-recursive make, since now we have logs/, not tests/logs/.
> 
> Fix the rule to remove the intended directory.
> 
> Signed-off-by: Pekka Paalanen <pekka.paalanen at collabora.co.uk>

Thanks, both applied.

Kristian

> ---
>  Makefile.am | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/Makefile.am b/Makefile.am
> index 177ce2e..343adc6 100644
> --- a/Makefile.am
> +++ b/Makefile.am
> @@ -828,7 +828,7 @@ LA_LOG_COMPILER = $(srcdir)/tests/weston-tests-env
>  WESTON_LOG_COMPILER = $(srcdir)/tests/weston-tests-env
>  
>  clean-local:
> -	-rm -rf tests/logs
> +	-rm -rf logs
>  
>  # To remove when automake 1.11 support is dropped
>  export abs_builddir
> -- 
> 1.8.5.5
> 


More information about the wayland-devel mailing list