diff options
| author | Kieran Bingham <kieran.bingham@ideasonboard.com> | 2020-09-03 11:36:57 +0100 |
|---|---|---|
| committer | Kieran Bingham <kieran.bingham@ideasonboard.com> | 2020-09-24 10:55:49 +0100 |
| commit | c09626cd6306239bc473aaf73a2030d5e56699b8 (patch) | |
| tree | 02df57c50c9e1730cadc2def8b5d86ee005ada9b | |
| parent | d6b6ad950d73b21dd6dc58ddedd4c2cfd4b638ef (diff) | |
libcamera: Move Header generation utilities to utils
Move the GPL2 utilities which handle generation of controls, formats and
the top level libcamera header to the utils subtree.
Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Paul Elder <paul.elder@ideasonboard.com>
| -rw-r--r-- | include/libcamera/meson.build | 6 | ||||
| -rw-r--r-- | src/libcamera/meson.build | 2 | ||||
| -rwxr-xr-x | utils/gen-controls.py (renamed from src/libcamera/gen-controls.py) | 0 | ||||
| -rwxr-xr-x | utils/gen-formats.py (renamed from include/libcamera/gen-formats.py) | 0 | ||||
| -rwxr-xr-x | utils/gen-header.sh (renamed from include/libcamera/gen-header.sh) | 0 | ||||
| -rw-r--r-- | utils/meson.build | 5 |
6 files changed, 5 insertions, 8 deletions
diff --git a/include/libcamera/meson.build b/include/libcamera/meson.build index cdb8e037..692931a5 100644 --- a/include/libcamera/meson.build +++ b/include/libcamera/meson.build @@ -34,8 +34,6 @@ install_headers(libcamera_public_headers, # # control_ids.h and property_ids.h -gen_controls = files('../../src/libcamera/gen-controls.py') - control_source_files = [ 'control_ids', 'property_ids', @@ -57,8 +55,6 @@ endforeach libcamera_public_headers += control_headers # formats.h -gen_formats = files('gen-formats.py') - formats_h = custom_target('formats_h', input : files( '../../src/libcamera/formats.yaml', @@ -72,8 +68,6 @@ formats_h = custom_target('formats_h', libcamera_public_headers += formats_h # libcamera.h -gen_header = files('gen-header.sh') - libcamera_h = custom_target('gen-header', input : 'meson.build', output : 'libcamera.h', diff --git a/src/libcamera/meson.build b/src/libcamera/meson.build index 0e6ecf50..d63dacd5 100644 --- a/src/libcamera/meson.build +++ b/src/libcamera/meson.build @@ -77,8 +77,6 @@ if libudev.found() ]) endif -gen_controls = files('gen-controls.py') - control_sources = [] foreach source : control_source_files diff --git a/src/libcamera/gen-controls.py b/utils/gen-controls.py index 87c3d52a..87c3d52a 100755 --- a/src/libcamera/gen-controls.py +++ b/utils/gen-controls.py diff --git a/include/libcamera/gen-formats.py b/utils/gen-formats.py index 60dcecc3..60dcecc3 100755 --- a/include/libcamera/gen-formats.py +++ b/utils/gen-formats.py diff --git a/include/libcamera/gen-header.sh b/utils/gen-header.sh index fcb9c5e1..fcb9c5e1 100755 --- a/include/libcamera/gen-header.sh +++ b/utils/gen-header.sh diff --git a/utils/meson.build b/utils/meson.build index c3cd9d69..ef5507b1 100644 --- a/utils/meson.build +++ b/utils/meson.build @@ -1,3 +1,8 @@ # SPDX-License-Identifier: CC0-1.0 subdir('ipu3') + +## Code generation +gen_controls = files('gen-controls.py') +gen_formats = files('gen-formats.py') +gen_header = files('gen-header.sh') |