Skip to content

Commit

Permalink
libcamera: Move Header generation utilities to utils
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
kbingham committed Sep 24, 2020
1 parent d6b6ad9 commit c09626c
Show file tree
Hide file tree
Showing 6 changed files with 5 additions and 8 deletions.
6 changes: 0 additions & 6 deletions include/libcamera/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand All @@ -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',
Expand All @@ -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',
Expand Down
2 changes: 0 additions & 2 deletions src/libcamera/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,6 @@ if libudev.found()
])
endif

gen_controls = files('gen-controls.py')

control_sources = []

foreach source : control_source_files
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
5 changes: 5 additions & 0 deletions utils/meson.build
Original file line number Diff line number Diff line change
@@ -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')

0 comments on commit c09626c

Please sign in to comment.