[libcamera-devel] [PATCH 1/6] build: Clean up file names variables

Laurent Pinchart laurent.pinchart at ideasonboard.com
Tue Dec 11 20:10:06 CET 2018


The build system defines two variables, public_api and sources, that
store the names of the public headers and the source files respectively.
These files will need to be referenced when generating documentation
from source code, so let's make the variable names more descriptive:

- Rename public_api to libcamera_api and use the files() function
- Rename sources to libcamera_sources
- Add a libcamera_headers variable to hold the internal headers

Signed-off-by: Laurent Pinchart <laurent.pinchart at ideasonboard.com>
---
 include/libcamera/meson.build | 6 +++---
 src/libcamera/meson.build     | 9 +++++++--
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/include/libcamera/meson.build b/include/libcamera/meson.build
index 8fb21e983832..8c82675a25d2 100644
--- a/include/libcamera/meson.build
+++ b/include/libcamera/meson.build
@@ -1,6 +1,6 @@
-public_api = [
+libcamera_api = files([
     'libcamera.h',
-]
+])
 
-install_headers(public_api,
+install_headers(libcamera_api,
                 subdir : 'libcamera')
diff --git a/src/libcamera/meson.build b/src/libcamera/meson.build
index fe38f8b2b5b4..0c44b5ab58fb 100644
--- a/src/libcamera/meson.build
+++ b/src/libcamera/meson.build
@@ -1,14 +1,19 @@
-sources = files([
+libcamera_sources = files([
     'log.cpp',
     'main.cpp',
 ])
 
+libcamera_headers = files([
+    'include/log.h',
+    'include/utils.h',
+])
+
 includes = [
     libcamera_includes,
     include_directories('include'),
 ]
 
 libcamera = shared_library('camera',
-                           sources,
+                           libcamera_sources,
                            install : true,
                            include_directories : includes)
-- 
Regards,

Laurent Pinchart



More information about the libcamera-devel mailing list