From ba44276dd1393fb7583ac7253667c836a175158e Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Sun, 15 Sep 2019 03:05:20 +0300 Subject: libcamera: Move list of private headers to src/libcamera/include/meson.build 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 00000000..933be854 --- /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 0916bc41..755149c5 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') -- cgit v1.2.1