summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart@ideasonboard.com>2020-03-07 19:28:24 +0200
committerLaurent Pinchart <laurent.pinchart@ideasonboard.com>2020-03-08 19:33:59 +0200
commit00804512c6c091b3062beced6085b1b65badb8b8 (patch)
tree6f280bf6c508ce154da169c11aa2017ca7b99e2d
parent34396936f7a46f21422ef64769fd807876716304 (diff)
include: libcamera: Improve automation of libcamera.h generation
The gen-header.sh script that generates libcamera.h takes all .h files in the include/libcamera/ directory, and manually adds the generated control_ids.h and version.h. This is fragile, as shown by the failure to add property_ids.h to the list in commit f870591a9bf5 ("libcamera: properties: Add location property"). To avoid future omissions, take all the .h.in files into account to generate libcamera.h. This also fixes the missing property_ids.h. Fixes: f870591a9bf5 ("libcamera: properties: Add location property") Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com> Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
-rwxr-xr-xinclude/libcamera/gen-header.sh5
1 files changed, 3 insertions, 2 deletions
diff --git a/include/libcamera/gen-header.sh b/include/libcamera/gen-header.sh
index 7f7816c9..fcb9c5e1 100755
--- a/include/libcamera/gen-header.sh
+++ b/include/libcamera/gen-header.sh
@@ -16,10 +16,11 @@ cat <<EOF > "$dst_file"
EOF
-headers=$(for header in "$src_dir"/*.h ; do
+headers=$(for header in "$src_dir"/*.h "$src_dir"/*.h.in ; do
header=$(basename "$header")
+ header="${header%.in}"
echo "$header"
-done ; echo "control_ids.h" ; echo "version.h" | sort)
+done | sort)
for header in $headers ; do
echo "#include <libcamera/$header>" >> "$dst_file"