From 66051636c5754a33a812d9f306935e29397e0009 Mon Sep 17 00:00:00 2001
From: Kieran Bingham <kieran.bingham@ideasonboard.com>
Date: Mon, 26 Nov 2018 10:32:13 +0000
Subject: include: Install include files
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The include directory was defined but not installed.

Add it to the meson build structure to incorporate it as part of the
library install.

To facilitate the same include paths in our internal includes, update
the structure for headers to match the install structure.

Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
---
 include/libcamera.h           | 5 -----
 include/libcamera/libcamera.h | 5 +++++
 include/libcamera/meson.build | 6 ++++++
 include/meson.build           | 1 +
 meson.build                   | 1 +
 test/init.cpp                 | 2 +-
 6 files changed, 14 insertions(+), 6 deletions(-)
 delete mode 100644 include/libcamera.h
 create mode 100644 include/libcamera/libcamera.h
 create mode 100644 include/libcamera/meson.build
 create mode 100644 include/meson.build

diff --git a/include/libcamera.h b/include/libcamera.h
deleted file mode 100644
index d5b34a2c..00000000
--- a/include/libcamera.h
+++ /dev/null
@@ -1,5 +0,0 @@
-class libcamera
-{
-public:
-	void init_lib(void);
-};
diff --git a/include/libcamera/libcamera.h b/include/libcamera/libcamera.h
new file mode 100644
index 00000000..d5b34a2c
--- /dev/null
+++ b/include/libcamera/libcamera.h
@@ -0,0 +1,5 @@
+class libcamera
+{
+public:
+	void init_lib(void);
+};
diff --git a/include/libcamera/meson.build b/include/libcamera/meson.build
new file mode 100644
index 00000000..da685f34
--- /dev/null
+++ b/include/libcamera/meson.build
@@ -0,0 +1,6 @@
+public_api = [
+	'libcamera.h',
+]
+
+install_headers(public_api,
+                subdir : 'libcamera')
diff --git a/include/meson.build b/include/meson.build
new file mode 100644
index 00000000..4ce9668c
--- /dev/null
+++ b/include/meson.build
@@ -0,0 +1 @@
+subdir('libcamera')
diff --git a/meson.build b/meson.build
index 4b3d528c..1f57b49d 100644
--- a/meson.build
+++ b/meson.build
@@ -4,6 +4,7 @@ project('libcamera - supporting complex camera pipelines', 'c', 'cpp',
 
 inc = include_directories('include')
 
+subdir('include')
 subdir('lib')
 subdir('test')
 subdir('utils')
diff --git a/test/init.cpp b/test/init.cpp
index 182728d3..8c8ec9ad 100644
--- a/test/init.cpp
+++ b/test/init.cpp
@@ -1,4 +1,4 @@
-#include <libcamera.h>
+#include <libcamera/libcamera.h>
 
 int main(void)
 {
-- 
cgit v1.2.1