From patchwork Sun Sep 15 00:39:24 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 1970 Return-Path: Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 0010A60C11 for ; Sun, 15 Sep 2019 02:39:36 +0200 (CEST) Received: from pendragon.lan (unknown [IPv6:2001:8a0:6be4:9301:a728:6099:33:a27c]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 1155723F for ; Sun, 15 Sep 2019 02:39:35 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1568507976; bh=9uUE55pd5tojM8glKSdmbSSZdVcl45L6Ckv3J2PTkXo=; h=From:To:Subject:Date:From; b=B4c4eyi4h40o7QiIN9cNpb78joJCuDKqpA5TczCsVSNUecUOUGMMSMMU3wfGs2LDl jCEB7Tn+5P0ZOkKZ1XHDbDrQcjlAIrYox4w6pnlPRYRuvj7feXCmkGLf4RwnW9Qj22 GVwOuMZtXKOXnaI550ynMrp9yeRbXdkVoA4WlVjg= From: Laurent Pinchart To: libcamera-devel@lists.libcamera.org Date: Sun, 15 Sep 2019 03:39:24 +0300 Message-Id: <20190915003924.9803-1-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH] libcamera: Move list of private headers to src/libcamera/include/meson.build X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Sep 2019 00:39:37 -0000 The libcamera private headers are listed in src/libcamera/meson.build, while they are located in src/libcamera/include/. The lack of a meson.build in src/libcamera/include/ increases the risk of forgetting to add new headers to the libcamera_headers array. Fix it by moving it to src/libcamera/include/meson.build, and add the missing v4l2_controls.h entry. Signed-off-by: Laurent Pinchart Reviewed-by: Jacopo Mondi --- src/libcamera/include/meson.build | 24 ++++++++++++++++++++++++ src/libcamera/meson.build | 24 +----------------------- 2 files changed, 25 insertions(+), 23 deletions(-) create mode 100644 src/libcamera/include/meson.build diff --git a/src/libcamera/include/meson.build b/src/libcamera/include/meson.build new file mode 100644 index 000000000000..933be8543a8d --- /dev/null +++ b/src/libcamera/include/meson.build @@ -0,0 +1,24 @@ +libcamera_headers = files([ + 'camera_sensor.h', + 'device_enumerator.h', + 'device_enumerator_sysfs.h', + 'device_enumerator_udev.h', + 'event_dispatcher_poll.h', + 'formats.h', + 'ipa_manager.h', + 'ipa_module.h', + 'ipa_proxy.h', + 'ipc_unixsocket.h', + 'log.h', + 'media_device.h', + 'media_object.h', + 'message.h', + 'pipeline_handler.h', + 'process.h', + 'thread.h', + 'utils.h', + 'v4l2_controls.h', + 'v4l2_device.h', + 'v4l2_subdevice.h', + 'v4l2_videodevice.h', +]) diff --git a/src/libcamera/meson.build b/src/libcamera/meson.build index 0916bc411360..755149c55c7b 100644 --- a/src/libcamera/meson.build +++ b/src/libcamera/meson.build @@ -36,29 +36,7 @@ libcamera_sources = files([ 'v4l2_videodevice.cpp', ]) -libcamera_headers = files([ - 'include/camera_sensor.h', - 'include/device_enumerator.h', - 'include/device_enumerator_sysfs.h', - 'include/device_enumerator_udev.h', - 'include/event_dispatcher_poll.h', - 'include/formats.h', - 'include/ipa_manager.h', - 'include/ipa_module.h', - 'include/ipa_proxy.h', - 'include/ipc_unixsocket.h', - 'include/log.h', - 'include/media_device.h', - 'include/media_object.h', - 'include/message.h', - 'include/pipeline_handler.h', - 'include/process.h', - 'include/thread.h', - 'include/utils.h', - 'include/v4l2_device.h', - 'include/v4l2_subdevice.h', - 'include/v4l2_videodevice.h', -]) +subdir('include') libcamera_internal_includes = include_directories('include')