From aa7e7175c7c7407ef0d6400055dfec5086b31f3b Mon Sep 17 00:00:00 2001
From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Date: Fri, 15 May 2020 18:55:19 +0300
Subject: meson: Rename variables storing headers lists
The list of public, IPA and internal header files are stored in three
meson variables, named libcamera_api, libcamera_ipa_api and
libcamera_headers respectively. The lack of uniformity is a bit
confusing. Fix it by renaming those variables to
libcamera_public_headers, libcamera_ipa_headers and
libcamera_internal_headers.
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Jacopo Mondi <jacopo@jmondi.org>
Acked-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
---
include/libcamera/internal/meson.build | 2 +-
include/libcamera/ipa/meson.build | 4 ++--
include/libcamera/meson.build | 8 ++++----
3 files changed, 7 insertions(+), 7 deletions(-)
(limited to 'include')
diff --git a/include/libcamera/internal/meson.build b/include/libcamera/internal/meson.build
index 1f6af579..d868eff4 100644
--- a/include/libcamera/internal/meson.build
+++ b/include/libcamera/internal/meson.build
@@ -1,6 +1,6 @@
# SPDX-License-Identifier: CC0-1.0
-libcamera_headers = files([
+libcamera_internal_headers = files([
'byte_stream_buffer.h',
'camera_controls.h',
'camera_sensor.h',
diff --git a/include/libcamera/ipa/meson.build b/include/libcamera/ipa/meson.build
index 3d5c0dd6..508c6bd1 100644
--- a/include/libcamera/ipa/meson.build
+++ b/include/libcamera/ipa/meson.build
@@ -1,10 +1,10 @@
# SPDX-License-Identifier: CC0-1.0
-libcamera_ipa_api = files([
+libcamera_ipa_headers = files([
'ipa_controls.h',
'ipa_interface.h',
'ipa_module_info.h',
])
-install_headers(libcamera_ipa_api,
+install_headers(libcamera_ipa_headers,
subdir: join_paths(libcamera_include_dir, 'ipa'))
diff --git a/include/libcamera/meson.build b/include/libcamera/meson.build
index 32b8d142..27760c19 100644
--- a/include/libcamera/meson.build
+++ b/include/libcamera/meson.build
@@ -1,6 +1,6 @@
# SPDX-License-Identifier: CC0-1.0
-libcamera_api = files([
+libcamera_public_headers = files([
'bound_method.h',
'buffer.h',
'camera.h',
@@ -26,7 +26,7 @@ include_dir = join_paths(libcamera_include_dir, 'libcamera')
subdir('internal')
subdir('ipa')
-install_headers(libcamera_api,
+install_headers(libcamera_public_headers,
subdir : include_dir)
gen_controls = files('../../src/libcamera/gen-controls.py')
@@ -49,7 +49,7 @@ foreach header : control_source_files
install_dir : join_paths('include', include_dir))
endforeach
-libcamera_api += control_headers
+libcamera_public_headers += control_headers
gen_header = files('gen-header.sh')
@@ -60,7 +60,7 @@ libcamera_h = custom_target('gen-header',
install : true,
install_dir : join_paths('include', include_dir))
-libcamera_api += libcamera_h
+libcamera_public_headers += libcamera_h
version = libcamera_version.split('.')
libcamera_version_config = configuration_data()
--
cgit v1.2.1