From 1e704c84a946f988c290169f060aa088d53fc4a8 Mon Sep 17 00:00:00 2001
From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
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 <laurent.pinchart@ideasonboard.com>
Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>
---
 src/libcamera/proxy/ipa_proxy_linux.cpp               | 4 ++--
 src/libcamera/proxy/worker/ipa_proxy_linux_worker.cpp | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/libcamera/proxy')

diff --git a/src/libcamera/proxy/ipa_proxy_linux.cpp b/src/libcamera/proxy/ipa_proxy_linux.cpp
index f881aab5..83a74250 100644
--- a/src/libcamera/proxy/ipa_proxy_linux.cpp
+++ b/src/libcamera/proxy/ipa_proxy_linux.cpp
@@ -7,8 +7,8 @@
 
 #include <vector>
 
-#include <libcamera/ipa/ipa_interface.h>
-#include <libcamera/ipa/ipa_module_info.h>
+#include <ipa/ipa_interface.h>
+#include <ipa/ipa_module_info.h>
 
 #include "ipa_module.h"
 #include "ipa_proxy.h"
diff --git a/src/libcamera/proxy/worker/ipa_proxy_linux_worker.cpp b/src/libcamera/proxy/worker/ipa_proxy_linux_worker.cpp
index ffba3ae4..a10761e5 100644
--- a/src/libcamera/proxy/worker/ipa_proxy_linux_worker.cpp
+++ b/src/libcamera/proxy/worker/ipa_proxy_linux_worker.cpp
@@ -9,8 +9,8 @@
 #include <sys/types.h>
 #include <unistd.h>
 
+#include <ipa/ipa_interface.h>
 #include <libcamera/event_dispatcher.h>
-#include <libcamera/ipa/ipa_interface.h>
 #include <libcamera/logging.h>
 
 #include "ipa_module.h"
-- 
cgit v1.2.1