[libcamera-devel] [PATCH v2 3/3] meson: Rename variables storing headers lists
Laurent Pinchart
laurent.pinchart at ideasonboard.com
Fri May 15 18:35:04 CEST 2020
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 at ideasonboard.com>
---
Documentation/meson.build | 6 +++---
include/libcamera/internal/meson.build | 2 +-
include/libcamera/ipa/meson.build | 4 ++--
include/libcamera/meson.build | 8 ++++----
src/libcamera/meson.build | 5 ++++-
5 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/Documentation/meson.build b/Documentation/meson.build
index b3b4f0b66f57..6d9a397cf1a3 100644
--- a/Documentation/meson.build
+++ b/Documentation/meson.build
@@ -22,9 +22,9 @@ if doxygen.found()
custom_target('doxygen',
input : [
doxyfile,
- libcamera_api,
- libcamera_ipa_api,
- libcamera_headers,
+ libcamera_internal_headers,
+ libcamera_ipa_headers,
+ libcamera_public_headers,
libcamera_sources,
libipa_headers,
libipa_sources,
diff --git a/include/libcamera/internal/meson.build b/include/libcamera/internal/meson.build
index 1f6af579cca2..d868eff47f92 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 3d5c0dd69bb4..508c6bd12a93 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 32b8d14211a4..27760c19f9b9 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()
diff --git a/src/libcamera/meson.build b/src/libcamera/meson.build
index 472af451c1ef..b88f295d251d 100644
--- a/src/libcamera/meson.build
+++ b/src/libcamera/meson.build
@@ -138,7 +138,10 @@ libcamera = shared_library('camera',
build_rpath : '/',
dependencies : libcamera_deps)
-libcamera_dep = declare_dependency(sources : [libcamera_api, libcamera_ipa_api],
+libcamera_dep = declare_dependency(sources : [
+ libcamera_ipa_headers,
+ libcamera_public_headers,
+ ],
include_directories : libcamera_includes,
link_with : libcamera)
--
Regards,
Laurent Pinchart
More information about the libcamera-devel
mailing list