From patchwork Sat Mar 7 21:13:21 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 3042 Return-Path: Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 879716193A for ; Sat, 7 Mar 2020 22:13:38 +0100 (CET) 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 140DD5F; Sat, 7 Mar 2020 22:13:38 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1583615618; bh=jZ/kP3uIB2vXSgpE39CJ4oFTiU3Uf96zgAJkmWdQR3g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=veOuo5ZD2axwNjxEEWrwzgbo94USth3Ito0nuVJ+acbL0r3wUSMMCAftnHmRDDKm2 IxKG8coaYec6yHsinhHxvj5ys9yti7Bd3PY0wyZUH3UDdKcdUKVERQqdmyPRbEM0at c9fSO/HQhBCzxini83ZMAqSnWCqtbDksxYAiPLP4= From: Laurent Pinchart To: libcamera-devel@lists.libcamera.org Date: Sat, 7 Mar 2020 23:13:21 +0200 Message-Id: <20200307211326.26994-3-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200307211326.26994-1-laurent.pinchart@ideasonboard.com> References: <20200307211326.26994-1-laurent.pinchart@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v3 2/7] include: libcamera: meson: Add control headers to the libcamera_api array 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: Sat, 07 Mar 2020 21:13:38 -0000 From: Kieran Bingham The libcamera_api array is meant to contain all the headers from the libcamera public API, for the purpose of generating documentation and creating the libcamera_dep dependency. The generated control headers are part of the libcamera public API, and used to be included in the libcamera_api array until commit f870591a9bf5 ("libcamera: properties: Add location property") inadvertently removed them. Add them back. Fixes: f870591a9bf5 ("libcamera: properties: Add location property") Signed-off-by: Kieran Bingham [Split the change out and reworded the commit message] Signed-off-by: Laurent Pinchart --- include/libcamera/meson.build | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/libcamera/meson.build b/include/libcamera/meson.build index f47c583cbbc0..88edf620f69e 100644 --- a/include/libcamera/meson.build +++ b/include/libcamera/meson.build @@ -44,6 +44,8 @@ foreach header : control_source_files install_dir : join_paths('include', include_dir)) endforeach +libcamera_api += control_headers + gen_header = files('gen-header.sh') libcamera_h = custom_target('gen-header',