From patchwork Mon Aug 5 14:36:48 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 20798 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id 32336C323E for ; Mon, 5 Aug 2024 14:37:57 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 12998633C8; Mon, 5 Aug 2024 16:37:56 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="uhk5lBdx"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 6E917633B5 for ; Mon, 5 Aug 2024 16:37:34 +0200 (CEST) Received: from pendragon.ideasonboard.com (81-175-209-231.bb.dnainternet.fi [81.175.209.231]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id D84B0581 for ; Mon, 5 Aug 2024 16:36:42 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1722868603; bh=NC4ukbdD482fvuYs9QTMC0cCYWETUgJ3CaseMtMUgnE=; h=From:To:Subject:Date:In-Reply-To:References:From; b=uhk5lBdxoyB7Zvy3WYsygfvph62vuQqafxNDDHvgezz9afUNMND5nwaf2xfncP8EW VKJwqpVS5ouvZcbwt9YrbYal5EiZmxhBEMIFeYM1jwJR462MGeeaJuML2fcgqnEHcN 7VQ/MKsDyH9s1Xn/OKO/ERJ/PeLVJJU9JMAdvcgM= From: Laurent Pinchart To: libcamera-devel@lists.libcamera.org Subject: [PATCH v5 12/18] libcamera: Consolidate tracepoint header in libcamera_internal_headers Date: Mon, 5 Aug 2024 17:36:48 +0300 Message-ID: <20240805143654.20870-13-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.44.2 In-Reply-To: <20240805143654.20870-1-laurent.pinchart@ideasonboard.com> References: <20240805143654.20870-1-laurent.pinchart@ideasonboard.com> MIME-Version: 1.0 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: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" 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 Reviewed-by: Kieran Bingham --- include/libcamera/internal/meson.build | 16 +++++++++------- 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 f96cc5e37c23..39230facc8a4 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 86e8b88cc1b2..6a7c9d77dfd8 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,