{"id":3802,"url":"https://patchwork.libcamera.org/api/1.1/patches/3802/?format=json","web_url":"https://patchwork.libcamera.org/patch/3802/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20200515163505.24330-3-laurent.pinchart@ideasonboard.com>","date":"2020-05-15T16:35:04","name":"[libcamera-devel,v2,3/3] meson: Rename variables storing headers lists","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"131430aa17e75bde2d4bb37c728b273f24979c84","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/1.1/people/2/?format=json","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/3802/mbox/","series":[{"id":906,"url":"https://patchwork.libcamera.org/api/1.1/series/906/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=906","date":"2020-05-15T16:35:02","name":"[libcamera-devel,v2,1/3] libcamera: Move internal headers to include/libcamera/internal/","version":2,"mbox":"https://patchwork.libcamera.org/series/906/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/3802/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/3802/checks/","tags":{},"headers":{"Return-Path":"","Received":["from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 7EA4A60E0F\n\tfor ;\n\tFri, 15 May 2020 18:35:18 +0200 (CEST)","from pendragon.bb.dnainternet.fi (81-175-216-236.bb.dnainternet.fi\n\t[81.175.216.236])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 225A826A\n\tfor ;\n\tFri, 15 May 2020 18:35:18 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"eB8xeHjK\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1589560518;\n\tbh=peqxQWZP3UQYXfNpZ1zPRfL0Rh4ipaSe5/qj0jXn6oM=;\n\th=From:To:Subject:Date:In-Reply-To:References:From;\n\tb=eB8xeHjK5RpPQ4ghpJvpNXQ6Dr2jCdAlZU/im1y9NxECDgkzZ0jpD2ady1jF2v2Vs\n\txpWmutS2F+Lhl8S6or7TOHyGlCTnvgfgmxZSJz95outRjnfLQhsgNHIeDXhcVH9ghP\n\thd95Q8D15uuq8EnGIuVQWs2nyeM2EBnsL86y6KnE=","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","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v2 3/3] meson: Rename variables storing\n\theaders lists","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","X-List-Received-Date":"Fri, 15 May 2020 16:35:18 -0000"},"content":"The list of public, IPA and internal header files are stored in three\nmeson variables, named libcamera_api, libcamera_ipa_api and\nlibcamera_headers respectively. The lack of uniformity is a bit\nconfusing. Fix it by renaming those variables to\nlibcamera_public_headers, libcamera_ipa_headers and\nlibcamera_internal_headers.\n\nSigned-off-by: Laurent Pinchart \n---\n Documentation/meson.build | 6 +++---\n include/libcamera/internal/meson.build | 2 +-\n include/libcamera/ipa/meson.build | 4 ++--\n include/libcamera/meson.build | 8 ++++----\n src/libcamera/meson.build | 5 ++++-\n 5 files changed, 14 insertions(+), 11 deletions(-)","diff":"diff --git a/Documentation/meson.build b/Documentation/meson.build\nindex b3b4f0b66f57..6d9a397cf1a3 100644\n--- a/Documentation/meson.build\n+++ b/Documentation/meson.build\n@@ -22,9 +22,9 @@ if doxygen.found()\n custom_target('doxygen',\n input : [\n doxyfile,\n- libcamera_api,\n- libcamera_ipa_api,\n- libcamera_headers,\n+ libcamera_internal_headers,\n+ libcamera_ipa_headers,\n+ libcamera_public_headers,\n libcamera_sources,\n libipa_headers,\n libipa_sources,\ndiff --git a/include/libcamera/internal/meson.build b/include/libcamera/internal/meson.build\nindex 1f6af579cca2..d868eff47f92 100644\n--- a/include/libcamera/internal/meson.build\n+++ b/include/libcamera/internal/meson.build\n@@ -1,6 +1,6 @@\n # SPDX-License-Identifier: CC0-1.0\n \n-libcamera_headers = files([\n+libcamera_internal_headers = files([\n 'byte_stream_buffer.h',\n 'camera_controls.h',\n 'camera_sensor.h',\ndiff --git a/include/libcamera/ipa/meson.build b/include/libcamera/ipa/meson.build\nindex 3d5c0dd69bb4..508c6bd12a93 100644\n--- a/include/libcamera/ipa/meson.build\n+++ b/include/libcamera/ipa/meson.build\n@@ -1,10 +1,10 @@\n # SPDX-License-Identifier: CC0-1.0\n \n-libcamera_ipa_api = files([\n+libcamera_ipa_headers = files([\n 'ipa_controls.h',\n 'ipa_interface.h',\n 'ipa_module_info.h',\n ])\n \n-install_headers(libcamera_ipa_api,\n+install_headers(libcamera_ipa_headers,\n subdir: join_paths(libcamera_include_dir, 'ipa'))\ndiff --git a/include/libcamera/meson.build b/include/libcamera/meson.build\nindex 32b8d14211a4..27760c19f9b9 100644\n--- a/include/libcamera/meson.build\n+++ b/include/libcamera/meson.build\n@@ -1,6 +1,6 @@\n # SPDX-License-Identifier: CC0-1.0\n \n-libcamera_api = files([\n+libcamera_public_headers = files([\n 'bound_method.h',\n 'buffer.h',\n 'camera.h',\n@@ -26,7 +26,7 @@ include_dir = join_paths(libcamera_include_dir, 'libcamera')\n subdir('internal')\n subdir('ipa')\n \n-install_headers(libcamera_api,\n+install_headers(libcamera_public_headers,\n subdir : include_dir)\n \n gen_controls = files('../../src/libcamera/gen-controls.py')\n@@ -49,7 +49,7 @@ foreach header : control_source_files\n install_dir : join_paths('include', include_dir))\n endforeach\n \n-libcamera_api += control_headers\n+libcamera_public_headers += control_headers\n \n gen_header = files('gen-header.sh')\n \n@@ -60,7 +60,7 @@ libcamera_h = custom_target('gen-header',\n install : true,\n install_dir : join_paths('include', include_dir))\n \n-libcamera_api += libcamera_h\n+libcamera_public_headers += libcamera_h\n \n version = libcamera_version.split('.')\n libcamera_version_config = configuration_data()\ndiff --git a/src/libcamera/meson.build b/src/libcamera/meson.build\nindex 472af451c1ef..b88f295d251d 100644\n--- a/src/libcamera/meson.build\n+++ b/src/libcamera/meson.build\n@@ -138,7 +138,10 @@ libcamera = shared_library('camera',\n build_rpath : '/',\n dependencies : libcamera_deps)\n \n-libcamera_dep = declare_dependency(sources : [libcamera_api, libcamera_ipa_api],\n+libcamera_dep = declare_dependency(sources : [\n+ libcamera_ipa_headers,\n+ libcamera_public_headers,\n+ ],\n include_directories : libcamera_includes,\n link_with : libcamera)\n \n","prefixes":["libcamera-devel","v2","3/3"]}