[libcamera-devel] [PATCH 2/2] libcamera: Drop unneeded depend_files from meson custom targets

[Kieran Bingham]

Hi Laurent,

On 08/02/2021 22:20, Laurent Pinchart wrote:
> The meson custom_target() function accepts a 'depend_files' argument to
> list additional dependency files. Files already listed in the 'command'
> argument are handled automatically, and don't need to be added manually.
> Drop them.
> 

Seems to make sense. This makes me remember the race conditions we've
had in the past, but I can't see that this makes a difference here, so I
think it's good as long at the dependency is met.

Reviewed-by: Kieran Bingham <kieran.bingham at ideasonboard.com>



> Signed-off-by: Laurent Pinchart <laurent.pinchart at ideasonboard.com>
> ---
>  include/libcamera/meson.build | 1 -
>  src/libcamera/meson.build     | 1 -
>  2 files changed, 2 deletions(-)
> 
> diff --git a/include/libcamera/meson.build b/include/libcamera/meson.build
> index 13e9eeb6d6ad..eb787d44746a 100644
> --- a/include/libcamera/meson.build
> +++ b/include/libcamera/meson.build
> @@ -46,7 +46,6 @@ foreach header : control_source_files
>      control_headers += custom_target(header + '_h',
>                                       input : input_files,
>                                       output : header + '.h',
> -                                     depend_files : gen_controls,
>                                       command : [gen_controls, '-o', '@OUTPUT@', '@INPUT@'],
>                                       install : true,
>                                       install_dir : join_paths('include', include_dir))
> diff --git a/src/libcamera/meson.build b/src/libcamera/meson.build
> index 2b1850897aa4..ebce19d90c1e 100644
> --- a/src/libcamera/meson.build
> +++ b/src/libcamera/meson.build
> @@ -94,7 +94,6 @@ foreach source : control_source_files
>      control_sources += custom_target(source + '_cpp',
>                                       input : input_files,
>                                       output : source + '.cpp',
> -                                     depend_files : gen_controls,
>                                       command : [gen_controls, '-o', '@OUTPUT@', '@INPUT@'])
>  endforeach
>  
> 

-- 
Regards
--
Kieran