From 1e704c84a946f988c290169f060aa088d53fc4a8 Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Sat, 14 Sep 2019 22:47:28 +0300 Subject: libcamera: Move ipa includes to the same level as libcamera The ipa includes are located in include/libcamera/ipa/. This gives an incorrect impression that they are a sub-part of the rest of the libcamera API, while they are the API towards the IPA the same way that include/libcamera/ contains the API towards applications. To clarify this, move them to include/ipa/. The IPA headers are however still part of libcamera, so installing them to ${prefix}/include/ipa/ would make little sense. To fix this, move the application facing API to ${prefix}/include/libcamera/libcamera/ when installed, and the IPA to ${prefix}/include/libcamera/ipa/. When major versions of libcamera will be released, they could then be installed side by side in ${prefix}/include/libcamera-${version}/. Signed-off-by: Laurent Pinchart Reviewed-by: Jacopo Mondi --- Documentation/Doxyfile.in | 4 +++- Documentation/meson.build | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'Documentation') diff --git a/Documentation/Doxyfile.in b/Documentation/Doxyfile.in index db939abc..ecc058ee 100644 --- a/Documentation/Doxyfile.in +++ b/Documentation/Doxyfile.in @@ -791,7 +791,9 @@ WARN_LOGFILE = # spaces. See also FILE_PATTERNS and EXTENSION_MAPPING # Note: If this tag is empty the current directory is searched. -INPUT = "@TOP_SRCDIR@/include/libcamera" "@TOP_SRCDIR@/src/libcamera" +INPUT = "@TOP_SRCDIR@/include/ipa" \ + "@TOP_SRCDIR@/include/libcamera" \ + "@TOP_SRCDIR@/src/libcamera" # This tag can be used to specify the character encoding of the source files # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses diff --git a/Documentation/meson.build b/Documentation/meson.build index a560d02a..4ff3fbeb 100644 --- a/Documentation/meson.build +++ b/Documentation/meson.build @@ -21,6 +21,7 @@ if doxygen.found() input : [ doxyfile, libcamera_api, + libcamera_ipa_api, libcamera_headers, libcamera_sources, ], -- cgit v1.2.1