diff options
| author | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2024-08-05 02:01:05 +0300 |
|---|---|---|
| committer | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2024-08-07 17:57:22 +0300 |
| commit | 6865649730c4055238a0f7584e864140a6c00825 (patch) | |
| tree | cd31aaf14a21aea1a72639d7d04c2a1b2dcd383d | |
| parent | 4736ec509d9135af7260171f3ace947da360adba (diff) | |
libcamera: Consolidate tracepoint header in libcamera_internal_headers
The libcamera_tracepoint_header variable stores the tracepoints.h header
custom target, for the sole purpose of being listed as a source of the
libcamera shared library, through the libcamera_internal_sources
variable.
Add the tracepoints.h header to libcamera_internal_headers instead of
libcamera_internal_sources, and list libcamera_internal_headers as a
source of the shared library, alongside libcamera_internal_sources. This
makes libcamera_internal_sources contain sources only, improving clarity
of the build system variables.
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Daniel Scally <dan.scally@ideasonboard.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
| -rw-r--r-- | include/libcamera/internal/meson.build | 16 | ||||
| -rw-r--r-- | src/libcamera/meson.build | 2 |
2 files changed, 10 insertions, 8 deletions
diff --git a/include/libcamera/internal/meson.build b/include/libcamera/internal/meson.build index f96cc5e3..39230fac 100644 --- a/include/libcamera/internal/meson.build +++ b/include/libcamera/internal/meson.build @@ -2,13 +2,6 @@ subdir('tracepoints') -libcamera_tracepoint_header = custom_target( - 'tp_header', - input : ['tracepoints.h.in', tracepoint_files], - output : 'tracepoints.h', - command : [gen_tracepoints_header, include_build_dir, '@OUTPUT@', '@INPUT@'], -) - libcamera_internal_headers = files([ 'bayer_format.h', 'byte_stream_buffer.h', @@ -51,5 +44,14 @@ libcamera_internal_headers = files([ 'yaml_parser.h', ]) +tracepoints_h = custom_target( + 'tp_header', + input : ['tracepoints.h.in', tracepoint_files], + output : 'tracepoints.h', + command : [gen_tracepoints_header, include_build_dir, '@OUTPUT@', '@INPUT@'], +) + +libcamera_internal_headers += tracepoints_h + subdir('converter') subdir('software_isp') diff --git a/src/libcamera/meson.build b/src/libcamera/meson.build index 86e8b88c..6a7c9d77 100644 --- a/src/libcamera/meson.build +++ b/src/libcamera/meson.build @@ -55,7 +55,6 @@ libcamera_internal_sources = files([ ]) libcamera_public_sources += libcamera_public_headers -libcamera_internal_sources += libcamera_tracepoint_header includes = [ libcamera_includes, @@ -196,6 +195,7 @@ libcamera = shared_library('libcamera', [ libcamera_public_sources, libcamera_ipa_headers, + libcamera_internal_headers, libcamera_internal_sources, ], version : libcamera_version, |