From 913b3ee817a34bd78d5a8dc4fc9025920202db09 Mon Sep 17 00:00:00 2001
From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Date: Tue, 4 Dec 2018 23:38:48 +0200
Subject: [PATCH] Overhaul the directory structure

In order to match the directory structure of traditional projects,
rename the top-level lib/ directory to src/libcamera/. Other libraries
developed as part of the project will later find a home in src/.

Split the libcamera header files in three categories: public headers
describing the public API in include/libcamera/, internal headers
describing the internal API in src/libcamera/include/, and private
headers local to one or a small number of compilation units along the
corresponding .cpp files. As no internal header exists yet the
src/libcamera/include/ directory is created empty as the build system
would fail otherwise.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
---
 meson.build                        | 4 ++--
 src/libcamera/include/.keep_empty  | 0
 {lib => src/libcamera}/main.cpp    | 0
 {lib => src/libcamera}/meson.build | 7 ++++++-
 src/meson.build                    | 1 +
 test/meson.build                   | 2 +-
 6 files changed, 10 insertions(+), 4 deletions(-)
 create mode 100644 src/libcamera/include/.keep_empty
 rename {lib => src/libcamera}/main.cpp (100%)
 rename {lib => src/libcamera}/meson.build (50%)
 create mode 100644 src/meson.build

diff --git a/meson.build b/meson.build
index e0aeefa30..e6ed03f95 100644
--- a/meson.build
+++ b/meson.build
@@ -21,11 +21,11 @@ cpp_arguments = common_arguments
 add_project_arguments(c_arguments, language: 'c')
 add_project_arguments(cpp_arguments, language: 'cpp')
 
-inc = include_directories('include')
+libcamera_includes = include_directories('include')
 
 subdir('Documentation')
 subdir('include')
-subdir('lib')
+subdir('src')
 subdir('test')
 subdir('utils')
 
diff --git a/src/libcamera/include/.keep_empty b/src/libcamera/include/.keep_empty
new file mode 100644
index 000000000..e69de29bb
diff --git a/lib/main.cpp b/src/libcamera/main.cpp
similarity index 100%
rename from lib/main.cpp
rename to src/libcamera/main.cpp
diff --git a/lib/meson.build b/src/libcamera/meson.build
similarity index 50%
rename from lib/meson.build
rename to src/libcamera/meson.build
index fcd738cc8..07d9cd448 100644
--- a/lib/meson.build
+++ b/src/libcamera/meson.build
@@ -1,6 +1,11 @@
 sources = ['main.cpp']
 
+includes = [
+    libcamera_includes,
+    include_directories('include'),
+]
+
 libcamera = shared_library('camera',
                            sources,
                            install : true,
-                           include_directories : inc)
+                           include_directories : includes)
diff --git a/src/meson.build b/src/meson.build
new file mode 100644
index 000000000..4ce9668ca
--- /dev/null
+++ b/src/meson.build
@@ -0,0 +1 @@
+subdir('libcamera')
diff --git a/test/meson.build b/test/meson.build
index afe9bd9a7..924a26f1c 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -1,5 +1,5 @@
 test_init = executable('test_init', 'init.cpp',
                        link_with : libcamera,
-                       include_directories : inc)
+                       include_directories : libcamera_includes)
 
 test('Initialisation test', test_init)