From patchwork Fri May 15 16:35:04 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 3802 Return-Path: Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 7EA4A60E0F for ; Fri, 15 May 2020 18:35:18 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="eB8xeHjK"; dkim-atps=neutral Received: from pendragon.bb.dnainternet.fi (81-175-216-236.bb.dnainternet.fi [81.175.216.236]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 225A826A for ; Fri, 15 May 2020 18:35:18 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1589560518; bh=peqxQWZP3UQYXfNpZ1zPRfL0Rh4ipaSe5/qj0jXn6oM=; h=From:To:Subject:Date:In-Reply-To:References:From; b=eB8xeHjK5RpPQ4ghpJvpNXQ6Dr2jCdAlZU/im1y9NxECDgkzZ0jpD2ady1jF2v2Vs xpWmutS2F+Lhl8S6or7TOHyGlCTnvgfgmxZSJz95outRjnfLQhsgNHIeDXhcVH9ghP hd95Q8D15uuq8EnGIuVQWs2nyeM2EBnsL86y6KnE= From: Laurent Pinchart To: libcamera-devel@lists.libcamera.org Date: Fri, 15 May 2020 19:35:04 +0300 Message-Id: <20200515163505.24330-3-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200515163505.24330-1-laurent.pinchart@ideasonboard.com> References: <20200515163505.24330-1-laurent.pinchart@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v2 3/3] meson: Rename variables storing headers lists X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 May 2020 16:35:18 -0000 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 Acked-by: Jacopo Mondi Acked-by: Kieran Bingham --- 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)