From 830031892b875e284fa14bb13b5d6bd1e8a9173b Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Tue, 11 Dec 2018 20:16:46 +0200 Subject: build: Clean up file names variables 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 --- 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 8fb21e98..8c82675a 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 fe38f8b2..0c44b5ab 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) -- cgit v1.2.1